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

Prevent generating summary if response is being generated

Browse Source
This commit is contained in:
SillyLossy
2023-04-30 01:09:26 +03:00
parent d590ead665
commit 3725e38b20
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
import { getStringHash, debounce } from "../../utils.js"; import { getStringHash, debounce } from "../../utils.js";
import { getContext, getApiUrl, extension_settings } from "../../extensions.js"; import { getContext, getApiUrl, extension_settings } from "../../extensions.js";
import { extension_prompt_types, saveSettingsDebounced } from "../../../script.js"; import { extension_prompt_types, is_send_press, saveSettingsDebounced } from "../../../script.js";
export { MODULE_NAME }; export { MODULE_NAME };
const MODULE_NAME = '1_memory'; const MODULE_NAME = '1_memory';
@@ -137,6 +137,11 @@ async function moduleWorker() {
return; return;
} }
// Generation is in progress, summary prevented
if (is_send_press) {
return;
}
// Chat/character/group changed // Chat/character/group changed
if ((context.groupId && lastGroupId !== context.groupId) || (context.characterId !== lastCharacterId) || (context.chatId !== lastChatId)) { if ((context.groupId && lastGroupId !== context.groupId) || (context.characterId !== lastCharacterId) || (context.chatId !== lastChatId)) {
const latestMemory = getLatestMemoryFromChat(chat); const latestMemory = getLatestMemoryFromChat(chat);
@@ -189,6 +194,7 @@ async function summarizeChat(context) {
const chat = context.chat; const chat = context.chat;
const longMemory = getLatestMemoryFromChat(chat); const longMemory = getLatestMemoryFromChat(chat);
const reversedChat = chat.slice().reverse(); const reversedChat = chat.slice().reverse();
const preSummaryLastMessage = getStringHash(chat.length ? chat[chat.length - 1] : '');
let memoryBuffer = []; let memoryBuffer = [];
for (let mes of reversedChat) { for (let mes of reversedChat) {
@@ -248,9 +254,14 @@ 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 - 1] : '');
// something changed during summarization request // something changed during summarization request
if (newContext.groupId !== context.groupId || newContext.chatId !== context.chatId || (!newContext.groupId && (newContext.characterId !== context.characterId))) { if (postSummaryLastMessage !== preSummaryLastMessage
|| newContext.groupId !== context.groupId
|| newContext.chatId !== context.chatId
|| (!newContext.groupId && (newContext.characterId !== context.characterId))) {
console.log('Context changed, summary discarded');
return; return;
} }