rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove extraneous newlines when formatting quiet prompts

This commit is contained in:
Cohee 2024-03-30 15:54:42 +02:00
parent 9987ec33d9
commit e99d37d549
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/script.js
View File

@ -3555,7 +3555,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
//TODO: respect output_sequence vs last_output_sequence settings //TODO: respect output_sequence vs last_output_sequence settings
//TODO: decide how to prompt this to clarify who is talking 'Narrator', 'System', etc. //TODO: decide how to prompt this to clarify who is talking 'Narrator', 'System', etc.
if (isInstruct) { if (isInstruct) {
lastMesString += '\n' + quietAppend; // + power_user.instruct.output_sequence + '\n'; lastMesString += quietAppend; // + power_user.instruct.output_sequence + '\n';
} else { } else {
lastMesString += quietAppend; lastMesString += quietAppend;
} }

5
public/scripts/instruct-mode.js
View File

@ -458,6 +458,11 @@ export function formatInstructModePrompt(name, isImpersonate, promptBias, name1,
const separator = power_user.instruct.wrap ? '\n' : ''; const separator = power_user.instruct.wrap ? '\n' : '';
let text = includeNames ? (separator + sequence + separator + `${name}:`) : (separator + sequence); let text = includeNames ? (separator + sequence + separator + `${name}:`) : (separator + sequence);
// Quiet prompt already has a newline at the end
if (isQuiet && separator) {
text = text.slice(separator.length);
}
if (!isImpersonate && promptBias) { if (!isImpersonate && promptBias) {
text += (includeNames ? promptBias : (separator + promptBias.trimStart())); text += (includeNames ? promptBias : (separator + promptBias.trimStart()));
} }