Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2026-02-01 07:11:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: conflicting fetch with /api/convos

Browse source
This commit is contained in:
Daniel Avila 2023-03-18 14:28:10 -04:00
parent 0f54ffd8b4
commit b97594c000
10 changed files with 199 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/models/Conversation.js
View file

@ -145,10 +145,11 @@ module.exports = {
const promises = convoIds.map(convo => {
return Conversation.findOne({ user, conversationId: convo.conversationId}).exec();
});
const results = await Promise.all(promises);
const results = (await Promise.all(promises)).filter(convo => convo);
const startIndex = (pageNumber - 1) * pageSize;
const convos = results.slice(startIndex, startIndex + pageSize);
const totalPages = Math.ceil(results.length / pageSize);
console.log(results.length, totalPages, convos.length);
return { conversations: convos, pages: totalPages, pageNumber, pageSize };
} catch (error) {
console.log(error);

33
api/server/routes/search.js
View file

@ -2,7 +2,7 @@ const express = require('express');
const router = express.Router();
const { Message } = require('../../models/Message');
const { Conversation, getConvosQueried } = require('../../models/Conversation');
const {reduceMessages, reduceHits} = require('../../lib/utils/reduceHits');
const { reduceMessages, reduceHits } = require('../../lib/utils/reduceHits');
// const { MeiliSearch } = require('meilisearch');
router.get('/sync', async function (req, res) {
@ -12,19 +12,24 @@ router.get('/sync', async function (req, res) {
});
router.get('/', async function (req, res) {
const { q } = req.query;
console.log(req.query);
const pageNumber = req.query.pageNumber || 1;
// const message = await Message.meiliSearch(q, { attributesToHighlight: ['text', 'sender'] });
const message = await Message.meiliSearch(q);
const title = await Conversation.meiliSearch(q, { attributesToHighlight: ['title'] });
// console.log('titles', title);
// console.log(sortedHits);
const sortedHits = reduceHits(message.hits, title.hits);
const result = await getConvosQueried(req?.session?.user?.username, sortedHits, pageNumber);
// const sortedHits = reduceMessages(message.hits);
// res.status(200).send(sortedHits || result);
res.status(200).send(result);
try {
const { q } = req.query;
console.log(req.query, req.params);
const pageNumber = req.query.pageNumber || 1;
const message = await Message.meiliSearch(q);
const title = await Conversation.meiliSearch(q, { attributesToHighlight: ['title'] });
const sortedHits = reduceHits(message.hits, title.hits);
const result = await getConvosQueried(
req?.session?.user?.username,
sortedHits,
pageNumber
);
console.log('result', result.pageNumber, result.pages, result.pageSize);
res.status(200).send(result);
} catch (error) {
console.log(error);
res.status(500).send({ message: 'Error searching' });
}
});
router.get('/clear', async function (req, res) {