mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-20 18:30:15 +01: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
269 lines
7.4 KiB
TypeScript
269 lines
7.4 KiB
TypeScript
import { useEffect } from 'react';
|
|
import { useResetRecoilState, useSetRecoilState } from 'recoil';
|
|
import { SSE, createPayload, tMessageSchema, tConversationSchema } from 'librechat-data-provider';
|
|
import type { TResPlugin, TMessage, TConversation, TSubmission } from 'librechat-data-provider';
|
|
import { useAuthContext } from '~/hooks/AuthContext';
|
|
import store from '~/store';
|
|
|
|
type TResData = {
|
|
plugin: TResPlugin;
|
|
final?: boolean;
|
|
initial?: boolean;
|
|
requestMessage: TMessage;
|
|
responseMessage: TMessage;
|
|
conversation: TConversation;
|
|
};
|
|
|
|
export default function useServerStream(submission: TSubmission | null) {
|
|
const setMessages = useSetRecoilState(store.messages);
|
|
const setIsSubmitting = useSetRecoilState(store.isSubmitting);
|
|
const setConversation = useSetRecoilState(store.conversation);
|
|
const resetLatestMessage = useResetRecoilState(store.latestMessage);
|
|
const { token } = useAuthContext();
|
|
|
|
const { refreshConversations } = store.useConversations();
|
|
|
|
const messageHandler = (data: string, submission: TSubmission) => {
|
|
const { messages, message, plugin, initialResponse, isRegenerate = false } = submission;
|
|
|
|
if (isRegenerate) {
|
|
setMessages([
|
|
...messages,
|
|
{
|
|
...initialResponse,
|
|
text: data,
|
|
parentMessageId: message?.overrideParentMessageId ?? null,
|
|
messageId: message?.overrideParentMessageId + '_',
|
|
plugin: plugin ?? null,
|
|
submitting: true,
|
|
// unfinished: true
|
|
},
|
|
]);
|
|
} else {
|
|
setMessages([
|
|
...messages,
|
|
message,
|
|
{
|
|
...initialResponse,
|
|
text: data,
|
|
parentMessageId: message?.messageId,
|
|
messageId: message?.messageId + '_',
|
|
plugin: plugin ?? null,
|
|
submitting: true,
|
|
// unfinished: true
|
|
},
|
|
]);
|
|
}
|
|
};
|
|
|
|
const cancelHandler = (data: TResData, submission: TSubmission) => {
|
|
const { requestMessage, responseMessage, conversation } = data;
|
|
const { messages, isRegenerate = false } = submission;
|
|
|
|
// update the messages
|
|
if (isRegenerate) {
|
|
setMessages([...messages, responseMessage]);
|
|
} else {
|
|
setMessages([...messages, requestMessage, responseMessage]);
|
|
}
|
|
setIsSubmitting(false);
|
|
|
|
// refresh title
|
|
if (requestMessage.parentMessageId == '00000000-0000-0000-0000-000000000000') {
|
|
setTimeout(() => {
|
|
refreshConversations();
|
|
}, 2000);
|
|
|
|
// in case it takes too long.
|
|
setTimeout(() => {
|
|
refreshConversations();
|
|
}, 5000);
|
|
}
|
|
|
|
setConversation((prevState) => ({
|
|
...prevState,
|
|
...conversation,
|
|
}));
|
|
};
|
|
|
|
const createdHandler = (data: TResData, submission: TSubmission) => {
|
|
const { messages, message, initialResponse, isRegenerate = false } = submission;
|
|
|
|
if (isRegenerate) {
|
|
setMessages([
|
|
...messages,
|
|
{
|
|
...initialResponse,
|
|
parentMessageId: message?.overrideParentMessageId ?? null,
|
|
messageId: message?.overrideParentMessageId + '_',
|
|
submitting: true,
|
|
},
|
|
]);
|
|
} else {
|
|
setMessages([
|
|
...messages,
|
|
message,
|
|
{
|
|
...initialResponse,
|
|
parentMessageId: message?.messageId,
|
|
messageId: message?.messageId + '_',
|
|
submitting: true,
|
|
},
|
|
]);
|
|
}
|
|
|
|
const { conversationId } = message;
|
|
setConversation((prevState) =>
|
|
tConversationSchema.parse({
|
|
...prevState,
|
|
conversationId,
|
|
}),
|
|
);
|
|
resetLatestMessage();
|
|
};
|
|
|
|
const finalHandler = (data: TResData, submission: TSubmission) => {
|
|
const { requestMessage, responseMessage, conversation } = data;
|
|
const { messages, isRegenerate = false } = submission;
|
|
|
|
// update the messages
|
|
if (isRegenerate) {
|
|
setMessages([...messages, responseMessage]);
|
|
} else {
|
|
setMessages([...messages, requestMessage, responseMessage]);
|
|
}
|
|
setIsSubmitting(false);
|
|
|
|
// refresh title
|
|
if (requestMessage.parentMessageId == '00000000-0000-0000-0000-000000000000') {
|
|
setTimeout(() => {
|
|
refreshConversations();
|
|
}, 2000);
|
|
|
|
// in case it takes too long.
|
|
setTimeout(() => {
|
|
refreshConversations();
|
|
}, 5000);
|
|
}
|
|
|
|
setConversation((prevState) => ({
|
|
...prevState,
|
|
...conversation,
|
|
}));
|
|
};
|
|
|
|
const errorHandler = (data: TResData, submission: TSubmission) => {
|
|
const { messages, message } = submission;
|
|
|
|
console.log('Error:', data);
|
|
const errorResponse = tMessageSchema.parse({
|
|
...data,
|
|
error: true,
|
|
parentMessageId: message?.messageId,
|
|
});
|
|
setIsSubmitting(false);
|
|
setMessages([...messages, message, errorResponse]);
|
|
return;
|
|
};
|
|
|
|
const abortConversation = (conversationId = '', submission: TSubmission) => {
|
|
console.log(submission);
|
|
const { endpoint } = submission?.conversation || {};
|
|
|
|
fetch(`/api/ask/${endpoint}/abort`, {
|
|
method: 'POST',
|
|
headers: {
|
|
'Content-Type': 'application/json',
|
|
Authorization: `Bearer ${token}`,
|
|
},
|
|
body: JSON.stringify({
|
|
abortKey: conversationId,
|
|
}),
|
|
})
|
|
.then((response) => response.json())
|
|
.then((data) => {
|
|
console.log('aborted', data);
|
|
cancelHandler(data, submission);
|
|
})
|
|
.catch((error) => {
|
|
console.error('Error aborting request');
|
|
console.error(error);
|
|
// errorHandler({ text: 'Error aborting request' }, { ...submission, message });
|
|
});
|
|
return;
|
|
};
|
|
|
|
useEffect(() => {
|
|
if (submission === null) {
|
|
return;
|
|
}
|
|
if (Object.keys(submission).length === 0) {
|
|
return;
|
|
}
|
|
|
|
let { message } = submission;
|
|
|
|
const { server, payload } = createPayload(submission);
|
|
|
|
const events = new SSE(server, {
|
|
payload: JSON.stringify(payload),
|
|
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
|
|
});
|
|
|
|
events.onmessage = (e: MessageEvent) => {
|
|
const data = JSON.parse(e.data);
|
|
|
|
if (data.final) {
|
|
finalHandler(data, { ...submission, message });
|
|
console.log('final', data);
|
|
}
|
|
if (data.created) {
|
|
message = {
|
|
...data.message,
|
|
overrideParentMessageId: message?.overrideParentMessageId,
|
|
};
|
|
createdHandler(data, { ...submission, message });
|
|
console.log('created', message);
|
|
} else {
|
|
const text = data.text || data.response;
|
|
const { initial, plugin } = data;
|
|
if (initial) {
|
|
console.log(data);
|
|
}
|
|
|
|
if (data.message) {
|
|
messageHandler(text, { ...submission, plugin, message });
|
|
}
|
|
}
|
|
};
|
|
|
|
events.onopen = () => console.log('connection is opened');
|
|
|
|
events.oncancel = () =>
|
|
abortConversation(message?.conversationId ?? submission?.conversationId, submission);
|
|
|
|
events.onerror = function (e: MessageEvent) {
|
|
console.log('error in opening conn.');
|
|
events.close();
|
|
|
|
const data = JSON.parse(e.data);
|
|
|
|
errorHandler(data, { ...submission, message });
|
|
};
|
|
|
|
setIsSubmitting(true);
|
|
events.stream();
|
|
|
|
return () => {
|
|
const isCancelled = events.readyState <= 1;
|
|
events.close();
|
|
// setSource(null);
|
|
if (isCancelled) {
|
|
const e = new Event('cancel');
|
|
events.dispatchEvent(e);
|
|
}
|
|
setIsSubmitting(false);
|
|
};
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [submission]);
|
|
}
|