camel-ai 0.2.67__py3-none-any.whl → 0.2.69a1__py3-none-any.whl

camel/societies/workforce/workforce.py

@@ -274,10 +274,13 @@ class Workforce(BaseNode):
             "of agents. This ensures efficient execution by minimizing "
             "context switching between agents.",
         )
-        _kwargs = dict(task_agent_kwargs or {})
+        _task_agent_kwargs = dict(task_agent_kwargs or {})
         extra_tools = TaskPlanningToolkit().get_tools()
-        _kwargs["tools"] = [*_kwargs.get("tools", []), *extra_tools]
-        self.task_agent = ChatAgent(task_sys_msg, **_kwargs)
+        _task_agent_kwargs["tools"] = [
+            *_task_agent_kwargs.get("tools", []),
+            *extra_tools,
+        ]
+        self.task_agent = ChatAgent(task_sys_msg, **_task_agent_kwargs)
 
     def __repr__(self):
         return (
@@ -671,8 +674,8 @@ class Workforce(BaseNode):
             # Reset state for tasks being moved back to pending
             for task in tasks_to_move_back:
                 # Handle all possible task states
-                if task.state in [TaskState.DONE, TaskState.FAILED]:
-                    task.state = TaskState.OPEN
+                if task.state in [TaskState.DONE, TaskState.OPEN]:
+                    task.state = TaskState.FAILED  # TODO: Add logic for OPEN
                     # Clear result to avoid confusion
                     task.result = None
                     # Reset failure count to give task a fresh start
@@ -823,9 +826,17 @@ class Workforce(BaseNode):
 
         # Check if we're already in an event loop
         try:
-            asyncio.get_running_loop()
+            current_loop = asyncio.get_running_loop()
+            # Store the current loop for potential reuse by async tools
+            self._loop = current_loop
+
+            logger.info(
+                "Running in active event loop context. "
+                "Consider using process_task_async() directly for better "
+                "async tool compatibility."
+            )
 
-            # If we're in an event loop, we need to run in a thread
+            # Create a new thread with a fresh event loop
             def run_in_thread():
                 # Create new event loop for this thread
                 new_loop = asyncio.new_event_loop()
@@ -836,6 +847,8 @@ class Workforce(BaseNode):
                     )
                 finally:
                     new_loop.close()
+                    # Restore original loop reference
+                    self._loop = current_loop
 
             with concurrent.futures.ThreadPoolExecutor() as executor:
                 future = executor.submit(run_in_thread)
@@ -868,7 +881,7 @@ class Workforce(BaseNode):
         self.reset()
         self._task = task
         self._state = WorkforceState.RUNNING
-        task.state = TaskState.OPEN
+        task.state = TaskState.FAILED  # TODO: Add logic for OPEN
         self._pending_tasks.append(task)
 
         # Decompose the task into subtasks first
@@ -982,18 +995,27 @@ class Workforce(BaseNode):
 
     @check_if_running(False)
     def add_single_agent_worker(
-        self, description: str, worker: ChatAgent
+        self,
+        description: str,
+        worker: ChatAgent,
+        pool_max_size: int = 10,
     ) -> Workforce:
         r"""Add a worker node to the workforce that uses a single agent.
 
         Args:
             description (str): Description of the worker node.
             worker (ChatAgent): The agent to be added.
+            pool_max_size (int): Maximum size of the agent pool.
+                (default: :obj:`10`)
 
         Returns:
             Workforce: The workforce node itself.
         """
