From 7d4cf9a7bc309be39ae7a09a1eb349d36bb3769a Mon Sep 17 00:00:00 2001
From: Braelyn Boynton <bboynton97@gmail.com>
Date: Thu, 5 Sep 2024 14:45:01 +0900
Subject: [PATCH] undo agentops api key check

---
 src/crewai/agent.py                           | 27 ++++++-------------
 src/crewai/crew.py                            | 11 +++-----
 src/crewai/tools/tool_usage.py                | 11 +++-----
 .../utilities/evaluators/task_evaluator.py    | 20 ++++----------
 4 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/src/crewai/agent.py b/src/crewai/agent.py
index 0711c741d..02ca52ea8 100644
--- a/src/crewai/agent.py
+++ b/src/crewai/agent.py
@@ -19,27 +19,16 @@ from crewai.utilities.constants import TRAINED_AGENTS_DATA_FILE, TRAINING_DATA_F
 from crewai.utilities.token_counter_callback import TokenCalcHandler
 from crewai.utilities.training_handler import CrewTrainingHandler
 
-
-def mock_agent_ops_provider():
-    def track_agent(*args, **kwargs):
-        def noop(f):
-            return f
-
-        return noop
-
-    return track_agent
-
-
 agentops = None
+try:
+    import agentops  # type: ignore # Name "agentops" already defined on line 21
+    from agentops import track_agent
+except ImportError:
+    def track_agent():
+      def noop(f):
+        return f
 
-if os.environ.get("AGENTOPS_API_KEY"):
-    try:
-        import agentops  # type: ignore # Name "agentops" already defined on line 21
-        from agentops import track_agent
-    except ImportError:
-        track_agent = mock_agent_ops_provider()
-else:
-    track_agent = mock_agent_ops_provider()
+      return noop
 
 
 @track_agent()
diff --git a/src/crewai/crew.py b/src/crewai/crew.py
index 87f3f29f6..b357e11b7 100644
--- a/src/crewai/crew.py
+++ b/src/crewai/crew.py
@@ -1,6 +1,5 @@
 import asyncio
 import json
-import os
 import uuid
 from concurrent.futures import Future
 from hashlib import md5
@@ -47,12 +46,10 @@ from crewai.utilities.planning_handler import CrewPlanner
 from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler
 from crewai.utilities.training_handler import CrewTrainingHandler
 
-agentops = None
-if os.environ.get("AGENTOPS_API_KEY"):
-    try:
-        import agentops  # type: ignore
-    except ImportError:
-        pass
+try:
+    import agentops
+except ImportError:
+    agentops = None
 
 if TYPE_CHECKING:
     from crewai.pipeline.pipeline import Pipeline
diff --git a/src/crewai/tools/tool_usage.py b/src/crewai/tools/tool_usage.py
index 7d2c46634..42919f013 100644
--- a/src/crewai/tools/tool_usage.py
+++ b/src/crewai/tools/tool_usage.py
@@ -1,5 +1,4 @@
 import ast
-import os
 from difflib import SequenceMatcher
 from textwrap import dedent
 from typing import Any, List, Union
@@ -12,12 +11,10 @@ from crewai.telemetry import Telemetry
 from crewai.tools.tool_calling import InstructorToolCalling, ToolCalling
 from crewai.utilities import I18N, Converter, ConverterError, Printer
 
-agentops = None
-if os.environ.get("AGENTOPS_API_KEY"):
-    try:
-        import agentops  # type: ignore
-    except ImportError:
-        pass
+try:
+    import agentops
+except ImportError:
+    agentops = None
 
 OPENAI_BIGGER_MODELS = ["gpt-4o"]
 
diff --git a/src/crewai/utilities/evaluators/task_evaluator.py b/src/crewai/utilities/evaluators/task_evaluator.py
index ed2df41ce..3c93bc672 100644
--- a/src/crewai/utilities/evaluators/task_evaluator.py
+++ b/src/crewai/utilities/evaluators/task_evaluator.py
@@ -8,26 +8,16 @@ from crewai.utilities import Converter
 from crewai.utilities.pydantic_schema_parser import PydanticSchemaParser
 
 
-def mock_agent_ops_provider():
-    def track_agent(*args, **kwargs):
+agentops = None
+try:
+    from agentops import track_agent
+except ImportError:
+    def track_agent(name):
         def noop(f):
             return f
 
         return noop
 
-    return track_agent
-
-
-agentops = None
-
-if os.environ.get("AGENTOPS_API_KEY"):
-    try:
-        from agentops import track_agent
-    except ImportError:
-        track_agent = mock_agent_ops_provider()
-else:
-    track_agent = mock_agent_ops_provider()
-
 
 class Entity(BaseModel):
     name: str = Field(description="The name of the entity.")