rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

More continue copium

Browse Source
This commit is contained in:
Cohee
2023-07-03 03:45:13 +03:00
parent a61a8f9495
commit d153488690
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/script.js
View File

@@ -2240,11 +2240,14 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
cyclePrompt += ' '; cyclePrompt += ' ';
} }
streamingProcessor && (streamingProcessor.firstMessageText = cyclePrompt); // Save reply does add cycle text to the prompt, so it's not needed here
streamingProcessor && (streamingProcessor.firstMessageText = '');
message_already_generated = cyclePrompt; message_already_generated = cyclePrompt;
tokens_already_generated = 1; // Multigen copium tokens_already_generated = 1; // Multigen copium
} }
// Multigen rewrites the type and I don't know why
const originalType = type;
runGenerate(cyclePrompt); runGenerate(cyclePrompt);
async function runGenerate(cycleGenerationPromt = '') { async function runGenerate(cycleGenerationPromt = '') {
@@ -2649,7 +2652,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
tokens_already_generated = 0; tokens_already_generated = 0;
generatedPromtCache = ""; generatedPromtCache = "";
const substringStart = type !== 'continue' ? magFirst.length : 0; const substringStart = originalType !== 'continue' ? magFirst.length : 0;
getMessage = message_already_generated.substring(substringStart); getMessage = message_already_generated.substring(substringStart);
} }
@@ -2672,7 +2675,8 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
resolve(getMessage); resolve(getMessage);
} }
else { else {
if (!isMultigenEnabled()) { // Without streaming we'll be having a full message on continuation. Treat it as a multigen last chunk.
if (!isMultigenEnabled() && originalType !== 'continue') {
({ type, getMessage } = saveReply(type, getMessage, this_mes_is_name, title)); ({ type, getMessage } = saveReply(type, getMessage, this_mes_is_name, title));
} }
else { else {