+
+ Model: {modelName} {customModel?`(${customModel})`:null}
+
{messageTree.length === 0 ? (
) : (
diff --git a/client/src/components/Models/ModelMenu.jsx b/client/src/components/Models/ModelMenu.jsx
index 6c260f40b3..300df6abba 100644
--- a/client/src/components/Models/ModelMenu.jsx
+++ b/client/src/components/Models/ModelMenu.jsx
@@ -187,9 +187,9 @@ export default function ModelMenu() {
diff --git a/client/src/components/svg/StopGeneratingIcon.jsx b/client/src/components/svg/StopGeneratingIcon.jsx
new file mode 100644
index 0000000000..4c134cafe9
--- /dev/null
+++ b/client/src/components/svg/StopGeneratingIcon.jsx
@@ -0,0 +1,7 @@
+import React from 'react';
+
+export default function StopGeneratingIcon() {
+ return (
+
+ );
+}
diff --git a/client/src/mobile.css b/client/src/mobile.css
index 70977212db..fff8d5a91d 100644
--- a/client/src/mobile.css
+++ b/client/src/mobile.css
@@ -46,6 +46,18 @@
}
@media (max-width: 767px) {
+ .input-panel-button {
+ border: 0;
+ }
+
+ .input-panel-button svg {
+ width: 16px;
+ height: 16px;
+ }
+
+ .input-panel {
+ }
+
.nav-close-button {
display: block;
position: absolute;
diff --git a/client/src/store/convoSlice.js b/client/src/store/convoSlice.js
index c862a8e1e7..e234af87d0 100644
--- a/client/src/store/convoSlice.js
+++ b/client/src/store/convoSlice.js
@@ -15,6 +15,7 @@ const initialState = {
pageNumber: 1,
pages: 1,
refreshConvoHint: 0,
+ latestMessage: null,
convos: [],
};
@@ -52,6 +53,7 @@ const currentSlice = createSlice({
state.chatGptLabel = null;
state.promptPrefix = null;
state.convosLoading = false;
+ state.latestMessage = null;
},
setConvos: (state, action) => {
state.convos = action.payload.sort(
@@ -66,11 +68,14 @@ const currentSlice = createSlice({
},
removeAll: (state) => {
state.convos = [];
- }
+ },
+ setLatestMessage: (state, action) => {
+ state.latestMessage = action.payload;
+ },
}
});
-export const { refreshConversation, setConversation, setPages, setConvos, setNewConvo, setError, increasePage, decreasePage, setPage, removeConvo, removeAll } =
+export const { refreshConversation, setConversation, setPages, setConvos, setNewConvo, setError, increasePage, decreasePage, setPage, removeConvo, removeAll, setLatestMessage } =
currentSlice.actions;
export default currentSlice.reducer;
diff --git a/client/src/utils/handleSubmit.js b/client/src/utils/handleSubmit.js
index 5c4184aac5..bdfa46713a 100644
--- a/client/src/utils/handleSubmit.js
+++ b/client/src/utils/handleSubmit.js
@@ -1,5 +1,89 @@
import { SSE } from './sse';
-// const newLineRegex = /^\n+/;
+import resetConvo from './resetConvo';
+import { useSelector, useDispatch } from 'react-redux';
+import { setNewConvo } from '~/store/convoSlice';
+import { setMessages } from '~/store/messageSlice';
+import { setSubmitState, setSubmission } from '~/store/submitSlice';
+import { setText } from '~/store/textSlice';
+
+const useMessageHandler = () => {
+ const dispatch = useDispatch();
+ const convo = useSelector((state) => state.convo);
+ const { initial } = useSelector((state) => state.models);
+ const { messages } = useSelector((state) => state.messages);
+ const { model, chatGptLabel, promptPrefix, isSubmitting } = useSelector((state) => state.submit);
+ const { text } = useSelector((state) => state.text);
+ const { latestMessage, error } = convo;
+
+ const ask = ({ text, parentMessageId=null, conversationId=null, messageId=null}, { isRegenerate=false }={}) => {
+ if (error) {
+ dispatch(setError(false));
+ }
+
+ if (!!isSubmitting || text === '') {
+ return;
+ }
+
+ // this is not a real messageId, it is used as placeholder before real messageId returned
+ text = text.trim();
+ const fakeMessageId = crypto.randomUUID();
+ const isCustomModel = model === 'chatgptCustom' || !initial[model];
+ const sender = model === 'chatgptCustom' ? chatGptLabel : model;
+ parentMessageId = parentMessageId || latestMessage?.messageId || '00000000-0000-0000-0000-000000000000';
+ let currentMessages = messages;
+ if (resetConvo(currentMessages, sender)) {
+ parentMessageId = '00000000-0000-0000-0000-000000000000';
+ conversationId = null;
+ dispatch(setNewConvo());
+ currentMessages = [];
+ }
+ 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 };
+
+ dispatch(setSubmitState(true));
+ if (isRegenerate) {
+ dispatch(setMessages([...currentMessages, initialResponse]));
+ } else {
+ dispatch(setMessages([...currentMessages, currentMsg, initialResponse]));
+ }
+ dispatch(setText(''));
+
+ const submission = {
+ convo,
+ isCustomModel,
+ message: {
+ ...currentMsg,
+ model,
+ chatGptLabel,
+ promptPrefix,
+ overrideParentMessageId: isRegenerate?messageId:null
+ },
+ messages: currentMessages,
+ isRegenerate,
+ initialResponse,
+ sender,
+ };
+ console.log('User Input:', text);
+ dispatch(setSubmission(submission));
+ }
+
+ const regenerate = ({ parentMessageId }) => {
+ const parentMessage = messages?.find(element => element.messageId == parentMessageId);
+
+ if (parentMessage && parentMessage.isCreatedByUser)
+ ask({ ...parentMessage }, { isRegenerate: true })
+ else
+ console.error('Failed to regenerate the message: parentMessage not found or not created by user.', message);
+ }
+
+ const stopGenerating = () => {
+ dispatch(setSubmission({}));
+ }
+
+ return { ask, regenerate, stopGenerating }
+}
+
+export { useMessageHandler };
export default function handleSubmit({
model,