mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-05-01 15:22:37 +00:00
Fix lint and type checker errors
Co-Authored-By: Joe Moura <joao@crewai.com>
This commit is contained in:
@@ -152,7 +152,7 @@ class ToolUsage:
|
|||||||
) -> str:
|
) -> str:
|
||||||
if self._check_tool_repeated_usage(calling=calling):
|
if self._check_tool_repeated_usage(calling=calling):
|
||||||
try:
|
try:
|
||||||
result = self._i18n.errors("task_repeated_usage").format(
|
repeated_result = self._i18n.errors("task_repeated_usage").format(
|
||||||
tool_names=self.tools_names
|
tool_names=self.tools_names
|
||||||
)
|
)
|
||||||
self._telemetry.tool_repeated_usage(
|
self._telemetry.tool_repeated_usage(
|
||||||
@@ -160,8 +160,8 @@ class ToolUsage:
|
|||||||
tool_name=tool.name,
|
tool_name=tool.name,
|
||||||
attempts=self._run_attempts,
|
attempts=self._run_attempts,
|
||||||
)
|
)
|
||||||
result = self._format_result(result=result)
|
repeated_result = self._format_result(result=repeated_result)
|
||||||
return result
|
return repeated_result
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
if self.task:
|
if self.task:
|
||||||
@@ -172,10 +172,12 @@ class ToolUsage:
|
|||||||
result: Optional[str] = None
|
result: Optional[str] = None
|
||||||
|
|
||||||
if self.tools_handler and self.tools_handler.cache:
|
if self.tools_handler and self.tools_handler.cache:
|
||||||
result = self.tools_handler.cache.read(
|
cache_result = self.tools_handler.cache.read(
|
||||||
tool=calling.tool_name, input=calling.arguments
|
tool=calling.tool_name, input=calling.arguments
|
||||||
)
|
)
|
||||||
from_cache = result is not None
|
if cache_result is not None:
|
||||||
|
result = cache_result
|
||||||
|
from_cache = True
|
||||||
|
|
||||||
available_tool = next(
|
available_tool = next(
|
||||||
(
|
(
|
||||||
@@ -276,12 +278,13 @@ class ToolUsage:
|
|||||||
result=result,
|
result=result,
|
||||||
)
|
)
|
||||||
|
|
||||||
if (
|
if available_tool is not None and (
|
||||||
hasattr(available_tool, "result_as_answer")
|
hasattr(available_tool, "result_as_answer")
|
||||||
and available_tool.result_as_answer
|
and available_tool.result_as_answer
|
||||||
):
|
):
|
||||||
result_as_answer = available_tool.result_as_answer
|
result_as_answer = available_tool.result_as_answer
|
||||||
data["result_as_answer"] = result_as_answer
|
if isinstance(result_as_answer, bool):
|
||||||
|
data["result_as_answer"] = result_as_answer
|
||||||
|
|
||||||
if self.agent and hasattr(self.agent, "tools_results"):
|
if self.agent and hasattr(self.agent, "tools_results"):
|
||||||
self.agent.tools_results.append(data)
|
self.agent.tools_results.append(data)
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
import pytest
|
import pytest
|
||||||
from unittest.mock import patch, MagicMock
|
from typing import Any, Dict, List, Optional, Union
|
||||||
from typing import List, Dict, Any, Optional, Union
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
from crewai import Agent, Task, Crew
|
from crewai import Agent, Crew, Task
|
||||||
from crewai.tools import BaseTool
|
|
||||||
from crewai.agents.tools_handler import ToolsHandler
|
from crewai.agents.tools_handler import ToolsHandler
|
||||||
from crewai.tools.tool_usage import ToolUsage
|
|
||||||
from crewai.tasks.task_output import TaskOutput
|
from crewai.tasks.task_output import TaskOutput
|
||||||
|
from crewai.tools import BaseTool
|
||||||
from crewai.tools.structured_tool import CrewStructuredTool
|
from crewai.tools.structured_tool import CrewStructuredTool
|
||||||
from crewai.tools.tool_calling import ToolCalling, InstructorToolCalling
|
from crewai.tools.tool_calling import InstructorToolCalling, ToolCalling
|
||||||
|
from crewai.tools.tool_usage import ToolUsage
|
||||||
|
|
||||||
|
|
||||||
class TestCodeInterpreterTool(BaseTool):
|
class TestCodeInterpreterTool(BaseTool):
|
||||||
|
|||||||
Reference in New Issue
Block a user