From e9335e89a64c6ed141a34623813022e8a02dc44f Mon Sep 17 00:00:00 2001 From: Braelyn Boynton Date: Fri, 19 Apr 2024 19:09:20 -0700 Subject: [PATCH] Revert "Revert "true dependency"" This reverts commit 4d1b460b --- pyproject.toml | 3 +-- src/crewai/crew.py | 8 ++------ src/crewai/tools/tool_usage.py | 8 +++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index abbe0fa09..cd11eaad4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,11 +28,10 @@ click = "^8.1.7" python-dotenv = "1.0.0" embedchain = "^0.1.98" appdirs = "^1.4.4" -agentops = { version = "^0.1.5", optional = true } +agentops = "^0.1.5" [tool.poetry.extras] tools = ["crewai-tools"] -agentops = ["agentops"] [tool.poetry.group.dev.dependencies] isort = "^5.13.2" diff --git a/src/crewai/crew.py b/src/crewai/crew.py index 1249a460c..a93b32601 100644 --- a/src/crewai/crew.py +++ b/src/crewai/crew.py @@ -26,10 +26,7 @@ from crewai.task import Task from crewai.telemetry import Telemetry from crewai.tools.agent_tools import AgentTools from crewai.utilities import I18N, FileHandler, Logger, RPMController -try: - import agentops -except ImportError: - agentops = None +import agentops class Crew(BaseModel): @@ -380,8 +377,7 @@ class Crew(BaseModel): def _finish_execution(self, output) -> None: if self.max_rpm: self._rpm_controller.stop_rpm_counter() - if agentops: - agentops.end_session(end_state="Success", end_state_reason="Finished Execution") + agentops.end_session(end_state="Success", end_state_reason="Finished Execution") self._telemetry.end_crew(self, output) def __repr__(self): diff --git a/src/crewai/tools/tool_usage.py b/src/crewai/tools/tool_usage.py index da3f1be50..b11f4ec2a 100644 --- a/src/crewai/tools/tool_usage.py +++ b/src/crewai/tools/tool_usage.py @@ -97,7 +97,7 @@ class ToolUsage: tool: BaseTool, calling: Union[ToolCalling, InstructorToolCalling], ) -> None: - tool_event = agentops.ToolEvent(name=calling.tool_name) if agentops else None + tool_event = agentops.ToolEvent(name=calling.tool_name) if self._check_tool_repeated_usage(calling=calling): try: result = self._i18n.errors("task_repeated_usage").format( @@ -161,8 +161,7 @@ class ToolUsage: self._printer.print(content=f"\n\n{error_message}\n", color="red") return error self.task.increment_tools_errors() - if agentops: - agentops.record(agentops.ErrorEvent(exception=e, trigger_event=tool_event)) + agentops.record(agentops.ErrorEvent(details=e, trigger_event=tool_event)) return self.use(calling=calling, tool_string=tool_string) if self.tools_handler: @@ -183,8 +182,7 @@ class ToolUsage: ) self._printer.print(content=f"\n\n{result}\n", color="purple") - if agentops: - agentops.record(tool_event) + agentops.record(tool_event) self._telemetry.tool_usage( llm=self.function_calling_llm, tool_name=tool.name,