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

Copy textgen-types enum to server code

Browse Source
This commit is contained in:
valadaptive
2023-12-03 15:00:25 -05:00
parent 9c33ddbafc
commit a68505e857
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server.js
View File

@ -180,13 +180,13 @@ function setAdditionalHeaders(request, args, server) {
let headers; let headers;
switch (request.body.api_type) { switch (request.body.api_type) {
case 'mancer': case TEXTGEN_TYPES.MANCER:
headers = getMancerHeaders(); headers = getMancerHeaders();
break; break;
case 'aphrodite': case TEXTGEN_TYPES.APHRODITE:
headers = getAphroditeHeaders(); headers = getAphroditeHeaders();
break; break;
case 'tabby': case TEXTGEN_TYPES.TABBY:
headers = getTabbyHeaders(); headers = getTabbyHeaders();
break; break;
default: default:
@ -217,7 +217,7 @@ const AVATAR_WIDTH = 400;
const AVATAR_HEIGHT = 600; const AVATAR_HEIGHT = 600;
const jsonParser = express.json({ limit: '200mb' }); const jsonParser = express.json({ limit: '200mb' });
const urlencodedParser = express.urlencoded({ extended: true, limit: '200mb' }); const urlencodedParser = express.urlencoded({ extended: true, limit: '200mb' });
const { DIRECTORIES, UPLOADS_PATH, PALM_SAFETY } = require('./src/constants'); const { DIRECTORIES, UPLOADS_PATH, PALM_SAFETY, TEXTGEN_TYPES } = require('./src/constants');
const { TavernCardValidator } = require('./src/validator/TavernCardValidator'); const { TavernCardValidator } = require('./src/validator/TavernCardValidator');
// CSRF Protection // // CSRF Protection //
@ -569,15 +569,15 @@ app.post('/api/textgenerationwebui/status', jsonParser, async function (request,
url += '/v1/model'; url += '/v1/model';
} else { } else {
switch (request.body.api_type) { switch (request.body.api_type) {
case 'ooba': case TEXTGEN_TYPES.OOBA:
case 'aphrodite': case TEXTGEN_TYPES.APHRODITE:
case 'koboldcpp': case TEXTGEN_TYPES.KOBOLDCPP:
url += '/v1/models'; url += '/v1/models';
break; break;
case 'mancer': case TEXTGEN_TYPES.MANCER:
url += '/oai/v1/models'; url += '/oai/v1/models';
break; break;
case 'tabby': case TEXTGEN_TYPES.TABBY:
url += '/v1/model/list'; url += '/v1/model/list';
break; break;
} }
@ -608,7 +608,7 @@ 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.api_type === 'ooba') { if (request.body.api_type === TEXTGEN_TYPES.OOBA) {
try { try {
const modelInfoUrl = baseUrl + '/v1/internal/model/info'; const modelInfoUrl = baseUrl + '/v1/internal/model/info';
const modelInfoReply = await fetch(modelInfoUrl, args); const modelInfoReply = await fetch(modelInfoUrl, args);
@ -623,7 +623,7 @@ app.post('/api/textgenerationwebui/status', jsonParser, async function (request,
} catch (error) { } catch (error) {
console.error(`Failed to get Ooba model info: ${error}`); console.error(`Failed to get Ooba model info: ${error}`);
} }
} else if (request.body.api_type === 'tabby') { } else if (request.body.api_type === TEXTGEN_TYPES.TABBY) {
try { try {
const modelInfoUrl = baseUrl + '/v1/model'; const modelInfoUrl = baseUrl + '/v1/model';
const modelInfoReply = await fetch(modelInfoUrl, args); const modelInfoReply = await fetch(modelInfoUrl, args);
@ -675,13 +675,13 @@ app.post('/api/textgenerationwebui/generate', jsonParser, async function (reques
url += '/v1/generate'; url += '/v1/generate';
} else { } else {
switch (request.body.api_type) { switch (request.body.api_type) {
case 'aphrodite': case TEXTGEN_TYPES.APHRODITE:
case 'ooba': case TEXTGEN_TYPES.OOBA:
case 'tabby': case TEXTGEN_TYPES.TABBY:
case 'koboldcpp': case TEXTGEN_TYPES.KOBOLDCPP:
url += '/v1/completions'; url += '/v1/completions';
break; break;
case 'mancer': case TEXTGEN_TYPES.MANCER:
url += '/oai/v1/completions'; url += '/oai/v1/completions';
break; break;
} }
@ -3500,11 +3500,11 @@ app.post('/tokenize_via_api', jsonParser, async function (request, response) {
args.body = JSON.stringify({ 'prompt': text }); args.body = JSON.stringify({ 'prompt': text });
} else { } else {
switch (request.body.api_type) { switch (request.body.api_type) {
case 'tabby': case TEXTGEN_TYPES.TABBY:
url += '/v1/token/encode'; url += '/v1/token/encode';
args.body = JSON.stringify({ 'text': text }); args.body = JSON.stringify({ 'text': text });
break; break;
case 'koboldcpp': case TEXTGEN_TYPES.KOBOLDCPP:
url += '/api/extra/tokencount'; url += '/api/extra/tokencount';
args.body = JSON.stringify({ 'prompt': text }); args.body = JSON.stringify({ 'prompt': text });
break; break;

10
src/constants.js
View File

@ -134,9 +134,19 @@ const PALM_SAFETY = [
const UPLOADS_PATH = './uploads'; const UPLOADS_PATH = './uploads';
// TODO: this is copied from the client code; there should be a way to de-duplicate it eventually
const TEXTGEN_TYPES = {
OOBA: 'ooba',
MANCER: 'mancer',
APHRODITE: 'aphrodite',
TABBY: 'tabby',
KOBOLDCPP: 'koboldcpp',
};
module.exports = { module.exports = {
DIRECTORIES, DIRECTORIES,
UNSAFE_EXTENSIONS, UNSAFE_EXTENSIONS,
UPLOADS_PATH, UPLOADS_PATH,
PALM_SAFETY, PALM_SAFETY,
TEXTGEN_TYPES,
}; };