rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-03-02 19:07:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add shouldRegister arg to /tools-register

Browse Source
This commit is contained in:
Cohee 2024-11-03 19:11:07 +02:00
parent fe469745b3
commit 649c3911eb
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
public/scripts/tool-calling.js
View File

@ -10,6 +10,7 @@ import { enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.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 { slashCommandReturnHelper } from './slash-commands/SlashCommandReturnHelper.js'; import { slashCommandReturnHelper } from './slash-commands/SlashCommandReturnHelper.js';
import { isTrueBoolean } from './utils.js';
/** /**
* @typedef {object} ToolInvocation * @typedef {object} ToolInvocation
@ -852,6 +853,13 @@ export class ToolManager {
isRequired: true, isRequired: true,
acceptsMultiple: false, acceptsMultiple: false,
}), }),
SlashCommandNamedArgument.fromProps({
name: 'shouldRegister',
description: 'The closure to be executed to determine if the tool should be registered. Must return a boolean.',
typeList: [ARGUMENT_TYPE.CLOSURE],
isRequired: false,
acceptsMultiple: false,
}),
], ],
unnamedArgumentList: [ unnamedArgumentList: [
SlashCommandArgument.fromProps({ SlashCommandArgument.fromProps({
@ -865,9 +873,10 @@ export class ToolManager {
/** /**
* Converts a slash command closure to a function. * Converts a slash command closure to a function.
* @param {SlashCommandClosure} action Closure to convert to a function * @param {SlashCommandClosure} action Closure to convert to a function
* @param {function(any): any} convertResult Function to convert the result
* @returns {function} Function that executes the closure * @returns {function} Function that executes the closure
*/ */
function closureToFunction(action) { function closureToFunction(action, convertResult) {
return async (args) => { return async (args) => {
const localClosure = action.getCopy(); const localClosure = action.getCopy();
localClosure.onProgress = () => { }; localClosure.onProgress = () => { };
@ -878,11 +887,11 @@ export class ToolManager {
scope.letVariable('arg', args); scope.letVariable('arg', args);
} }
const result = await localClosure.execute(); const result = await localClosure.execute();
return result.pipe; return convertResult(result.pipe);
}; };
} }
const { name, displayName, description, parameters, formatMessage } = args; const { name, displayName, description, parameters, formatMessage, shouldRegister } = args;
if (!(action instanceof SlashCommandClosure)) { if (!(action instanceof SlashCommandClosure)) {
throw new Error('The unnamed argument must be a closure.'); throw new Error('The unnamed argument must be a closure.');
@ -902,9 +911,13 @@ export class ToolManager {
if (formatMessage && !(formatMessage instanceof SlashCommandClosure)) { if (formatMessage && !(formatMessage instanceof SlashCommandClosure)) {
throw new Error('The "formatMessage" argument must be a closure.'); throw new Error('The "formatMessage" argument must be a closure.');
} }
if (shouldRegister && !(shouldRegister instanceof SlashCommandClosure)) {
throw new Error('The "shouldRegister" argument must be a closure.');
}
const actionFunc = closureToFunction(action); const actionFunc = closureToFunction(action, x => x);
const formatMessageFunc = formatMessage instanceof SlashCommandClosure ? closureToFunction(formatMessage) : null; const formatMessageFunc = formatMessage instanceof SlashCommandClosure ? closureToFunction(formatMessage, x => String(x)) : null;
const shouldRegisterFunc = shouldRegister instanceof SlashCommandClosure ? closureToFunction(shouldRegister, x => isTrueBoolean(x)) : null;
ToolManager.registerFunctionTool({ ToolManager.registerFunctionTool({
name: String(name ?? ''), name: String(name ?? ''),
@ -913,7 +926,7 @@ export class ToolManager {
parameters: JSON.parse(parameters ?? '{}'), parameters: JSON.parse(parameters ?? '{}'),
action: actionFunc, action: actionFunc,
formatMessage: formatMessageFunc, formatMessage: formatMessageFunc,
shouldRegister: async () => true, // TODO: Implement shouldRegister shouldRegister: shouldRegisterFunc,
}); });
return ''; return '';