rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3916 from SillyTavern/fix-instruct-regex

Browse Source 
Check instruct activation regex before selecting context template
This commit is contained in:
Cohee
2025-04-26 14:25:35 +03:00
committed by GitHub
parent 84f339cdd6 a927ab557a
commit 37c97db969
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
public/scripts/instruct-mode.js
View File

@@ -208,16 +208,7 @@ export function autoSelectInstructPreset(modelId) {
// Select matching instruct preset
let foundMatch = false;
for (const instruct_preset of instruct_presets) {
// If instruct preset matches the context template
if (power_user.instruct.bind_to_context && instruct_preset.name === power_user.context.preset) {
foundMatch = true;
selectInstructPreset(instruct_preset.name, { isAuto: true });
break;
}
}
// If no match was found, auto-select instruct preset
if (!foundMatch) {
for (const preset of instruct_presets) {
// If activation regex is set, check if it matches the model id
if (preset.activation_regex) {
@@ -227,8 +218,8 @@ export function autoSelectInstructPreset(modelId) {
// 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;
foundMatch = true;
break;
}
} catch {
// If regex is invalid, ignore it
@@ -236,9 +227,20 @@ export function autoSelectInstructPreset(modelId) {
}
}
}
// If no match was found, auto-select instruct preset
if (!foundMatch && power_user.instruct.bind_to_context) {
for (const instruct_preset of instruct_presets) {
// If instruct preset matches the context template
if (instruct_preset.name === power_user.context.preset) {
selectInstructPreset(instruct_preset.name, { isAuto: true });
foundMatch = true;
break;
}
}
}
return false;
return foundMatch;
}
/**