mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* refactor: replace lodash import with specific function import fix(api): esm imports to cjs * refactor(Messages.tsx): convert to TS, out-source scrollToDiv logic to a custom hook fix(ScreenshotContext.tsx): change Ref to RefObject in ScreenshotContextType feat(useScrollToRef.ts): add useScrollToRef hook for scrolling to a ref with throttle fix(Chat.tsx): update import path for Messages component fix(Search.tsx): update import path for Messages component * chore(types.ts): add TAskProps and TOptions types refactor(useMessageHandler.ts): use TAskFunction type for ask function signature * refactor(Message/Content): convert to TS, move Plugin component to Content dir * feat(MessageContent.tsx): add MessageContent component for displaying and editing message content feat(index.ts): export MessageContent component from Messages/Content directory * wip(Message.jsx): conversion and use of new component in progress * refactor: convert Message.jsx to TS and fix typing/imports based on changes * refactor: add typed props and refactor MultiMessage to TS, fix typing issues resulting from the conversion * edit message in progress * feat: complete edit AI message logic, refactor continue logic * feat(middleware): add validateMessageReq middleware feat(routes): add validation for message requests using validateMessageReq middleware feat(routes): add create, read, update, and delete routes for messages * feat: complete frontend logic for editing messages in place feat(messages.js): update route for updating a specific message - Change the route for updating a message to include the messageId in the URL - Update the request handler to use the messageId from the request parameters and the text from the request body - Call the updateMessage function with the updated parameters feat(MessageContent.tsx): add functionality to update a message - Import the useUpdateMessageMutation hook from the data provider - Destructure the conversationId, parentMessageId, and messageId from the message object - Create a mutation function using the useUpdateMessageMutation hook - Implement the updateMessage function to call the mutation function with the updated message parameters - Update the messages state to reflect the updated message text feat(api-endpoints.ts): update messages endpoint to include messageId - Update the messages endpoint to include the messageId as an optional parameter feat(data-service.ts): add updateMessage function - Implement the updateMessage function to make a PUT request to * fix(messages.js): make updateMessage function asynchronous and await its execution * style(EditIcon): make icon active for AI message * feat(gptPlugins/anthropic): add edit support * fix(validateMessageReq.js): handle case when conversationId is 'new' and return empty array feat(Message.tsx): pass message prop to SiblingSwitch component refactor(SiblingSwitch.tsx): convert to TS * fix(useMessageHandler.ts): remove message from currentMessages if isContinued is true feat(useMessageHandler.ts): add support for submission messages in setMessages fix(useServerStream.ts): remove unnecessary conditional in setMessages fix(useServerStream.ts): remove isContinued variable from submission * fix(continue): switch to continued message generation when continuing an earlier branch in conversation * fix(abortMiddleware.js): fix condition to check partialText length chore(abortMiddleware.js): add error logging when abortMessage fails * refactor(MessageHeader.tsx): convert to TS fix(Plugin.tsx): add default value for className prop in Plugin component * refactor(MultiMessage.tsx): remove commented out code docs(MultiMessage.tsx): update comment to clarify when siblingIdx is reset * fix(GenerationButtons): optimistic state for continue button * fix(MessageContent.tsx): add data-testid attribute to message text editor fix(messages.spec.ts): update waitForServerStream function to include edit endpoint check feat(messages.spec.ts): add test case for editing messages * fix(HoverButtons & Message & useGenerations): Refactor edit functionality and related conditions - Update enterEdit function signature and prop - Create and utilize hideEditButton variable - Enhance conditions for edit button visibility and active state - Update button event handlers - Introduce isEditableEndpoint in useGenerations and refine continueSupported condition. * fix(useGenerations.ts): fix condition for hideEditButton to include error and searchResult chore(data-provider): bump version to 0.1.6 fix(types.ts): add status property to TError type * chore: bump @dqbd/tiktoken to 1.0.7 * fix(abortMiddleware.js): add required isCreatedByUser property to the error response object * refactor(Message.tsx): remove unnecessary props from SiblingSwitch component, as setLatestMessage is firing on every switch already refactor(SiblingSwitch.tsx): remove unused imports and code * chore(BaseClient.js): move console.debug statements back inside if block
109 lines
2.9 KiB
JavaScript
109 lines
2.9 KiB
JavaScript
const { saveMessage, getConvo, getConvoTitle } = require('../../models');
|
|
const { sendMessage, handleError } = require('../utils');
|
|
const abortControllers = require('./abortControllers');
|
|
|
|
async function abortMessage(req, res) {
|
|
const { abortKey } = req.body;
|
|
|
|
if (!abortControllers.has(abortKey) && !res.headersSent) {
|
|
return res.status(404).send('Request not found');
|
|
}
|
|
|
|
const { abortController } = abortControllers.get(abortKey);
|
|
const ret = await abortController.abortCompletion();
|
|
console.log('Aborted request', abortKey);
|
|
abortControllers.delete(abortKey);
|
|
res.send(JSON.stringify(ret));
|
|
}
|
|
|
|
const handleAbort = () => {
|
|
return async (req, res) => {
|
|
try {
|
|
return await abortMessage(req, res);
|
|
} catch (err) {
|
|
console.error(err);
|
|
}
|
|
};
|
|
};
|
|
|
|
const createAbortController = (res, req, endpointOption, getAbortData) => {
|
|
const abortController = new AbortController();
|
|
const onStart = (userMessage) => {
|
|
sendMessage(res, { message: userMessage, created: true });
|
|
const abortKey = userMessage?.conversationId ?? req.user.id;
|
|
abortControllers.set(abortKey, { abortController, ...endpointOption });
|
|
|
|
res.on('finish', function () {
|
|
abortControllers.delete(abortKey);
|
|
});
|
|
};
|
|
|
|
abortController.abortCompletion = async function () {
|
|
abortController.abort();
|
|
const { conversationId, userMessage, ...responseData } = getAbortData();
|
|
|
|
const responseMessage = {
|
|
...responseData,
|
|
finish_reason: 'incomplete',
|
|
model: endpointOption.modelOptions.model,
|
|
unfinished: false,
|
|
cancelled: true,
|
|
error: false,
|
|
};
|
|
|
|
saveMessage(responseMessage);
|
|
|
|
return {
|
|
title: await getConvoTitle(req.user.id, conversationId),
|
|
final: true,
|
|
conversation: await getConvo(req.user.id, conversationId),
|
|
requestMessage: userMessage,
|
|
responseMessage: responseMessage,
|
|
};
|
|
};
|
|
|
|
return { abortController, onStart };
|
|
};
|
|
|
|
const handleAbortError = async (res, req, error, data) => {
|
|
console.error(error);
|
|
const { sender, conversationId, messageId, parentMessageId, partialText } = data;
|
|
|
|
const respondWithError = async () => {
|
|
const errorMessage = {
|
|
sender,
|
|
messageId,
|
|
conversationId,
|
|
parentMessageId,
|
|
unfinished: false,
|
|
cancelled: false,
|
|
error: true,
|
|
text: error.message,
|
|
isCreatedByUser: false,
|
|
};
|
|
if (abortControllers.has(conversationId)) {
|
|
const { abortController } = abortControllers.get(conversationId);
|
|
abortController.abort();
|
|
abortControllers.delete(conversationId);
|
|
}
|
|
await saveMessage(errorMessage);
|
|
handleError(res, errorMessage);
|
|
};
|
|
|
|
if (partialText && partialText.length > 5) {
|
|
try {
|
|
return await abortMessage(req, res);
|
|
} catch (err) {
|
|
console.error(err);
|
|
return respondWithError();
|
|
}
|
|
} else {
|
|
return respondWithError();
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
handleAbort,
|
|
createAbortController,
|
|
handleAbortError,
|
|
};
|