Merge pull request #2700 from SillyTavern/fix-mag Cull the usage of MAG in streaming

2294fe12e71aaea3c2378d2954537ea57f294f9e

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

Signed

public/script.js+13 -11 Viewed

+}
 class StreamingProcessor {
-    constructor(type, force_name2, timeStarted, messageAlreadyGenerated) {
+    /**
+     * Creates a new streaming processor.
+     * @param {string} type Generation type
+     * @param {boolean} forceName2 If true, force the use of name2
+     * @param {Date} timeStarted Date when generation was started
+     * @param {string} continueMessage Previous message if the type is 'continue'
+     */
+    constructor(type, forceName2, timeStarted, continueMessage) {
         this.result = '';
         this.messageId = -1;
         this.messageDom = null;

         /** @type {HTMLTextAreaElement} */
         this.sendTextarea = document.querySelector('#send_textarea');
         this.type = type;
-        this.force_name2 = force_name2;
+        this.force_name2 = forceName2;
         this.isStopped = false;
         this.isFinished = false;
         this.generator = this.nullStreamingGeneration;
         this.abortController = new AbortController();
         this.firstMessageText = '...';
         this.timeStarted = timeStarted;
-        this.messageAlreadyGenerated = messageAlreadyGenerated;
+        this.continueMessage = type === 'continue' ? continueMessage : '';
         this.swipes = [];
         /** @type {import('./scripts/logprobs.js').TokenLogprobs[]} */
         this.messageLogprobs = [];

             await eventSource.emit(event_types.IMPERSONATE_READY, text);
+        }
-        const continueMsg = this.type === 'continue' ? this.messageAlreadyGenerated : undefined;
+        saveLogprobsForActiveMessage(this.messageLogprobs.filter(Boolean), this.continueMessage);
-        saveLogprobsForActiveMessage(this.messageLogprobs.filter(Boolean), continueMsg);
         await saveChatConditional();
         unblockGeneration();
         generatedPromptCache = '';

@@ -3111,7 +3117,7 @@ class StreamingProcessor {
3111	if (logprobs) {	3117	if (logprobs) {
3112	this.messageLogprobs.push(...(Array.isArray(logprobs) ? logprobs : [logprobs]));	3118	this.messageLogprobs.push(...(Array.isArray(logprobs) ? logprobs : [logprobs]));
3113	}	3119	}
3114	await sw.tick(() => this.onProgressStreaming(this.messageId, this.messageAlreadyGenerated + text));	3120	await sw.tick(() => this.onProgressStreaming(this.messageId, this.continueMessage + text));
3115	}	3121	}
3116	const seconds = (timestamps[timestamps.length - 1] - timestamps[0]) / 1000;	3122	const seconds = (timestamps[timestamps.length - 1] - timestamps[0]) / 1000;
3117	console.warn(`Stream stats: ${timestamps.length} tokens, ${seconds.toFixed(2)} seconds, rate: ${Number(timestamps.length / seconds).toFixed(2)} TPS`);	3123	console.warn(`Stream stats: ${timestamps.length} tokens, ${seconds.toFixed(2)} seconds, rate: ${Number(timestamps.length / seconds).toFixed(2)} TPS`);

     const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
     const isImpersonate = type == 'impersonate';
-    let message_already_generated = isImpersonate ? `${name1}: ` : `${name2}: `;
     if (!(dryRun || type == 'regenerate' || type == 'swipe' || type == 'quiet')) {
         const interruptedByCommand = await processCommands(String($('#send_textarea').val()));

     let oaiMessageExamples = [];
     if (main_api === 'openai') {
-        message_already_generated = '';
         oaiMessages = setOpenAIMessages(coreChat);
         oaiMessageExamples = setOpenAIMessageExamples(mesExamplesArray);
+    }

@@ -3887,7 +3890,6 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
3887	cyclePrompt += oai_settings.continue_postfix;	3890	cyclePrompt += oai_settings.continue_postfix;
3888	continue_mag += oai_settings.continue_postfix;	3891	continue_mag += oai_settings.continue_postfix;
3889	}	3892	}
3890	message_already_generated = continue_mag;
3891	}	3893	}
3892		3894
3893	const originalType = type;	3895	const originalType = type;

         console.debug(`pushed prompt bits to itemizedPrompts array. Length is now: ${itemizedPrompts.length}`);
         if (isStreamingEnabled() && type !== 'quiet') {
-            streamingProcessor = new StreamingProcessor(type, force_name2, generation_started, message_already_generated);
+            streamingProcessor = new StreamingProcessor(type, force_name2, generation_started, continue_mag);
             if (isContinue) {
                 // Save reply does add cycle text to the prompt, so it's not needed here
                 streamingProcessor.firstMessageText = '';