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

Add AND ALL logic for WI secondary keys

Browse Source
This commit is contained in:
Cohee 2024-01-01 21:49:54 +02:00
parent b315778e32
commit a69f92444b
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/index.html
View File

@ -4274,6 +4274,7 @@
<small class="textAlignCenter">Logic</small> <small class="textAlignCenter">Logic</small>
<select name="entryLogicType" class="widthFitContent margin0"> <select name="entryLogicType" class="widthFitContent margin0">
<option value="0">AND ANY</option> <option value="0">AND ANY</option>
<option value="3">AND ALL</option>
<option value="1">NOT ALL</option> <option value="1">NOT ALL</option>
<option value="2">NOT ANY</option> <option value="2">NOT ANY</option>
</select> </select>

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

@ -39,6 +39,7 @@ const world_info_logic = {
AND_ANY: 0, AND_ANY: 0,
NOT_ALL: 1, NOT_ALL: 1,
NOT_ANY: 2, NOT_ANY: 2,
AND_ALL: 3,
}; };
let world_info = {}; let world_info = {};
@ -1789,6 +1790,7 @@ async function checkWorldInfo(chat, maxContext) {
) { ) {
console.debug(`WI UID:${entry.uid} found. Checking logic: ${entry.selectiveLogic}`); console.debug(`WI UID:${entry.uid} found. Checking logic: ${entry.selectiveLogic}`);
let hasAnyMatch = false; let hasAnyMatch = false;
let hasAllMatch = true;
secondary: for (let keysecondary of entry.keysecondary) { secondary: for (let keysecondary of entry.keysecondary) {
const secondarySubstituted = substituteParams(keysecondary); const secondarySubstituted = substituteParams(keysecondary);
const hasSecondaryMatch = secondarySubstituted && matchKeys(textToScan, secondarySubstituted.trim()); const hasSecondaryMatch = secondarySubstituted && matchKeys(textToScan, secondarySubstituted.trim());
@ -1798,6 +1800,10 @@ async function checkWorldInfo(chat, maxContext) {
hasAnyMatch = true; hasAnyMatch = true;
} }
if (!hasSecondaryMatch) {
hasAllMatch = false;
}
// Simplified AND ANY / NOT ALL if statement. (Proper fix for PR#1356 by Bronya) // Simplified AND ANY / NOT ALL if statement. (Proper fix for PR#1356 by Bronya)
// If AND ANY logic and the main checks pass OR if NOT ALL logic and the main checks do not pass // If AND ANY logic and the main checks pass OR if NOT ALL logic and the main checks do not pass
if ((selectiveLogic === world_info_logic.AND_ANY && hasSecondaryMatch) || (selectiveLogic === world_info_logic.NOT_ALL && !hasSecondaryMatch)) { if ((selectiveLogic === world_info_logic.AND_ANY && hasSecondaryMatch) || (selectiveLogic === world_info_logic.NOT_ALL && !hasSecondaryMatch)) {
@ -1817,6 +1823,12 @@ async function checkWorldInfo(chat, maxContext) {
console.debug(`(NOT ANY Check) Activating WI Entry ${entry.uid}, no secondary keywords found.`); console.debug(`(NOT ANY Check) Activating WI Entry ${entry.uid}, no secondary keywords found.`);
activatedNow.add(entry); activatedNow.add(entry);
} }
// Handle AND ALL logic
if (selectiveLogic === world_info_logic.AND_ALL && hasAllMatch) {
console.debug(`(AND ALL Check) Activating WI Entry ${entry.uid}, all secondary keywords found.`);
activatedNow.add(entry);
}
} else { } else {
// Handle cases where secondary is empty // Handle cases where secondary is empty
console.debug(`WI UID ${entry.uid}: Activated without filter logic.`); console.debug(`WI UID ${entry.uid}: Activated without filter logic.`);