no authorization

This commit is contained in:
DarokCx
2024-06-27 10:02:28 -04:00
parent bd5592de7b
commit 8608bc92ae
3 changed files with 10 additions and 1 deletions

View File

@ -1124,6 +1124,7 @@ async function getStatusTextgen() {
online_status = textgen_settings.aphrodite_model; online_status = textgen_settings.aphrodite_model;
} else if (textgen_settings.type === FEATHERLESS) { } else if (textgen_settings.type === FEATHERLESS) {
loadFeatherlessModels(data?.data); loadFeatherlessModels(data?.data);
online_status = textgen_settings.featherless_model;
} else { } else {
online_status = data?.result; online_status = data?.result;
} }

View File

@ -4,7 +4,7 @@ const _ = require('lodash');
const Readable = require('stream').Readable; const Readable = require('stream').Readable;
const { jsonParser } = require('../../express-common'); const { jsonParser } = require('../../express-common');
const { TEXTGEN_TYPES, TOGETHERAI_KEYS, OLLAMA_KEYS, INFERMATICAI_KEYS, OPENROUTER_KEYS, VLLM_KEYS, DREAMGEN_KEYS } = require('../../constants'); const { TEXTGEN_TYPES, TOGETHERAI_KEYS, OLLAMA_KEYS, INFERMATICAI_KEYS, OPENROUTER_KEYS, VLLM_KEYS, DREAMGEN_KEYS, FEATHERLESS_KEYS } = require('../../constants');
const { forwardFetchResponse, trimV1 } = require('../../util'); const { forwardFetchResponse, trimV1 } = require('../../util');
const { setAdditionalHeaders } = require('../../additional-headers'); const { setAdditionalHeaders } = require('../../additional-headers');
@ -238,6 +238,7 @@ router.post('/generate', jsonParser, async function (request, response) {
} else { } else {
switch (request.body.api_type) { switch (request.body.api_type) {
case TEXTGEN_TYPES.VLLM: case TEXTGEN_TYPES.VLLM:
case TEXTGEN_TYPES.FEATHERLESS:
case TEXTGEN_TYPES.APHRODITE: case TEXTGEN_TYPES.APHRODITE:
case TEXTGEN_TYPES.OOBA: case TEXTGEN_TYPES.OOBA:
case TEXTGEN_TYPES.TABBY: case TEXTGEN_TYPES.TABBY:
@ -284,6 +285,11 @@ router.post('/generate', jsonParser, async function (request, response) {
args.body = JSON.stringify(request.body); args.body = JSON.stringify(request.body);
} }
if (request.body.api_type === TEXTGEN_TYPES.FEATHERLESS) {
request.body = _.pickBy(request.body, (_, key) => FEATHERLESS_KEYS.includes(key));
args.body = JSON.stringify(request.body);
}
if (request.body.api_type === TEXTGEN_TYPES.DREAMGEN) { if (request.body.api_type === TEXTGEN_TYPES.DREAMGEN) {
request.body = _.pickBy(request.body, (_, key) => DREAMGEN_KEYS.includes(key)); request.body = _.pickBy(request.body, (_, key) => DREAMGEN_KEYS.includes(key));
// NOTE: DreamGen sometimes get confused by the unusual formatting in the character cards. // NOTE: DreamGen sometimes get confused by the unusual formatting in the character cards.

View File

@ -4,6 +4,7 @@ const express = require('express');
const { getConfigValue } = require('../util'); const { getConfigValue } = require('../util');
const writeFileAtomicSync = require('write-file-atomic').sync; const writeFileAtomicSync = require('write-file-atomic').sync;
const { jsonParser } = require('../express-common'); const { jsonParser } = require('../express-common');
const { FEATHERLESS_KEYS } = require('../constants');
const SECRETS_FILE = 'secrets.json'; const SECRETS_FILE = 'secrets.json';
const SECRET_KEYS = { const SECRET_KEYS = {
@ -40,6 +41,7 @@ const SECRET_KEYS = {
PERPLEXITY: 'api_key_perplexity', PERPLEXITY: 'api_key_perplexity',
GROQ: 'api_key_groq', GROQ: 'api_key_groq',
AZURE_TTS: 'api_key_azure_tts', AZURE_TTS: 'api_key_azure_tts',
FEATHERLESS: 'api_key_featherless',
}; };
// These are the keys that are safe to expose, even if allowKeysExposure is false // These are the keys that are safe to expose, even if allowKeysExposure is false