Revamping tool usage

src/crewai/agent.py

@@ -3,9 +3,9 @@ from typing import Any, List, Optional
 
 from langchain.agents.agent import RunnableAgent
 from langchain.agents.format_scratchpad import format_log_to_str
+from langchain.agents.output_parsers import ReActSingleInputOutputParser
 from langchain.memory import ConversationSummaryMemory
 from langchain.tools.render import render_text_description
-from langchain_core.runnables.config import RunnableConfig
 from langchain_openai import ChatOpenAI
 from pydantic import (
     UUID4,
@@ -19,12 +19,7 @@ from pydantic import (
 )
 from pydantic_core import PydanticCustomError
 
-from crewai.agents import (
-    CacheHandler,
-    CrewAgentExecutor,
-    CrewAgentOutputParser,
-    ToolsHandler,
-)
+from crewai.agents import CacheHandler, CrewAgentExecutor, ToolsHandler
 from crewai.utilities import I18N, Logger, Prompts, RPMController
 
 
@@ -158,8 +153,7 @@ class Agent(BaseModel):
                 "input": task,
                 "tool_names": self.__tools_names(tools),
                 "tools": render_text_description(tools),
-            },
-            RunnableConfig(callbacks=[self.tools_handler]),
+            }
         )["output"]
 
         if self.max_rpm:
@@ -200,12 +194,14 @@ class Agent(BaseModel):
             "agent_scratchpad": lambda x: format_log_to_str(x["intermediate_steps"]),
         }
         executor_args = {
+            "llm": self.llm,
             "i18n": self.i18n,
             "tools": self.tools,
             "verbose": self.verbose,
             "handle_parsing_errors": True,
             "max_iterations": self.max_iter,
             "step_callback": self.step_callback,
+            "tools_handler": self.tools_handler,
         }
 
         if self._rpm_controller:
@@ -231,14 +227,7 @@ class Agent(BaseModel):
 
         bind = self.llm.bind(stop=[self.i18n.slice("observation")])
         inner_agent = (
-            agent_args
-            | execution_prompt
-            | bind
-            | CrewAgentOutputParser(
-                tools_handler=self.tools_handler,
-                cache=self.cache_handler,
-                i18n=self.i18n,
-            )
+            agent_args | execution_prompt | bind | ReActSingleInputOutputParser()
         )
         self.agent_executor = CrewAgentExecutor(
             agent=RunnableAgent(runnable=inner_agent), **executor_args