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

fix as per review

Browse Source
This commit is contained in:
Juha Jeronen
2024-01-24 16:02:08 +02:00
parent 0a07161cf8
commit 71344720d2
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/endpoints/vectors.js
View File

@ -143,6 +143,27 @@ async function queryCollection(collectionId, source, sourceSettings, searchText,
return { metadata, hashes }; return { metadata, hashes };
} }
/**
* Extracts settings for the vectorization sources from the HTTP request headers.
* @param {object} request - The HTTP request object.
* @returns {object} - An object that can be used as `sourceSettings` in functions that take that parameter.
*/
function extractSourceSettings(request) {
// Extras API settings to connect to the Extras embeddings provider
let extrasUrl = '';
let extrasKey = '';
if (source === 'extras') {
extrasUrl = String(request.headers['x-extras-url']);
extrasKey = String(request.headers['x-extras-key']);
}
const sourceSettings = {
extrasUrl: extrasUrl,
extrasKey: extrasKey
};
return sourceSettings;
}
const router = express.Router(); const router = express.Router();
router.post('/query', jsonParser, async (req, res) => { router.post('/query', jsonParser, async (req, res) => {
@ -155,18 +176,7 @@ router.post('/query', jsonParser, async (req, res) => {
const searchText = String(req.body.searchText); const searchText = String(req.body.searchText);
const topK = Number(req.body.topK) || 10; const topK = Number(req.body.topK) || 10;
const source = String(req.body.source) || 'transformers'; const source = String(req.body.source) || 'transformers';
const sourceSettings = extractSourceSettings(req);
// API settings for Extras embeddings provider
let extrasUrl = '';
let extrasKey = '';
if (source === 'extras') {
extrasUrl = String(req.headers['x-extras-url']);
extrasKey = String(req.headers['x-extras-key']);
}
const sourceSettings = {
extrasUrl: extrasUrl,
extrasKey: extrasKey
};
const results = await queryCollection(collectionId, source, sourceSettings, searchText, topK); const results = await queryCollection(collectionId, source, sourceSettings, searchText, topK);
return res.json(results); return res.json(results);
@ -185,18 +195,7 @@ router.post('/insert', jsonParser, async (req, res) => {
const collectionId = String(req.body.collectionId); const collectionId = String(req.body.collectionId);
const items = req.body.items.map(x => ({ hash: x.hash, text: x.text, index: x.index })); const items = req.body.items.map(x => ({ hash: x.hash, text: x.text, index: x.index }));
const source = String(req.body.source) || 'transformers'; const source = String(req.body.source) || 'transformers';
const sourceSettings = extractSourceSettings(req);
// API settings for Extras embeddings provider
let extrasUrl = '';
let extrasKey = '';
if (source === 'extras') {
extrasUrl = String(req.headers['x-extras-url']);
extrasKey = String(req.headers['x-extras-key']);
}
const sourceSettings = {
extrasUrl: extrasUrl,
extrasKey: extrasKey
};
await insertVectorItems(collectionId, source, sourceSettings, items); await insertVectorItems(collectionId, source, sourceSettings, items);
return res.sendStatus(200); return res.sendStatus(200);

1
src/extras-vectors.js
View File

@ -32,6 +32,7 @@ async function getExtrasVector(text, apiUrl, apiKey) {
catch (error) { catch (error) {
console.log('Failed to set up Extras API call:', error); console.log('Failed to set up Extras API call:', error);
console.log('Extras API URL given was:', apiUrl); console.log('Extras API URL given was:', apiUrl);
throw error;
} }
const headers = { const headers = {