rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2874 from steve02081504/patch-1 

Second macro evaluation of WI for all positions
This commit is contained in:
Cohee 2024-09-19 14:20:10 +03:00 committed by GitHub
parent 83c3f6d1bf 8edc999854
commit e2a3a060dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4125,7 +4125,9 @@ export async function checkWorldInfo(chat, maxContext, isDryRun) {
// TODO (kingbri): Change to use WI Anchor positioning instead of separate top/bottom arrays // TODO (kingbri): Change to use WI Anchor positioning instead of separate top/bottom arrays
[...allActivatedEntries].sort(sortFn).forEach((entry) => { [...allActivatedEntries].sort(sortFn).forEach((entry) => {
const regexDepth = entry.position === world_info_position.atDepth ? (entry.depth ?? DEFAULT_DEPTH) : null; 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 }); const content = substituteParams(
getRegexedString(entry.content, regex_placement.WORLD_INFO, { depth: regexDepth, isMarkdown: false, isPrompt: true })
);
if (!content) { if (!content) {
console.debug(`[WI] Entry ${entry.uid}`, 'skipped adding to prompt due to empty content', entry); console.debug(`[WI] Entry ${entry.uid}`, 'skipped adding to prompt due to empty content', entry);
@ -4134,10 +4136,10 @@ export async function checkWorldInfo(chat, maxContext, isDryRun) {
switch (entry.position) { switch (entry.position) {
case world_info_position.before: case world_info_position.before:
WIBeforeEntries.unshift(substituteParams(content)); WIBeforeEntries.unshift(content);
break; break;
case world_info_position.after: case world_info_position.after:
WIAfterEntries.unshift(substituteParams(content)); WIAfterEntries.unshift(content);
break; break;
case world_info_position.EMTop: case world_info_position.EMTop:
EMEntries.unshift( EMEntries.unshift(