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

fix: only give initialResponse unfinished true value when not a cancellable endpoint

Browse source
This commit is contained in:
Daniel Avila 2023-04-10 18:27:06 -04:00
parent 0bd240939a
commit e0d5e75e73
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/src/components/MessageHandler/index.jsx
View file

@ -17,7 +17,7 @@ export default function MessageHandler() {
const messageHandler = (data, submission) => { const messageHandler = (data, submission) => {
const { messages, message, initialResponse, isRegenerate = false } = submission; const { messages, message, initialResponse, isRegenerate = false } = submission;
if (isRegenerate) if (isRegenerate) {
setMessages([ setMessages([
...messages, ...messages,
{ {
@ -26,10 +26,10 @@ export default function MessageHandler() {
parentMessageId: message?.overrideParentMessageId, parentMessageId: message?.overrideParentMessageId,
messageId: message?.overrideParentMessageId + '_', messageId: message?.overrideParentMessageId + '_',
submitting: true, submitting: true,
unfinished: true // unfinished: true
} }
]); ]);
else } else {
setMessages([ setMessages([
...messages, ...messages,
message, message,
@ -39,9 +39,10 @@ export default function MessageHandler() {
parentMessageId: message?.messageId, parentMessageId: message?.messageId,
messageId: message?.messageId + '_', messageId: message?.messageId + '_',
submitting: true, submitting: true,
unfinished: true // unfinished: true
} }
]); ]);
}
}; };
const cancelHandler = (data, submission) => { const cancelHandler = (data, submission) => {
@ -50,8 +51,11 @@ export default function MessageHandler() {
const { requestMessage, responseMessage, conversation } = data; const { requestMessage, responseMessage, conversation } = data;
// update the messages // update the messages
if (isRegenerate) setMessages([...messages, responseMessage]); if (isRegenerate) {
else setMessages([...messages, requestMessage, responseMessage]); setMessages([...messages, responseMessage]);
} else {
setMessages([...messages, requestMessage, responseMessage]);
}
setIsSubmitting(false); setIsSubmitting(false);
// refresh title // refresh title

6
client/src/components/Messages/Message.jsx
View file

@ -34,6 +34,12 @@ export default function Message({
const blinker = submitting && isSubmitting; const blinker = submitting && isSubmitting;
const getConversationQuery = useGetConversationByIdQuery(message.conversationId, { enabled: false }); const getConversationQuery = useGetConversationByIdQuery(message.conversationId, { enabled: false });
// debugging
// useEffect(() => {
// console.log('isSubmitting:', isSubmitting);
// console.log('unfinished:', unfinished);
// }, [isSubmitting, unfinished]);
useEffect(() => { useEffect(() => {
if (blinker && !abortScroll) { if (blinker && !abortScroll) {
scrollToBottom(); scrollToBottom();

2
client/src/utils/handleSubmit.js
View file

@ -106,7 +106,7 @@ const useMessageHandler = () => {
parentMessageId: isRegenerate ? messageId : fakeMessageId, parentMessageId: isRegenerate ? messageId : fakeMessageId,
messageId: (isRegenerate ? messageId : fakeMessageId) + '_', messageId: (isRegenerate ? messageId : fakeMessageId) + '_',
conversationId, conversationId,
unfinished: true, unfinished: (endpoint === 'azureOpenAI' || endpoint === 'openAI') ? false : true,
submitting: true submitting: true
}; };