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

Set default newline suffix if wrap is enabled and there's no suffix in instruct template

Browse Source
This commit is contained in:
Cohee
2024-04-02 01:24:36 +03:00
parent 3b333d3803
commit d7817d1882
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,6 +332,10 @@ export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvata
prefix = prefix.replace(/{{name}}/gi, name || 'System'); prefix = prefix.replace(/{{name}}/gi, name || 'System');
} }
if (!suffix && power_user.instruct.wrap) {
suffix = '\n';
}
const separator = power_user.instruct.wrap ? '\n' : ''; const separator = power_user.instruct.wrap ? '\n' : '';
const textArray = includeNames ? [prefix, `${name}: ${mes}` + suffix] : [prefix, mes + suffix]; const textArray = includeNames ? [prefix, `${name}: ${mes}` + suffix] : [prefix, mes + suffix];
const text = textArray.filter(x => x).join(separator); const text = textArray.filter(x => x).join(separator);
@ -386,6 +390,14 @@ export function formatInstructModeExamples(mesExamplesArray, name1, name2) {
inputPrefix = inputPrefix.replace(/{{name}}/gi, name1); inputPrefix = inputPrefix.replace(/{{name}}/gi, name1);
outputPrefix = outputPrefix.replace(/{{name}}/gi, name2); outputPrefix = outputPrefix.replace(/{{name}}/gi, name2);
if (!inputSuffix && power_user.instruct.wrap) {
inputSuffix = '\n';
}
if (!outputSuffix && power_user.instruct.wrap) {
outputSuffix = '\n';
}
} }
const separator = power_user.instruct.wrap ? '\n' : ''; const separator = power_user.instruct.wrap ? '\n' : '';