camel-ai 0.2.69a3__py3-none-any.whl → 0.2.69a4__py3-none-any.whl

camel/__init__.py

@@ -14,7 +14,7 @@
 
 from camel.logger import disable_logging, enable_logging, set_log_level
 
-__version__ = '0.2.69a3'
+__version__ = '0.2.69a4'
 
 __all__ = [
     '__version__',

camel/agents/chat_agent.py

@@ -1904,36 +1904,12 @@ class ChatAgent(BaseAgent):
             ChatAgent: A new instance of :obj:`ChatAgent` with the same
                 configuration.
         """
-        import copy
-
         # Create a new instance with the same configuration
         # If with_memory is True, set system_message to None
         # If with_memory is False, use the original system message
         # To avoid duplicated system memory.
         system_message = None if with_memory else self._original_system_message
 
-        # Create deep copies of tools to avoid shared state
-        cloned_tools: List[Union[FunctionTool, Callable]] = []
-        for tool in self._internal_tools.values():
-            # Create a new FunctionTool instance to avoid sharing state
-            cloned_tool = copy.deepcopy(tool)
-            cloned_tools.append(cloned_tool)
-
-        # Create deep copies of external tool schemas
-        cloned_external_tools: List[
-            Union[FunctionTool, Callable, Dict[str, Any]]
-        ] = []
-        for schema in self._external_tool_schemas.values():
-            cloned_schema = copy.deepcopy(schema)
-            cloned_external_tools.append(cloned_schema)
-
-        # Create deep copies of response terminators to avoid shared state
-        cloned_terminators: List[ResponseTerminator] = []
-        if self.response_terminators:
-            for terminator in self.response_terminators:
-                cloned_terminator = copy.deepcopy(terminator)
-                cloned_terminators.append(cloned_terminator)
-
         new_agent = ChatAgent(
             system_message=system_message,
             model=self.model_backend.models,  # Pass the existing model_backend
@@ -1943,9 +1919,11 @@ class ChatAgent(BaseAgent):
                 self.memory.get_context_creator(), "token_limit", None
             ),
             output_language=self._output_language,
-            tools=cloned_tools,
-            external_tools=cloned_external_tools,
-            response_terminators=cloned_terminators,
+            tools=[tool.func for tool in self._internal_tools.values()],
+            external_tools=[
+                schema for schema in self._external_tool_schemas.values()
+            ],
+            response_terminators=self.response_terminators,
             scheduling_strategy=self.model_backend.scheduling_strategy.__name__,
             max_iteration=self.max_iteration,
             stop_event=self.stop_event,

camel/societies/workforce/single_agent_worker.py

@@ -284,6 +284,13 @@ class SingleAgentWorker(Worker):
             response = await worker_agent.astep(
                 prompt, response_format=TaskResult
             )
+
+            # Get token usage from the response
+            usage_info = response.info.get("usage") or response.info.get(
+                "token_usage"
+            )
+            total_tokens = usage_info.get("total_tokens", 0)
+
         except Exception as e:
             print(
                 f"{Fore.RED}Error processing task {task.id}: "
@@ -294,13 +301,6 @@ class SingleAgentWorker(Worker):
             # Return agent to pool or let it be garbage collected
             await self._return_worker_agent(worker_agent)
 
-        # Get actual token usage from the agent that processed this task
-        try:
-            _, total_token_count = worker_agent.memory.get_context()
-        except Exception:
-            # Fallback if memory context unavailable
-            total_token_count = 0
-
         # Populate additional_info with worker attempt details
         if task.additional_info is None:
             task.additional_info = {}
@@ -321,7 +321,7 @@ class SingleAgentWorker(Worker):
             f"to process task {task.content}",
             "response_content": response.msg.content,
             "tool_calls": response.info.get("tool_calls"),
-            "total_token_count": total_token_count,
+            "total_tokens": total_tokens,
         }
 
         # Store the worker attempt in additional_info
@@ -330,9 +330,7 @@ class SingleAgentWorker(Worker):
         task.additional_info["worker_attempts"].append(worker_attempt_details)
 
         # Store the actual token usage for this specific task
-        task.additional_info["token_usage"] = {
-            "total_tokens": total_token_count
-        }
+        task.additional_info["token_usage"] = {"total_tokens": total_tokens}
 
         print(f"======\n{Fore.GREEN}Reply from {self}:{Fore.RESET}")
 

{camel_ai-0.2.69a3.dist-info → camel_ai-0.2.69a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.69a3
+Version: 0.2.69a4
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel

{camel_ai-0.2.69a3.dist-info → camel_ai-0.2.69a4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camel/__init__.py,sha256=Ryf5ZVEFpFI3TVgtC_wE9pClrhx8VR7g5d2M9lll1tU,901
+camel/__init__.py,sha256=UtJjquAEThQRkMPBBQETBWgOPPDjxWeuDnkWHwHQrJw,901
 camel/generators.py,sha256=JRqj9_m1PF4qT6UtybzTQ-KBT9MJQt18OAAYvQ_fr2o,13844
 camel/human.py,sha256=Xg8x1cS5KK4bQ1SDByiHZnzsRpvRP-KZViNvmu38xo4,5475
 camel/logger.py,sha256=rZVeOVYuQ9RYJ5Tqyv0usqy0g4zaVEq4qSfZ9nd2640,5755
@@ -7,7 +7,7 @@ camel/agents/__init__.py,sha256=64weKqdvmpZcGWyVkO-OKASAmVUdrQjv60JApgPk_SA,1644
 camel/agents/_types.py,sha256=ryPRmEXnpNtbFT23GoAcwK-zxWWsIOqYu64mxMx_PhI,1430
 camel/agents/_utils.py,sha256=AR7Qqgbkmn4X2edYUQf1rdksGUyV5hm3iK1z-Dn0Mcg,6266
 camel/agents/base.py,sha256=c4bJYL3G3Z41SaFdMPMn8ZjLdFiFaVOFO6EQIfuCVR8,1124
-camel/agents/chat_agent.py,sha256=QFFyJOZ0fsyjjX_KwKsbp-SIFEFC6KTzMZ4dT98JsVg,80333
+camel/agents/chat_agent.py,sha256=x0-PgQ2ptvqHYv_nu2tcWdWn7szl8o6TzYjr739U4Rk,79407
 camel/agents/critic_agent.py,sha256=L6cTbYjyZB0DCa51tQ6LZLA6my8kHLC4nktHySH78H4,10433
 camel/agents/deductive_reasoner_agent.py,sha256=6BZGaq1hR6hKJuQtOfoYQnk_AkZpw_Mr7mUy2MspQgs,13540
 camel/agents/embodied_agent.py,sha256=XBxBu5ZMmSJ4B2U3Z7SMwvLlgp6yNpaBe8HNQmY9CZA,7536
@@ -273,7 +273,7 @@ camel/societies/workforce/__init__.py,sha256=bkTI-PE-MSK9AQ2V2gR6cR2WY-R7Jqy_NmX
 camel/societies/workforce/base.py,sha256=z2DmbTP5LL5-aCAAqglznQqCLfPmnyM5zD3w6jjtsb8,2175
 camel/societies/workforce/prompts.py,sha256=_l7OUkzH5p7KOd8HMZle9zB9W3jKza_Yb_6elFKiZ2s,11813
 camel/societies/workforce/role_playing_worker.py,sha256=pWPCtkLx-xbc4SWyZBfMwvWr-R5ZpANhN7g6PDuH8Po,7615
-camel/societies/workforce/single_agent_worker.py,sha256=5lF9zzxDJMCtELh6Y407m_D2bMAXMsY3yvY3_Bssd5A,14704
+camel/societies/workforce/single_agent_worker.py,sha256=ZDVq5doJUoUY0Uuvhkucf4U--y36q1We3p3c4TuoBSM,14627
 camel/societies/workforce/task_channel.py,sha256=uqQQI67Tr4awbR4bjZXdx8_4gL6-ON5IjQk_H_ryqT4,7431
 camel/societies/workforce/utils.py,sha256=Gjlz7pLo4r1b6iNHtlIMxeEuat4d6tEEQMI40JAU3kY,6190
 camel/societies/workforce/worker.py,sha256=36tkOyz4G2wfBdrFjt9NBPXsx4UbE6uL5on8sP2aoqk,6414
@@ -431,7 +431,7 @@ camel/verifiers/math_verifier.py,sha256=tA1D4S0sm8nsWISevxSN0hvSVtIUpqmJhzqfbuMo
 camel/verifiers/models.py,sha256=GdxYPr7UxNrR1577yW4kyroRcLGfd-H1GXgv8potDWU,2471
 camel/verifiers/physics_verifier.py,sha256=c1grrRddcrVN7szkxhv2QirwY9viIRSITWeWFF5HmLs,30187
 camel/verifiers/python_verifier.py,sha256=ogTz77wODfEcDN4tMVtiSkRQyoiZbHPY2fKybn59lHw,20558
-camel_ai-0.2.69a3.dist-info/METADATA,sha256=IqaSVunoJDMvh0Hp12M5MItps4OkEnqbmPx4NVi_xZw,45047
-camel_ai-0.2.69a3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-camel_ai-0.2.69a3.dist-info/licenses/LICENSE,sha256=id0nB2my5kG0xXeimIu5zZrbHLS6EQvxvkKkzIHaT2k,11343
-camel_ai-0.2.69a3.dist-info/RECORD,,
+camel_ai-0.2.69a4.dist-info/METADATA,sha256=vhax7Mw7tHuk_bMtaNMfj-CHqCAXzEhvEZP5x6xPPzk,45047
+camel_ai-0.2.69a4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+camel_ai-0.2.69a4.dist-info/licenses/LICENSE,sha256=id0nB2my5kG0xXeimIu5zZrbHLS6EQvxvkKkzIHaT2k,11343
+camel_ai-0.2.69a4.dist-info/RECORD,,