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

Merge pull request #852 from StefanDanielSchwarz/fix-inconsistent-newline-trimming 

Fix inconsistent newline trimming
This commit is contained in:
Cohee 2023-08-02 21:55:12 +03:00 committed by GitHub
parent baddee8082 9d99b89c9c
commit 90e08e08de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -2489,7 +2489,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
} }
if (i === arrMes.length - 1 && !item.trim().startsWith(name1 + ":")) { if (i === arrMes.length - 1 && !item.trim().startsWith(name1 + ":")) {
if (textareaText == "") { //if (textareaText == "") {
// Cohee: I think this was added to allow the model to continue // Cohee: I think this was added to allow the model to continue
// where it left off by removing the trailing newline at the end // where it left off by removing the trailing newline at the end
// that was added by chat2 generator. This causes problems with // that was added by chat2 generator. This causes problems with
@ -2497,7 +2497,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
// removing a newline ONLY at the end of the string if it exists. // removing a newline ONLY at the end of the string if it exists.
item = item.replace(/\n?$/, ''); item = item.replace(/\n?$/, '');
//item = item.substr(0, item.length - 1); //item = item.substr(0, item.length - 1);
} //}
} }
if (is_pygmalion && !isInstruct) { if (is_pygmalion && !isInstruct) {
if (item.trim().startsWith(name1)) { if (item.trim().startsWith(name1)) {