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

fix: set isSubmitting with messages together

Browse source 
style: some notification
This commit is contained in:
Wentao Lyu 2023-03-18 01:00:38 +08:00
parent 6b2a2bb858
commit a213868b17
2 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/src/components/Main/TextChat.jsx
View file

@ -100,10 +100,6 @@ export default function TextChat({ messages }) {
const { messages, _currentMsg, message, isCustomModel, sender, isRegenerate } = const { messages, _currentMsg, message, isCustomModel, sender, isRegenerate } =
currentState; currentState;
const { model, chatGptLabel, promptPrefix } = message; const { model, chatGptLabel, promptPrefix } = message;
<<<<<<< HEAD
if (isRegenerate) dispatch(setMessages([...messages, responseMessage]));
else dispatch(setMessages([...messages, requestMessage, responseMessage]));
=======
if (isRegenerate) if (isRegenerate)
dispatch( dispatch(
setMessages([...messages, responseMessage,]) setMessages([...messages, responseMessage,])
@ -113,7 +109,6 @@ export default function TextChat({ messages }) {
setMessages([...messages, requestMessage, responseMessage,]) setMessages([...messages, requestMessage, responseMessage,])
); );
dispatch(setSubmitState(false)); dispatch(setSubmitState(false));
>>>>>>> 92d0d11 (feat: save cancelled flag in message)
const isBing = model === 'bingai' || model === 'sydney'; const isBing = model === 'bingai' || model === 'sydney';
@ -213,14 +208,10 @@ export default function TextChat({ messages }) {
} }
const currentState = submission; const currentState = submission;
<<<<<<< HEAD
let currentMsg = { ...currentState.message };
======= let currentMsg = { ...currentState.message };
let currentMsg = {...currentState.message};
let latestResponseText = ''; let latestResponseText = '';
>>>>>>> 92d0d11 (feat: save cancelled flag in message)
const { server, payload } = createPayload(submission); const { server, payload } = createPayload(submission);
const onMessage = (e) => { const onMessage = (e) => {
if (stopStream) { if (stopStream) {
@ -383,7 +374,7 @@ export default function TextChat({ messages }) {
onChange={changeHandler} onChange={changeHandler}
onCompositionStart={handleCompositionStart} onCompositionStart={handleCompositionStart}
onCompositionEnd={handleCompositionEnd} onCompositionEnd={handleCompositionEnd}
placeholder={disabled ? 'Choose another model or customize GPT again' : isNotAppendable ? 'Can not send new message after an error or unfinished response.' : ''} placeholder={disabled ? 'Choose another model or customize GPT again' : isNotAppendable ? 'Try to regenerate the incomplete response.' : ''}
disabled={disabled || isNotAppendable} disabled={disabled || isNotAppendable}
className="m-0 h-auto max-h-52 resize-none overflow-auto border-0 bg-transparent p-0 pl-12 pr-8 leading-6 focus:outline-none focus:ring-0 focus-visible:ring-0 dark:bg-transparent md:pl-8" className="m-0 h-auto max-h-52 resize-none overflow-auto border-0 bg-transparent p-0 pl-12 pr-8 leading-6 focus:outline-none focus:ring-0 focus-visible:ring-0 dark:bg-transparent md:pl-8"
/> />

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

@ -41,13 +41,6 @@ const useMessageHandler = () => {
const currentMsg = { sender: 'User', text, current: true, isCreatedByUser: true, parentMessageId, conversationId, messageId: fakeMessageId }; const currentMsg = { sender: 'User', text, current: true, isCreatedByUser: true, parentMessageId, conversationId, messageId: fakeMessageId };
const initialResponse = { sender, text: '', parentMessageId: isRegenerate?messageId:fakeMessageId, messageId: (isRegenerate?messageId:fakeMessageId) + '_', submitting: true }; const initialResponse = { sender, text: '', parentMessageId: isRegenerate?messageId:fakeMessageId, messageId: (isRegenerate?messageId:fakeMessageId) + '_', submitting: true };
dispatch(setSubmitState(true));
if (isRegenerate) {
dispatch(setMessages([...currentMessages, initialResponse]));
} else {
dispatch(setMessages([...currentMessages, currentMsg, initialResponse]));
dispatch(setText(''));
}
const submission = { const submission = {
convo, convo,
isCustomModel, isCustomModel,
@ -63,7 +56,16 @@ const useMessageHandler = () => {
initialResponse, initialResponse,
sender, sender,
}; };
console.log('User Input:', text); console.log('User Input:', text);
if (isRegenerate) {
dispatch(setMessages([...currentMessages, initialResponse]));
} else {
dispatch(setMessages([...currentMessages, currentMsg, initialResponse]));
dispatch(setText(''));
}
dispatch(setSubmitState(true));
dispatch(setSubmission(submission)); dispatch(setSubmission(submission));
} }