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

wip: feat: abort messages and continue conversation

Browse source 
fix(addToCache.js): remove unused variables and parameters
feat(addToCache.js): add message to cache with id, parentMessageId, role, and text
fix(askOpenAI.js): remove parentMessageId parameter from addToCache call
feat(MessageHandler.jsx): add latestMessage to store on cancel of submission, and generate messageId and parentMessageId for latestMessage
This commit is contained in:
Daniel Avila 2023-04-09 22:21:27 -04:00
parent a81bd27b39
commit a953fc9f2b
3 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
api/server/routes/ask/addToCache.js
View file

@ -1,21 +1,16 @@
const Keyv = require('keyv');
const { KeyvFile } = require('keyv-file');
const crypto = require('crypto');
const { saveMessage } = require('../../../models');
const addToCache = async ({
endpointOption,
conversationId,
userMessage,
latestMessage,
parentMessageId
}) => {
const addToCache = async ({ endpointOption, userMessage, latestMessage }) => {
try {
const conversationsCache = new Keyv({
store: new KeyvFile({ filename: './data/cache.json' }),
namespace: 'chatgpt', // should be 'bing' for bing/sydney
namespace: 'chatgpt' // should be 'bing' for bing/sydney
});
const { conversationId, messageId, parentMessageId, text } = latestMessage;
let conversation = await conversationsCache.get(conversationId);
// used to generate a title for the conversation if none exists
// let isNewConversation = false;
@ -38,13 +33,13 @@ const addToCache = async ({
}
};
const messageId = crypto.randomUUID();
// const messageId = crypto.randomUUID();
let responseMessage = {
id: messageId,
parentMessageId,
role: roles(endpointOption),
message: latestMessage
message: text
};
await saveMessage({
@ -52,7 +47,7 @@ const addToCache = async ({
conversationId,
messageId,
sender: responseMessage.role,
text: latestMessage
text
});
conversation.messages.push(userMessage, responseMessage);

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

@ -10,7 +10,7 @@ const { handleError, sendMessage, createOnProgress, handleText } = require('./ha
const abortControllers = new Map();
router.post('/abort', async (req, res) => {
const { abortKey, latestMessage, parentMessageId } = req.body;
const { abortKey, latestMessage } = req.body;
console.log(`req.body`, req.body);
if (!abortControllers.has(abortKey)) {
return res.status(404).send('Request not found');
@ -24,7 +24,7 @@ router.post('/abort', async (req, res) => {
abortController.abort();
abortControllers.delete(abortKey);
console.log('Aborted request', abortKey, userMessage, endpointOption);
await addToCache({ endpointOption, conversationId: abortKey, userMessage, latestMessage, parentMessageId });
await addToCache({ endpointOption, userMessage, latestMessage });
res.status(200).send('Aborted');
});