fix: interactive

Author: c121914yu

packages/service/core/chat/saveChat.ts

@@ -16,6 +16,7 @@ import { mergeChatResponseData } from '@fastgpt/global/core/chat/utils';
 import { pushChatLog } from './pushChatLog';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
+import { extractDeepestInteractive } from '@fastgpt/global/core/workflow/runtime/utils';
 
 type Props = {
   chatId: string;
@@ -209,34 +210,24 @@ export const updateInteractiveChat = async ({
     }
   })();
 
-  if (interactiveValue.interactive.type === 'userSelect') {
-    interactiveValue.interactive = {
-      ...interactiveValue.interactive,
-      params: {
-        ...interactiveValue.interactive.params,
-        userSelectedVal: userInteractiveVal
-      }
-    };
+  let finalInteractive = extractDeepestInteractive(interactiveValue.interactive);
+
+  if (finalInteractive.type === 'userSelect') {
+    finalInteractive.params.userSelectedVal = userInteractiveVal;
   } else if (
-    interactiveValue.interactive.type === 'userInput' &&
+    finalInteractive.type === 'userInput' &&
     typeof parsedUserInteractiveVal === 'object'
   ) {
-    interactiveValue.interactive = {
-      ...interactiveValue.interactive,
-      params: {
-        ...interactiveValue.interactive.params,
-        inputForm: interactiveValue.interactive.params.inputForm.map((item) => {
-          const itemValue = parsedUserInteractiveVal[item.label];
-          return itemValue !== undefined
-            ? {
-                ...item,
-                value: itemValue
-              }
-            : item;
-        }),
-        submitted: true
-      }
-    };
+    finalInteractive.params.inputForm = finalInteractive.params.inputForm.map((item) => {
+      const itemValue = parsedUserInteractiveVal[item.label];
+      return itemValue !== undefined
+        ? {
+            ...item,
+            value: itemValue
+          }
+        : item;
+    });
+    finalInteractive.params.submitted = true;
   }
 
   if (aiResponse.customFeedbacks) {

packages/service/core/workflow/dispatch/index.ts

@@ -141,6 +141,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
   } else {
     props.workflowDispatchDeep += 1;
   }
+  const isRootRuntime = props.workflowDispatchDeep === 1;
 
   if (props.workflowDispatchDeep > 20) {
     return {
@@ -161,25 +162,28 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
   let workflowRunTimes = 0;
 
   // set sse response headers
-  if (stream && res) {
-    res.setHeader('Content-Type', 'text/event-stream;charset=utf-8');
-    res.setHeader('Access-Control-Allow-Origin', '*');
-    res.setHeader('X-Accel-Buffering', 'no');
-    res.setHeader('Cache-Control', 'no-cache, no-transform');
-
-    // 10s sends a message to prevent the browser from thinking that the connection is disconnected
-    const sendStreamTimerSign = () => {
-      setTimeout(() => {
-        props?.workflowStreamResponse?.({
-          event: SseResponseEventEnum.answer,
-          data: textAdaptGptResponse({
-            text: ''
-          })
-        });
-        sendStreamTimerSign();
-      }, 10000);
-    };
-    sendStreamTimerSign();
+  if (isRootRuntime) {
+    res?.setHeader('Connection', 'keep-alive'); // Set keepalive for long connection
+    if (stream && res) {
+      res.setHeader('Content-Type', 'text/event-stream;charset=utf-8');
+      res.setHeader('Access-Control-Allow-Origin', '*');
+      res.setHeader('X-Accel-Buffering', 'no');
+      res.setHeader('Cache-Control', 'no-cache, no-transform');
+
+      // 10s sends a message to prevent the browser from thinking that the connection is disconnected
+      const sendStreamTimerSign = () => {
+        setTimeout(() => {
+          props?.workflowStreamResponse?.({
+            event: SseResponseEventEnum.answer,
+            data: textAdaptGptResponse({
+              text: ''
+            })
+          });
+          sendStreamTimerSign();
+        }, 10000);
+      };
+      sendStreamTimerSign();
+    }
   }
 
   variables = {
@@ -373,7 +377,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
     };
 
     // Tool call, not need interactive response
-    if (!props.isToolCall && !props.runningAppInfo.isChildApp) {
+    if (!props.isToolCall && isRootRuntime) {
       props.workflowStreamResponse?.({
         event: SseResponseEventEnum.interactive,
         data: { interactive: interactiveResult }
@@ -427,14 +431,6 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
     })();
 
     if (!nodeRunResult) return [];
-    if (res?.closed) {
-      addLog.warn('Request is closed', {
-        appId: props.runningAppInfo.id,
-        nodeId: node.nodeId,
-        nodeName: node.name
-      });
-      return [];
-    }
 
     /* 
       特殊情况：
@@ -491,6 +487,15 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
       await Promise.all(nextStepSkipNodes.map((node) => checkNodeCanRun(node, skippedNodeIdList)))
     ).flat();
 
+    if (res?.closed) {
+      addLog.warn('Request is closed', {
+        appId: props.runningAppInfo.id,
+        nodeId: node.nodeId,
+        nodeName: node.name
+      });
+      return [];
+    }
+
     return [
       ...nextStepActiveNodes,
       ...nextStepSkipNodes,
@@ -631,7 +636,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
     if (
       version === 'v2' &&
       !props.isToolCall &&
-      !props.runningAppInfo.isChildApp &&
+      isRootRuntime &&
       formatResponseData &&
       !(!props.responseDetail && filterModuleTypeList.includes(formatResponseData.moduleType))
     ) {
@@ -720,7 +725,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
           entryNodeIds: nodeInteractiveResponse.entryNodeIds,
           interactiveResponse: nodeInteractiveResponse.interactiveResponse
         });
-        if (!props.runningAppInfo.isChildApp) {
+        if (isRootRuntime) {
           chatAssistantResponse.push(interactiveAssistant);
         }
         return interactiveAssistant.interactive;

projects/app/src/pages/api/v2/chat/completions.ts

@@ -291,6 +291,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
           runtimeEdges: initWorkflowEdgeStatus(edges, interactive),
           variables,
           query: removeEmptyUserInput(userQuestion.value),
+          lastInteractive: interactive,
           chatConfig,
           histories: newHistories,
           stream,