mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
enable talkinghead's talking animation while the LLM is streaming
This commit is contained in:
@ -10,6 +10,7 @@ export { MODULE_NAME };
|
|||||||
const MODULE_NAME = 'expressions';
|
const MODULE_NAME = 'expressions';
|
||||||
const UPDATE_INTERVAL = 2000;
|
const UPDATE_INTERVAL = 2000;
|
||||||
const STREAMING_UPDATE_INTERVAL = 6000;
|
const STREAMING_UPDATE_INTERVAL = 6000;
|
||||||
|
const TALKINGCHECK_UPDATE_INTERVAL = 250;
|
||||||
const FALLBACK_EXPRESSION = 'joy';
|
const FALLBACK_EXPRESSION = 'joy';
|
||||||
const DEFAULT_EXPRESSIONS = [
|
const DEFAULT_EXPRESSIONS = [
|
||||||
'talkinghead',
|
'talkinghead',
|
||||||
@ -46,6 +47,8 @@ const DEFAULT_EXPRESSIONS = [
|
|||||||
let expressionsList = null;
|
let expressionsList = null;
|
||||||
let lastCharacter = undefined;
|
let lastCharacter = undefined;
|
||||||
let lastMessage = null;
|
let lastMessage = null;
|
||||||
|
let lastTalkingState = false;
|
||||||
|
let lastTalkingStateMessage = null; // last message as seen by `updateTalkingState` (tracked separately, different timer)
|
||||||
let spriteCache = {};
|
let spriteCache = {};
|
||||||
let inApiCall = false;
|
let inApiCall = false;
|
||||||
let lastServerResponseTime = 0;
|
let lastServerResponseTime = 0;
|
||||||
@ -623,6 +626,62 @@ async function moduleWorker() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts/stops talkinghead talking animation.
|
||||||
|
*
|
||||||
|
* Talking starts only when all the following conditions are met:
|
||||||
|
* - The LLM is currently streaming its output.
|
||||||
|
* - The AI's current last message is non-empty, and also not just '...' (as produced by a swipe).
|
||||||
|
* - The AI's current last message has changed from what we saw during the previous call.
|
||||||
|
*
|
||||||
|
* In all other cases, talking stops.
|
||||||
|
*
|
||||||
|
* A talkinghead API call is made only when the talking state changes.
|
||||||
|
*/
|
||||||
|
async function updateTalkingState() {
|
||||||
|
const context = getContext();
|
||||||
|
const currentLastMessage = getLastCharacterMessage();
|
||||||
|
|
||||||
|
try {
|
||||||
|
// TODO: Not sure if we need also "&& !context.groupId" here - the classify check in `moduleWorker`
|
||||||
|
// (that similarly checks the streaming processor state) does that for some reason.
|
||||||
|
// Talkinghead isn't currently designed to work with groups.
|
||||||
|
if (isTalkingHeadEnabled()) {
|
||||||
|
const lastMessageChanged = !((lastCharacter === context.characterId || lastCharacter === context.groupId)
|
||||||
|
&& lastTalkingStateMessage === currentLastMessage.mes);
|
||||||
|
const url = new URL(getApiUrl());
|
||||||
|
let newTalkingState;
|
||||||
|
if (context.streamingProcessor && !context.streamingProcessor.isFinished &&
|
||||||
|
currentLastMessage.mes.length !== 0 && currentLastMessage.mes !== '...' && lastMessageChanged) {
|
||||||
|
url.pathname = '/api/talkinghead/start_talking';
|
||||||
|
newTalkingState = true;
|
||||||
|
} else {
|
||||||
|
url.pathname = '/api/talkinghead/stop_talking';
|
||||||
|
newTalkingState = false;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// Call the talkinghead API only if the talking state changed.
|
||||||
|
if (newTalkingState !== lastTalkingState) {
|
||||||
|
console.debug(`updateTalkingState: calling ${url.pathname}`);
|
||||||
|
await doExtrasFetch(url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (error) {
|
||||||
|
// it's ok if not supported
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
lastTalkingState = newTalkingState;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (error) {
|
||||||
|
// console.log(error);
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
lastTalkingStateMessage = currentLastMessage.mes;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks whether the current character has a talkinghead image available.
|
* Checks whether the current character has a talkinghead image available.
|
||||||
* @returns {Promise<boolean>} True if the character has a talkinghead image available, false otherwise.
|
* @returns {Promise<boolean>} True if the character has a talkinghead image available, false otherwise.
|
||||||
@ -1513,6 +1572,11 @@ function setExpressionOverrideHtml(forceClear = false) {
|
|||||||
const updateFunction = wrapper.update.bind(wrapper);
|
const updateFunction = wrapper.update.bind(wrapper);
|
||||||
setInterval(updateFunction, UPDATE_INTERVAL);
|
setInterval(updateFunction, UPDATE_INTERVAL);
|
||||||
moduleWorker();
|
moduleWorker();
|
||||||
|
// For setting the talkinghead talking animation on/off quickly enough for realtime use, we need another timer on a shorter schedule.
|
||||||
|
const wrapper_talkingstate = new ModuleWorkerWrapper(updateTalkingState);
|
||||||
|
const updateTalkingStateFunction = wrapper_talkingstate.update.bind(wrapper_talkingstate);
|
||||||
|
setInterval(updateTalkingStateFunction, TALKINGCHECK_UPDATE_INTERVAL);
|
||||||
|
updateTalkingState();
|
||||||
dragElement($('#expression-holder'));
|
dragElement($('#expression-holder'));
|
||||||
eventSource.on(event_types.CHAT_CHANGED, () => {
|
eventSource.on(event_types.CHAT_CHANGED, () => {
|
||||||
// character changed
|
// character changed
|
||||||
|
Reference in New Issue
Block a user