rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2024-12-12 09:26:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1469 from Bronya-Rand/staging

Browse Source 
Proper World Info logic checks
This commit is contained in:
Cohee 2023-12-05 11:57:34 +02:00 committed by GitHub
commit ebe0f46f31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/index.html
View File

@ -4071,8 +4071,9 @@
<div class="world_entry_form_control"> <div class="world_entry_form_control">
<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</option> <option value="0">AND ONE</option>
<option value="1">NOT</option> <option value="1">NOT ALL</option>
<option value="2">NOT ONE</option>
</select> </select>
</div> </div>
<div class="world_entry_form_control keysecondary flex1"> <div class="world_entry_form_control keysecondary flex1">

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

@ -35,6 +35,12 @@ const world_info_insertion_strategy = {
global_first: 2, global_first: 2,
}; };
const world_info_logic = {
AND_ONE: 0,
NOT_ALL: 1,
NOT_ONE: 2,
};
let world_info = {}; let world_info = {};
let selected_world_info = []; let selected_world_info = [];
let world_names; let world_names;
@ -843,7 +849,7 @@ function getWorldEntry(name, data, entry) {
const uid = $(this).data('uid'); const uid = $(this).data('uid');
const value = Number($(this).val()); const value = Number($(this).val());
console.debug(`logic for ${entry.uid} set to ${value}`); console.debug(`logic for ${entry.uid} set to ${value}`);
data.entries[uid].selectiveLogic = !isNaN(value) ? value : 0; data.entries[uid].selectiveLogic = !isNaN(value) ? value : world_info_logic.AND_ONE;
setOriginalDataValue(data, uid, 'selectiveLogic', data.entries[uid].selectiveLogic); setOriginalDataValue(data, uid, 'selectiveLogic', data.entries[uid].selectiveLogic);
saveWorldInfo(name, data); saveWorldInfo(name, data);
}); });
@ -1365,7 +1371,7 @@ const newEntryTemplate = {
content: '', content: '',
constant: false, constant: false,
selective: true, selective: true,
selectiveLogic: 0, selectiveLogic: world_info_logic.AND_ONE,
addMemo: false, addMemo: false,
order: 100, order: 100,
position: 0, position: 0,
@ -1759,53 +1765,58 @@ async function checkWorldInfo(chat, maxContext) {
if (Array.isArray(entry.key) && entry.key.length) { //check for keywords existing if (Array.isArray(entry.key) && entry.key.length) { //check for keywords existing
// If selectiveLogic isn't found, assume it's AND, only do this once per entry // If selectiveLogic isn't found, assume it's AND, only do this once per entry
const selectiveLogic = entry.selectiveLogic ?? 0; const selectiveLogic = entry.selectiveLogic ?? 0;
let notFlag = true;
primary: for (let key of entry.key) { primary: for (let key of entry.key) {
const substituted = substituteParams(key); const substituted = substituteParams(key);
console.debug(`${entry.uid}: ${substituted}`); console.debug(`${entry.uid}: ${substituted}`);
if (substituted && matchKeys(textToScan, substituted.trim())) { if (substituted && matchKeys(textToScan, substituted.trim())) {
console.debug(`${entry.uid}: got primary match`); console.debug(`WI UID ${entry.uid} found by primary match: ${substituted}.`);
//selective logic begins //selective logic begins
if ( if (
entry.selective && //all entries are selective now entry.selective && //all entries are selective now
Array.isArray(entry.keysecondary) && //always true Array.isArray(entry.keysecondary) && //always true
entry.keysecondary.length //ignore empties entry.keysecondary.length //ignore empties
) { ) {
console.debug(`uid:${entry.uid}: checking logic: ${entry.selectiveLogic}`); console.debug(`WI UID:${entry.uid} found. Checking logic: ${entry.selectiveLogic}`);
let hasAnyMatch = false;
secondary: for (let keysecondary of entry.keysecondary) { secondary: for (let keysecondary of entry.keysecondary) {
const secondarySubstituted = substituteParams(keysecondary); const secondarySubstituted = substituteParams(keysecondary);
console.debug(`uid:${entry.uid}: filtering ${secondarySubstituted}`); const hasSecondaryMatch = secondarySubstituted && matchKeys(textToScan, secondarySubstituted.trim());
//AND operator console.debug(`WI UID:${entry.uid}: Filtering for secondary keyword - "${secondarySubstituted}".`);
if (selectiveLogic === 0) {
console.debug('saw AND logic, checking..'); if (hasSecondaryMatch) {
if (secondarySubstituted && matchKeys(textToScan, secondarySubstituted.trim())) { hasAnyMatch = true;
console.debug(`activating entry ${entry.uid} with AND found`); }
// Simplified AND ONE / NOT ALL if statement. (Proper fix for PR#1356 by Bronya)
// If AND ONE logic and the main checks pass OR if NOT ALL logic and the main checks do not pass
if ((selectiveLogic === world_info_logic.AND_ONE && hasSecondaryMatch) || (selectiveLogic === world_info_logic.NOT_ALL && !hasSecondaryMatch)) {
// Differ both logic statements in the debugger
if (selectiveLogic === world_info_logic.AND_ONE) {
console.debug(`(AND ONE Check) Activating WI Entry ${entry.uid}. Found match for word: ${substituted} ${secondarySubstituted}`);
} else {
console.debug(`(NOT ALL Check) Activating WI Entry ${entry.uid}. Found match for word "${substituted}" without secondary keyword: ${secondarySubstituted}`);
}
activatedNow.add(entry); activatedNow.add(entry);
break secondary; break secondary;
} }
} }
//NOT operator
if (selectiveLogic === 1) { // Handle NOT ONE logic
console.debug(`uid ${entry.uid}: checking NOT logic for ${secondarySubstituted}`); if (selectiveLogic === world_info_logic.NOT_ONE && !hasAnyMatch) {
if (secondarySubstituted && matchKeys(textToScan, secondarySubstituted.trim())) { console.debug(`(NOT ONE Check) Activating WI Entry ${entry.uid}, no secondary keywords found.`);
console.debug(`uid ${entry.uid}: canceled; filtered out by ${secondarySubstituted}`); activatedNow.add(entry);
notFlag = false;
break primary;
} }
} // Handle cases where secondary is empty
}
//handle cases where secondary is empty
} else { } else {
console.debug(`uid ${entry.uid}: activated without filter logic`); console.debug(`WI UID ${entry.uid}: Activated without filter logic.`);
activatedNow.add(entry); activatedNow.add(entry);
break primary; break primary;
} }
} else { console.debug('no active entries for logic checks yet'); } } else { console.debug(`No active entries for logic checks for word: ${substituted}.`); }
}
//for a NOT all entries must be checked, a single match invalidates activation
if (selectiveLogic === 1 && notFlag) {
console.debug(`${entry.uid}: activated; passed NOT filter`);
activatedNow.add(entry);
} }
} }
} }
@ -1963,6 +1974,7 @@ function convertAgnaiMemoryBook(inputObj) {
content: entry.entry, content: entry.entry,
constant: false, constant: false,
selective: false, selective: false,
selectiveLogic: world_info_logic.AND_ONE,
order: entry.weight, order: entry.weight,
position: 0, position: 0,
disable: !entry.enabled, disable: !entry.enabled,
@ -1990,6 +2002,7 @@ function convertRisuLorebook(inputObj) {
content: entry.content, content: entry.content,
constant: entry.alwaysActive, constant: entry.alwaysActive,
selective: entry.selective, selective: entry.selective,
selectiveLogic: world_info_logic.AND_ONE,
order: entry.insertorder, order: entry.insertorder,
position: world_info_position.before, position: world_info_position.before,
disable: false, disable: false,
@ -2022,6 +2035,7 @@ function convertNovelLorebook(inputObj) {
content: entry.text, content: entry.text,
constant: false, constant: false,
selective: false, selective: false,
selectiveLogic: world_info_logic.AND_ONE,
order: entry.contextConfig?.budgetPriority ?? 0, order: entry.contextConfig?.budgetPriority ?? 0,
position: 0, position: 0,
disable: !entry.enabled, disable: !entry.enabled,
@ -2063,7 +2077,7 @@ function convertCharacterBook(characterBook) {
probability: entry.extensions?.probability ?? null, probability: entry.extensions?.probability ?? null,
useProbability: entry.extensions?.useProbability ?? false, useProbability: entry.extensions?.useProbability ?? false,
depth: entry.extensions?.depth ?? DEFAULT_DEPTH, depth: entry.extensions?.depth ?? DEFAULT_DEPTH,
selectiveLogic: entry.extensions?.selectiveLogic ?? 0, selectiveLogic: entry.extensions?.selectiveLogic ?? world_info_logic.AND_ONE,
group: entry.extensions?.group ?? '', group: entry.extensions?.group ?? '',
}; };
}); });