Remove continue prompt "clean-up" function (#4422) * Remove continue prompt "clean-up" function Fixes #4415 * Simplify generatedPromptCache handling

dec25d128899b57d1e0b57c05a701d380fcd12b1

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

Signed

public/script.js+1 -38 Viewed

 let currentVersion = '0.0.0';
 export let displayVersion = 'SillyTavern';
-let generatedPromptCache = '';
 let generation_started = new Date();
 /** @type {import('./scripts/char-data.js').v1CharData[]} */
 export let characters = [];

     let avatarImg = getThumbnailUrl('persona', user_avatar);
     const isSystem = mes.is_system;
     const title = mes.title;
-    generatedPromptCache = '';
     //for non-user mesages
     if (!mes['is_user']) {

         saveLogprobsForActiveMessage(this.messageLogprobs.filter(Boolean), this.continueMessage);
         await saveChatConditional();
         unblockGeneration();
-        generatedPromptCache = '';
         const isAborted = this.abortController.signal.aborted;
         if (!isAborted && power_user.auto_swipe && generatedTextFiltered(text)) {

         this.isStopped = true;
         this.markUIGenStopped();
-        generatedPromptCache = '';
         unblockGeneration();
         const noEmitTypes = ['swipe', 'impersonate', 'continue'];

         is_send_press = true;
+    }
-    generatedPromptCache += cyclePrompt;
+    let generatedPromptCache = cyclePrompt || '';
     if (generatedPromptCache.length == 0 || type === 'continue') {
         console.debug('generating prompt');
         chatString = '';

         return lastMesString;
+    }
-    // Clean up the already generated prompt for seamless addition
-    function cleanupPromptCache(promptCache) {
-        // Remove the first occurrance of character's name
-        if (promptCache.trimStart().startsWith(`${name2}:`)) {
-            promptCache = promptCache.replace(`${name2}:`, '').trimStart();
-        }
-        // Remove the first occurrance of prompt bias
-        if (promptCache.trimStart().startsWith(promptBias)) {
-            promptCache = promptCache.replace(promptBias, '');
-        }
-        // Add a space if prompt cache doesn't start with one
-        if (!/^\s/.test(promptCache) && !isInstruct) {
-            promptCache = ' ' + promptCache;
-        }
-        return promptCache;
-    }
     async function checkPromptSize() {
         console.debug('---checking Prompt size');
         setPromptString();

@@ -4278,11 +4254,6 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4278	}	4254	}
4279	}	4255	}
4280		4256
4281	// Prune from prompt cache if it exists
4282	if (generatedPromptCache.length !== 0) {
4283	generatedPromptCache = cleanupPromptCache(generatedPromptCache);
4284	}
4285
4286	// Flattens the multiple prompt objects to a string.	4257	// Flattens the multiple prompt objects to a string.
4287	const combine = () => {	4258	const combine = () => {
4288	// Right now, everything is suffixed with a newline	4259	// Right now, everything is suffixed with a newline

     await eventSource.emit(event_types.GENERATE_AFTER_DATA, generate_data);
     if (dryRun) {
-        generatedPromptCache = '';
         return Promise.resolve();
+    }

@@ -4527,7 +4497,6 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4527	ToolManager.showToolCallError(invocationResult.errors);	4497	ToolManager.showToolCallError(invocationResult.errors);
4528	}	4498	}
4529	unblockGeneration(type);	4499	unblockGeneration(type);
4530	generatedPromptCache = '';
4531	streamingProcessor = null;	4500	streamingProcessor = null;
4532	return;	4501	return;
4533	}	4502	}

         // if an error was returned in data (textgenwebui), show it and throw it
         if (data.error) {
             unblockGeneration(type);
-            generatedPromptCache = '';
             if (data?.response) {
                 toastr.error(data.response, t`API Error`, { preventDuplicates: true });

         if (jsonSchema) {
             unblockGeneration(type);
-            generatedPromptCache = '';
             return extractJsonFromData(data);
+        }

         if (isImpersonate) {
             $('#send_textarea').val(getMessage)[0].dispatchEvent(new Event('input', { bubbles: true }));
-            generatedPromptCache = '';
             await eventSource.emit(event_types.IMPERSONATE_READY, getMessage);
+        }
         else if (type == 'quiet') {

@@ -4658,7 +4624,6 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4658	ToolManager.showToolCallError(invocationResult.errors);	4624	ToolManager.showToolCallError(invocationResult.errors);
4659	}	4625	}
4660	unblockGeneration(type);	4626	unblockGeneration(type);
4661	generatedPromptCache = '';
4662	return;	4627	return;
4663	}	4628	}
4664		4629

             toastr.error(exception.error.message, t`Text generation error`, { timeOut: 10000, extendedTimeOut: 20000 });
+        }
-        generatedPromptCache = '';
         unblockGeneration(type);
         console.log(exception);
         streamingProcessor = null;