Framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks.
chore: fix ruff linting issues in tools module
Greyson LaLondecb0efd05b4f3
diff --git a/src/crewai/tools/__init__.py b/src/crewai/tools/__init__.pyindex 2467fa906..51c363e1a 100644--- a/src/crewai/tools/__init__.py+++ b/src/crewai/tools/__init__.py@@ -1,7 +1,7 @@-from .base_tool import BaseTool, tool, EnvVar+from .base_tool import BaseTool, EnvVar, tool__all__ = ["BaseTool",- "tool","EnvVar",-]\ No newline at end of file+ "tool",+]diff --git a/src/crewai/tools/agent_tools/add_image_tool.py b/src/crewai/tools/agent_tools/add_image_tool.pyindex 939dff2df..8539d54a6 100644--- a/src/crewai/tools/agent_tools/add_image_tool.py+++ b/src/crewai/tools/agent_tools/add_image_tool.py@@ -1,5 +1,3 @@-from typing import Dict, Optional, Union-from pydantic import BaseModel, Fieldfrom crewai.tools.base_tool import BaseTool@@ -10,7 +8,7 @@ i18n = I18N()class AddImageToolSchema(BaseModel):image_url: str = Field(..., description="The URL or path of the image to add")- action: Optional[str] = Field(+ action: str | None = Field(default=None, description="Optional context or question about the image")@@ -18,14 +16,16 @@ class AddImageToolSchema(BaseModel):class AddImageTool(BaseTool):"""Tool for adding images to the content"""- name: str = Field(default_factory=lambda: i18n.tools("add_image")["name"]) # type: ignore- description: str = Field(default_factory=lambda: i18n.tools("add_image")["description"]) # type: ignore+ name: str = Field(default_factory=lambda: i18n.tools("add_image")["name"]) # type: ignore[index]+ description: str = Field(+ default_factory=lambda: i18n.tools("add_image")["description"] # type: ignore[index]+ )args_schema: type[BaseModel] = AddImageToolSchemadef _run(self,image_url: str,- action: Optional[str] = None,+ action: str | None = None,**kwargs,) -> dict:action = action or i18n.tools("add_image")["default_action"] # type: ignorediff --git a/src/crewai/tools/agent_tools/agent_tools.py b/src/crewai/tools/agent_tools/agent_tools.pyindex 77d3c2d89..9077c55d3 100644--- a/src/crewai/tools/agent_tools/agent_tools.py+++ b/src/crewai/tools/agent_tools/agent_tools.py@@ -9,9 +9,9 @@ from .delegate_work_tool import DelegateWorkToolclass AgentTools:"""Manager class for agent-related tools"""- def __init__(self, agents: list[BaseAgent], i18n: I18N = I18N()):+ def __init__(self, agents: list[BaseAgent], i18n: I18N | None = None):self.agents = agents- self.i18n = i18n+ self.i18n = i18n if i18n is not None else I18N()def tools(self) -> list[BaseTool]:"""Get all available agent tools"""diff --git a/src/crewai/tools/agent_tools/ask_question_tool.py b/src/crewai/tools/agent_tools/ask_question_tool.pyindex 9294770e5..c4d2e6292 100644--- a/src/crewai/tools/agent_tools/ask_question_tool.py+++ b/src/crewai/tools/agent_tools/ask_question_tool.py@@ -1,5 +1,3 @@-from typing import Optional-from pydantic import BaseModel, Fieldfrom crewai.tools.agent_tools.base_agent_tools import BaseAgentTool@@ -21,7 +19,7 @@ class AskQuestionTool(BaseAgentTool):self,question: str,context: str,- coworker: Optional[str] = None,+ coworker: str | None = None,**kwargs,) -> str:coworker = self._get_coworker(coworker, **kwargs)diff --git a/src/crewai/tools/agent_tools/base_agent_tools.py b/src/crewai/tools/agent_tools/base_agent_tools.pyindex b00fbb7b5..c6c7321a7 100644--- a/src/crewai/tools/agent_tools/base_agent_tools.py+++ b/src/crewai/tools/agent_tools/base_agent_tools.py@@ -1,5 +1,4 @@import logging-from typing import Optionalfrom pydantic import Field@@ -38,7 +37,7 @@ class BaseAgentTool(BaseTool):# Remove quotes and convert to lowercasereturn normalized.replace('"', "").casefold()- def _get_coworker(self, coworker: Optional[str], **kwargs) -> Optional[str]:+ def _get_coworker(self, coworker: str | None, **kwargs) -> str | None:coworker = coworker or kwargs.get("co_worker") or kwargs.get("coworker")if coworker:is_list = coworker.startswith("[") and coworker.endswith("]")@@ -47,10 +46,7 @@ class BaseAgentTool(BaseTool):return coworkerdef _execute(- self,- agent_name: Optional[str],- task: str,- context: Optional[str] = None+ self, agent_name: str | None, task: str, context: str | None = None) -> str:"""Execute delegation to an agent with case-insensitive and whitespace-tolerant matching.@@ -77,7 +73,9 @@ class BaseAgentTool(BaseTool):# when it should look like this:# {"task": "....", "coworker": "...."}sanitized_name = self.sanitize_agent_name(agent_name)- logger.debug(f"Sanitized agent name from '{agent_name}' to '{sanitized_name}'")+ logger.debug(+ f"Sanitized agent name from '{agent_name}' to '{sanitized_name}'"+ )available_agents = [agent.role for agent in self.agents]logger.debug(f"Available agents: {available_agents}")@@ -87,38 +85,47 @@ class BaseAgentTool(BaseTool):for available_agent in self.agentsif self.sanitize_agent_name(available_agent.role) == sanitized_name]- logger.debug(f"Found {len(agent)} matching agents for role '{sanitized_name}'")+ logger.debug(+ f"Found {len(agent)} matching agents for role '{sanitized_name}'"+ )except (AttributeError, ValueError) as e:# Handle specific exceptions that might occur during role name processingreturn self.i18n.errors("agent_tool_unexisting_coworker").format(coworkers="\n".join(- [f"- {self.sanitize_agent_name(agent.role)}" for agent in self.agents]+ [+ f"- {self.sanitize_agent_name(agent.role)}"+ for agent in self.agents+ ]),- error=str(e)+ error=str(e),)if not agent:# No matching agent found after sanitizationreturn self.i18n.errors("agent_tool_unexisting_coworker").format(coworkers="\n".join(- [f"- {self.sanitize_agent_name(agent.role)}" for agent in self.agents]+ [+ f"- {self.sanitize_agent_name(agent.role)}"+ for agent in self.agents+ ]),- error=f"No agent found with role '{sanitized_name}'"+ error=f"No agent found with role '{sanitized_name}'",)- agent = agent[0]+ selected_agent = agent[0]try:task_with_assigned_agent = Task(description=task,- agent=agent,- expected_output=agent.i18n.slice("manager_request"),- i18n=agent.i18n,+ agent=selected_agent,+ expected_output=selected_agent.i18n.slice("manager_request"),+ i18n=selected_agent.i18n,+ )+ logger.debug(+ f"Created task for agent '{self.sanitize_agent_name(selected_agent.role)}': {task}")- logger.debug(f"Created task for agent '{self.sanitize_agent_name(agent.role)}': {task}")- return agent.execute_task(task_with_assigned_agent, context)+ return selected_agent.execute_task(task_with_assigned_agent, context)except Exception as e:# Handle task creation or execution errorsreturn self.i18n.errors("agent_tool_execution_error").format(- agent_role=self.sanitize_agent_name(agent.role),- error=str(e)+ agent_role=self.sanitize_agent_name(selected_agent.role), error=str(e))diff --git a/src/crewai/tools/agent_tools/delegate_work_tool.py b/src/crewai/tools/agent_tools/delegate_work_tool.pyindex 9dbf6c920..cc0f6cbe2 100644--- a/src/crewai/tools/agent_tools/delegate_work_tool.py+++ b/src/crewai/tools/agent_tools/delegate_work_tool.py@@ -1,5 +1,3 @@-from typing import Optional-from pydantic import BaseModel, Fieldfrom crewai.tools.agent_tools.base_agent_tools import BaseAgentTool@@ -23,7 +21,7 @@ class DelegateWorkTool(BaseAgentTool):self,task: str,context: str,- coworker: Optional[str] = None,+ coworker: str | None = None,**kwargs,) -> str:coworker = self._get_coworker(coworker, **kwargs)diff --git a/src/crewai/tools/base_tool.py b/src/crewai/tools/base_tool.pyindex 5ddad0872..0905db320 100644--- a/src/crewai/tools/base_tool.py+++ b/src/crewai/tools/base_tool.py@@ -1,7 +1,8 @@import asynciofrom abc import ABC, abstractmethod+from collections.abc import Callablefrom inspect import signature-from typing import Any, Callable, Type, get_args, get_origin, Optional, List+from typing import Any, get_args, get_originfrom pydantic import (BaseModel,@@ -19,7 +20,7 @@ class EnvVar(BaseModel):name: strdescription: strrequired: bool = True- default: Optional[str] = None+ default: str | None = Noneclass BaseTool(BaseModel, ABC):@@ -32,10 +33,10 @@ class BaseTool(BaseModel, ABC):"""The unique name of the tool that clearly communicates its purpose."""description: str"""Used to tell the model how/when/why to use the tool."""- env_vars: List[EnvVar] = []+ env_vars: list[EnvVar] = []"""List of environment variables used by the tool."""- args_schema: Type[PydanticBaseModel] = Field(- default_factory=_ArgsSchemaPlaceholder, validate_default=True+ args_schema: type[PydanticBaseModel] = Field(+ default=_ArgsSchemaPlaceholder, validate_default=True)"""The schema for the arguments that the tool accepts."""description_updated: bool = False@@ -52,9 +53,9 @@ class BaseTool(BaseModel, ABC):@field_validator("args_schema", mode="before")@classmethoddef _default_args_schema(- cls, v: Type[PydanticBaseModel]- ) -> Type[PydanticBaseModel]:- if not isinstance(v, cls._ArgsSchemaPlaceholder):+ cls, v: type[PydanticBaseModel]+ ) -> type[PydanticBaseModel]:+ if v != cls._ArgsSchemaPlaceholder:return vreturn type(@@ -139,7 +140,7 @@ class BaseTool(BaseModel, ABC):# Infer args_schema from the function signature if not providedfunc_signature = signature(tool.func)annotations = func_signature.parameters- args_fields = {}+ args_fields: dict[str, Any] = {}for name, param in annotations.items():if name != "self":param_annotation = (@@ -247,7 +248,7 @@ class Tool(BaseTool):# Infer args_schema from the function signature if not providedfunc_signature = signature(tool.func)annotations = func_signature.parameters- args_fields = {}+ args_fields: dict[str, Any] = {}for name, param in annotations.items():if name != "self":param_annotation = (diff --git a/src/crewai/tools/tool_calling.py b/src/crewai/tools/tool_calling.pyindex 16c5e0bfc..1e2eed546 100644--- a/src/crewai/tools/tool_calling.py+++ b/src/crewai/tools/tool_calling.py@@ -1,4 +1,4 @@-from typing import Any, Dict, Optional+from typing import Anyfrom pydantic import BaseModel, Fieldfrom pydantic import BaseModel as PydanticBaseModel@@ -7,7 +7,7 @@ from pydantic import Field as PydanticFieldclass ToolCalling(BaseModel):tool_name: str = Field(..., description="The name of the tool to be called.")- arguments: Optional[Dict[str, Any]] = Field(+ arguments: dict[str, Any] | None = Field(..., description="A dictionary of arguments to be passed to the tool.")@@ -16,6 +16,6 @@ class InstructorToolCalling(PydanticBaseModel):tool_name: str = PydanticField(..., description="The name of the tool to be called.")- arguments: Optional[Dict[str, Any]] = PydanticField(+ arguments: dict[str, Any] | None = PydanticField(..., description="A dictionary of arguments to be passed to the tool.")