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

Apply regex to parsed reasoning

Browse Source
This commit is contained in:
Cohee
2025-01-30 01:02:23 +02:00
parent 4e7326b61b
commit 4b2575f301
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/scripts/reasoning.js
View File

@@ -8,7 +8,7 @@ import { SlashCommand } from './slash-commands/SlashCommand.js';
import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from './slash-commands/SlashCommandArgument.js'; import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from './slash-commands/SlashCommandArgument.js';
import { commonEnumProviders } from './slash-commands/SlashCommandCommonEnumsProvider.js'; import { commonEnumProviders } from './slash-commands/SlashCommandCommonEnumsProvider.js';
import { SlashCommandParser } from './slash-commands/SlashCommandParser.js'; import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
import { copyText, escapeRegex } from './utils.js'; import { copyText, escapeRegex, isFalseBoolean } from './utils.js';
/** /**
* Gets a message from a jQuery element. * Gets a message from a jQuery element.
@@ -172,13 +172,22 @@ function registerReasoningSlashCommands() {
name: 'reasoning-parse', name: 'reasoning-parse',
returns: 'reasoning string', returns: 'reasoning string',
helpString: t`Extracts the reasoning block from a string using the Reasoning Formatting settings.`, helpString: t`Extracts the reasoning block from a string using the Reasoning Formatting settings.`,
namedArgumentList: [
SlashCommandNamedArgument.fromProps({
name: 'regex',
description: 'Whether to apply regex scripts to the reasoning content.',
typeList: ARGUMENT_TYPE.BOOLEAN,
defaultValue: 'true',
isRequired: false,
}),
],
unnamedArgumentList: [ unnamedArgumentList: [
SlashCommandArgument.fromProps({ SlashCommandArgument.fromProps({
description: 'input string', description: 'input string',
typeList: ARGUMENT_TYPE.STRING, typeList: ARGUMENT_TYPE.STRING,
}), }),
], ],
callback: (_, value) => { callback: (args, value) => {
if (!value) { if (!value) {
return ''; return '';
} }
@@ -194,7 +203,10 @@ function registerReasoningSlashCommands() {
return ''; return '';
} }
return getRegexedString(parsedReasoning.reasoning, regex_placement.REASONING); const applyRegex = !isFalseBoolean(args.regex.toString());
return applyRegex
? getRegexedString(parsedReasoning.reasoning, regex_placement.REASONING)
: parsedReasoning.reasoning;
}, },
})); }));
} }
@@ -398,7 +410,7 @@ function registerReasoningAppEvents() {
// If reasoning was found, add it to the message // If reasoning was found, add it to the message
if (parsedReasoning.reasoning) { if (parsedReasoning.reasoning) {
message.extra.reasoning = parsedReasoning.reasoning; message.extra.reasoning = getRegexedString(parsedReasoning.reasoning, regex_placement.REASONING);
} }
// Update the message text if it was changed // Update the message text if it was changed