Merge pull request #2748 from SillyTavern/fix-summary Fix automatic summarization

02d97f72f30ed92c82f193e05480466b12df30dc

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/extensions/memory/index.js+46 -24 Viewed

     generateRaw,
     getMaxContextSize,
     setExtensionPrompt,
 +    streamingProcessor,
 } from '../../../script.js';
 import { is_group_generating, selected_group } from '../../group-chats.js';
 import { loadMovingUIState } from '../../power-user.js';

@@ -408,8 +409,8 @@ async function onChatEvent() {
408	409	return;
409	410	}
410	411
411	412	// Generation isStreaming in -progress, summary prevented
412	413	if (is_send_pressstreamingProcessor && !streamingProcessor.isFinished) {
413	414	return;
414	415	}
415	416

         delete chat[chat.length - 1].extra.memory;
+    }
 -    try {
 +    summarizeChat(context)
 -        await summarizeChat(context);
 +        .catch(console.error)
 -    }
 +        .finally(saveLastValues);
 -    catch (error) {
 -        console.log(error);
 -    }
 -    finally {
 -        saveLastValues();
 -    }
+}
 /**

             await waitUntilCondition(() => is_group_generating === false, 1000, 10);
+        }
         // Wait for the send button to be released
         await waitUntilCondition(() => is_send_press === false, 30000, 100);
     } catch {
         console.debug('Timeout waiting for is_send_press');
         return '';

         params.max_tokens = extension_settings.memory.overrideResponseLength;
+    }
 -    const summary = await generateWebLlmChatPrompt(messages, params);
 +    try {
 -    const newContext = getContext();
 +        inApiCall = true;
 +        const summary = await generateWebLlmChatPrompt(messages, params);
 +        const newContext = getContext();
 -    // something changed during summarization request
 +        if (!summary) {
 -    if (newContext.groupId !== context.groupId ||
 +            console.warn('Empty summary received');
 -        newContext.chatId !== context.chatId ||
 +            return;
 -        (!newContext.groupId && (newContext.characterId !== context.characterId))) {
 +        }
 -        console.log('Context changed, summary discarded');
 -        return;
 -    }
 -    setMemoryContext(summary, true, lastUsedIndex);
 +        // something changed during summarization request
 -    return summary;
 +        if (newContext.groupId !== context.groupId ||
 +            newContext.chatId !== context.chatId ||
 +            (!newContext.groupId && (newContext.characterId !== context.characterId))) {
 +            console.log('Context changed, summary discarded');
 +            return;
 +        }
++
 +        setMemoryContext(summary, true, lastUsedIndex);
 +        return summary;
 +    } finally {
 +        inApiCall = false;
 +    }
+}
 async function summarizeChatMain(context, force, skipWIAN) {

     let index = null;
     if (prompt_builders.DEFAULT === extension_settings.memory.prompt_builder) {
 -        summary = await generateQuietPrompt(prompt, false, skipWIAN, '', '', extension_settings.memory.overrideResponseLength);
 +        try {
 +            inApiCall = true;
 +            summary = await generateQuietPrompt(prompt, false, skipWIAN, '', '', extension_settings.memory.overrideResponseLength);
 +        } finally {
 +            inApiCall = false;
 +        }
+    }
     if ([prompt_builders.RAW_BLOCKING, prompt_builders.RAW_NON_BLOCKING].includes(extension_settings.memory.prompt_builder)) {
         const lock = extension_settings.memory.prompt_builder === prompt_builders.RAW_BLOCKING;
         try {
 +            inApiCall = true;
             if (lock) {
                 deactivateSendButtons();
+            }

             summary = await generateRaw(rawPrompt, '', false, false, prompt, extension_settings.memory.overrideResponseLength);
             index = lastUsedIndex;
         } finally {
 +            inApiCall = false;
             if (lock) {
                 activateSendButtons();
+            }
+        }
+    }
 +    if (!summary) {
 +        console.warn('Empty summary received');
 +        return;
 +    }
++
     const newContext = getContext();
     // something changed during summarization request

         const summary = await callExtrasSummarizeAPI(resultingString);
         const newContext = getContext();
 +        if (!summary) {
 +            console.warn('Empty summary received');
 +            return;
 +        }
++
         // something changed during summarization request
         if (newContext.groupId !== context.groupId
             || newContext.chatId !== context.chatId