Merge pull request #3382 from SillyTavern/staging Staging into reasoning-regex

9e8fd3f5a060c432692431a10a2610b983b4f24d

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

Signed

Parents: d616dfef38a801114c0666ad3171ea8838777558 cd05650164c375bfe6e8cd993c2b1a561480a4f4

public/script.js+19 -0 Viewed

     return { type, getMessage };
+}
+export function syncCurrentSwipeInfoExtras() {
+    if (!chat.length) {
+        return;
+    }
+    const currentMessage = chat[chat.length - 1];
+    if (currentMessage && Array.isArray(currentMessage.swipe_info) && typeof currentMessage.swipe_id === 'number') {
+        const swipeInfo = currentMessage.swipe_info[currentMessage.swipe_id];
+        if (swipeInfo && typeof swipeInfo === 'object') {
+            swipeInfo.extra = structuredClone(currentMessage.extra);
+        }
+    }
+}
 function saveImageToMessage(img, mes) {
     if (mes && img.image) {
         if (!mes.extra || typeof mes.extra !== 'object') {

         streamingProcessor.onStopStreaming();
+    }
+    // Make sure ad-hoc changes to extras are saved before swiping away
+    syncCurrentSwipeInfoExtras();
     const swipe_duration = 120;
     const swipe_range = '700px';
     chat[chat.length - 1]['swipe_id']--;

         return unblockGeneration();
+    }
+    // Make sure ad-hoc changes to extras are saved before swiping away
+    syncCurrentSwipeInfoExtras();
     const swipe_duration = 200;
     const swipe_range = 700;
     //console.log(swipe_range);

public/scripts/authors-note.js+1 -1 Viewed

         namedArgumentList: [],
         unnamedArgumentList: [
             new SlashCommandArgument(
-                'position', [ARGUMENT_TYPE.STRING], false, false, null, ['system', 'user', 'assistant'],
+                'role', [ARGUMENT_TYPE.STRING], false, false, null, ['system', 'user', 'assistant'],
             ),
         ],
         helpString: `

public/scripts/extensions/connection-manager/index.js+4 -0 Viewed

     'api-url',
     'model',
     'proxy',
+    'stop-strings',
 ];
 const TC_COMMANDS = [

     'context',
     'instruct-state',
     'tokenizer',
+    'stop-strings',
 ];
 const FANCY_NAMES = {

     'instruct': 'Instruct Template',
     'context': 'Context Template',
     'tokenizer': 'Tokenizer',
+    'stop-strings': 'Custom Stopping Strings',
 };
 /**

  * @property {string} [context] Context Template
  * @property {string} [instruct-state] Instruct Mode
  * @property {string} [tokenizer] Tokenizer
+ * @property {string} [stop-strings] Custom Stopping Strings
  * @property {string[]} [exclude] Commands to exclude
  */

public/scripts/extensions/tts/index.js+48 -5 Viewed

 export { talkingAnimation };
 const UPDATE_INTERVAL = 1000;
+const wrapper = new ModuleWorkerWrapper(moduleWorker);
 let voiceMapEntries = [];
 let voiceMap = {}; // {charName:voiceid, charName2:voiceid2}

@@ -120,7 +121,7 @@ async function onNarrateOneMessage() {
120	}	121	}
121		122
122	resetTtsPlayback();	123	resetTtsPlayback();
123	ttsJobQueue.push(message);	124	processAndQueueTtsMessage(message);
124	moduleWorker();	125	moduleWorker();
125	}	126	}
126		127

+    }
     resetTtsPlayback();
-    ttsJobQueue.push({ mes: text, name: name });
+    processAndQueueTtsMessage({ mes: text, name: name });
     await moduleWorker();
     // Return back to the chat voices

     return processing;
+}
+/**
+ * Splits a message into lines and adds each non-empty line to the TTS job queue.
+ * @param {Object} message - The message object to be processed.
+ * @param {string} message.mes - The text of the message to be split into lines.
+ * @param {string} message.name - The name associated with the message.
+ * @returns {void}
+ */
+function processAndQueueTtsMessage(message) {
+    if (!extension_settings.tts.narrate_by_paragraphs) {
+        ttsJobQueue.push(message);
+        return;
+    }
+    const lines = message.mes.split('\n');
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line.length === 0) {
+            continue;
+        }
+        ttsJobQueue.push(
+            Object.assign({}, message, {
+                mes: line,
+            }),
+        );
+    }
+}
 function debugTtsPlayback() {
     console.log(JSON.stringify(
+        {

@@ -350,7 +381,7 @@ function onAudioControlClicked() {
350	talkingAnimation(false);	381	talkingAnimation(false);
351	} else {	382	} else {
352	// Default play behavior if not processing or playing is to play the last message.	383	// Default play behavior if not processing or playing is to play the last message.
353	ttsJobQueue.push(context.chat[context.chat.length - 1]);	384	processAndQueueTtsMessage(context.chat[context.chat.length - 1]);
354	}	385	}
355	updateUiAudioPlayState();	386	updateUiAudioPlayState();
356	}	387	}

     currentAudioJob = null;
     talkingAnimation(false); //stop lip animation
     // updateUiPlayState();
+    wrapper.update();
+}
 /**

@@ -466,7 +498,7 @@ async function processTtsQueue() {
466	}	498	}
467		499
468	if (extension_settings.tts.skip_tags) {	500	if (extension_settings.tts.skip_tags) {
469	text = text.replace(/<.?>.?<\/.*?>/g, '').trim();	501	text = text.replace(/<.?>[\s\S]?<\/.*?>/g, '').trim();
470	}	502	}
471		503
472	if (!extension_settings.tts.pass_asterisks) {	504	if (!extension_settings.tts.pass_asterisks) {

     $('#tts_narrate_quoted').prop('checked', extension_settings.tts.narrate_quoted_only);
     $('#tts_auto_generation').prop('checked', extension_settings.tts.auto_generation);
     $('#tts_periodic_auto_generation').prop('checked', extension_settings.tts.periodic_auto_generation);
+    $('#tts_narrate_by_paragraphs').prop('checked', extension_settings.tts.narrate_by_paragraphs);
     $('#tts_narrate_translated_only').prop('checked', extension_settings.tts.narrate_translated_only);
     $('#tts_narrate_user').prop('checked', extension_settings.tts.narrate_user);
     $('#tts_pass_asterisks').prop('checked', extension_settings.tts.pass_asterisks);

     saveSettingsDebounced();
+}
+function onNarrateByParagraphsClick() {
+    extension_settings.tts.narrate_by_paragraphs = !!$('#tts_narrate_by_paragraphs').prop('checked');
+    saveSettingsDebounced();
+}
 function onNarrateDialoguesClick() {
     extension_settings.tts.narrate_dialogues_only = !!$('#tts_narrate_dialogues').prop('checked');

     lastChatId = context.chatId;
     console.debug(`Adding message from ${message.name} for TTS processing: "${message.mes}"`);
+    if (extension_settings.tts.periodic_auto_generation) {
         ttsJobQueue.push(message);
+    } else {
+        processAndQueueTtsMessage(message);
+    }
+}
 async function onMessageDeleted() {

         $('#tts_pass_asterisks').on('click', onPassAsterisksClick);
         $('#tts_auto_generation').on('click', onAutoGenerationClick);
         $('#tts_periodic_auto_generation').on('click', onPeriodicAutoGenerationClick);
+        $('#tts_narrate_by_paragraphs').on('click', onNarrateByParagraphsClick);
         $('#tts_narrate_user').on('click', onNarrateUserClick);
         $('#playback_rate').on('input', function () {

     loadSettings(); // Depends on Extension Controls and loadTtsProvider
     loadTtsProvider(extension_settings.tts.currentProvider); // No dependencies
     addAudioControl(); // Depends on Extension Controls
-    const wrapper = new ModuleWorkerWrapper(moduleWorker);
     setInterval(wrapper.update.bind(wrapper), UPDATE_INTERVAL); // Init depends on all the things
     eventSource.on(event_types.MESSAGE_SWIPED, resetTtsPlayback);
     eventSource.on(event_types.CHAT_CHANGED, onChatChanged);

public/scripts/extensions/tts/settings.html+4 -0 Viewed

                     <input type="checkbox" id="tts_periodic_auto_generation">
                     <small data-i18n="Narrate by paragraphs (when streaming)">Narrate by paragraphs (when streaming)</small>
                 </label>
+                <label class="checkbox_label" for="tts_narrate_by_paragraphs">
+                    <input type="checkbox" id="tts_narrate_by_paragraphs">
+                    <small data-i18n="Narrate by paragraphs (when not streaming)">Narrate by paragraphs (when not streaming)</small>
+                </label>
                 <label class="checkbox_label" for="tts_narrate_quoted">
                     <input type="checkbox" id="tts_narrate_quoted">
                     <small data-i18n="Only narrate quotes">Only narrate "quotes"</small>

public/scripts/power-user.js+41 -0 Viewed

         ],
         helpString: 'activates a movingUI preset by name',
     }));
+    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
+        name: 'stop-strings',
+        aliases: ['stopping-strings', 'custom-stopping-strings', 'custom-stop-strings'],
+        helpString: `
+            <div>
+                Sets a list of custom stopping strings. Gets the list if no value is provided.
+            </div>
+            <div>
+                <strong>Examples:</strong>
+            </div>
+            <ul>
+                <li>Value must be a JSON-serialized array: <pre><code class="language-stscript">/stop-strings ["goodbye", "farewell"]</code></pre></li>
+                <li>Pipe characters must be escaped with a backslash: <pre><code class="language-stscript">/stop-strings ["left\\|right"]</code></pre></li>
+            </ul>
+        `,
+        returns: ARGUMENT_TYPE.LIST,
+        unnamedArgumentList: [
+            SlashCommandArgument.fromProps({
+                description: 'list of strings',
+                typeList: [ARGUMENT_TYPE.LIST],
+                acceptsMultiple: false,
+                isRequired: false,
+            }),
+        ],
+        callback: (_, value) => {
+            if (String(value ?? '').trim()) {
+                const parsedValue = ((x) => { try { return JSON.parse(x.toString()); } catch { return null; } })(value);
+                if (!parsedValue || !Array.isArray(parsedValue)) {
+                    throw new Error('Invalid list format. The value must be a JSON-serialized array of strings.');
+                }
+                parsedValue.forEach((item, index) => {
+                    parsedValue[index] = String(item);
+                });
+                power_user.custom_stopping_strings = JSON.stringify(parsedValue);
+                $('#custom_stopping_strings').val(power_user.custom_stopping_strings);
+                saveSettingsDebounced();
+            }
+            return power_user.custom_stopping_strings;
+        },
+    }));
 });

public/scripts/reasoning.js+1 -1 Viewed

             }),
         ],
         callback: async (args, value) => {
-            const messageId = !isNaN(Number(args[0])) ? Number(args[0]) : chat.length - 1;
+            const messageId = !isNaN(Number(args.at)) ? Number(args.at) : chat.length - 1;
             const message = chat[messageId];
             if (!message?.extra) {
                 return '';

public/scripts/slash-commands.js+4 -0 Viewed

     showMoreMessages,
     stopGeneration,
     substituteParams,
+    syncCurrentSwipeInfoExtras,
     system_avatar,
     system_message_types,
     this_chid,

     const newSwipeId = lastMessage.swipes.length - 1;
     if (isTrueBoolean(args.switch)) {
+        // Make sure ad-hoc changes to extras are saved before swiping away
+        syncCurrentSwipeInfoExtras();
         lastMessage.swipe_id = newSwipeId;
         lastMessage.mes = lastMessage.swipes[newSwipeId];
+        lastMessage.extra = structuredClone(lastMessage.swipe_info?.[newSwipeId]?.extra ?? lastMessage.extra ?? {});
+    }
     await saveChatConditional();