/classify allows custom prompt for LLM api

2472b2605766eb032253d96a4f3fb27ed20522ff

Wolfsblvt <wolfsblvt@gmail.com>

public/scripts/extensions/expressions/index.js+11 -4 Viewed

     return '';
+}
-async function classifyCallback(/** @type {{api: string?}} */ { api = null }, text) {
+async function classifyCallback(/** @type {{api: string?, prompt: string?}} */ { api = null, prompt = null }, text) {
     if (!text) {
         toastr.warning('No text provided');
         return '';

@@ -938,7 +938,7 @@ async function classifyCallback(/** @type {{api: string?}} */ { api = null }, te
938	return '';	938	return '';
939	}	939	}
940		940
941	const label = getExpressionLabel(text, expressionApi);	941	const label = getExpressionLabel(text, expressionApi, { customPrompt: prompt });
942	console.debug(`Classification result for "${text}": ${label}`);	942	console.debug(`Classification result for "${text}": ${label}`);
943	return label;	943	return label;
944	}	944	}

  * Optionally allows to override the expressions API being used.
  * @param {string} text - The text to classify and retrieve the expression label for.
  * @param {EXPRESSION_API} [expressionsApi=extension_settings.expressions.api] - The expressions API to use for classification.
+ * @param {object} [options={}] - Optional arguments.
+ * @param {string?} [options.customPrompt=null] - The custom prompt to use for classification.
  * @returns {Promise<string>} - The label of the expression.
  */
-export async function getExpressionLabel(text, expressionsApi = extension_settings.expressions.api) {
+export async function getExpressionLabel(text, expressionsApi = extension_settings.expressions.api, { customPrompt = null } = {}) {
     // Return if text is undefined, saving a costly fetch request
     if ((!modules.includes('classify') && expressionsApi == EXPRESSION_API.extras) || !text) {
         return getFallbackExpression();

+                }
                 const expressionsList = await getExpressionsList();
-                const prompt = await getLlmPrompt(expressionsList);
+                const prompt = customPrompt || await getLlmPrompt(expressionsList);
                 let functionResult = null;
                 eventSource.once(event_types.TEXT_COMPLETION_SETTINGS_READY, onTextGenSettingsReady);
                 eventSource.once(event_types.LLM_FUNCTION_TOOL_REGISTER, onFunctionToolRegister);

                 typeList: [ARGUMENT_TYPE.STRING],
                 enumList: Object.keys(EXPRESSION_API).map(api => new SlashCommandEnumValue(api, null, enumTypes.enum)),
             }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'prompt',
+                description: 'Custom prompt for classification. Only relevant if Classifier API is set to LLM.',
+                typeList: [ARGUMENT_TYPE.STRING],
+            }),
         ],
         unnamedArgumentList: [
             new SlashCommandArgument(