fix: send message error when chatting with opening statement (langgen…

…ius#8627)
hgnulb · Sep 26, 2024 · b0082da · b0082da
1 parent 0be35f7
commit b0082da
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
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
@@ -83,11 +83,17 @@ const DebugWithSingleModel = forwardRef<DebugWithSingleModelRefType, DebugWithSi
  },
  }
 
+ const lastAnswer = chatListRef.current.at(-1)
+
  const data: any = {
  query: message,
  inputs,
  model_config: configData,
- 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 (visionConfig.enabled && files?.length && supportVision)

diff --git a/web/app/components/base/chat/chat-with-history/chat-wrapper.tsx b/web/app/components/base/chat/chat-with-history/chat-wrapper.tsx
@@ -67,11 +67,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/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
@@ -76,13 +76,19 @@ const ChatWrapper = forwardRef<ChatWrapperRefType, ChatWrapperProps>(({ showConv
  )
 
  const doSend = useCallback<OnSend>((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),