rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-04-04 22:21:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add quiet argument to /api-url

Browse Source
This commit is contained in:
Cohee 2024-09-07 13:09:10 +03:00
parent b4948ec842
commit ed115d4e11
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1616,6 +1616,13 @@ export function initDefaultSlashCommands() {
defaultValue: 'true', defaultValue: 'true',
enumList: commonEnumProviders.boolean('trueFalse')(), enumList: commonEnumProviders.boolean('trueFalse')(),
}), }),
SlashCommandNamedArgument.fromProps({
name: 'quiet',
description: 'suppress the toast message on API change',
typeList: [ARGUMENT_TYPE.BOOLEAN],
defaultValue: 'false',
enumList: commonEnumProviders.boolean('trueFalse')(),
}),
], ],
unnamedArgumentList: [ unnamedArgumentList: [
SlashCommandArgument.fromProps({ SlashCommandArgument.fromProps({
@ -3577,10 +3584,12 @@ function setPromptEntryCallback(args, targetState) {
* @param {object} args - named args * @param {object} args - named args
* @param {string?} [args.api=null] - the API name to set/get the URL for * @param {string?} [args.api=null] - the API name to set/get the URL for
* @param {string?} [args.connect=true] - whether to connect to the API after setting * @param {string?} [args.connect=true] - whether to connect to the API after setting
* @param {string?} [args.quiet=false] - whether to suppress toasts
* @param {string} url - the API URL to set * @param {string} url - the API URL to set
* @returns {Promise<string>} * @returns {Promise<string>}
*/ */
async function setApiUrlCallback({ api = null, connect = 'true' }, url) { async function setApiUrlCallback({ api = null, connect = 'true', quiet = 'false' }, url) {
const isQuiet = isTrueBoolean(quiet);
const autoConnect = isTrueBoolean(connect); const autoConnect = isTrueBoolean(connect);
// Special handling for Chat Completion Custom OpenAI compatible, that one can also support API url handling // Special handling for Chat Completion Custom OpenAI compatible, that one can also support API url handling
@ -3629,22 +3638,26 @@ async function setApiUrlCallback({ api = null, connect = 'true' }, url) {
// Do some checks and get the api type we are targeting with this command // Do some checks and get the api type we are targeting with this command
if (api && !Object.values(textgen_types).includes(api)) { if (api && !Object.values(textgen_types).includes(api)) {
toastr.warning(`API '${api}' is not a valid text_gen API.`); !isQuiet && toastr.warning(`API '${api}' is not a valid text_gen API.`);
return ''; return '';
} }
if (!api && !Object.values(textgen_types).includes(textgenerationwebui_settings.type)) { if (!api && !Object.values(textgen_types).includes(textgenerationwebui_settings.type)) {
toastr.warning(`API '${textgenerationwebui_settings.type}' is not a valid text_gen API.`); !isQuiet && toastr.warning(`API '${textgenerationwebui_settings.type}' is not a valid text_gen API.`);
return '';
}
if (!api && main_api !== 'textgenerationwebui') {
!isQuiet && toastr.warning(`API type '${main_api}' does not support setting the server URL.`);
return ''; return '';
} }
if (api && url && autoConnect && api !== textgenerationwebui_settings.type) { if (api && url && autoConnect && api !== textgenerationwebui_settings.type) {
toastr.warning(`API '${api}' is not the currently selected API, so we cannot do an auto-connect. Consider switching to it via /api beforehand.`); !isQuiet && toastr.warning(`API '${api}' is not the currently selected API, so we cannot do an auto-connect. Consider switching to it via /api beforehand.`);
return ''; return '';
} }
const type = api || textgenerationwebui_settings.type; const type = api || textgenerationwebui_settings.type;
const inputSelector = SERVER_INPUTS[type]; const inputSelector = SERVER_INPUTS[type];
if (!inputSelector) { if (!inputSelector) {
toastr.warning(`API '${type}' does not have a server url input.`); !isQuiet && toastr.warning(`API '${type}' does not have a server url input.`);
return ''; return '';
} }