Merge pull request #3916 from SillyTavern/fix-instruct-regex Check instruct activation regex before selecting context template

37c97db96980f63357aeca393cfa0d1d553de7b0

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: 84f339cdd652a18af83f9506a07de7b961a1ca77 a927ab557a1c97a2e67efc3b3da4626a7ec3aa77

public/scripts/instruct-mode.js+26 -24 Viewed

     // Select matching instruct preset
     let foundMatch = false;
-    for (const instruct_preset of instruct_presets) {
-        // If instruct preset matches the context template
+    for (const preset of instruct_presets) {
-        if (power_user.instruct.bind_to_context && instruct_preset.name === power_user.context.preset) {
+        // If activation regex is set, check if it matches the model id
-            foundMatch = true;
+        if (preset.activation_regex) {
-            selectInstructPreset(instruct_preset.name, { isAuto: true });
+            try {
-            break;
+                const regex = regexFromString(preset.activation_regex);
+                // Stop on first match so it won't cycle back and forth between presets if multiple regexes match
+                if (regex instanceof RegExp && regex.test(modelId)) {
+                    selectInstructPreset(preset.name, { isAuto: true });
+                    foundMatch = true;
+                    break;
+                }
+            } catch {
+                // If regex is invalid, ignore it
+                console.warn(`Invalid instruct activation regex in preset "${preset.name}"`);
+            }
+        }
+    }
     // If no match was found, auto-select instruct preset
-    if (!foundMatch) {
+    if (!foundMatch && power_user.instruct.bind_to_context) {
-        for (const preset of instruct_presets) {
+        for (const instruct_preset of instruct_presets) {
-            // If activation regex is set, check if it matches the model id
+            // If instruct preset matches the context template
-            if (preset.activation_regex) {
+            if (instruct_preset.name === power_user.context.preset) {
-                try {
+                selectInstructPreset(instruct_preset.name, { isAuto: true });
-                    const regex = regexFromString(preset.activation_regex);
+                foundMatch = true;
+                break;
-                    // Stop on first match so it won't cycle back and forth between presets if multiple regexes match
-                    if (regex instanceof RegExp && regex.test(modelId)) {
-                        selectInstructPreset(preset.name, { isAuto: true });
-                        return true;
-                    }
-                } catch {
-                    // If regex is invalid, ignore it
-                    console.warn(`Invalid instruct activation regex in preset "${preset.name}"`);
-                }
+            }
+        }
+    }
-    return false;
+    return foundMatch;
+}
 /**