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
191 lines
5.3 KiB
JavaScript
191 lines
5.3 KiB
JavaScript
const express = require('express');
|
|
const router = express.Router();
|
|
const { getResponseSender } = require('../endpoints/schemas');
|
|
const { validateTools } = require('../../../app');
|
|
const { initializeClient } = require('../endpoints/gptPlugins');
|
|
const { saveMessage, getConvoTitle, getConvo } = require('../../../models');
|
|
const { sendMessage, createOnProgress, formatSteps, formatAction } = require('../../utils');
|
|
const {
|
|
handleAbort,
|
|
createAbortController,
|
|
handleAbortError,
|
|
setHeaders,
|
|
requireJwtAuth,
|
|
validateEndpoint,
|
|
buildEndpointOption,
|
|
} = require('../../middleware');
|
|
|
|
router.post('/abort', requireJwtAuth, handleAbort());
|
|
|
|
router.post(
|
|
'/',
|
|
requireJwtAuth,
|
|
validateEndpoint,
|
|
buildEndpointOption,
|
|
setHeaders,
|
|
async (req, res) => {
|
|
let {
|
|
text,
|
|
generation,
|
|
endpointOption,
|
|
conversationId,
|
|
responseMessageId,
|
|
isContinued = false,
|
|
parentMessageId = null,
|
|
overrideParentMessageId = null,
|
|
} = req.body;
|
|
console.log('edit log');
|
|
console.dir({ text, generation, isContinued, conversationId, endpointOption }, { depth: null });
|
|
let metadata;
|
|
let userMessage;
|
|
let lastSavedTimestamp = 0;
|
|
let saveDelay = 100;
|
|
const userMessageId = parentMessageId;
|
|
const user = req.user.id;
|
|
|
|
const plugin = {
|
|
loading: true,
|
|
inputs: [],
|
|
latest: null,
|
|
outputs: null,
|
|
};
|
|
|
|
const addMetadata = (data) => (metadata = data);
|
|
const getIds = (data) => {
|
|
userMessage = data.userMessage;
|
|
responseMessageId = data.responseMessageId;
|
|
};
|
|
|
|
const {
|
|
onProgress: progressCallback,
|
|
sendIntermediateMessage,
|
|
getPartialText,
|
|
} = createOnProgress({
|
|
generation,
|
|
onProgress: ({ text: partialText }) => {
|
|
const currentTimestamp = Date.now();
|
|
|
|
if (plugin.loading === true) {
|
|
plugin.loading = false;
|
|
}
|
|
|
|
if (currentTimestamp - lastSavedTimestamp > saveDelay) {
|
|
lastSavedTimestamp = currentTimestamp;
|
|
saveMessage({
|
|
messageId: responseMessageId,
|
|
sender: getResponseSender(endpointOption),
|
|
conversationId,
|
|
parentMessageId: overrideParentMessageId || userMessageId,
|
|
text: partialText,
|
|
model: endpointOption.modelOptions.model,
|
|
unfinished: true,
|
|
cancelled: false,
|
|
error: false,
|
|
});
|
|
}
|
|
|
|
if (saveDelay < 500) {
|
|
saveDelay = 500;
|
|
}
|
|
},
|
|
});
|
|
|
|
const onAgentAction = (action, start = false) => {
|
|
const formattedAction = formatAction(action);
|
|
plugin.inputs.push(formattedAction);
|
|
plugin.latest = formattedAction.plugin;
|
|
if (!start) {
|
|
saveMessage(userMessage);
|
|
}
|
|
sendIntermediateMessage(res, { plugin });
|
|
// console.log('PLUGIN ACTION', formattedAction);
|
|
};
|
|
|
|
const onChainEnd = (data) => {
|
|
let { intermediateSteps: steps } = data;
|
|
plugin.outputs = steps && steps[0].action ? formatSteps(steps) : 'An error occurred.';
|
|
plugin.loading = false;
|
|
saveMessage(userMessage);
|
|
sendIntermediateMessage(res, { plugin });
|
|
// console.log('CHAIN END', plugin.outputs);
|
|
};
|
|
|
|
const getAbortData = () => ({
|
|
sender: getResponseSender(endpointOption),
|
|
conversationId,
|
|
messageId: responseMessageId,
|
|
parentMessageId: overrideParentMessageId ?? userMessageId,
|
|
text: getPartialText(),
|
|
plugin: { ...plugin, loading: false },
|
|
userMessage,
|
|
});
|
|
const { abortController, onStart } = createAbortController(
|
|
res,
|
|
req,
|
|
endpointOption,
|
|
getAbortData,
|
|
);
|
|
|
|
try {
|
|
endpointOption.tools = await validateTools(user, endpointOption.tools);
|
|
const { client } = initializeClient(req, endpointOption);
|
|
|
|
let response = await client.sendMessage(text, {
|
|
user,
|
|
generation,
|
|
isContinued,
|
|
isEdited: true,
|
|
conversationId,
|
|
parentMessageId,
|
|
responseMessageId,
|
|
overrideParentMessageId,
|
|
getIds,
|
|
onAgentAction,
|
|
onChainEnd,
|
|
onStart,
|
|
addMetadata,
|
|
...endpointOption,
|
|
onProgress: progressCallback.call(null, {
|
|
res,
|
|
text,
|
|
plugin,
|
|
parentMessageId: overrideParentMessageId || userMessageId,
|
|
}),
|
|
abortController,
|
|
});
|
|
|
|
if (overrideParentMessageId) {
|
|
response.parentMessageId = overrideParentMessageId;
|
|
}
|
|
|
|
if (metadata) {
|
|
response = { ...response, ...metadata };
|
|
}
|
|
|
|
console.log('CLIENT RESPONSE');
|
|
console.dir(response, { depth: null });
|
|
response.plugin = { ...plugin, loading: false };
|
|
await saveMessage(response);
|
|
|
|
sendMessage(res, {
|
|
title: await getConvoTitle(req.user.id, conversationId),
|
|
final: true,
|
|
conversation: await getConvo(req.user.id, conversationId),
|
|
requestMessage: userMessage,
|
|
responseMessage: response,
|
|
});
|
|
res.end();
|
|
} catch (error) {
|
|
const partialText = getPartialText();
|
|
handleAbortError(res, req, error, {
|
|
partialText,
|
|
conversationId,
|
|
sender: getResponseSender(endpointOption),
|
|
messageId: responseMessageId,
|
|
parentMessageId: userMessageId,
|
|
});
|
|
}
|
|
},
|
|
);
|
|
|
|
module.exports = router;
|