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

Merge pull request #2431 from SillyTavern/remove-slash-command-var-usages

Browse Source 
Remove slash command var usages
This commit is contained in:
Cohee
2024-06-28 13:50:06 +03:00
committed by GitHub
parent 902dfbcdcc 6653757c5c
commit 8136293593
4 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/scripts/extensions/memory/index.js
View File

@ -447,7 +447,7 @@ async function summarizeCallback(args, text) {
} }
const source = args.source || extension_settings.memory.source; const source = args.source || extension_settings.memory.source;
const prompt = substituteParamsExtended((resolveVariable(args.prompt) || extension_settings.memory.prompt), { words: extension_settings.memory.promptWords }); const prompt = substituteParamsExtended((args.prompt || extension_settings.memory.prompt), { words: extension_settings.memory.promptWords });
try { try {
switch (source) { switch (source) {
@ -923,10 +923,8 @@ jQuery(async function () {
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'prompt', name: 'prompt',
description: 'prompt to use for summarization', description: 'prompt to use for summarization',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.STRING],
defaultValue: '', defaultValue: '',
enumProvider: commonEnumProviders.variables('all'),
forceEnum: false,
}), }),
], ],
unnamedArgumentList: [ unnamedArgumentList: [

8
public/scripts/extensions/regex/index.js
View File

@ -349,7 +349,7 @@ function migrateSettings() {
/** /**
* /regex slash command callback * /regex slash command callback
* @param {object} args Named arguments * @param {{name: string}} args Named arguments
* @param {string} value Unnamed argument * @param {string} value Unnamed argument
* @returns {string} The regexed string * @returns {string} The regexed string
*/ */
@ -359,11 +359,11 @@ function runRegexCallback(args, value) {
return value; return value;
} }
const scriptName = String(resolveVariable(args.name)); const scriptName = args.name;
const scripts = getRegexScripts(); const scripts = getRegexScripts();
for (const script of scripts) { for (const script of scripts) {
if (String(script.scriptName).toLowerCase() === String(scriptName).toLowerCase()) { if (script.scriptName.toLowerCase() === scriptName.toLowerCase()) {
if (script.disabled) { if (script.disabled) {
toastr.warning(`Regex script "${scriptName}" is disabled.`); toastr.warning(`Regex script "${scriptName}" is disabled.`);
return value; return value;
@ -588,7 +588,7 @@ jQuery(async () => {
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'name', name: 'name',
description: 'script name', description: 'script name',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.STRING],
isRequired: true, isRequired: true,
enumProvider: localEnumProviders.regexScripts, enumProvider: localEnumProviders.regexScripts,
}), }),

5
public/scripts/extensions/stable-diffusion/index.js
View File

@ -2206,7 +2206,7 @@ async function generatePicture(initiator, args, trigger, message, callback) {
} }
const dimensions = setTypeSpecificDimensions(generationType); const dimensions = setTypeSpecificDimensions(generationType);
let negativePromptPrefix = resolveVariable(args?.negative) || ''; let negativePromptPrefix = args?.negative || '';
let imagePath = ''; let imagePath = '';
try { try {
@ -3356,8 +3356,7 @@ jQuery(async () => {
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'negative', name: 'negative',
description: 'negative prompt prefix', description: 'negative prompt prefix',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.STRING],
enumProvider: commonEnumProviders.variables('all'),
}), }),
], ],
unnamedArgumentList: [ unnamedArgumentList: [

32
public/scripts/slash-commands.js
View File

@ -466,12 +466,9 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'name', name: 'name',
description: 'display name', description: 'display name',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.STRING],
defaultValue: '{{user}}', defaultValue: '{{user}}',
enumProvider: () => [ enumProvider: commonEnumProviders.characters('character'),
...commonEnumProviders.characters('character')(),
...commonEnumProviders.variables('all')().map(x => { x.description = 'Variable'; return x; }),
],
}), }),
], ],
unnamedArgumentList: [ unnamedArgumentList: [
@ -1267,13 +1264,9 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'id', name: 'id',
description: 'injection ID or variable name pointing to ID', description: 'injection ID or variable name pointing to ID',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.STRING],
isRequired: true, isRequired: true,
enumProvider: commonEnumProviders.injects,
enumProvider: () => [
...commonEnumProviders.injects(),
...commonEnumProviders.variables('all')().map(x => { x.description = 'Variable'; return x; }),
],
}), }),
new SlashCommandNamedArgument( new SlashCommandNamedArgument(
'position', 'injection position', [ARGUMENT_TYPE.STRING], false, false, 'after', ['before', 'after', 'chat'], 'position', 'injection position', [ARGUMENT_TYPE.STRING], false, false, 'after', ['before', 'after', 'chat'],
@ -1317,12 +1310,9 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
unnamedArgumentList: [ unnamedArgumentList: [
SlashCommandArgument.fromProps({ SlashCommandArgument.fromProps({
description: 'injection ID or a variable name pointing to ID', description: 'injection ID or a variable name pointing to ID',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.STRING],
defaultValue: '', defaultValue: '',
enumProvider: () => [ enumProvider: commonEnumProviders.injects,
...commonEnumProviders.injects(),
...commonEnumProviders.variables('all')().map(x => { x.description = 'Variable'; return x; }),
],
}), }),
], ],
callback: flushInjectsCallback, callback: flushInjectsCallback,
@ -1415,7 +1405,7 @@ function injectCallback(args, value) {
'assistant': extension_prompt_roles.ASSISTANT, 'assistant': extension_prompt_roles.ASSISTANT,
}; };
const id = resolveVariable(args?.id); const id = args?.id;
const ephemeral = isTrueBoolean(args?.ephemeral); const ephemeral = isTrueBoolean(args?.ephemeral);
if (!id) { if (!id) {
@ -1493,16 +1483,16 @@ function listInjectsCallback() {
/** /**
* Flushes script injections for the current chat. * Flushes script injections for the current chat.
* @param {import('./slash-commands/SlashCommand.js').NamedArguments} args Named arguments * @param {import('./slash-commands/SlashCommand.js').NamedArguments} _ Named arguments
* @param {string} value Unnamed argument * @param {string} value Unnamed argument
* @returns {string} Empty string * @returns {string} Empty string
*/ */
function flushInjectsCallback(args, value) { function flushInjectsCallback(_, value) {
if (!chat_metadata.script_injects) { if (!chat_metadata.script_injects) {
return ''; return '';
} }
const idArgument = resolveVariable(value, args._scope); const idArgument = value;
for (const [id, inject] of Object.entries(chat_metadata.script_injects)) { for (const [id, inject] of Object.entries(chat_metadata.script_injects)) {
if (idArgument && id !== idArgument) { if (idArgument && id !== idArgument) {
@ -2441,7 +2431,7 @@ async function sendUserMessageCallback(args, text) {
const insertAt = Number(resolveVariable(args?.at)); const insertAt = Number(resolveVariable(args?.at));
if ('name' in args) { if ('name' in args) {
const name = resolveVariable(args.name) || ''; const name = args.name || '';
const avatar = findPersonaByName(name) || user_avatar; const avatar = findPersonaByName(name) || user_avatar;
await sendMessageAsUser(text, bias, insertAt, compact, name, avatar); await sendMessageAsUser(text, bias, insertAt, compact, name, avatar);
} }