From ad099bcfd16f973b9a2f32a49f4896890a2988ed Mon Sep 17 00:00:00 2001 From: lorenzejay Date: Fri, 11 Apr 2025 13:36:41 -0700 Subject: [PATCH] refactor: remove _parse_tools method from OpenAIAgentAdapter and BaseAgent - Eliminated the _parse_tools method from OpenAIAgentAdapter and its abstract declaration in BaseAgent. - Cleaned up related test code in MockAgent to reflect the removal of the method. --- .../openai_agents/openai_adapter.py | 19 ------------------- src/crewai/agents/agent_builder/base_agent.py | 2 -- tests/agents/agent_builder/base_agent_test.py | 3 --- 3 files changed, 24 deletions(-) diff --git a/src/crewai/agents/agent_adapters/openai_agents/openai_adapter.py b/src/crewai/agents/agent_adapters/openai_agents/openai_adapter.py index 562d10322..118e6cd7e 100644 --- a/src/crewai/agents/agent_adapters/openai_agents/openai_adapter.py +++ b/src/crewai/agents/agent_adapters/openai_agents/openai_adapter.py @@ -159,25 +159,6 @@ class OpenAIAgentAdapter(BaseAgentAdapter): return Converter(llm=llm, text=text, model=model, instructions=instructions) - def _parse_tools(self, tools: List[BaseTool]) -> List[BaseTool]: - """Parse and validate tools""" - tools_list = [] - try: - # tentatively try to import from crewai_tools import BaseTool as CrewAITool - from crewai.tools import BaseTool as CrewAITool - - for tool in tools: - if isinstance(tool, CrewAITool): - tools_list.append(tool.to_structured_tool()) - else: - tools_list.append(tool) - except ModuleNotFoundError: - tools_list = [] - for tool in tools: - tools_list.append(tool) - - return tools_list - def configure_structured_output(self, task) -> None: """Configure the structured output for the specific agent implementation. diff --git a/src/crewai/agents/agent_builder/base_agent.py b/src/crewai/agents/agent_builder/base_agent.py index f11c74ae1..b9f462dec 100644 --- a/src/crewai/agents/agent_builder/base_agent.py +++ b/src/crewai/agents/agent_builder/base_agent.py @@ -62,8 +62,6 @@ class BaseAgent(ABC, BaseModel): Abstract method to execute a task. create_agent_executor(tools=None) -> None: Abstract method to create an agent executor. - _parse_tools(tools: List[BaseTool]) -> List[Any]: - Abstract method to parse tools. get_delegation_tools(agents: List["BaseAgent"]): Abstract method to set the agents task tools for handling delegation and question asking to other agents in crew. get_output_converter(llm, model, instructions): diff --git a/tests/agents/agent_builder/base_agent_test.py b/tests/agents/agent_builder/base_agent_test.py index 99f66dcc4..59faa6ba3 100644 --- a/tests/agents/agent_builder/base_agent_test.py +++ b/tests/agents/agent_builder/base_agent_test.py @@ -18,9 +18,6 @@ class MockAgent(BaseAgent): def create_agent_executor(self, tools=None) -> None: ... - def _parse_tools(self, tools: List[BaseTool]) -> List[BaseTool]: - return [] - def get_delegation_tools(self, agents: List["BaseAgent"]): ... def get_output_converter(