Merge branch 'staging' into contentEditablew-AF-Panel

c21f59ca7a84e1229a3c34d74f66c9174d5d42a8

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

public/index.html+8 -6 Viewed

             </div>
             <div id="WorldInfo" class="drawer-content closedDrawer">
                 <div id="WorldInfoheader" class="fa-solid fa-grip drag-grabber"></div>
 -                <div id="WI_panel_pin_div" class="flex-container alignitemscenter gap10px" title="Locked = World Editor will stay open" data-i18n="[title]Locked = World Editor will stay open">
 +                <div class="flex-container alignitemscenter gap10px">
 -                    <input type="checkbox" id="WI_panel_pin">
 +                    <div id="WI_panel_pin_div" title="Locked = World Editor will stay open" data-i18n="[title]Locked = World Editor will stay open">
                                             <labelinput fortype="checkbox" id="WI_panel_pin">
 -                        <div class="unchecked fa-solid fa-unlock "></div>
 +                        <label for="WI_panel_pin">
                                                     <div class="checkedunchecked fa-solid fa-lockunlock "></div>
 -                    </label>
 +                            <div class="checked fa-solid fa-lock "></div>
 +                        </label>
 +                    </div>
                     <h3 class="margin0">
                         <span data-i18n="Worlds/Lorebooks">Worlds/Lorebooks</span>
                         <a href="https://docs.sillytavern.app/usage/core-concepts/worldinfo/" class="notes-link" target="_blank">

public/script.js+4 -1 Viewed

     // TODO: Naming convention is inconsistent with other events
     CHARACTER_DELETED: 'characterDeleted',
     CHARACTER_DUPLICATED: 'character_duplicated',
 -    SMOOTH_STREAM_TOKEN_RECEIVED: 'smooth_stream_token_received',
 +    /** @deprecated The event is aliased to STREAM_TOKEN_RECEIVED. */
 +    SMOOTH_STREAM_TOKEN_RECEIVED: 'stream_token_received',
 +    STREAM_TOKEN_RECEIVED: 'stream_token_received',
     FILE_ATTACHMENT_DELETED: 'file_attachment_deleted',
     WORLDINFO_FORCE_ACTIVATE: 'worldinfo_force_activate',
     OPEN_CHARACTER_LIBRARY: 'open_character_library',

@@ -3122,6 +3124,7 @@ class StreamingProcessor {
3122	3124	if (logprobs) {
3123	3125	this.messageLogprobs.push(...(Array.isArray(logprobs) ? logprobs : [logprobs]));
3124	3126	}
	3127	+ await eventSource.emit(event_types.STREAM_TOKEN_RECEIVED, text);
3125	3128	await sw.tick(() => this.onProgressStreaming(this.messageId, this.continueMessage + text));
3126	3129	}
3127	3130	const seconds = (timestamps[timestamps.length - 1] - timestamps[0]) / 1000;

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

public/scripts/sse-stream.js+0 -2 Viewed

 -import { eventSource, event_types } from '../script.js';
 import { power_user } from './power-user.js';
 import { delay } from './utils.js';

                         hasFocus && await delay(getDelay(lastStr));
                         controller.enqueue(new MessageEvent(event.type, { data: JSON.stringify(parsed.data) }));
                         lastStr = parsed.chunk;
 -                        hasFocus && await eventSource.emit(event_types.SMOOTH_STREAM_TOKEN_RECEIVED, parsed.chunk);
+                    }
                 } catch (error) {
                     console.debug('Smooth Streaming parsing error', error);