rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-03-03 03:17:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not double-parse WI content on "always on"

Browse Source
This commit is contained in:
Wolfsblvt 2024-05-09 06:37:14 +02:00
parent 0587931cae
commit b9d72bfdf4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/scripts/world-info.js
View File

@ -2373,7 +2373,6 @@ async function checkWorldInfo(chat, maxContext) {
} }
if (entry.constant || buffer.isExternallyActivated(entry)) { if (entry.constant || buffer.isExternallyActivated(entry)) {
entry.content = substituteParams(entry.content);
activatedNow.add(entry); activatedNow.add(entry);
continue; continue;
} }
@ -2466,7 +2465,9 @@ async function checkWorldInfo(chat, maxContext) {
continue; continue;
} else { console.debug(`uid:${entry.uid} passed probability check, inserting to prompt`); } } else { console.debug(`uid:${entry.uid} passed probability check, inserting to prompt`); }
newContent += `${substituteParams(entry.content)}\n`; // Substitute macros inline, for both this checking and also future processing
entry.content = substituteParams(entry.content);
newContent += `${entry.content}\n`;
if ((textToScanTokens + (await getTokenCountAsync(newContent))) >= budget) { if ((textToScanTokens + (await getTokenCountAsync(newContent))) >= budget) {
console.debug('WI budget reached, stopping'); console.debug('WI budget reached, stopping');
@ -2499,7 +2500,7 @@ async function checkWorldInfo(chat, maxContext) {
const text = newEntries const text = newEntries
.filter(x => !failedProbabilityChecks.has(x)) .filter(x => !failedProbabilityChecks.has(x))
.filter(x => !x.preventRecursion) .filter(x => !x.preventRecursion)
.map(x => substituteParams(x.content)).join('\n'); .map(x => x.content).join('\n');
buffer.addRecurse(text); buffer.addRecurse(text);
allActivatedText = (text + '\n' + allActivatedText); allActivatedText = (text + '\n' + allActivatedText);
} }