Reduce nesting and simply WI check loop

02989a9a787c64de5644b0d5635b790245020365

Wolfsblvt <wolfsblvt@gmail.com>

Parents: 0b9431cd9aa71348ddaf781803abde80c3bac33f

public/scripts/world-info.js+34 -33 Viewed

         console.debug(`[WI] Loop #${count}. Search state`, Object.entries(scan_state).find(x => x[1] === scanState));
+        // Until decided otherwise, we set the loop to stop scanning after this
+        let nextScanState = scan_state.NONE;
+        // Loop and find all entries that can activate here
         let activatedNow = new Set();
         for (let entry of sortedEntries) {

+        }
         console.debug(`[WI] Search done. Found ${activatedNow.size} possible entries.`);
-        scanState = world_info_recursive && activatedNow.size > 0 ? scan_state.RECURSION : scan_state.NONE;
         const newEntries = [...activatedNow]
             .sort((a, b) => sortedEntries.indexOf(a) - sortedEntries.indexOf(b));
         let newContent = '';

@@ -3826,7 +3828,6 @@ async function checkWorldInfo(chat, maxContext, isDryRun) {
3826	} else {	3828	} else {
3827	console.debug(`[WI] budget of ${budget} reached, stopping after ${allActivatedEntries.size} entries`);	3829	console.debug(`[WI] budget of ${budget} reached, stopping after ${allActivatedEntries.size} entries`);
3828	}	3830	}
3829	scanState = scan_state.NONE;
3830	token_budget_overflowed = true;	3831	token_budget_overflowed = true;
3831	break;	3832	break;
3832	}	3833	}

+        }
         const successfulNewEntries = newEntries.filter(x => !failedProbabilityChecks.has(x));
+        const successfulNewEntriesForRecursion = successfulNewEntries.filter(x => !x.preventRecursion);
         if (!newEntries.length) {
             console.debug('[WI] No new entries activated, stopping');
-            scanState = scan_state.NONE;
+        } else if (!successfulNewEntries.length) {
-        }
-        if (newEntries.length && !successfulNewEntries.length) {
             console.debug('[WI] Probability checks failed for all activated entries, stopping');
-            scanState = scan_state.NONE;
+        } else {
-        }
+            console.debug(`[WI] Sucessfully activated ${successfulNewEntries.length} new entries to prompt. ${allActivatedEntries.size} total entries activated.`, successfulNewEntries);
-        if (scanState) {
-            const text = successfulNewEntries
-                .filter(x => !x.preventRecursion)
-                .map(x => x.content).join('\n');
-            buffer.addRecurse(text);
-            allActivatedText = (text + '\n' + allActivatedText);
+        }
-        if (successfulNewEntries.length) {
+        // After processing and rolling entries is done, see if we should continue with recursion
-            console.debug(`[WI] Sucessfully activated ${successfulNewEntries.length} new entries to prompt. ${allActivatedEntries.size} total entries activated.`, successfulNewEntries);
+        if (world_info_recursive && !token_budget_overflowed && successfulNewEntriesForRecursion.length) {
+            nextScanState = scan_state.RECURSION;
+        }
-        // world_info_min_activations
+        // If scanning is planned to stop, but min activations is set and not satisfied, check if we should continue
-        if (!scanState && !token_budget_overflowed) {
+        const minActivationsNotSatisfied = world_info_min_activations > 0 && (allActivatedEntries.size < world_info_min_activations);
-            if (world_info_min_activations > 0 && (allActivatedEntries.size < world_info_min_activations)) {
+        if (!nextScanState && !token_budget_overflowed && minActivationsNotSatisfied) {
-                console.debug('[WI] --- MIN ACTIVATIONS CHECK ---');
+            console.debug('[WI] --- MIN ACTIVATIONS CHECK ---');
-                let over_max = (
+            let over_max = (
-                    world_info_min_activations_depth_max > 0 &&
+                world_info_min_activations_depth_max > 0 &&
-                    buffer.getDepth() > world_info_min_activations_depth_max
+                buffer.getDepth() > world_info_min_activations_depth_max
-                ) || (buffer.getDepth() > chat.length);
+            ) || (buffer.getDepth() > chat.length);
-                if (!over_max) {
+            if (!over_max) {
-                    console.debug(`[WI] Min activations not reached (${allActivatedEntries.size}/${world_info_min_activations}), advancing depth to ${buffer.getDepth() + 1} and checking again`);
+                console.debug(`[WI] Min activations not reached (${allActivatedEntries.size}/${world_info_min_activations}), advancing depth to ${buffer.getDepth() + 1} and checking again`);
-                    scanState = scan_state.MIN_ACTIVATIONS; // loop
+                nextScanState = scan_state.MIN_ACTIVATIONS; // loop
-                    buffer.advanceScanPosition();
+                buffer.advanceScanPosition();
-                } else {
+            } else {
-                    console.debug(`[WI] Min activations not reached (${allActivatedEntries.size}/${world_info_min_activations}), but reached on of depth. Stopping`);
+                console.debug(`[WI] Min activations not reached (${allActivatedEntries.size}/${world_info_min_activations}), but reached on of depth. Stopping`);
-                }
+            }
+        }
+        // Final check if we should really continue scan, and extend the current WI recurse buffer
+        scanState = nextScanState;
+        if (scanState) {
+            const text = successfulNewEntriesForRecursion
+                .map(x => x.content).join('\n');
+            buffer.addRecurse(text);
+            allActivatedText = (text + '\n' + allActivatedText);
+        }
+    }
     console.debug('[WI] --- BUILDING PROMPT ---');