mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +01:00
* 🤖 Assistants V2 Support: Part 1 - Separated Azure Assistants to its own endpoint - File Search / Vector Store integration is incomplete, but can toggle and use storage from playground - Code Interpreter resource files can be added but not deleted - GPT-4o is supported - Many improvements to the Assistants Endpoint overall data-provider v2 changes copy existing route as v1 chore: rename new endpoint to reduce comparison operations and add new azure filesource api: add azureAssistants part 1 force use of version for assistants/assistantsAzure chore: switch name back to azureAssistants refactor type version: string | number Ensure assistants endpoints have version set fix: isArchived type issue in ConversationListParams refactor: update assistants mutations/queries with endpoint/version definitions, update Assistants Map structure chore: FilePreview component ExtendedFile type assertion feat: isAssistantsEndpoint helper chore: remove unused useGenerations chore(buildTree): type issue chore(Advanced): type issue (unused component, maybe in future) first pass for multi-assistant endpoint rewrite fix(listAssistants): pass params correctly feat: list separate assistants by endpoint fix(useTextarea): access assistantMap correctly fix: assistant endpoint switching, resetting ID fix: broken during rewrite, selecting assistant mention fix: set/invalidate assistants endpoint query data correctly feat: Fix issue with assistant ID not being reset correctly getOpenAIClient helper function feat: add toast for assistant deletion fix: assistants delete right after create issue for azure fix: assistant patching refactor: actions to use getOpenAIClient refactor: consolidate logic into helpers file fix: issue where conversation data was not initially available v1 chat support refactor(spendTokens): only early return if completionTokens isNaN fix(OpenAIClient): ensure spendTokens has all necessary params refactor: route/controller logic fix(assistants/initializeClient): use defaultHeaders field fix: sanitize default operation id chore: bump openai package first pass v2 action service feat: retroactive domain parsing for actions added via v1 feat: delete db records of actions/assistants on openai assistant deletion chore: remove vision tools from v2 assistants feat: v2 upload and delete assistant vision images WIP first pass, thread attachments fix: show assistant vision files (save local/firebase copy) v2 image continue fix: annotations fix: refine annotations show analyze as error if is no longer submitting before progress reaches 1 and show file_search as retrieval tool fix: abort run, undefined endpoint issue refactor: consolidate capabilities logic and anticipate versioning frontend version 2 changes fix: query selection and filter add endpoint to unknown filepath add file ids to resource, deleting in progress enable/disable file search remove version log * 🤖 Assistants V2 Support: Part 2 🎹 fix: Autocompletion Chrome Bug on Action API Key Input chore: remove `useOriginNavigate` chore: set correct OpenAI Storage Source fix: azure file deletions, instantiate clients by source for deletion update code interpret files info feat: deleteResourceFileId chore: increase poll interval as azure easily rate limits fix: openai file deletions, TODO: evaluate rejected deletion settled promises to determine which to delete from db records file source icons update table file filters chore: file search info and versioning fix: retrieval update with necessary tool_resources if specified fix(useMentions): add optional chaining in case listMap value is undefined fix: force assistant avatar roundedness fix: azure assistants, check correct flag chore: bump data-provider * fix: merge conflict * ci: fix backend tests due to new updates * chore: update .env.example * meilisearch improvements * localization updates * chore: update comparisons * feat: add additional metadata: endpoint, author ID * chore: azureAssistants ENDPOINTS exclusion warning
105 lines
3.4 KiB
JavaScript
105 lines
3.4 KiB
JavaScript
const Keyv = require('keyv');
|
|
const express = require('express');
|
|
const { MeiliSearch } = require('meilisearch');
|
|
const { Conversation, getConvosQueried } = require('~/models/Conversation');
|
|
const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
|
|
const { cleanUpPrimaryKeyValue } = require('~/lib/utils/misc');
|
|
const { reduceHits } = require('~/lib/utils/reduceHits');
|
|
const { isEnabled } = require('~/server/utils');
|
|
const { Message } = require('~/models/Message');
|
|
const keyvRedis = require('~/cache/keyvRedis');
|
|
const { logger } = require('~/config');
|
|
|
|
const router = express.Router();
|
|
|
|
const expiration = 60 * 1000;
|
|
const cache = isEnabled(process.env.USE_REDIS)
|
|
? new Keyv({ store: keyvRedis })
|
|
: new Keyv({ namespace: 'search', ttl: expiration });
|
|
|
|
router.use(requireJwtAuth);
|
|
|
|
router.get('/sync', async function (req, res) {
|
|
await Message.syncWithMeili();
|
|
await Conversation.syncWithMeili();
|
|
res.send('synced');
|
|
});
|
|
|
|
router.get('/', async function (req, res) {
|
|
try {
|
|
let user = req.user.id ?? '';
|
|
const { q } = req.query;
|
|
const pageNumber = req.query.pageNumber || 1;
|
|
const key = `${user}:search:${q}`;
|
|
const cached = await cache.get(key);
|
|
if (cached) {
|
|
logger.debug('[/search] cache hit: ' + key);
|
|
const { pages, pageSize, messages } = cached;
|
|
res
|
|
.status(200)
|
|
.send({ conversations: cached[pageNumber], pages, pageNumber, pageSize, messages });
|
|
return;
|
|
}
|
|
|
|
const messages = (await Message.meiliSearch(q, undefined, true)).hits;
|
|
const titles = (await Conversation.meiliSearch(q)).hits;
|
|
|
|
const sortedHits = reduceHits(messages, titles);
|
|
const result = await getConvosQueried(user, sortedHits, pageNumber);
|
|
|
|
const activeMessages = [];
|
|
for (let i = 0; i < messages.length; i++) {
|
|
let message = messages[i];
|
|
if (message.conversationId.includes('--')) {
|
|
message.conversationId = cleanUpPrimaryKeyValue(message.conversationId);
|
|
}
|
|
if (result.convoMap[message.conversationId]) {
|
|
const convo = result.convoMap[message.conversationId];
|
|
const { title, chatGptLabel, model } = convo;
|
|
message = { ...message, ...{ title, chatGptLabel, model } };
|
|
activeMessages.push(message);
|
|
}
|
|
}
|
|
result.messages = activeMessages;
|
|
if (result.cache) {
|
|
result.cache.messages = activeMessages;
|
|
cache.set(key, result.cache, expiration);
|
|
delete result.cache;
|
|
}
|
|
delete result.convoMap;
|
|
|
|
res.status(200).send(result);
|
|
} catch (error) {
|
|
logger.error('[/search] Error while searching messages & conversations', error);
|
|
res.status(500).send({ message: 'Error searching' });
|
|
}
|
|
});
|
|
|
|
router.get('/test', async function (req, res) {
|
|
const { q } = req.query;
|
|
const messages = (
|
|
await Message.meiliSearch(q, { attributesToHighlight: ['text'] }, true)
|
|
).hits.map((message) => {
|
|
const { _formatted, ...rest } = message;
|
|
return { ...rest, searchResult: true, text: _formatted.text };
|
|
});
|
|
res.send(messages);
|
|
});
|
|
|
|
router.get('/enable', async function (req, res) {
|
|
let result = false;
|
|
try {
|
|
const client = new MeiliSearch({
|
|
host: process.env.MEILI_HOST,
|
|
apiKey: process.env.MEILI_MASTER_KEY,
|
|
});
|
|
|
|
const { status } = await client.health();
|
|
result = status === 'available' && !!process.env.SEARCH;
|
|
return res.send(result);
|
|
} catch (error) {
|
|
return res.send(false);
|
|
}
|
|
});
|
|
|
|
module.exports = router;
|