Merge branch 'release/2.0.0'

Author: bsorrentino

LangChainDemo/LangChainDemo/AgentExecutor.swift

@@ -20,7 +20,7 @@ struct AgentExecutorState : AgentState {
 
     init() {
         self.init([
-            "intermediate_steps": AppendableValue(),
+            "intermediate_steps": AppendableValue<(AgentAction, String)>(),
             "chat_history": AppendableValue()
         ])
     }
@@ -58,7 +58,7 @@ struct AgentExecutorState : AgentState {
 struct ToolOutputParser: BaseOutputParser {
     public init() {}
     public func parse(text: String) -> Parsed {
-        print(text.uppercased())
+        print("\n-------\n\(text.uppercased())\n-------\n")
         let pattern = "Action\\s*:[\\s]*(.*)[\\s]*Action\\s*Input\\s*:[\\s]*(.*)"
         let regex = try! NSRegularExpression(pattern: pattern)
 
@@ -99,7 +99,7 @@ public func runAgent( input: String, llm: LLM, tools: [BaseTool], callbacks: [Ba
 
     let toolExecutor = {  (action: AgentAction) in
         guard let tool = tools.filter({$0.name() == action.action}).first else {
-            throw GraphRunnerError.executionError("tool \(action.action) not found!")
+            throw CompiledGraphError.executionError("tool \(action.action) not found!")
         }
 
         do {
@@ -151,7 +151,7 @@ public func runAgent( input: String, llm: LLM, tools: [BaseTool], callbacks: [Ba
     }
 
 
-    let workflow = GraphState {
+    let workflow = StateGraph {
         AgentExecutorState()
     }
 
@@ -175,10 +175,10 @@ public func runAgent( input: String, llm: LLM, tools: [BaseTool], callbacks: [Ba
     try workflow.addNode("call_agent" ) { state in
 
         guard let input = state.input else {
-            throw GraphRunnerError.executionError("'input' argument not found in state!")
+            throw CompiledGraphError.executionError("'input' argument not found in state!")
         }
         guard let intermediate_steps = state.intermediate_steps else {
-            throw GraphRunnerError.executionError("'intermediate_steps' property not found in state!")
+            throw CompiledGraphError.executionError("'intermediate_steps' property not found in state!")
         }
 
         onAgentStart( input )
@@ -191,18 +191,18 @@ public func runAgent( input: String, llm: LLM, tools: [BaseTool], callbacks: [Ba
             onAgentAction( action )
             return [ "agent_outcome": AgentOutcome.action(action) ]
         default:
-            throw GraphRunnerError.executionError( "Parsed.error" )
+            throw CompiledGraphError.executionError( "Parsed.error" )
         }
     }
 
     try workflow.addNode("call_action" ) { state in
 
         guard let agentOutcome = state.agentOutcome else {
-            throw GraphRunnerError.executionError("'agent_outcome' property not found in state!")
+            throw CompiledGraphError.executionError("'agent_outcome' property not found in state!")
         }
 
         guard case .action(let action) = agentOutcome else {
-            throw GraphRunnerError.executionError("'agent_outcome' is not an action!")
+            throw CompiledGraphError.executionError("'agent_outcome' is not an action!")
         }
 
         let result = try await toolExecutor( action )
@@ -218,7 +218,7 @@ public func runAgent( input: String, llm: LLM, tools: [BaseTool], callbacks: [Ba
     try workflow.addConditionalEdge( sourceId: "call_agent", condition: { state in
 
         guard let agentOutcome = state.agentOutcome else {
-            throw GraphRunnerError.executionError("'agent_outcome' property not found in state!")
+            throw CompiledGraphError.executionError("'agent_outcome' property not found in state!")
         }
 
         return switch agentOutcome {

README.md

@@ -91,17 +91,17 @@ In the [LangChainDemo](LangChainDemo) project, you can find the porting of [Agen
     }
 
 
-    let workflow = GraphState {
+    let workflow = StateGraph {
         AgentExecutorState()
     }
 
     try workflow.addNode("call_agent" ) { state in
 
         guard let input = state.input else {
-            throw GraphRunnerError.executionError("'input' argument not found in state!")
+            throw CompiledGraphError.executionError("'input' argument not found in state!")
         }
         guard let intermediate_steps = state.intermediate_steps else {
-            throw GraphRunnerError.executionError("'intermediate_steps' property not found in state!")
+            throw CompiledGraphError.executionError("'intermediate_steps' property not found in state!")
         }
 
         let step = await agent.plan(input: input, intermediate_steps: intermediate_steps)
@@ -111,17 +111,17 @@ In the [LangChainDemo](LangChainDemo) project, you can find the porting of [Agen
         case .action( let action ):
             return [ "agent_outcome": AgentOutcome.action(action) ]
         default:
-            throw GraphRunnerError.executionError( "Parsed.error" )
+            throw CompiledGraphError.executionError( "Parsed.error" )
         }
     }
 
     try workflow.addNode("call_action" ) { state in
 
         guard let agentOutcome = state.agentOutcome else {
-            throw GraphRunnerError.executionError("'agent_outcome' property not found in state!")
+            throw CompiledGraphError.executionError("'agent_outcome' property not found in state!")
         }
         guard case .action(let action) = agentOutcome else {
-            throw GraphRunnerError.executionError("'agent_outcome' is not an action!")
+            throw CompiledGraphError.executionError("'agent_outcome' is not an action!")
         }
         let result = try await toolExecutor( action )
         return [ "intermediate_steps" : (action, result) ]
@@ -132,7 +132,7 @@ In the [LangChainDemo](LangChainDemo) project, you can find the porting of [Agen
     try workflow.addConditionalEdge( sourceId: "call_agent", condition: { state in
 
         guard let agentOutcome = state.agentOutcome else {
-            throw GraphRunnerError.executionError("'agent_outcome' property not found in state!")
+            throw CompiledGraphError.executionError("'agent_outcome' property not found in state!")
         }
 
         switch agentOutcome {
@@ -148,9 +148,9 @@ In the [LangChainDemo](LangChainDemo) project, you can find the porting of [Agen
 
     try workflow.addEdge(sourceId: "call_action", targetId: "call_agent")
 
-    let runner = try workflow.compile()
+    let app = try workflow.compile()
 
-    let result = try await runner.invoke(inputs: [ "input": input, "chat_history": [] ])
+    let result = try await app.invoke(inputs: [ "input": input, "chat_history": [] ])
 
     print( result )
 
@@ -166,4 +166,4 @@ In the [LangChainDemo](LangChainDemo) project, you can find the porting of [Agen
 [langchain-swift]: https://github.com/buhe/langchain-swift.git
 [langchain.ai]: https://github.com/langchain-ai
 [langgraph]: https://github.com/langchain-ai/langgraph
-[AgentExecutor]: https://github.com/buhe/langchain-swift/blob/main/Sources/LangChain/agents/Agent.swift
+[AgentExecutor]: https://github.com/buhe/langchain-swift/blob/main/Sources/LangChain/agents/Agent.swift