andre/crewAI
1
0
Fork 0
mirror of https://github.com/crewAIInc/crewAI.git synced 2026-01-08 15:48:29 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refactor: simplify nested conditions in tool usage check

Browse Source 
Co-Authored-By: Joe Moura <joao@crewai.com>
This commit is contained in:
Devin AI
2025-02-24 13:22:13 +00:00
parent b44842d1de
commit a3b3b411df
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/crewai/tools/tool_usage.py
View File

@@ -284,24 +284,36 @@ class ToolUsage:
def _check_tool_repeated_usage(
self, calling: Union[ToolCalling, InstructorToolCalling]
) -> bool:
if not self.tools_handler:
"""Check if a tool is being called with the same arguments as the last call.
This method prevents duplicate tool executions by comparing the current tool call
with the last one. For WebSocket tools, it specifically checks if the 'question'
argument is identical. For other tools, it compares all arguments.
Args:
calling: The tool calling to check for repetition, containing the tool name
and arguments.
Returns:
bool: True if the tool is being called with the same name and arguments as
the last call, False otherwise.
"""
if not self.tools_handler or not self.tools_handler.last_used_tool:
return False
last_tool_usage = self.tools_handler.last_used_tool
if calling.tool_name != last_tool_usage.tool_name:
return False
if not calling.arguments or not last_tool_usage.arguments:
return False
try:
if "question" in calling.arguments and "question" in last_tool_usage.arguments:
return calling.arguments["question"] == last_tool_usage.arguments["question"]
return calling.arguments == last_tool_usage.arguments
except (KeyError, TypeError):
return False
if last_tool_usage := self.tools_handler.last_used_tool:
# For WebSocket tools, we need to check if the question is the same
if (calling.arguments is not None and last_tool_usage.arguments is not None and
"question" in calling.arguments and "question" in last_tool_usage.arguments):
return (
calling.tool_name == last_tool_usage.tool_name
and calling.arguments["question"] == last_tool_usage.arguments["question"]
)
# For other tools, check all arguments
return (
calling.tool_name == last_tool_usage.tool_name
and calling.arguments is not None
and last_tool_usage.arguments is not None
and calling.arguments == last_tool_usage.arguments
)
return False
def _select_tool(self, tool_name: str) -> Any:
order_tools = sorted(