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

More reliable bias cancellation

Browse Source
This commit is contained in:
SillyLossy
2023-05-07 15:55:44 +03:00
parent 28b5aa75a4
commit 14105bc4dd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/script.js
View File

@ -984,7 +984,7 @@ function messageFormatting(mes, ch_name, isSystem, isUser) {
mes = mes.replaceAll('\\begin{align*}', '$$'); mes = mes.replaceAll('\\begin{align*}', '$$');
mes = mes.replaceAll('\\end{align*}', '$$'); mes = mes.replaceAll('\\end{align*}', '$$');
mes = converter.makeHtml(mes); mes = converter.makeHtml(mes);
mes = mes.replace(/{{(\*?.+?\*?)}}/g, ""); mes = mes.replace(/{{(\*?.*\*?)}}/g, "");
mes = mes.replace(/\n/g, "<br/>"); mes = mes.replace(/\n/g, "<br/>");
mes = mes.trim(); mes = mes.trim();
@ -1272,7 +1272,7 @@ function extractMessageBias(message) {
} }
const found = []; const found = [];
const rxp = /{{(\*?.+?\*?)}}/g; const rxp = /{{(\*?.+\*?)}}/g;
//const rxp = /{([^}]+)}/g; //const rxp = /{([^}]+)}/g;
let curMatch; let curMatch;
@ -1282,7 +1282,7 @@ function extractMessageBias(message) {
if (!found.length) { if (!found.length) {
// cancels a bias // cancels a bias
if (message.includes('{') && message.includes('}')) { if (message.includes('{{') && message.includes('}}')) {
return ''; return '';
} }
return null; return null;
@ -1765,7 +1765,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
// replace bias markup // replace bias markup
//chat2[i] = (chat2[i] ?? '').replace(/{.*}/g, ''); //chat2[i] = (chat2[i] ?? '').replace(/{.*}/g, '');
chat2[i] = (chat2[i] ?? '').replace(/{{(\*?.+?\*?)}}/g, ''); chat2[i] = (chat2[i] ?? '').replace(/{{(\*?.*\*?)}}/g, '');
//console.log('replacing chat2 {}s'); //console.log('replacing chat2 {}s');
} }
//chat2 = chat2.reverse(); //chat2 = chat2.reverse();

2
public/scripts/openai.js
View File

@ -167,7 +167,7 @@ function setOpenAIMessages(chat, quietPrompt) {
// replace bias markup // replace bias markup
//content = (content ?? '').replace(/{.*}/g, ''); //content = (content ?? '').replace(/{.*}/g, '');
content = (content ?? '').replace(/{{(\*?.+?\*?)}}/g, ''); content = (content ?? '').replace(/{{(\*?.*\*?)}}/g, '');
content = content.replace(/\r/gm, ''); content = content.replace(/\r/gm, '');