rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaces is_[api] params with api_type param 

These were 5 mutually-exclusive booleans, which can be replaced with one
param that takes on 5 values, one for each API type.
This commit is contained in:
valadaptive 2023-12-03 02:45:53 -05:00
parent 8a1ead531c
commit ba54e3dea0
4 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/script.js
View File

@ -885,13 +885,9 @@ async function getStatus() {
method: 'POST',
headers: getRequestHeaders(),
body: JSON.stringify({
main_api: main_api,
main_api,
api_server: endpoint,
use_mancer: main_api == 'textgenerationwebui' ? isMancer() : false,
use_aphrodite: main_api == 'textgenerationwebui' ? isAphrodite() : false,
use_ooba: main_api == 'textgenerationwebui' ? isOoba() : false,
use_tabby: main_api == 'textgenerationwebui' ? isTabby() : false,
use_koboldcpp: main_api == 'textgenerationwebui' ? isKoboldCpp() : false,
api_type: textgenerationwebui_settings.type,
legacy_api: main_api == 'textgenerationwebui' ? textgenerationwebui_settings.legacy_api && !isMancer() : false,
}),
signal: abortStatusCheck.signal,

6
public/scripts/textgen-settings.js
View File

@ -620,11 +620,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
'mirostat_tau': textgenerationwebui_settings.mirostat_tau,
'mirostat_eta': textgenerationwebui_settings.mirostat_eta,
'custom_token_bans': isAphrodite() ? toIntArray(getCustomTokenBans()) : getCustomTokenBans(),
'use_mancer': isMancer(),
'use_aphrodite': isAphrodite(),
'use_tabby': isTabby(),
'use_koboldcpp': isKoboldCpp(),
'use_ooba': isOoba(),
'api_type': textgenerationwebui_settings.type,
'api_server': isMancer() ? MANCER_SERVER : api_server_textgenerationwebui,
'legacy_api': textgenerationwebui_settings.legacy_api && !isMancer(),
'sampler_order': isKoboldCpp() ? textgenerationwebui_settings.sampler_order : undefined,

5
public/scripts/tokenizers.js
View File

@ -392,11 +392,10 @@ function getTokenCacheObject() {
function getRemoteTokenizationParams(str) {
return {
text: str,
api: main_api,
main_api,
api_type: textgenerationwebui_settings.type,
url: getAPIServerUrl(),
legacy_api: main_api === 'textgenerationwebui' && textgenerationwebui_settings.legacy_api && !isMancer(),
use_tabby: main_api === 'textgenerationwebui' && isTabby(),
use_koboldcpp: main_api === 'textgenerationwebui' && isKoboldCpp(),
};
}

107
server.js
View File

@ -177,19 +177,24 @@ function getOverrideHeaders(urlHost) {
* @param {string|null} server API server for new request
*/
function setAdditionalHeaders(request, args, server) {
let headers = {};
let headers;
if (request.body.use_mancer) {
headers = getMancerHeaders();
} else if (request.body.use_aphrodite) {
headers = getAphroditeHeaders();
} else if (request.body.use_tabby) {
headers = getTabbyHeaders();
} else {
headers = server ? getOverrideHeaders((new URL(server))?.host) : {};
switch (request.body.api_type) {
case 'mancer':
headers = getMancerHeaders();
break;
case 'aphrodite':
headers = getAphroditeHeaders();
break;
case 'tabby':
headers = getTabbyHeaders();
break;
default:
headers = server ? getOverrideHeaders((new URL(server))?.host) : {};
break;
}
args.headers = Object.assign(args.headers, headers);
Object.assign(args.headers, headers);
}
function humanizedISO8601DateTime(date) {
@ -562,21 +567,20 @@ app.post('/api/textgenerationwebui/status', jsonParser, async function (request,
if (request.body.legacy_api) {
url += '/v1/model';
}
else if (request.body.use_ooba) {
url += '/v1/models';
}
else if (request.body.use_aphrodite) {
url += '/v1/models';
}
else if (request.body.use_mancer) {
url += '/oai/v1/models';
}
else if (request.body.use_tabby) {
url += '/v1/model/list';
}
else if (request.body.use_koboldcpp) {
url += '/v1/models';
} else {
switch (request.body.api_type) {
case 'ooba':
case 'aphrodite':
case 'koboldcpp':
url += '/v1/models';
break;
case 'mancer':
url += '/oai/v1/models';
break;
case 'tabby':
url += '/v1/model/list';
break;
}
}
const modelsReply = await fetch(url, args);
@ -604,7 +608,7 @@ app.post('/api/textgenerationwebui/status', jsonParser, async function (request,
// Set result to the first model ID
result = modelIds[0] || 'Valid';
if (request.body.use_ooba) {
if (request.body.api_type === 'ooba') {
try {
const modelInfoUrl = baseUrl + '/v1/internal/model/info';
const modelInfoReply = await fetch(modelInfoUrl, args);
@ -619,9 +623,7 @@ app.post('/api/textgenerationwebui/status', jsonParser, async function (request,
} catch (error) {
console.error(`Failed to get Ooba model info: ${error}`);
}
}
if (request.body.use_tabby) {
} else if (request.body.api_type === 'tabby') {
try {
const modelInfoUrl = baseUrl + '/v1/model';
const modelInfoReply = await fetch(modelInfoUrl, args);
@ -671,12 +673,18 @@ app.post('/api/textgenerationwebui/generate', jsonParser, async function (reques
if (request.body.legacy_api) {
url += '/v1/generate';
}
else if (request.body.use_aphrodite || request.body.use_ooba || request.body.use_tabby || request.body.use_koboldcpp) {
url += '/v1/completions';
}
else if (request.body.use_mancer) {
url += '/oai/v1/completions';
} else {
switch (request.body.api_type) {
case 'aphrodite':
case 'ooba':
case 'tabby':
case 'koboldcpp':
url += '/v1/completions';
break;
case 'mancer':
url += '/oai/v1/completions';
break;
}
}
const args = {
@ -3471,7 +3479,7 @@ app.post('/tokenize_via_api', jsonParser, async function (request, response) {
return response.sendStatus(400);
}
const text = String(request.body.text) || '';
const api = String(request.body.api);
const api = String(request.body.main_api);
const baseUrl = String(request.body.url);
const legacyApi = Boolean(request.body.legacy_api);
@ -3490,18 +3498,21 @@ app.post('/tokenize_via_api', jsonParser, async function (request, response) {
if (legacyApi) {
url += '/v1/token-count';
args.body = JSON.stringify({ 'prompt': text });
}
else if (request.body.use_tabby) {
url += '/v1/token/encode';
args.body = JSON.stringify({ 'text': text });
}
else if (request.body.use_koboldcpp) {
url += '/api/extra/tokencount';
args.body = JSON.stringify({ 'prompt': text });
}
else {
url += '/v1/internal/encode';
args.body = JSON.stringify({ 'text': text });
} else {
switch (request.body.api_type) {
case 'tabby':
url += '/v1/token/encode';
args.body = JSON.stringify({ 'text': text });
break;
case 'koboldcpp':
url += '/api/extra/tokencount';
args.body = JSON.stringify({ 'prompt': text });
break;
default:
url += '/v1/internal/encode';
args.body = JSON.stringify({ 'text': text });
break;
}
}
const result = await fetch(url, args);