diff --git a/web/app/components/app/configuration/debug/debug-with-single-model/index.tsx b/web/app/components/app/configuration/debug/debug-with-single-model/index.tsx index 80e7c98a8f0c92..5faef46d988e0d 100644 --- a/web/app/components/app/configuration/debug/debug-with-single-model/index.tsx +++ b/web/app/components/app/configuration/debug/debug-with-single-model/index.tsx @@ -83,11 +83,17 @@ const DebugWithSingleModel = forwardRef { }, []) const doSend: OnSend = useCallback((message, files, last_answer) => { + const lastAnswer = chatListRef.current.at(-1) + const data: any = { query: message, inputs: currentConversationId ? currentConversationItem?.inputs : newConversationInputs, conversation_id: currentConversationId, - parent_message_id: last_answer?.id || chatListRef.current.at(-1)?.id || null, + parent_message_id: last_answer?.id || (lastAnswer + ? lastAnswer.isOpeningStatement + ? null + : lastAnswer.id + : null), } if (appConfig?.file_upload?.image.enabled && files?.length) diff --git a/web/app/components/base/chat/embedded-chatbot/chat-wrapper.tsx b/web/app/components/base/chat/embedded-chatbot/chat-wrapper.tsx index 8cb546fd52a0e8..ed2f24274dcd7b 100644 --- a/web/app/components/base/chat/embedded-chatbot/chat-wrapper.tsx +++ b/web/app/components/base/chat/embedded-chatbot/chat-wrapper.tsx @@ -69,11 +69,17 @@ const ChatWrapper = () => { }, []) const doSend: OnSend = useCallback((message, files, last_answer) => { + const lastAnswer = chatListRef.current.at(-1) + const data: any = { query: message, inputs: currentConversationId ? currentConversationItem?.inputs : newConversationInputs, conversation_id: currentConversationId, - parent_message_id: last_answer?.id || chatListRef.current.at(-1)?.id || null, + parent_message_id: last_answer?.id || (lastAnswer + ? lastAnswer.isOpeningStatement + ? null + : lastAnswer.id + : null), } if (appConfig?.file_upload?.image.enabled && files?.length) diff --git a/web/app/components/workflow/panel/debug-and-preview/chat-wrapper.tsx b/web/app/components/workflow/panel/debug-and-preview/chat-wrapper.tsx index 107a5dc698f741..86519af60357d7 100644 --- a/web/app/components/workflow/panel/debug-and-preview/chat-wrapper.tsx +++ b/web/app/components/workflow/panel/debug-and-preview/chat-wrapper.tsx @@ -76,13 +76,19 @@ const ChatWrapper = forwardRef(({ showConv ) const doSend = useCallback((query, files, last_answer) => { + const lastAnswer = chatListRef.current.at(-1) + handleSend( { query, files, inputs: workflowStore.getState().inputs, conversation_id: conversationId, - parent_message_id: last_answer?.id || chatListRef.current.at(-1)?.id || null, + parent_message_id: last_answer?.id || (lastAnswer + ? lastAnswer.isOpeningStatement + ? null + : lastAnswer.id + : null), }, { onGetSuggestedQuestions: (messageId, getAbortController) => fetchSuggestedQuestions(appDetail!.id, messageId, getAbortController),