Merge pull request #2691 from SillyTavern/quiet Add quiet flags to /api and /summarize

e4d012e49d348e46312a869e5467a4fff2abf5d1

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/script.js+21 -5 Viewed

 import { INTERACTABLE_CONTROL_CLASS, initKeyboard } from './scripts/keyboard.js';
 import { initDynamicStyles } from './scripts/dynamic-styles.js';
 import { SlashCommandEnumValue, enumTypes } from './scripts/slash-commands/SlashCommandEnumValue.js';
-import { enumIcons } from './scripts/slash-commands/SlashCommandCommonEnumsProvider.js';
+import { commonEnumProviders, enumIcons } from './scripts/slash-commands/SlashCommandCommonEnumsProvider.js';
 //exporting functions and vars for mods
 export {

 /**
  * @param {string} text API name
  */
-async function connectAPISlash(_, text) {
+async function connectAPISlash(args, text) {
     if (!text.trim()) {
         for (const [key, config] of Object.entries(CONNECT_API_MAP)) {
             if (config.selected !== main_api) continue;

@@ -8498,12 +8498,15 @@ async function connectAPISlash(_, text) {
8498		8498
8499	return key;	8499	return key;
8500	}	8500	}
		8501
		8502	console.error('FIXME: The current API is not in the API map');
		8503	return '';
8501	}	8504	}
8502		8505
8503	const apiConfig = CONNECT_API_MAP[text.toLowerCase()];	8506	const apiConfig = CONNECT_API_MAP[text.toLowerCase()];
8504	if (!apiConfig) {	8507	if (!apiConfig) {
8505	toastr.error(`Error: ${text} is not a valid API`);	8508	toastr.error(`Error: ${text} is not a valid API`);
8506	return;	8509	return '';
8507	}	8510	}
8508		8511
8509	$(`#main_api option[value='${apiConfig.selected \|\| text}']`).prop('selected', true);	8512	$(`#main_api option[value='${apiConfig.selected \|\| text}']`).prop('selected', true);

@@ -8523,14 +8526,18 @@ async function connectAPISlash(_, text) {
8523	$(apiConfig.button).trigger('click');	8526	$(apiConfig.button).trigger('click');
8524	}	8527	}
8525		8528
8526	toastr.info(`API set to ${text}, trying to connect..`);	8529	const quiet = isTrueBoolean(args?.quiet);
		8530	const toast = quiet ? jQuery() : toastr.info(`API set to ${text}, trying to connect..`);
8527		8531
8528	try {	8532	try {
8529	await waitUntilCondition(() => online_status !== 'no_connection', 10000, 100);	8533	await waitUntilCondition(() => online_status !== 'no_connection', 10000, 100);
8530	console.log('Connection successful');	8534	console.log('Connection successful');
8531	} catch {	8535	} catch {
8532	console.log('Could not connect after 5 seconds, skipping.');	8536	console.log('Could not connect after 10 seconds, skipping.');
8533	}	8537	}
		8538
		8539	toastr.clear(toast);
		8540	return text;
8534	}	8541	}
8535		8542
8536	/**	8543	/**

         name: 'api',
         callback: connectAPISlash,
         returns: 'the current API',
+        namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'quiet',
+                description: 'Suppress the toast message on connection',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'false',
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+            }),
+        ],
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({
                 description: 'API to connect to',

public/scripts/extensions/memory/index.js+20 -6 Viewed

-import { getStringHash, debounce, waitUntilCondition, extractAllWords } from '../../utils.js';
+import { getStringHash, debounce, waitUntilCondition, extractAllWords, isTrueBoolean } from '../../utils.js';
 import { getContext, getApiUrl, extension_settings, doExtrasFetch, modules, renderExtensionTemplateAsync } from '../../extensions.js';
 import {
     activateSendButtons,

 import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
 import { MacrosParser } from '../../macros.js';
 import { countWebLlmTokens, generateWebLlmChatPrompt, getWebLlmContextSize, isWebLlmSupported } from '../shared.js';
+import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
 export { MODULE_NAME };
 const MODULE_NAME = '1_memory';

+    }
+}
-async function forceSummarizeChat() {
+/**
+ * Forces a summary generation for the current chat.
+ * @param {boolean} quiet If an informational toast should be displayed
+ * @returns {Promise<string>} Summarized text
+ */
+async function forceSummarizeChat(quiet) {
     if (extension_settings.memory.source === summary_sources.extras) {
         toastr.warning('Force summarization is not supported for Extras API');
         return;

         return '';
+    }
-    const toast = toastr.info('Summarizing chat...', 'Please wait', { timeOut: 0, extendedTimeOut: 0 });
+    const toast = quiet ? jQuery() : toastr.info('Summarizing chat...', 'Please wait', { timeOut: 0, extendedTimeOut: 0 });
     const value = extension_settings.memory.source === summary_sources.main
         ? await summarizeChatMain(context, true, skipWIAN)
         : await summarizeChatWebLLM(context, true);

 async function summarizeCallback(args, text) {
     text = text.trim();
-    // Using forceSummarizeChat to summarize the current chat
+    // Summarize the current chat if no text provided
     if (!text) {
-        return await forceSummarizeChat();
+        const quiet = isTrueBoolean(args.quiet);
+        return await forceSummarizeChat(quiet);
+    }
     const source = args.source || extension_settings.memory.source;

     $('#memory_prompt_words').off('click').on('input', onMemoryPromptWordsInput);
     $('#memory_prompt_interval').off('click').on('input', onMemoryPromptIntervalInput);
     $('#memory_prompt').off('click').on('input', onMemoryPromptInput);
-    $('#memory_force_summarize').off('click').on('click', forceSummarizeChat);
+    $('#memory_force_summarize').off('click').on('click', () => forceSummarizeChat(false));
     $('#memory_template').off('click').on('input', onMemoryTemplateInput);
     $('#memory_depth').off('click').on('input', onMemoryDepthInput);
     $('#memory_role').off('click').on('input', onMemoryRoleInput);

                 typeList: [ARGUMENT_TYPE.STRING],
                 defaultValue: '',
             }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'quiet',
+                description: 'suppress the toast message when summarizing the chat',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'false',
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+            }),
         ],
         unnamedArgumentList: [
             new SlashCommandArgument('text to summarize', [ARGUMENT_TYPE.STRING], false, false, ''),