rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support for group chat expressions

Browse Source
This commit is contained in:
SillyLossy
2023-04-14 15:13:31 +03:00
parent c44cd02a01
commit 4b98f9d825
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/script.js
View File

@ -125,6 +125,7 @@ export {
updateChatMetadata, updateChatMetadata,
scrollChatToBottom, scrollChatToBottom,
getTokenCount, getTokenCount,
isStreamingEnabled,
chat, chat,
this_chid, this_chid,
settings, settings,

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

@ -37,22 +37,22 @@ async function moduleWorker() {
continue; continue;
} }
return mes.mes; return { mes: mes.mes, name: mes.name };
} }
return ''; return { mes: '', name: null };
} }
const context = getContext(); const context = getContext();
// group chats and non-characters not supported // non-characters not supported
if (context.groupId || !context.characterId) { if (!context.groupId && !context.characterId) {
removeExpression(); removeExpression();
return; return;
} }
// character changed // character changed
if (lastCharacter !== context.characterId) { if (context.groupId !== lastCharacter && context.characterId !== lastCharacter) {
removeExpression(); removeExpression();
validateImages(); validateImages();
} }
@ -69,7 +69,7 @@ async function moduleWorker() {
// check if last message changed // check if last message changed
const currentLastMessage = getLastCharacterMessage(); const currentLastMessage = getLastCharacterMessage();
if (lastCharacter === context.characterId && lastMessage === currentLastMessage && $('img.expression').attr('src')) { if (lastCharacter === context.characterId && lastMessage === currentLastMessage.mes && $('img.expression').attr('src')) {
return; return;
} }
@ -89,13 +89,15 @@ async function moduleWorker() {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Bypass-Tunnel-Reminder': 'bypass', 'Bypass-Tunnel-Reminder': 'bypass',
}, },
body: JSON.stringify({ text: currentLastMessage }) body: JSON.stringify({ text: currentLastMessage.mes })
}); });
if (apiResult.ok) { if (apiResult.ok) {
const name = context.groupId ? currentLastMessage.name : context.name2;
const force = !!context.groupId;
const data = await apiResult.json(); const data = await apiResult.json();
const expression = data.classification[0].label; const expression = data.classification[0].label;
setExpression(context.name2, expression); setExpression(name, expression, force);
} }
} }
@ -104,8 +106,8 @@ async function moduleWorker() {
} }
finally { finally {
inApiCall = false; inApiCall = false;
lastCharacter = context.characterId; lastCharacter = context.groupId || context.characterId;
lastMessage = currentLastMessage; lastMessage = currentLastMessage.mes;
} }
} }

3
public/scripts/group-chats.js
View File

@ -38,6 +38,7 @@ import {
hideSwipeButtons, hideSwipeButtons,
chat_metadata, chat_metadata,
updateChatMetadata, updateChatMetadata,
isStreamingEnabled,
} from "../script.js"; } from "../script.js";
export { export {
@ -291,7 +292,7 @@ async function generateGroupWrapper(by_auto_mode, type = null) {
let typingIndicator = $("#chat .typing_indicator"); let typingIndicator = $("#chat .typing_indicator");
if (typingIndicator.length === 0) { if (typingIndicator.length === 0 && !isStreamingEnabled()) {
typingIndicator = $( typingIndicator = $(
"#typing_indicator_template .typing_indicator" "#typing_indicator_template .typing_indicator"
).clone(); ).clone();