rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: LLM Classifier Defaulting to Last Spoken Character's Expression For All Characters in Group Chats (#2605) 

* fix: fix llm expression classifier on group chats

* chore: adjust some things

* fix: exisiting chats defaulting to last character's sent message

* chore: use dual awaits than promise

* chore: restore allSettled and separate await call for llm only

* chore: move classification to generateRaw

* chore: remove characterId

* chore: revert some placements back to how they were

* chore: remove uneeded imports
This commit is contained in:
Azariel Del Carmen 2024-08-04 11:24:24 +01:00 committed by GitHub
parent 16172b410c
commit 5d0581603b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/scripts/extensions/expressions/index.js
View File

@ -1,4 +1,4 @@
import { callPopup, eventSource, event_types, generateQuietPrompt, getRequestHeaders, online_status, saveSettingsDebounced, substituteParams, substituteParamsExtended, system_message_types } from '../../../script.js'; import { callPopup, eventSource, event_types, generateRaw, getRequestHeaders, main_api, online_status, saveSettingsDebounced, substituteParams, substituteParamsExtended, system_message_types } from '../../../script.js';
import { dragElement, isMobile } from '../../RossAscends-mods.js'; import { dragElement, isMobile } from '../../RossAscends-mods.js';
import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js'; import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js';
import { loadMovingUIState, power_user } from '../../power-user.js'; import { loadMovingUIState, power_user } from '../../power-user.js';
@ -1156,7 +1156,7 @@ async function getExpressionLabel(text) {
functionResult = args?.arguments; functionResult = args?.arguments;
}); });
const emotionResponse = await generateQuietPrompt(prompt, false, false); const emotionResponse = await generateRaw(text, main_api, false, false, prompt);
return parseLlmResponse(functionResult || emotionResponse, expressionsList); return parseLlmResponse(functionResult || emotionResponse, expressionsList);
} }
// Extras // Extras