mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +01:00
* refactor: use keyv for search caching with 1 min expirations * feat: keyvRedis; chore: bump keyv, bun.lockb, add jsconfig for vscode file resolution * feat: api/search redis support * refactor(redis) use ioredis cluster for keyv fix(OpenID): when redis is configured, use redis memory store for express-session * fix: revert using uri for keyvredis * fix(SearchBar): properly debounce search queries, fix weird render behaviors * refactor: add authentication to search endpoint and show error messages in results * feat: redis support for violation logs * fix(logViolation): ensure a number is always being stored in cache * feat(concurrentLimiter): uses clearPendingReq, clears pendingReq on abort, redis support * fix(api/search/enable): query only when authenticated * feat(ModelService): redis support * feat(checkBan): redis support * refactor(api/search): consolidate keyv logic * fix(ci): add default empty value for REDIS_URI * refactor(keyvRedis): use condition to initialize keyvRedis assignment * refactor(connectDb): handle disconnected state (should create a new conn) * fix(ci/e2e): handle case where cleanUp did not successfully run * fix(getDefaultEndpoint): return endpoint from localStorage if defined and endpointsConfig is default * ci(e2e): remove afterAll messages as startup/cleanUp will clear messages * ci(e2e): remove teardown for CI until further notice * chore: bump playwright/test * ci(e2e): reinstate teardown as CI issue is specific to github env * fix(ci): click settings menu trigger by testid
126 lines
4 KiB
JavaScript
126 lines
4 KiB
JavaScript
const Keyv = require('keyv');
|
|
const express = require('express');
|
|
const router = express.Router();
|
|
const { MeiliSearch } = require('meilisearch');
|
|
const { Message } = require('../../models/Message');
|
|
const { Conversation, getConvosQueried } = require('../../models/Conversation');
|
|
const { reduceHits } = require('../../lib/utils/reduceHits');
|
|
const { cleanUpPrimaryKeyValue } = require('../../lib/utils/misc');
|
|
const requireJwtAuth = require('../middleware/requireJwtAuth');
|
|
const keyvRedis = require('../../cache/keyvRedis');
|
|
const { isEnabled } = require('../utils');
|
|
|
|
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) {
|
|
console.log('cache hit', key);
|
|
const { pages, pageSize, messages } = cached;
|
|
res
|
|
.status(200)
|
|
.send({ conversations: cached[pageNumber], pages, pageNumber, pageSize, messages });
|
|
return;
|
|
}
|
|
|
|
// const message = await Message.meiliSearch(q);
|
|
const messages = (
|
|
await Message.meiliSearch(
|
|
q,
|
|
{
|
|
attributesToHighlight: ['text'],
|
|
highlightPreTag: '**',
|
|
highlightPostTag: '**',
|
|
},
|
|
true,
|
|
)
|
|
).hits.map((message) => {
|
|
const { _formatted, ...rest } = message;
|
|
return {
|
|
...rest,
|
|
searchResult: true,
|
|
text: _formatted.text,
|
|
};
|
|
});
|
|
const titles = (await Conversation.meiliSearch(q)).hits;
|
|
const sortedHits = reduceHits(messages, titles);
|
|
// debugging:
|
|
// console.log('user:', user, 'message hits:', messages.length, 'convo hits:', titles.length);
|
|
// console.log('sorted hits:', sortedHits.length);
|
|
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;
|
|
// for debugging
|
|
// console.log(result, messages.length);
|
|
res.status(200).send(result);
|
|
} catch (error) {
|
|
console.log(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();
|
|
// console.log(`Meilisearch: ${status}`);
|
|
result = status === 'available' && !!process.env.SEARCH;
|
|
return res.send(result);
|
|
} catch (error) {
|
|
// console.error(error);
|
|
return res.send(false);
|
|
}
|
|
});
|
|
|
|
module.exports = router;
|