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

also run regex on worldinfo

Browse Source
This commit is contained in:
steve green
2024-05-08 22:55:33 +08:00
committed by steve02081504
parent 10fda0b220
commit d2477bba0c
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import { power_user } from './power-user.js';
import { getTagKeyForEntity } from './tags.js';
import { resolveVariable } from './variables.js';
import { debounce_timeout } from './constants.js';
import { getRegexedString, regex_placement } from './extensions/regex/engine.js';
export {
world_info,
@ -2571,8 +2572,8 @@ async function checkWorldInfo(chat, maxContext) {
}
});
const worldInfoBefore = WIBeforeEntries.length ? WIBeforeEntries.join('\n') : '';
const worldInfoAfter = WIAfterEntries.length ? WIAfterEntries.join('\n') : '';
var worldInfoBefore = WIBeforeEntries.length ? WIBeforeEntries.join('\n') : '';
var worldInfoAfter = WIAfterEntries.length ? WIAfterEntries.join('\n') : '';
if (shouldWIAddPrompt) {
const originalAN = context.extensionPrompts[NOTE_MODULE_NAME].value;
@ -2582,6 +2583,14 @@ async function checkWorldInfo(chat, maxContext) {
buffer.cleanExternalActivations();
{
let regexType = regex_placement.WAIN;
let options = { isPrompt: true, depth: 0 };
worldInfoAfter = getRegexedString(worldInfoAfter, regexType, options);
worldInfoBefore = getRegexedString(worldInfoBefore, regexType, options);
}
return { worldInfoBefore, worldInfoAfter, EMEntries, WIDepthEntries, allActivatedEntries };
}