Update AgentExecutor

intitni · intitni · commit 40fe5d42ed65 · 2023-09-21T11:11:05.000+08:00
diff --git a/Tool/Sources/LangChain/Agent.swift b/Tool/Sources/LangChain/Agent.swift
@@ -47,8 +47,8 @@ public extension CallbackEvents {
     
     struct AgentFunctionCallingToolReportProgress: CallbackEvent {
         public struct Info {
-            let functionName: String
-            let progress: String
+            public let functionName: String
+            public let progress: String
         }
         
         public let info: Info
diff --git a/Tool/Sources/LangChain/AgentExecutor.swift b/Tool/Sources/LangChain/AgentExecutor.swift
@@ -158,8 +158,13 @@ extension AgentExecutor {
                     }
                     guard let tool = tools[action.toolName] else { throw InvalidToolError() }
                     taskGroup.addTask {
-                        let observation = try await tool.run(input: action.toolInput)
-                        return action.observationAvailable(observation)
+                        do {
+                            let observation = try await tool.run(input: action.toolInput)
+                            return action.observationAvailable(observation)
+                        } catch {
+                            let observation = error.localizedDescription
+                            return action.observationAvailable(observation)
+                        }
                     }
                 }
                 var completedActions = [AgentAction]()

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ public extension CallbackEvents {`
`47`	`47`
`48`	`48`	`struct AgentFunctionCallingToolReportProgress: CallbackEvent {`
`49`	`49`	`public struct Info {`
`50`		`- let functionName: String`
`51`		`- let progress: String`
	`50`	`+ public let functionName: String`
	`51`	`+ public let progress: String`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public let info: Info`
Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,13 @@ extension AgentExecutor {`
`158`	`158`	`}`
`159`	`159`	`guard let tool = tools[action.toolName] else { throw InvalidToolError() }`
`160`	`160`	`taskGroup.addTask {`
`161`		`- let observation = try await tool.run(input: action.toolInput)`
`162`		`- return action.observationAvailable(observation)`
	`161`	`+ do {`
	`162`	`+ let observation = try await tool.run(input: action.toolInput)`
	`163`	`+ return action.observationAvailable(observation)`
	`164`	`+ } catch {`
	`165`	`+ let observation = error.localizedDescription`
	`166`	`+ return action.observationAvailable(observation)`
	`167`	`+ }`
`163`	`168`	`}`
`164`	`169`	`}`
`165`	`170`	`var completedActions = [AgentAction]()`