Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 17:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat(api): add support for saving messages to database

Browse source 
fix(api): change arrowParens prettier option to always
fix(api): update addToCache to include endpointOption and latestMessage
fix(api): update askOpenAI to include endpointOption in abortControllers
fix(client): remove abortKey state and add currentParent state to MessageHandler
This commit is contained in:
Daniel Avila 2023-04-09 11:17:08 -04:00
parent 6246ffff1e
commit a81bd27b39
5 changed files with 78 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
api/server/routes/ask/askOpenAI.js
View file

@ -1,6 +1,7 @@
const express = require('express');
const crypto = require('crypto');
const router = express.Router();
const addToCache = require('./addToCache');
const { getOpenAIModels } = require('../endpoints');
const { titleConvo, askClient } = require('../../../app/');
const { saveMessage, getConvoTitle, saveConvo, updateConvo, getConvo } = require('../../../models');
@ -8,16 +9,22 @@ const { handleError, sendMessage, createOnProgress, handleText } = require('./ha
const abortControllers = new Map();
router.post('/abort', (req, res) => {
const { abortKey, message } = req.body;
router.post('/abort', async (req, res) => {
const { abortKey, latestMessage, parentMessageId } = req.body;
console.log(`req.body`, req.body);
if (!abortControllers.has(abortKey)) {
return res.status(404).send('Request not found');
}
const { abortController, userMessage, endpointOption } = abortControllers.get(abortKey);
if (!endpointOption.endpoint) {
endpointOption.endpoint = req.originalUrl.replace('/api/ask/','').split('/abort')[0];
}
const { abortController, userMessage } = abortControllers.get(abortKey);
abortController.abort();
abortControllers.delete(abortKey);
console.log('Aborted request', abortKey, userMessage);
console.log('Aborted request', abortKey, userMessage, endpointOption);
await addToCache({ endpointOption, conversationId: abortKey, userMessage, latestMessage, parentMessageId });
res.status(200).send('Aborted');
});
@ -118,7 +125,7 @@ const ask = async ({
const abortController = new AbortController();
const abortKey = conversationId;
console.log('conversationId -----> ', conversationId);
abortControllers.set(abortKey, { abortController, userMessage });
abortControllers.set(abortKey, { abortController, userMessage, endpointOption });
res.on('close', () => {
abortController.abort();