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

Fix instruct mode stop strings for whitespace sequences

This commit is contained in:
Cohee 2023-08-17 11:47:15 +03:00
parent 80c1f527dd
commit 928d897946
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
public/script.js
View File

@ -1844,17 +1844,26 @@ function getStoppingStrings(isImpersonate, addSpace) {
} }
} }
// Cohee: oobabooga's textgen always appends newline before the sequence as a stopping string function addInstructSequence(sequence) {
// But it's a problem for Metharme which doesn't use newlines to separate them. // Cohee: oobabooga's textgen always appends newline before the sequence as a stopping string
const wrap = (s) => power_user.instruct.wrap ? '\n' + s : s; // But it's a problem for Metharme which doesn't use newlines to separate them.
const wrap = (s) => power_user.instruct.wrap ? '\n' + s : s;
// Sequence must be a non-empty string
if (typeof sequence === 'string' && sequence.length > 0) {
// If sequence is just a whitespace or newline - we don't want to make it a stopping string
// User can always add it as a custom stop string if really needed
if (sequence.trim().length > 0) {
const wrappedSequence = wrap(sequence);
// Need to respect "insert macro" setting
const stopString = power_user.instruct.macro ? substituteParams(wrappedSequence) : wrappedSequence;
result.push(stopString);
}
}
}
if (power_user.instruct.enabled) { if (power_user.instruct.enabled) {
if (power_user.instruct.input_sequence) { addInstructSequence(power_user.instruct.input_sequence);
result.push(substituteParams(wrap(power_user.instruct.input_sequence), name1, name2)); addInstructSequence(power_user.instruct.output_sequence);
}
if (power_user.instruct.output_sequence) {
result.push(substituteParams(wrap(power_user.instruct.output_sequence), name1, name2));
}
} }
if (power_user.custom_stopping_strings) { if (power_user.custom_stopping_strings) {