fix: entry (#2652)

labring · Sep 9, 2024 · bbdab1d · bbdab1d
1 parent 78ad279
commit bbdab1d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/packages/service/core/workflow/dispatch/agent/runTool/functionCall.ts b/packages/service/core/workflow/dispatch/agent/runTool/functionCall.ts
@@ -194,7 +194,10 @@ export const runToolWithFunctionCall = async (
                   isEntry: true,
                   inputs: updateToolInputValue({ params: startParams, inputs: item.inputs })
                 }
-              : item
+              : {
+                  ...item,
+                  isEntry: false
+                }
           )
         });
 

diff --git a/packages/service/core/workflow/dispatch/agent/runTool/promptCall.ts b/packages/service/core/workflow/dispatch/agent/runTool/promptCall.ts
@@ -226,7 +226,10 @@ export const runToolWithPromptCall = async (
               isEntry: true,
               inputs: updateToolInputValue({ params: startParams, inputs: item.inputs })
             }
-          : item
+          : {
+              ...item,
+              isEntry: false
+            }
       )
     });
 

diff --git a/packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts b/packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts
@@ -209,7 +209,10 @@ export const runToolWithToolChoice = async (
                     isEntry: true,
                     inputs: updateToolInputValue({ params: startParams, inputs: item.inputs })
                   }
-                : item
+                : {
+                    ...item,
+                    isEntry: false
+                  }
             )
           });
 
@@ -359,6 +362,7 @@ export const runToolWithToolChoice = async (
       };
     }
   } catch (error) {
+    console.log(error);
     addLog.warn(`LLM response error`, {
       requestBody
     });

diff --git a/packages/service/core/workflow/dispatch/index.ts b/packages/service/core/workflow/dispatch/index.ts
@@ -532,9 +532,12 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
   const entryNodes = runtimeNodes.filter((item) => item.isEntry);
 
   // reset entry
-  // runtimeNodes.forEach((item) => {
-  //   item.isEntry = false;
-  // });
+  runtimeNodes.forEach((item) => {
+    // Interactive node is not the entry node, return interactive result
+    if (item.flowNodeType !== FlowNodeTypeEnum.userSelect) {
+      item.isEntry = false;
+    }
+  });
   await Promise.all(entryNodes.map((node) => checkNodeCanRun(node)));
 
   // focus try to run pluginOutput