feat: max call tool times

labring · Sep 7, 2024 · 2eecded · 2eecded
1 parent e90194d
commit 2eecded
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/service/core/workflow/dispatch/agent/runTool/index.ts b/packages/service/core/workflow/dispatch/agent/runTool/index.ts
@@ -134,6 +134,7 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
         ...props,
         toolNodes,
         toolModel,
+        maxRunToolTimes: 30,
         messages: adaptMessages
       });
     }

diff --git a/packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts b/packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts
@@ -45,21 +45,25 @@ export const runToolWithToolChoice = async (
     messages: ChatCompletionMessageParam[];
     toolNodes: ToolNodeItemType[];
     toolModel: LLMModelItemType;
+    maxRunToolTimes: number;
   },
   response?: RunToolResponse
 ): Promise<RunToolResponse> => {
+  const { messages, toolNodes, toolModel, maxRunToolTimes, ...workflowProps } = props;
   const {
-    toolModel,
-    toolNodes,
-    messages,
     res,
     requestOrigin,
     runtimeNodes,
     node,
     stream,
     workflowStreamResponse,
     params: { temperature = 0, maxToken = 4000, aiChatVision }
-  } = props;
+  } = workflowProps;
+
+  if (maxRunToolTimes <= 0 && response) {
+    return response;
+  }
+
   const assistantResponses = response?.assistantResponses || [];
 
   const tools: ChatCompletionTool[] = toolNodes.map((item) => {
@@ -196,7 +200,7 @@ export const runToolWithToolChoice = async (
           })();
 
           const toolRunResponse = await dispatchWorkFlow({
-            ...props,
+            ...workflowProps,
             isToolCall: true,
             runtimeNodes: runtimeNodes.map((item) =>
               item.nodeId === toolNode.nodeId
@@ -325,6 +329,7 @@ export const runToolWithToolChoice = async (
       return runToolWithToolChoice(
         {
           ...props,
+          maxRunToolTimes: maxRunToolTimes - 1,
           messages: completeMessages
         },
         {