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

Check instruct activation regex before selecting bound context template match

Browse Source
This commit is contained in:
Cohee
2025-04-26 01:47:07 +03:00
parent 6848b38bb7
commit a927ab557a
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,37 +208,39 @@ export function autoSelectInstructPreset(modelId) {
// Select matching instruct preset // Select matching instruct preset
let foundMatch = false; 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) {
try {
const regex = regexFromString(preset.activation_regex);
// Stop on first match so it won't cycle back and forth between presets if multiple regexes match for (const preset of instruct_presets) {
if (regex instanceof RegExp && regex.test(modelId)) { // If activation regex is set, check if it matches the model id
selectInstructPreset(preset.name, { isAuto: true }); if (preset.activation_regex) {
try {
const regex = regexFromString(preset.activation_regex);
return true; // 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)) {
} catch { selectInstructPreset(preset.name, { isAuto: true });
// If regex is invalid, ignore it foundMatch = true;
console.warn(`Invalid instruct activation regex in preset "${preset.name}"`); break;
} }
} catch {
// If regex is invalid, ignore it
console.warn(`Invalid instruct activation regex in preset "${preset.name}"`);
} }
} }
} }
return false; // 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 foundMatch;
} }
/** /**