fix: track_agent() got an unexpected keyword argument 'name' when wit…

…hout agentops (#808)
camel-ai · Aug 8, 2024 · 925b964 · 925b964
1 parent f7b0d00
commit 925b964
Show file tree

Hide file tree

Showing 19 changed files with 103 additions and 84 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -27,7 +27,7 @@ body:
     attributes:
       label: What version of camel are you using?
       description: Run command `python3 -c 'print(__import__("camel").__version__)'` in your shell and paste the output here.
-      placeholder: E.g., 0.1.6.1
+      placeholder: E.g., 0.1.6.2
     validations:
       required: true
 

diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ conda create --name camel python=3.9
 conda activate camel
 
 # Clone github repo
-git clone -b v0.1.6.1 https://github.com/camel-ai/camel.git
+git clone -b v0.1.6.2 https://github.com/camel-ai/camel.git
 
 # Change directory into project directory
 cd camel

diff --git a/camel/__init__.py b/camel/__init__.py
@@ -12,7 +12,7 @@
 # limitations under the License.
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
 
-__version__ = '0.1.6.1'
+__version__ = '0.1.6.2'
 
 __all__ = [
     '__version__',

diff --git a/camel/agents/chat_agent.py b/camel/agents/chat_agent.py
@@ -63,14 +63,14 @@
 
 # AgentOps decorator setting
 try:
-    from agentops import track_agent
-except ImportError:
-
-    def track_agent():
-        def noop(f):
-            return f
-
-        return noop
+    import os
+
+    if os.getenv("AGENTOPS_API_KEY") is not None:
+        from agentops import track_agent
+    else:
+        raise ImportError
+except (ImportError, AttributeError):
+    from camel.utils import track_agent
 
 
 class FunctionCallingRecord(BaseModel):

diff --git a/camel/agents/critic_agent.py b/camel/agents/critic_agent.py
@@ -26,14 +26,14 @@
 
 # AgentOps decorator setting
 try:
-    from agentops import track_agent
-except ImportError:
-
-    def track_agent():
-        def noop(f):
-            return f
-
-        return noop
+    import os
+
+    if os.getenv("AGENTOPS_API_KEY") is not None:
+        from agentops import track_agent
+    else:
+        raise ImportError
+except (ImportError, AttributeError):
+    from camel.utils import track_agent
 
 
 @track_agent(name="CriticAgent")

diff --git a/camel/agents/deductive_reasoner_agent.py b/camel/agents/deductive_reasoner_agent.py
@@ -22,14 +22,14 @@
 
 # AgentOps decorator setting
 try:
-    from agentops import track_agent
-except ImportError:
+    import os
 
-    def track_agent():
-        def noop(f):
-            return f
-
-        return noop
+    if os.getenv("AGENTOPS_API_KEY") is not None:
+        from agentops import track_agent
+    else:
+        raise ImportError
+except (ImportError, AttributeError):
+    from camel.utils import track_agent
 
 
 @track_agent(name="DeductiveReasonerAgent")

diff --git a/camel/agents/embodied_agent.py b/camel/agents/embodied_agent.py
@@ -29,14 +29,14 @@
 
 # AgentOps decorator setting
 try:
-    from agentops import track_agent
-except ImportError:
-
-    def track_agent():
-        def noop(f):
-            return f
-
-        return noop
+    import os
+
+    if os.getenv("AGENTOPS_API_KEY") is not None:
+        from agentops import track_agent
+    else:
+        raise ImportError
+except (ImportError, AttributeError):
+    from camel.utils import track_agent
 
 
 @track_agent(name="EmbodiedAgent")

diff --git a/camel/agents/knowledge_graph_agent.py b/camel/agents/knowledge_graph_agent.py
@@ -31,14 +31,14 @@
 
 # AgentOps decorator setting
 try:
-    from agentops import track_agent
-except ImportError:
-
-    def track_agent():
-        def noop(f):
-            return f
-
-        return noop
+    import os
+
+    if os.getenv("AGENTOPS_API_KEY") is not None:
+        from agentops import track_agent
+    else:
+        raise ImportError
+except (ImportError, AttributeError):
+    from camel.utils import track_agent
 
 
 text_prompt = """

diff --git a/camel/agents/role_assignment_agent.py b/camel/agents/role_assignment_agent.py
@@ -22,14 +22,14 @@
 
 # AgentOps decorator setting
 try:
-    from agentops import track_agent
-except ImportError:
-
-    def track_agent():
-        def noop(f):
-            return f
-
-        return noop
+    import os
+
+    if os.getenv("AGENTOPS_API_KEY") is not None:
+        from agentops import track_agent
+    else:
+        raise ImportError
+except (ImportError, AttributeError):
+    from camel.utils import track_agent
 
 
 @track_agent(name="RoleAssignmentAgent")

diff --git a/camel/agents/search_agent.py b/camel/agents/search_agent.py
@@ -22,14 +22,14 @@
 
 # AgentOps decorator setting
 try:
-    from agentops import track_agent
-except ImportError:
-
-    def track_agent():
-        def noop(f):
-            return f
-
-        return noop
+    import os
+
+    if os.getenv("AGENTOPS_API_KEY") is not None:
+        from agentops import track_agent
+    else:
+        raise ImportError
+except (ImportError, AttributeError):
+    from camel.utils import track_agent
 
 
 @track_agent(name="SearchAgent")

diff --git a/camel/agents/task_agent.py b/camel/agents/task_agent.py
@@ -22,14 +22,14 @@
 
 # AgentOps decorator setting
 try:
-    from agentops import track_agent
-except ImportError:
-
-    def track_agent():
-        def noop(f):
-            return f
-
-        return noop
+    import os
+
+    if os.getenv("AGENTOPS_API_KEY") is not None:
+        from agentops import track_agent
+    else:
+        raise ImportError
+except (ImportError, AttributeError):
+    from camel.utils import track_agent
 
 
 @track_agent(name="TaskSpecifyAgent")

diff --git a/camel/utils/__init__.py b/camel/utils/__init__.py
@@ -32,6 +32,7 @@
     print_text_animated,
     text_extract_from_web,
     to_pascal,
+    track_agent,
 )
 from .constants import Constants
 from .token_counting import (
@@ -74,4 +75,5 @@
     'json_to_function_code',
     'agentops_decorator',
     'AgentOpsMeta',
+    'track_agent',
 ]
diff --git a/camel/utils/commons.py b/camel/utils/commons.py
@@ -488,8 +488,14 @@ def is_docker_running() -> bool:
 
 
 try:
-    from agentops import ToolEvent, record
-except ImportError:
+    if os.getenv("AGENTOPS_API_KEY") is not None:
+        from agentops import (
+            ToolEvent,
+            record,
+        )
+    else:
+        raise ImportError
+except (ImportError, AttributeError):
     ToolEvent = None
 
 
@@ -528,7 +534,16 @@ class AgentOpsMeta(type):
     """
 
     def __new__(cls, name, bases, dct):
-        for attr, value in dct.items():
-            if callable(value) and attr != 'get_tools':
-                dct[attr] = agentops_decorator(value)
-        return super(AgentOpsMeta, cls).__new__(cls, name, bases, dct)
+        if ToolEvent:
+            for attr, value in dct.items():
+                if callable(value) and attr != 'get_tools':
+                    dct[attr] = agentops_decorator(value)
+        return super().__new__(cls, name, bases, dct)
+
+
+# Mock trak agent decorator for AgentOps
+def track_agent(*args, **kwargs):
+    def noop(f):
+        return f
+
+    return noop
diff --git a/docs/conf.py b/docs/conf.py
@@ -27,7 +27,7 @@
 project = 'CAMEL'
 copyright = '2023, CAMEL-AI.org'
 author = 'CAMEL-AI.org'
-release = '0.1.6.1'
+release = '0.1.6.2'
 
 html_favicon = (
     'https://raw.githubusercontent.com/camel-ai/camel/master/misc/favicon.png'

diff --git a/docs/get_started/setup.md b/docs/get_started/setup.md
@@ -61,7 +61,7 @@ conda create --name camel python=3.10
 conda activate camel
 
 # Clone github repo
-git clone -b v0.1.6.1 https://github.com/camel-ai/camel.git
+git clone -b v0.1.6.2 https://github.com/camel-ai/camel.git
 
 # Change directory into project directory
 cd camel

diff --git a/examples/bots/telegram_bot.py b/examples/bots/telegram_bot.py
@@ -20,7 +20,9 @@
 
 # Conditionally import telebot types only for type checking
 if TYPE_CHECKING:
-    from telebot.types import Message  # type: ignore[import-untyped]
+    from telebot.types import (
+        Message,  # type: ignore[import-not-found]
+    )
 
 
 class TelegramBot:
@@ -49,7 +51,7 @@ def __init__(
         else:
             self.token = telegram_token
 
-        import telebot  # type: ignore[import-untyped]
+        import telebot  # type: ignore[import-not-found]
 
         self.bot = telebot.TeleBot(token=self.token)
 

diff --git a/examples/observability/agentops_track_roleplaying_with_function.py b/examples/observability/agentops_track_roleplaying_with_function.py
@@ -25,7 +25,7 @@
 from camel.utils import print_text_animated
 
 # Initialize agentops
-agentops.init(tags=["CAMEL X AgentOps1"])
+agentops.init(tags=["CAMEL X AgentOps"])
 
 # Import toolkits after init of agentops so that the tool useage would be
 # tracked

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "camel-ai"
-version = "0.1.6.1"
+version = "0.1.6.2"
 authors = ["CAMEL-AI.org"]
 description = "Communicative Agents for AI Society Study"
 readme = "README.md"