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

Changes

Browse Source
This commit is contained in:
NWilson 2024-02-16 09:07:06 -06:00
parent b5887960b6
commit 8075e4cd1e
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -7658,8 +7658,8 @@ const CONNECT_API_MAP = {
source: chat_completion_sources.CUSTOM, source: chat_completion_sources.CUSTOM,
}, },
'infermaticai': { 'infermaticai': {
selected: 'openai', selected: 'textgenerationwebui',
button: '#api_button_openai', button: '#api_button_textgenerationwebui',
type: textgen_types.INFERMATICAI, type: textgen_types.INFERMATICAI,
}, },
}; };

6
public/scripts/RossAscends-mods.js
View File

@ -389,8 +389,9 @@ function RA_autoconnect(PrevApi) {
} }
break; break;
case 'textgenerationwebui': case 'textgenerationwebui':
if ((textgen_settings.type === textgen_types.MANCER && secret_state[SECRET_KEYS.MANCER]) || if ((textgen_settings.type === textgen_types.MANCER && secret_state[SECRET_KEYS.MANCER])
(textgen_settings.type === textgen_types.TOGETHERAI && secret_state[SECRET_KEYS.TOGETHERAI]) || (textgen_settings.type === textgen_types.TOGETHERAI && secret_state[SECRET_KEYS.TOGETHERAI])
|| (textgen_settings.type === textgen_types.INFERMATICAI && secret_state[SECRET_KEYS.INFERMATICAI])
) { ) {
$('#api_button_textgenerationwebui').trigger('click'); $('#api_button_textgenerationwebui').trigger('click');
} }
@ -407,7 +408,6 @@ function RA_autoconnect(PrevApi) {
|| (secret_state[SECRET_KEYS.AI21] && oai_settings.chat_completion_source == chat_completion_sources.AI21) || (secret_state[SECRET_KEYS.AI21] && oai_settings.chat_completion_source == chat_completion_sources.AI21)
|| (secret_state[SECRET_KEYS.MAKERSUITE] && oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) || (secret_state[SECRET_KEYS.MAKERSUITE] && oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE)
|| (secret_state[SECRET_KEYS.MISTRALAI] && oai_settings.chat_completion_source == chat_completion_sources.MISTRALAI) || (secret_state[SECRET_KEYS.MISTRALAI] && oai_settings.chat_completion_source == chat_completion_sources.MISTRALAI)
|| (secret_state[SECRET_KEYS.INFERMATICAI] && oai_settings.chat_completion_source == chat_completion_sources.INFERMATICAI)
|| (isValidUrl(oai_settings.custom_url) && oai_settings.chat_completion_source == chat_completion_sources.CUSTOM) || (isValidUrl(oai_settings.custom_url) && oai_settings.chat_completion_source == chat_completion_sources.CUSTOM)
) { ) {
$('#api_button_openai').trigger('click'); $('#api_button_openai').trigger('click');

2
public/scripts/textgen-models.js
View File

@ -121,7 +121,7 @@ function onTogetherModelSelect() {
function onInfermaticAIModelSelect() { function onInfermaticAIModelSelect() {
const modelName = String($('#model_infermaticai_select').val()); const modelName = String($('#model_infermaticai_select').val());
textgen_settings.infermaticai_model = modelName; textgen_settings.infermaticai_model = modelName;
$('#api_button_openai').trigger('click'); $('#api_button_textgenerationwebui').trigger('click');
const model = infermaticAIModels.find(x => x.id === modelName); const model = infermaticAIModels.find(x => x.id === modelName);
setGenerationParamsFromPreset({ max_length: model.context_length }); setGenerationParamsFromPreset({ max_length: model.context_length });
} }

8
src/endpoints/backends/text-completions.js
View File

@ -106,6 +106,7 @@ router.post('/status', jsonParser, async function (request, response) {
case TEXTGEN_TYPES.APHRODITE: case TEXTGEN_TYPES.APHRODITE:
case TEXTGEN_TYPES.KOBOLDCPP: case TEXTGEN_TYPES.KOBOLDCPP:
case TEXTGEN_TYPES.LLAMACPP: case TEXTGEN_TYPES.LLAMACPP:
case TEXTGEN_TYPES.INFERMATICAI:
url += '/v1/models'; url += '/v1/models';
break; break;
case TEXTGEN_TYPES.MANCER: case TEXTGEN_TYPES.MANCER:
@ -117,9 +118,6 @@ router.post('/status', jsonParser, async function (request, response) {
case TEXTGEN_TYPES.TOGETHERAI: case TEXTGEN_TYPES.TOGETHERAI:
url += '/api/models?&info'; url += '/api/models?&info';
break; break;
case TEXTGEN_TYPES.INFERMATICAI:
url += '/models';
break;
case TEXTGEN_TYPES.OLLAMA: case TEXTGEN_TYPES.OLLAMA:
url += '/api/tags'; url += '/api/tags';
break; break;
@ -235,6 +233,7 @@ router.post('/generate', jsonParser, async function (request, response) {
case TEXTGEN_TYPES.TABBY: case TEXTGEN_TYPES.TABBY:
case TEXTGEN_TYPES.KOBOLDCPP: case TEXTGEN_TYPES.KOBOLDCPP:
case TEXTGEN_TYPES.TOGETHERAI: case TEXTGEN_TYPES.TOGETHERAI:
case TEXTGEN_TYPES.INFERMATICAI:
url += '/v1/completions'; url += '/v1/completions';
break; break;
case TEXTGEN_TYPES.MANCER: case TEXTGEN_TYPES.MANCER:
@ -246,9 +245,6 @@ router.post('/generate', jsonParser, async function (request, response) {
case TEXTGEN_TYPES.OLLAMA: case TEXTGEN_TYPES.OLLAMA:
url += '/api/generate'; url += '/api/generate';
break; break;
case TEXTGEN_TYPES.INFERMATICAI:
url += '/completions';
break;
} }
} }