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

Allow JS syntax in instruct activation regex

Browse Source
This commit is contained in:
Cohee
2024-05-17 01:14:07 +03:00
parent 59d00cca74
commit 909ec4191d
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ import {
power_user,
context_presets,
} from './power-user.js';
import { resetScrollHeight } from './utils.js';
import { regexFromString, resetScrollHeight } from './utils.js';
/**
* @type {any[]} Instruct mode presets.
@ -189,10 +189,10 @@ export function autoSelectInstructPreset(modelId) {
// If activation regex is set, check if it matches the model id
if (preset.activation_regex) {
try {
const regex = new RegExp(preset.activation_regex, 'i');
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.test(modelId)) {
if (regex instanceof RegExp && regex.test(modelId)) {
selectInstructPreset(preset.name);
return true;