mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-02-09 08:38:53 +01:00
/api-url slash command to get/set server url
This commit is contained in:
parent
d57272c166
commit
28a9c45c31
@ -20,6 +20,8 @@ import {
|
|||||||
validateTextGenUrl,
|
validateTextGenUrl,
|
||||||
parseTextgenLogprobs,
|
parseTextgenLogprobs,
|
||||||
parseTabbyLogprobs,
|
parseTabbyLogprobs,
|
||||||
|
textgenerationwebui_settings,
|
||||||
|
SERVER_INPUTS,
|
||||||
} from './scripts/textgen-settings.js';
|
} from './scripts/textgen-settings.js';
|
||||||
|
|
||||||
const { MANCER, TOGETHERAI, OOBA, VLLM, APHRODITE, TABBY, OLLAMA, INFERMATICAI, DREAMGEN, OPENROUTER, FEATHERLESS } = textgen_types;
|
const { MANCER, TOGETHERAI, OOBA, VLLM, APHRODITE, TABBY, OLLAMA, INFERMATICAI, DREAMGEN, OPENROUTER, FEATHERLESS } = textgen_types;
|
||||||
@ -242,7 +244,7 @@ import { DragAndDropHandler } from './scripts/dragdrop.js';
|
|||||||
import { INTERACTABLE_CONTROL_CLASS, initKeyboard } from './scripts/keyboard.js';
|
import { INTERACTABLE_CONTROL_CLASS, initKeyboard } from './scripts/keyboard.js';
|
||||||
import { initDynamicStyles } from './scripts/dynamic-styles.js';
|
import { initDynamicStyles } from './scripts/dynamic-styles.js';
|
||||||
import { SlashCommandEnumValue, enumTypes } from './scripts/slash-commands/SlashCommandEnumValue.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
|
//exporting functions and vars for mods
|
||||||
export {
|
export {
|
||||||
@ -8519,6 +8521,56 @@ async function connectAPISlash(_, text) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the API URL and triggers the text generation web UI button click.
|
||||||
|
*
|
||||||
|
* @param {object} args - named args
|
||||||
|
* @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} url - the API URL to set
|
||||||
|
* @returns {string}
|
||||||
|
*/
|
||||||
|
function setApiUrlCallback({ api = null, connect = 'true' }, url) {
|
||||||
|
// Do some checks and get the api type we are targeting with this command
|
||||||
|
if (api && !Object.values(textgen_types).includes(api)) {
|
||||||
|
toastr.warning(`API '${api}' is not a valid text_gen API.`);
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
if (!api && !Object.values(textgen_types).includes(textgenerationwebui_settings.type)) {
|
||||||
|
toastr.warning(`API '${textgenerationwebui_settings.type}' is not a valid text_gen API.`);
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
if (api && url && isTrueBoolean(connect) && 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.`);
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
const type = api || textgenerationwebui_settings.type;
|
||||||
|
|
||||||
|
const inputSelector = SERVER_INPUTS[type];
|
||||||
|
if (!inputSelector) {
|
||||||
|
toastr.warning(`API '${type}' does not have a server url input.`);
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no url was provided, return the current one
|
||||||
|
if (!url) {
|
||||||
|
return textgenerationwebui_settings.server_urls[type] ?? '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// else, we want to actually set the url
|
||||||
|
$(inputSelector).val(url).trigger('input');
|
||||||
|
// trigger blur debounced, so we hide the autocomplete menu
|
||||||
|
setTimeout(() => $(inputSelector).trigger('blur'), 1);
|
||||||
|
|
||||||
|
// Trigger the auto connect via connect button, if requested
|
||||||
|
if (isTrueBoolean(connect)) {
|
||||||
|
$('#api_button_textgenerationwebui').trigger('click');
|
||||||
|
}
|
||||||
|
|
||||||
|
// We still re-acquire the value, as it might have been modified by the validation on connect
|
||||||
|
return textgenerationwebui_settings.server_urls[type] ?? '';
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Imports supported files dropped into the app window.
|
* Imports supported files dropped into the app window.
|
||||||
* @param {File[]} files Array of files to process
|
* @param {File[]} files Array of files to process
|
||||||
@ -8977,11 +9029,11 @@ jQuery(async function () {
|
|||||||
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
|
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
|
||||||
name: 'api',
|
name: 'api',
|
||||||
callback: connectAPISlash,
|
callback: connectAPISlash,
|
||||||
|
returns: 'the current API',
|
||||||
unnamedArgumentList: [
|
unnamedArgumentList: [
|
||||||
SlashCommandArgument.fromProps({
|
SlashCommandArgument.fromProps({
|
||||||
description: 'API to connect to',
|
description: 'API to connect to',
|
||||||
typeList: [ARGUMENT_TYPE.STRING],
|
typeList: [ARGUMENT_TYPE.STRING],
|
||||||
isRequired: false,
|
|
||||||
enumList: Object.entries(CONNECT_API_MAP).map(([api, { selected }]) =>
|
enumList: Object.entries(CONNECT_API_MAP).map(([api, { selected }]) =>
|
||||||
new SlashCommandEnumValue(api, selected, enumTypes.getBasedOnIndex(uniqueAPIs.findIndex(x => x === selected)),
|
new SlashCommandEnumValue(api, selected, enumTypes.getBasedOnIndex(uniqueAPIs.findIndex(x => x === selected)),
|
||||||
selected[0].toUpperCase() ?? enumIcons.default)),
|
selected[0].toUpperCase() ?? enumIcons.default)),
|
||||||
@ -8997,6 +9049,42 @@ jQuery(async function () {
|
|||||||
</div>
|
</div>
|
||||||
`,
|
`,
|
||||||
}));
|
}));
|
||||||
|
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
|
||||||
|
name: 'api-url',
|
||||||
|
callback: setApiUrlCallback,
|
||||||
|
returns: 'the current API url',
|
||||||
|
aliases: ['server'],
|
||||||
|
namedArgumentList: [
|
||||||
|
SlashCommandNamedArgument.fromProps({
|
||||||
|
name: 'api',
|
||||||
|
description: 'API to set/get the URL for - if not provided, current API is used',
|
||||||
|
typeList: [ARGUMENT_TYPE.STRING],
|
||||||
|
enumList: Object.values(textgen_types).map(api => new SlashCommandEnumValue(api, null, enumTypes.enum)),
|
||||||
|
}),
|
||||||
|
SlashCommandNamedArgument.fromProps({
|
||||||
|
name: 'connect',
|
||||||
|
description: 'Whether to auto-connect to the API after setting the URL',
|
||||||
|
typeList: [ARGUMENT_TYPE.BOOLEAN],
|
||||||
|
defaultValue: 'true',
|
||||||
|
enumList: commonEnumProviders.boolean('trueFalse')(),
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
unnamedArgumentList: [
|
||||||
|
SlashCommandArgument.fromProps({
|
||||||
|
description: 'API url to connect to',
|
||||||
|
typeList: [ARGUMENT_TYPE.STRING],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
helpString: `
|
||||||
|
<div>
|
||||||
|
Set the API url / server url for the currently selected API, including the port. If no argument is provided, it will return the current API url.
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
If a manual API is provided to <b>set</b>the URL, make sure to set <code>connect=false</code>, as auto-connect only works for the currently selected API,
|
||||||
|
or consider switching to it with <code>/api</code> first.
|
||||||
|
</div>
|
||||||
|
`,
|
||||||
|
}));
|
||||||
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
|
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
|
||||||
name: 'impersonate',
|
name: 'impersonate',
|
||||||
callback: doImpersonate,
|
callback: doImpersonate,
|
||||||
|
@ -94,7 +94,7 @@ let DREAMGEN_SERVER = 'https://dreamgen.com';
|
|||||||
let OPENROUTER_SERVER = 'https://openrouter.ai/api';
|
let OPENROUTER_SERVER = 'https://openrouter.ai/api';
|
||||||
let FEATHERLESS_SERVER = 'https://api.featherless.ai/v1';
|
let FEATHERLESS_SERVER = 'https://api.featherless.ai/v1';
|
||||||
|
|
||||||
const SERVER_INPUTS = {
|
export const SERVER_INPUTS = {
|
||||||
[textgen_types.OOBA]: '#textgenerationwebui_api_url_text',
|
[textgen_types.OOBA]: '#textgenerationwebui_api_url_text',
|
||||||
[textgen_types.VLLM]: '#vllm_api_url_text',
|
[textgen_types.VLLM]: '#vllm_api_url_text',
|
||||||
[textgen_types.APHRODITE]: '#aphrodite_api_url_text',
|
[textgen_types.APHRODITE]: '#aphrodite_api_url_text',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user