camel-ai 0.2.69a3__tar.gz → 0.2.69a4__tar.gz

{camel_ai-0.2.69a3 → camel_ai-0.2.69a4}/PKG-INFO

@@ -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 → camel_ai-0.2.69a4}/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_ai-0.2.69a3 → camel_ai-0.2.69a4}/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_ai-0.2.69a3 → camel_ai-0.2.69a4}/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 → camel_ai-0.2.69a4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "camel-ai"
-version = "0.2.69a3"
+version = "0.2.69a4"
 description = "Communicative Agents for AI Society Study"
 authors = [{ name = "CAMEL-AI.org" }]
 requires-python = ">=3.10,<3.13"