rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-01-21 22:16:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't auto-enable instruct mode on regex match

Browse Source
This commit is contained in:
Cohee 2023-08-21 01:28:58 +03:00
parent 897ad28477
commit 724e789509
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,32 +68,31 @@ function highlightDefaultPreset() {
/** /**
* Automatically select instruct preset based on model id. * Automatically select instruct preset based on model id.
* 1. Enables instruct mode if preset is found. * Otherwise, if default instruct preset is set, selects it.
* 2. Otherwise, if default instruct preset is set, selects it.
* @param {string} modelId Model name reported by the API. * @param {string} modelId Model name reported by the API.
* @returns {boolean} True if instruct preset was activated by model id, false otherwise. * @returns {boolean} True if instruct preset was activated by model id, false otherwise.
*/ */
export function autoSelectInstructPreset(modelId) { export function autoSelectInstructPreset(modelId) {
// If instruct mode is disabled, don't do anything
if (!power_user.instruct.enabled) {
return false;
}
for (const preset of instruct_presets) { for (const preset of instruct_presets) {
// If activation regex is set, check if it matches the model id // If activation regex is set, check if it matches the model id
if (preset.activation_regex) { if (preset.activation_regex) {
try { try {
const modeState = power_user.instruct.enabled;
const regex = new RegExp(preset.activation_regex, 'i'); const regex = new RegExp(preset.activation_regex, 'i');
// If regex matches, select the preset and enable instruct mode // Stop on first match so it won't cycle back and forth between presets if multiple regexes match
// Should not enable instruct mode if it's already enabled and the preset is the same if (regex.test(modelId)) {
if (regex.test(modelId) && (power_user.instruct.preset !== preset.name || !modeState)) { // If preset is not already selected, select it
$('#instruct_presets').val(preset.name).trigger('change'); if (power_user.instruct.preset !== preset.name) {
$('#instruct_enabled').prop('checked', true).trigger('input'); $('#instruct_presets').val(preset.name).trigger('change');
console.log(`Instruct mode: preset "${preset.name}" auto-selected`); toastr.info(`Instruct mode: preset "${preset.name}" auto-selected`);
// If instruct mode was disabled, show a notification return true;
if (!modeState) {
toastr.info(`Instruct mode enabled by preset "${preset.name}" for model "${modelId}"`);
} }
return true;
} }
} catch { } catch {
// If regex is invalid, ignore it // If regex is invalid, ignore it
@ -102,7 +101,7 @@ export function autoSelectInstructPreset(modelId) {
} }
} }
if (power_user.instruct.enabled && power_user.default_instruct && power_user.instruct.preset !== power_user.default_instruct) { if (power_user.default_instruct && power_user.instruct.preset !== power_user.default_instruct) {
if (instruct_presets.some(p => p.name === power_user.default_instruct)) { if (instruct_presets.some(p => p.name === power_user.default_instruct)) {
console.log(`Instruct mode: default preset "${power_user.default_instruct}" selected`); console.log(`Instruct mode: default preset "${power_user.default_instruct}" selected`);
$('#instruct_presets').val(power_user.default_instruct).trigger('change'); $('#instruct_presets').val(power_user.default_instruct).trigger('change');