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

Fix naming and improve regex application

Browse Source
This commit is contained in:
Cohee
2024-05-08 20:10:52 +03:00
parent d2477bba0c
commit 3c0664dfb6
3 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2531,37 +2531,40 @@ async function checkWorldInfo(chat, maxContext) {
// Appends from insertion order 999 to 1. Use unshift for this purpose
// TODO (kingbri): Change to use WI Anchor positioning instead of separate top/bottom arrays
[...allActivatedEntries].sort(sortFn).forEach((entry) => {
const regexDepth = entry.position === world_info_position.atDepth ? (entry.depth ?? DEFAULT_DEPTH) : null;
const content = getRegexedString(entry.content, regex_placement.WORLD_INFO, { depth: regexDepth, isMarkdown: false, isPrompt: true });
switch (entry.position) {
case world_info_position.before:
WIBeforeEntries.unshift(substituteParams(entry.content));
WIBeforeEntries.unshift(substituteParams(content));
break;
case world_info_position.after:
WIAfterEntries.unshift(substituteParams(entry.content));
WIAfterEntries.unshift(substituteParams(content));
break;
case world_info_position.EMTop:
EMEntries.unshift(
{ position: wi_anchor_position.before, content: entry.content },
{ position: wi_anchor_position.before, content: content },
);
break;
case world_info_position.EMBottom:
EMEntries.unshift(
{ position: wi_anchor_position.after, content: entry.content },
{ position: wi_anchor_position.after, content: content },
);
break;
case world_info_position.ANTop:
ANTopEntries.unshift(entry.content);
ANTopEntries.unshift(content);
break;
case world_info_position.ANBottom:
ANBottomEntries.unshift(entry.content);
ANBottomEntries.unshift(content);
break;
case world_info_position.atDepth: {
const existingDepthIndex = WIDepthEntries.findIndex((e) => e.depth === (entry.depth ?? DEFAULT_DEPTH) && e.role === (entry.role ?? extension_prompt_roles.SYSTEM));
if (existingDepthIndex !== -1) {
WIDepthEntries[existingDepthIndex].entries.unshift(entry.content);
WIDepthEntries[existingDepthIndex].entries.unshift(content);
} else {
WIDepthEntries.push({
depth: entry.depth,
entries: [entry.content],
entries: [content],
role: entry.role ?? extension_prompt_roles.SYSTEM,
});
}
@ -2583,14 +2586,6 @@ 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 };
}