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

#260 Adjust message clean up. New setting to allow impersonation.

Browse Source
This commit is contained in:
SillyLossy
2023-05-08 18:55:01 +03:00
parent 977bfbf4f5
commit ef0d1a986b
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
public/script.js
View File

@ -1838,13 +1838,16 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
arrMes[arrMes.length] = item;
} else {
setInContextMessages(arrMes.length, type);
break;
}
await delay(1); //For disable slow down (encode gpt-2 need fix)
}
if (main_api !== 'openai') {
setInContextMessages(arrMes.length, type);
}
// Estimate how many unpinned example messages fit in the context
let count_exm_add = 0;
if (!power_user.pin_examples) {
@ -2459,7 +2462,6 @@ function extractMessageFromData(data) {
}
function cleanUpMessage(getMessage, isImpersonate) {
const nameToTrim = isImpersonate ? name2 : name1;
if (power_user.collapse_newlines) {
getMessage = collapseNewlines(getMessage);
}
@ -2474,8 +2476,21 @@ function cleanUpMessage(getMessage, isImpersonate) {
getMessage = getMessage.replace(/<BOT>/g, name2);
getMessage = getMessage.replace(/You:/g, name1 + ':');
}
if (getMessage.indexOf(nameToTrim + ":") != -1) {
getMessage = getMessage.substr(0, getMessage.indexOf(nameToTrim + ":"));
let nameToTrim = isImpersonate ? name2 : name1;
if (isImpersonate) {
nameToTrim = power_user.allow_name2_display ? '' : name2;
}
else {
nameToTrim = power_user.allow_name1_display ? '' : name1;
}
if (nameToTrim && getMessage.indexOf(`${nameToTrim}:`) == 0) {
getMessage = getMessage.substr(0, getMessage.indexOf(`${nameToTrim}:`));
}
if (nameToTrim && getMessage.indexOf(`\n${nameToTrim}:`) > 0) {
getMessage = getMessage.substr(0, getMessage.indexOf(`\n${nameToTrim}:`));
}
if (getMessage.indexOf('<|endoftext|>') != -1) {
getMessage = getMessage.substr(0, getMessage.indexOf('<|endoftext|>'));