-        worker_node = SingleAgentWorker(description, worker)
+        worker_node = SingleAgentWorker(
+            description=description,
+            worker=worker,
+            pool_max_size=pool_max_size,
+        )
         self._children.append(worker_node)
         if self.metrics_logger:
             self.metrics_logger.log_worker_created(
@@ -1174,6 +1196,13 @@ class Workforce(BaseNode):
         response = self.coordinator_agent.step(
             prompt, response_format=TaskAssignResult
         )
+        if response.msg is None or response.msg.content is None:
+            logger.error(
+                "Coordinator agent returned empty response for task assignment"
+            )
+            # Return empty result as fallback
+            return TaskAssignResult(assignments=[])
+
         result_dict = json.loads(response.msg.content, parse_int=str)
         task_assign_result = TaskAssignResult(**result_dict)
         return task_assign_result
@@ -1211,8 +1240,21 @@ class Workforce(BaseNode):
         response = self.coordinator_agent.step(
             prompt, response_format=WorkerConf
         )
-        result_dict = json.loads(response.msg.content)
-        new_node_conf = WorkerConf(**result_dict)
+        if response.msg is None or response.msg.content is None:
+            logger.error(
+                "Coordinator agent returned empty response for worker creation"
+            )
+            # Create a fallback worker configuration
+            new_node_conf = WorkerConf(
+                description=f"Fallback worker for "
+                f"task: {task.content[:50]}...",
+                role="General Assistant",
+                sys_msg="You are a general assistant that can help "
+                "with various tasks.",
+            )
+        else:
+            result_dict = json.loads(response.msg.content)
+            new_node_conf = WorkerConf(**result_dict)
 
         new_agent = self._create_new_agent(
             new_node_conf.role,
@@ -1222,6 +1264,7 @@ class Workforce(BaseNode):
         new_node = SingleAgentWorker(
             description=new_node_conf.description,
             worker=new_agent,
+            pool_max_size=10,  # TODO: make this configurable
         )
         new_node.set_channel(self._channel)
 
@@ -1273,14 +1316,17 @@ class Workforce(BaseNode):
             # Add timeout to prevent indefinite waiting
             return await asyncio.wait_for(
                 self._channel.get_returned_task_by_publisher(self.node_id),
-                timeout=300.0,  # 5 minute timeout
+                timeout=180.0,  # 3 minute timeout
             )
         except asyncio.TimeoutError:
             logger.warning(
                 f"Timeout waiting for returned task in "
-                f"workforce {self.node_id}"
+                f"workforce {self.node_id}. "
+                f"This may indicate an issue with async tool execution. "
+                f"Current pending tasks: {len(self._pending_tasks)}, "
+                f"In-flight tasks: {self._in_flight_tasks}"
             )
-            raise ValueError("Timeout waiting for task to be returned")
+            raise
 
     async def _post_ready_tasks(self) -> None:
         r"""Checks for unassigned tasks, assigns them, and then posts any
@@ -1360,10 +1406,10 @@ class Workforce(BaseNode):
                 metadata={'failure_count': task.failure_count},
             )
 
-        if task.failure_count >= 3:
+        if task.failure_count > 3:
             return True
 
-        if task.get_depth() >= 3:
+        if task.get_depth() > 3:
             # Create a new worker node and reassign
             assignee = self._create_worker_node_for_task(task)
 
@@ -1448,25 +1494,32 @@ class Workforce(BaseNode):
                     'processing_time_seconds'
                 ]
 
-            # Get token usage from task additional info
+            # Get token usage from task additional info (preferred - actual
+            # usage)
             if (
                 task.additional_info is not None
                 and 'token_usage' in task.additional_info
             ):
                 token_usage = task.additional_info['token_usage']
-
-            # Try to get token usage from SingleAgentWorker memory if available
-            assignee_node = next(
-                (
-                    child
-                    for child in self._children
-                    if child.node_id == worker_id
-                ),
-                None,
-            )
-            if isinstance(assignee_node, SingleAgentWorker):
-                _, total_tokens = assignee_node.worker.memory.get_context()
-                token_usage = {'total_tokens': total_tokens}
+            else:
+                # Fallback: Try to get token usage from SingleAgentWorker
+                # memory
+                assignee_node = next(
+                    (
+                        child
+                        for child in self._children
+                        if child.node_id == worker_id
+                    ),
+                    None,
+                )
+                if isinstance(assignee_node, SingleAgentWorker):
+                    try:
+                        _, total_tokens = (
+                            assignee_node.worker.memory.get_context()
+                        )
+                        token_usage = {'total_tokens': total_tokens}
+                    except Exception:
+                        token_usage = None
 
             # Log the completed task
             self.metrics_logger.log_task_completed(
@@ -1654,7 +1707,7 @@ class Workforce(BaseNode):
                     await self._graceful_shutdown(returned_task)
                     break
                 elif returned_task.state == TaskState.OPEN:
-                    # TODO: multi-layer workforce
+                    # TODO: Add logic for OPEN
                     pass
                 else:
                     raise ValueError(
@@ -1764,17 +1817,19 @@ class Workforce(BaseNode):
             if isinstance(child, SingleAgentWorker):
                 cloned_worker = child.worker.clone(with_memory)
                 new_instance.add_single_agent_worker(
-                    child.description, cloned_worker
+                    child.description,
+                    cloned_worker,
+                    pool_max_size=10,
                 )
             elif isinstance(child, RolePlayingWorker):
                 new_instance.add_role_playing_worker(
                     child.description,
                     child.assistant_role_name,
                     child.user_role_name,
-                    child.chat_turn_limit,
                     child.assistant_agent_kwargs,
                     child.user_agent_kwargs,
                     child.summarize_agent_kwargs,
+                    child.chat_turn_limit,
                 )
             elif isinstance(child, Workforce):
                 new_instance.add_workforce(child.clone(with_memory))
@@ -1868,7 +1923,7 @@ class Workforce(BaseNode):
             )
 
             try:
-                result_task = await workforce_instance.process_task(task)
+                result_task = await workforce_instance.process_task_async(task)
                 return {
                     "status": "success",
                     "task_id": result_task.id,

camel/tasks/task.py

@@ -25,10 +25,12 @@ from typing import (
     Union,
 )
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 if TYPE_CHECKING:
     from camel.agents import ChatAgent
+import uuid
+
 from camel.logger import get_logger
 from camel.messages import BaseMessage
 from camel.prompts import TextPrompt
@@ -142,27 +144,29 @@ class Task(BaseModel):
         content (str): string content for task.
         id (str): An unique string identifier for the task. This should
             ideally be provided by the provider/model which created the task.
-            (default: :obj: `""`)
+            (default: :obj:`uuid.uuid4()`)
         state (TaskState): The state which should be OPEN, RUNNING, DONE or
-            DELETED. (default: :obj: `TaskState.OPEN`)
-        type (Optional[str]): task type. (default: :obj: `None`)
+            DELETED. (default: :obj:`TaskState.FAILED`)
+        type (Optional[str]): task type. (default: :obj:`None`)
         parent (Optional[Task]): The parent task, None for root task.
-            (default: :obj: `None`)
+            (default: :obj:`None`)
         subtasks (List[Task]): The childrent sub-tasks for the task.
-            (default: :obj: `[]`)
+            (default: :obj:`[]`)
         result (Optional[str]): The answer for the task.
-            (default: :obj: `""`)
+            (default: :obj:`""`)
         failure_count (int): The failure count for the task.
-            (default: :obj: `0`)
+            (default: :obj:`0`)
         additional_info (Optional[Dict[str, Any]]): Additional information for
-            the task. (default: :obj: `None`)
+            the task. (default: :obj:`None`)
     """
 
     content: str
 
-    id: str = ""
+    id: str = Field(default_factory=lambda: str(uuid.uuid4()))
 
-    state: TaskState = TaskState.OPEN
+    state: TaskState = (
+        TaskState.FAILED
+    )  # TODO: Add logic for OPEN in workforce.py
 
     type: Optional[str] = None
 
@@ -204,7 +208,9 @@ class Task(BaseModel):
 
     def reset(self):
         r"""Reset Task to initial state."""
-        self.state = TaskState.OPEN
+        self.state = (
+            TaskState.FAILED
+        )  # TODO: Add logic for OPEN in workforce.py
         self.result = ""
 
     def update_result(self, result: str):

camel/toolkits/__init__.py

@@ -77,6 +77,7 @@ from .aci_toolkit import ACIToolkit
 from .playwright_mcp_toolkit import PlaywrightMCPToolkit
 from .wolfram_alpha_toolkit import WolframAlphaToolkit
 from .task_planning_toolkit import TaskPlanningToolkit
+from .non_visual_browser_toolkit import BrowserNonVisualToolkit
 
 
 __all__ = [
@@ -142,4 +143,5 @@ __all__ = [
     'WolframAlphaToolkit',
     'BohriumToolkit',
     'TaskPlanningToolkit',
+    'BrowserNonVisualToolkit',
 ]

camel/toolkits/aci_toolkit.py

@@ -48,14 +48,14 @@ class ACIToolkit(BaseToolkit):
 
         Args:
             api_key (Optional[str]): The API key for authentication.
-                (default: :obj: `None`)
+                (default: :obj:`None`)
             base_url (Optional[str]): The base URL for the ACI API.
-                (default: :obj: `None`)
+                (default: :obj:`None`)
             linked_account_owner_id (Optional[str]): ID of the owner of the
                 linked account, e.g., "johndoe"
-                (default: :obj: `None`)
+                (default: :obj:`None`)
             timeout (Optional[float]): Request timeout.
-                (default: :obj: `None`)
+                (default: :obj:`None`)
         """
         from aci import ACI
 
@@ -80,20 +80,20 @@ class ACIToolkit(BaseToolkit):
         Args:
             intent (Optional[str]): Search results will be sorted by relevance
                 to this intent.
-                (default: :obj: `None`)
+                (default: :obj:`None`)
             allowed_app_only (bool): If true, only return apps that
                 are allowed by the agent/accessor, identified by the api key.
-                (default: :obj: `True`)
+                (default: :obj:`True`)
             include_functions (bool): If true, include functions
                 (name and description) in the search results.
-                (default: :obj: `False`)
+                (default: :obj:`False`)
             categories (Optional[List[str]]): List of categories to filter the
                 search results. Defaults to an empty list.
-                (default: :obj: `None`)
+                (default: :obj:`None`)
             limit (Optional[int]): Maximum number of results to return.
-                (default: :obj: `10`)
+                (default: :obj:`10`)
             offset (Optional[int]): Offset for pagination.
-                (default: :obj: `0`)
+                (default: :obj:`0`)
 
         Returns:
             Optional[List[AppBasic]]: List of matching apps if successful,
@@ -123,10 +123,10 @@ class ACIToolkit(BaseToolkit):
 
         Args:
             app_names (Optional[List[str]]): List of app names to filter the
-                results. (default: :obj: `None`)
+                results. (default: :obj:`None`)
             limit (Optional[int]): Maximum number of results to return.
-                (default: :obj: `10`)
-            offset (Optional[int]): Offset for pagination. (default: :obj: `0`)
+                (default: :obj:`10`)
+            offset (Optional[int]): Offset for pagination. (default: :obj:`0`)
 
         Returns:
             Union[List[AppConfiguration], str]: List of configured apps if
@@ -356,15 +356,15 @@ class ACIToolkit(BaseToolkit):
 
         Args:
             app_names (Optional[List[str]]): List of app names to filter the
-                search results. (default: :obj: `None`)
+                search results. (default: :obj:`None`)
             intent (Optional[str]): The search query/intent.
-                (default: :obj: `None`)
+                (default: :obj:`None`)
             allowed_apps_only (bool): If true, only return
-                functions from allowed apps. (default: :obj: `True`)
+                functions from allowed apps. (default: :obj:`True`)
             limit (Optional[int]): Maximum number of results to return.
-                (default: :obj: `10`)
+                (default: :obj:`10`)
             offset (Optional[int]): Offset for pagination.
-                (default: :obj: `0`)
+                (default: :obj:`0`)
 
         Returns:
             List[Dict]: List of matching functions
@@ -395,7 +395,7 @@ class ACIToolkit(BaseToolkit):
                 owner id in the ACI dashboard (https://platform.aci.dev).
             allowed_apps_only (bool): If true, only returns functions/apps
                 that are allowed to be used by the agent/accessor, identified
-                by the api key. (default: :obj: `False`)
+                by the api key. (default: :obj:`False`)
 
         Returns:
             Dict: Result of the function execution

camel/toolkits/arxiv_toolkit.py

@@ -49,9 +49,9 @@ class ArxivToolkit(BaseToolkit):
             query (str): The search query string used to search for papers on
                 arXiv.
             paper_ids (List[str], optional): A list of specific arXiv paper
-                IDs to search for. (default: :obj: `None`)
+                IDs to search for. (default: :obj:`None`)
             max_results (int, optional): The maximum number of search results
-                to retrieve. (default: :obj: `5`)
+                to retrieve. (default: :obj:`5`)
 
         Returns:
             Generator: A generator that yields results from the arXiv search
@@ -80,9 +80,9 @@ class ArxivToolkit(BaseToolkit):
         Args:
             query (str): The search query string.
             paper_ids (List[str], optional): A list of specific arXiv paper
-                IDs to search for. (default: :obj: `None`)
+                IDs to search for. (default: :obj:`None`)
             max_results (int, optional): The maximum number of search results
-                to return. (default: :obj: `5`)
+                to return. (default: :obj:`5`)
 
         Returns:
             List[Dict[str, str]]: A list of dictionaries, each containing
@@ -138,9 +138,9 @@ class ArxivToolkit(BaseToolkit):
         Args:
             query (str): The search query string.
             paper_ids (List[str], optional): A list of specific arXiv paper
-                IDs to download. (default: :obj: `None`)
+                IDs to download. (default: :obj:`None`)
             max_results (int, optional): The maximum number of search results
-                to download. (default: :obj: `5`)
+                to download. (default: :obj:`5`)
             output_dir (str, optional): The directory to save the downloaded
                 PDFs. Defaults to the current directory.
 

camel/toolkits/dappier_toolkit.py

@@ -126,22 +126,22 @@ class DappierToolkit(BaseToolkit):
             query (str): The user query for retrieving recommendations.
             data_model_id (str, optional): The data model ID to use for
                 recommendations. Data model IDs always start with the prefix
-                "dm_". (default: :obj: `dm_01j0pb465keqmatq9k83dthx34`)
+                "dm_". (default: :obj:`dm_01j0pb465keqmatq9k83dthx34`)
             similarity_top_k (int, optional): The number of top documents to
-                retrieve based on similarity. (default: :obj: `9`)
+                retrieve based on similarity. (default: :obj:`9`)
             ref (Optional[str], optional): The site domain where AI
-                recommendations should be displayed. (default: :obj: `None`)
+                recommendations should be displayed. (default: :obj:`None`)
             num_articles_ref (int, optional): The minimum number of articles
                 to return from the specified reference domain (`ref`). The
                 remaining articles will come from other sites in the RAG
-                model. (default: :obj: `0`)
+                model. (default: :obj:`0`)
             search_algorithm (Literal[
                 "most_recent",
                 "semantic",
                 "most_recent_semantic",
                 "trending",
                 ], optional): The search algorithm to use for retrieving
-                articles. (default: :obj: `most_recent`)
+                articles. (default: :obj:`most_recent`)
 
         Returns:
             List[Dict[str, str]]: A list of recommended articles or content

camel/toolkits/file_write_toolkit.py

@@ -50,11 +50,11 @@ class FileWriteToolkit(BaseToolkit):
             output_dir (str): The default directory for output files.
                 Defaults to the current working directory.
             timeout (Optional[float]): The timeout for the toolkit.
-                (default: :obj: `None`)
+                (default: :obj:`None`)
             default_encoding (str): Default character encoding for text
-                operations. (default: :obj: `utf-8`)
+                operations. (default: :obj:`utf-8`)
             backup_enabled (bool): Whether to create backups of existing files
-                before overwriting. (default: :obj: `True`)
+                before overwriting. (default: :obj:`True`)
         """
         super().__init__(timeout=timeout)
         self.output_dir = Path(output_dir).resolve()
@@ -96,7 +96,7 @@ class FileWriteToolkit(BaseToolkit):
         Args:
             file_path (Path): The target file path.
             content (str): The text content to write.
-            encoding (str): Character encoding to use. (default: :obj: `utf-8`)
+            encoding (str): Character encoding to use. (default: :obj:`utf-8`)
         """
         with file_path.open("w", encoding=encoding) as f:
             f.write(content)
@@ -157,7 +157,7 @@ class FileWriteToolkit(BaseToolkit):
             content (str): The text content to write.
             use_latex (bool): Whether to use LaTeX for rendering. (requires
                 LaTeX toolchain). If False, uses FPDF for simpler PDF
-                generation. (default: :obj: `False`)
+                generation. (default: :obj:`False`)
 
         Raises:
             RuntimeError: If the 'pylatex' or 'fpdf' library is not installed
@@ -236,7 +236,7 @@ class FileWriteToolkit(BaseToolkit):
             file_path (Path): The target file path.
             content (Union[str, List[List]]): The CSV content as a string or
                 list of lists.
-            encoding (str): Character encoding to use. (default: :obj: `utf-8`)
+            encoding (str): Character encoding to use. (default: :obj:`utf-8`)
         """
         import csv
 
@@ -259,7 +259,7 @@ class FileWriteToolkit(BaseToolkit):
         Args:
             file_path (Path): The target file path.
             content (str): The JSON content as a string.
-            encoding (str): Character encoding to use. (default: :obj: `utf-8`)
+            encoding (str): Character encoding to use. (default: :obj:`utf-8`)
         """
         import json
 
@@ -288,7 +288,7 @@ class FileWriteToolkit(BaseToolkit):
         Args:
             file_path (Path): The target file path.
             content (str): The YAML content as a string.
-            encoding (str): Character encoding to use. (default: :obj: `utf-8`)
+            encoding (str): Character encoding to use. (default: :obj:`utf-8`)
         """
         with file_path.open("w", encoding=encoding) as f:
             f.write(content)
@@ -302,7 +302,7 @@ class FileWriteToolkit(BaseToolkit):
         Args:
             file_path (Path): The target file path.
             content (str): The HTML content to write.
-            encoding (str): Character encoding to use. (default: :obj: `utf-8`)
+            encoding (str): Character encoding to use. (default: :obj:`utf-8`)
         """
         with file_path.open("w", encoding=encoding) as f:
             f.write(content)
@@ -316,7 +316,7 @@ class FileWriteToolkit(BaseToolkit):
         Args:
             file_path (Path): The target file path.
             content (str): The Markdown content to write.
-            encoding (str): Character encoding to use. (default: :obj: `utf-8`)
+            encoding (str): Character encoding to use. (default: :obj:`utf-8`)
         """
         with file_path.open("w", encoding=encoding) as f:
             f.write(content)

camel/toolkits/github_toolkit.py

@@ -158,7 +158,7 @@ class GithubToolkit(BaseToolkit):
         Args:
             repo_name (str): The name of the GitHub repository.
             state (Literal["open", "closed", "all"]): The state of pull
-                requests to retrieve. (default: :obj: `all`)
+                requests to retrieve. (default: :obj:`all`)
                 Options are:
                 - "open": Retrieve only open pull requests.
                 - "closed": Retrieve only closed pull requests.
@@ -202,7 +202,7 @@ class GithubToolkit(BaseToolkit):
         Args:
             repo_name (str): The name of the GitHub repository.
             state (Literal["open", "closed", "all"]): The state of pull
-                requests to retrieve. (default: :obj: `all`)
+                requests to retrieve. (default: :obj:`all`)
                 Options are:
                 - "open": Retrieve only open pull requests.
                 - "closed": Retrieve only closed pull requests.
@@ -285,7 +285,7 @@ class GithubToolkit(BaseToolkit):
             repo_name (str): The name of the GitHub repository.
             path (str): The repository path to start the traversal from.
                 empty string means starts from the root directory.
-                (default: :obj: `""`)
+                (default: :obj:`""`)
 
         Returns:
             List[str]: A list of file paths within the specified directory

camel/toolkits/non_visual_browser_toolkit/__init__.py

@@ -0,0 +1,18 @@
+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+from .browser_non_visual_toolkit import BrowserNonVisualToolkit
+
+__all__ = [
+    "BrowserNonVisualToolkit",
+]