rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2806 from SillyTavern/bypass-command-string-parser 

Execute profile commands callbacks directly
This commit is contained in:
Cohee 2024-09-10 12:06:10 +03:00 committed by GitHub
parent 1582974ba9 4e84120981
commit b2705d1396
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
public/scripts/extensions/connection-manager/index.js
View File

@ -1,12 +1,14 @@
import { event_types, eventSource, main_api, saveSettingsDebounced } from '../../../script.js'; import { event_types, eventSource, main_api, saveSettingsDebounced } from '../../../script.js';
import { extension_settings, renderExtensionTemplateAsync } from '../../extensions.js'; import { extension_settings, renderExtensionTemplateAsync } from '../../extensions.js';
import { callGenericPopup, Popup, POPUP_TYPE } from '../../popup.js'; import { callGenericPopup, Popup, POPUP_TYPE } from '../../popup.js';
import { executeSlashCommandsWithOptions } from '../../slash-commands.js';
import { SlashCommand } from '../../slash-commands/SlashCommand.js'; import { SlashCommand } from '../../slash-commands/SlashCommand.js';
import { SlashCommandAbortController } from '../../slash-commands/SlashCommandAbortController.js';
import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js'; import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
import { commonEnumProviders, enumIcons } from '../../slash-commands/SlashCommandCommonEnumsProvider.js'; import { commonEnumProviders, enumIcons } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
import { SlashCommandDebugController } from '../../slash-commands/SlashCommandDebugController.js';
import { enumTypes, SlashCommandEnumValue } from '../../slash-commands/SlashCommandEnumValue.js'; import { enumTypes, SlashCommandEnumValue } from '../../slash-commands/SlashCommandEnumValue.js';
import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js'; import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
import { SlashCommandScope } from '../../slash-commands/SlashCommandScope.js';
import { collapseSpaces, getUniqueName, isFalseBoolean, uuidv4 } from '../../utils.js'; import { collapseSpaces, getUniqueName, isFalseBoolean, uuidv4 } from '../../utils.js';
const MODULE_NAME = 'connection-manager'; const MODULE_NAME = 'connection-manager';
@ -91,6 +93,24 @@ class ConnectionManagerSpinner {
} }
} }
/**
* Get named arguments for the command callback.
* @param {object} [args] Additional named arguments
* @returns {object} Named arguments
*/
function getNamedArguments(args = {}) {
// None of the commands here use underscored args, but better safe than sorry
return {
_scope: new SlashCommandScope(),
_abortController: new SlashCommandAbortController(),
_debugController: new SlashCommandDebugController(),
_parserFlags: {},
_hasUnnamedArgument: false,
quiet: 'true',
...args,
};
}
/** @type {() => SlashCommandEnumValue[]} */ /** @type {() => SlashCommandEnumValue[]} */
const profilesProvider = () => [ const profilesProvider = () => [
new SlashCommandEnumValue(NONE), new SlashCommandEnumValue(NONE),
@ -112,8 +132,6 @@ const profilesProvider = () => [
* @property {string} [tokenizer] Tokenizer * @property {string} [tokenizer] Tokenizer
*/ */
const escapeArgument = (a) => a.replace(/"/g, '\\"').replace(/\|/g, '\\|');
/** /**
* Finds the best match for the search value. * Finds the best match for the search value.
* @param {string} value Search value * @param {string} value Search value
@ -149,15 +167,15 @@ async function readProfileFromCommands(mode, profile, cleanUp = false) {
const commands = mode === 'cc' ? CC_COMMANDS : TC_COMMANDS; const commands = mode === 'cc' ? CC_COMMANDS : TC_COMMANDS;
const opposingCommands = mode === 'cc' ? TC_COMMANDS : CC_COMMANDS; const opposingCommands = mode === 'cc' ? TC_COMMANDS : CC_COMMANDS;
for (const command of commands) { for (const command of commands) {
const commandText = `/${command} quiet=true`;
try { try {
const result = await executeSlashCommandsWithOptions(commandText, { handleParserErrors: false, handleExecutionErrors: false }); const args = getNamedArguments();
if (result.pipe) { const result = await SlashCommandParser.commands[command].callback(args, '');
profile[command] = result.pipe; if (result) {
profile[command] = result;
continue; continue;
} }
} catch (error) { } catch (error) {
console.warn(`Failed to execute command: ${commandText}`, error); console.error(`Failed to execute command: ${command}`, error);
} }
} }
@ -273,11 +291,11 @@ async function applyConnectionProfile(profile) {
if (!argument) { if (!argument) {
continue; continue;
} }
const commandText = `/${command} quiet=true ${escapeArgument(argument)}`;
try { try {
await executeSlashCommandsWithOptions(commandText, { handleParserErrors: false, handleExecutionErrors: false }); const args = getNamedArguments();
await SlashCommandParser.commands[command].callback(args, argument);
} catch (error) { } catch (error) {
console.error(`Failed to execute command: ${commandText}`, error); console.error(`Failed to execute command: ${command} ${argument}`, error);
} }
} }