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

Pass group chat id to extensions. Remove temporary swipes fix from memory ext.

Browse Source
This commit is contained in:
SillyLossy
2023-05-02 18:30:19 +03:00
parent 51940c4501
commit e2187638fd
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -3688,7 +3688,9 @@ window["SillyTavern"].getContext = function () {
name2: name2, name2: name2,
characterId: this_chid, characterId: this_chid,
groupId: selected_group, groupId: selected_group,
chatId: this_chid && characters[this_chid] && characters[this_chid].chat, chatId: selected_group
? groups.find(x => x.id == selected_group)?.chat_id
: (this_chid && characters[this_chid] && characters[this_chid].chat),
onlineStatus: online_status, onlineStatus: online_status,
maxContext: Number(max_context), maxContext: Number(max_context),
chatMetadata: chat_metadata, chatMetadata: chat_metadata,

7
public/scripts/extensions/memory/index.js
View File

@ -157,7 +157,7 @@ async function moduleWorker() {
} }
// No new messages - do nothing // No new messages - do nothing
if (lastMessageId === chat.length && getStringHash(chat[chat.length - 1].mes) === lastMessageHash) { if (chat.length === 0 || (lastMessageId === chat.length && getStringHash(chat[chat.length - 1].mes) === lastMessageHash)) {
return; return;
} }
@ -196,7 +196,6 @@ async function summarizeChat(context) {
const longMemory = getLatestMemoryFromChat(chat); const longMemory = getLatestMemoryFromChat(chat);
const reversedChat = chat.slice().reverse(); const reversedChat = chat.slice().reverse();
reversedChat.shift(); reversedChat.shift();
const preSummaryLastMessage = getStringHash(reversedChat.length ? reversedChat[reversedChat.length - 1] : '');
let memoryBuffer = []; let memoryBuffer = [];
for (let mes of reversedChat) { for (let mes of reversedChat) {
@ -256,11 +255,9 @@ async function summarizeChat(context) {
const summary = data.summary; const summary = data.summary;
const newContext = getContext(); const newContext = getContext();
const postSummaryLastMessage = getStringHash(newContext.chat.length ? newContext.chat[newContext.chat.length - 2] : '');
// something changed during summarization request // something changed during summarization request
if (postSummaryLastMessage !== preSummaryLastMessage if (newContext.groupId !== context.groupId
|| newContext.groupId !== context.groupId
|| newContext.chatId !== context.chatId || newContext.chatId !== context.chatId
|| (!newContext.groupId && (newContext.characterId !== context.characterId))) { || (!newContext.groupId && (newContext.characterId !== context.characterId))) {
console.log('Context changed, summary discarded'); console.log('Context changed, summary discarded');