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

Tabby: Decouple combined conditionals 

Done by request.

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri 2023-11-17 14:51:44 -05:00
parent 4cfa267b1b
commit f7ed574d04
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server.js
View File

@ -560,21 +560,37 @@ app.post("/api/textgenerationwebui/status", jsonParser, async function (request,
// Set result to the first model ID // Set result to the first model ID
result = modelIds[0] || 'Valid'; result = modelIds[0] || 'Valid';
if (request.body.use_ooba || request.body.use_tabby) { if (request.body.use_ooba) {
try { try {
const modelInfoPath = request.body.use_ooba ? "/v1/internal/model/info" : "/v1/model" const modelInfoUrl = baseUrl + "/v1/internal/model/info";
const modelInfoUrl = baseUrl + modelInfoPath;
const modelInfoReply = await fetch(modelInfoUrl, args); const modelInfoReply = await fetch(modelInfoUrl, args);
if (modelInfoReply.ok) { if (modelInfoReply.ok) {
const modelInfo = await modelInfoReply.json(); const modelInfo = await modelInfoReply.json();
console.log(`${request.body.use_ooba ? "Ooba" : "Tabby"} model info: ${modelInfo}`); console.log(`Ooba model info: ${modelInfo}`);
const modelName = request.body.use_ooba ? modelInfo?.model_name : modelInfo?.id; const modelName = modelInfo?.model_name;
result = modelName || result; result = modelName || result;
} }
} catch (error) { } catch (error) {
console.error(`Failed to get ${request.body.use_ooba ? "Ooba" : "Tabby"} model info: ${error}`); console.error(`Failed to get Ooba model info: ${error}`);
}
}
if (request.body.use_tabby) {
try {
const modelInfoUrl = baseUrl + "/v1/model";
const modelInfoReply = await fetch(modelInfoUrl, args);
if (modelInfoReply.ok) {
const modelInfo = await modelInfoReply.json();
console.log(`Tabby model info: ${modelInfo}`);
const modelName = modelInfo?.id;
result = modelName || result;
}
} catch (error) {
console.error(`Failed to get TabbyAPI model info: ${error}`);
} }
} }
@ -3423,8 +3439,11 @@ app.post("/tokenize_via_api", jsonParser, async function (request, response) {
if (legacyApi) { if (legacyApi) {
url += '/v1/token-count'; url += '/v1/token-count';
args.body = JSON.stringify({ "prompt": text }); args.body = JSON.stringify({ "prompt": text });
} else if (request.body.use_tabby) {
url += '/v1/token/encode';
args.body = JSON.stringify({ "text": text });
} else { } else {
url += request.body.use_tabby ? '/v1/token/encode' : '/v1/internal/encode'; url += '/v1/internal/encode';
args.body = JSON.stringify({ "text": text }); args.body = JSON.stringify({ "text": text });
} }