camel-ai 0.2.74a1__tar.gz → 0.2.74a5__tar.gz

{camel_ai-0.2.74a1 → camel_ai-0.2.74a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.74a1
+Version: 0.2.74a5
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel
@@ -254,6 +254,7 @@ Requires-Dist: python-pptx>=1.0.2; extra == 'eigent'
 Requires-Dist: reportlab>=4.4.2; extra == 'eigent'
 Requires-Dist: requests-oauthlib<2,>=1.3.1; extra == 'eigent'
 Requires-Dist: scenedetect>=0.6.5.2; extra == 'eigent'
+Requires-Dist: slack-sdk<4,>=3.27.2; extra == 'eigent'
 Requires-Dist: tabulate>=0.9.0; extra == 'eigent'
 Requires-Dist: websockets<15.1,>=13.0; extra == 'eigent'
 Requires-Dist: wikipedia<2,>=1; extra == 'eigent'

{camel_ai-0.2.74a1 → camel_ai-0.2.74a5}/camel/__init__.py

@@ -14,7 +14,7 @@
 
 from camel.logger import disable_logging, enable_logging, set_log_level
 
-__version__ = '0.2.74a1'
+__version__ = '0.2.74a5'
 
 __all__ = [
     '__version__',

{camel_ai-0.2.74a1 → camel_ai-0.2.74a5}/camel/models/anthropic_model.py

@@ -145,7 +145,10 @@ class AnthropicModel(OpenAICompatibleModel):
                 tokenization style.
         """
         if not self._token_counter:
-            self._token_counter = AnthropicTokenCounter(self.model_type)
+            # Pass the API key to the token counter
+            self._token_counter = AnthropicTokenCounter(
+                self.model_type, api_key=self._api_key
+            )
         return self._token_counter
 
     def check_model_config(self):

{camel_ai-0.2.74a1 → camel_ai-0.2.74a5}/camel/societies/workforce/prompts.py

@@ -198,10 +198,9 @@ Now you should summarize the scenario and return the result of the task.
 
 TASK_DECOMPOSE_PROMPT = r"""You need to either decompose a complex task or enhance a simple one, following these important principles to maximize efficiency and clarity for the executing agents:
 
-0.  **Enhance Simple Tasks, Don't Decompose**: First, evaluate if the task is a single, straightforward action.
-    *   **If the task is simple, DO NOT decompose it.** Instead, **rewrite and enhance** it by consolidating the main goal with any specific details from the additional information into a single, self-contained instruction. The goal is to produce a high-quality task with a clear, specific deliverable.
-    *   For example, a vague task like "Generate a report about camel-ai" should be enhanced to "Generate a comprehensive, well-structured report about camel-ai as one HTML file".
-    *   **Only decompose if a task is truly complex**: A task is complex if it involves multiple distinct steps, requires different worker skills, or can be significantly sped up by running parts in parallel.
+0.  **Analyze Task Complexity**: First, evaluate if the task is a single, straightforward action or a complex one.
+    *   **If the task is complex or could be decomposed into multiple subtasks run in parallel, decompose it.** A task is considered complex if it involves multiple distinct steps, requires different skills, or can be significantly sped up by running parts in parallel.
+    *   **If the task is simple, do not decompose it.** Instead, **rewrite and enhance** it to produce a high-quality task with a clear, specific deliverable.
 
 1.  **Self-Contained Subtasks** (if decomposing): This is critical principle. Each subtask's description **must be fully self-sufficient and independently understandable**. The agent executing the subtask has **no knowledge** of the parent task, other subtasks, or the overall workflow.
     *   **DO NOT** use relative references like "the first task," "the paper mentioned above," or "the result from the previous step."
@@ -230,21 +229,6 @@ These principles aim to reduce overall completion time by maximizing concurrent
 
 **EXAMPLE FORMAT ONLY** (DO NOT use this example content for actual task decomposition):
 
-***
-**Example 0: Simple Task (Enhance, Don't Decompose)**
-
-*   **Overall Task**: "Generate a report about camel-ai"
-*   **Available Workers**:
-    *   `DocumentAgent`: A worker that can read documents and write summaries.
-*   **Correct Output**:
-    ```xml
-    <tasks>
-    <task>Generate a comprehensive, well-structured report about camel-ai as one HTML file</task>
-    </tasks>
-    ```
-*   **Reasoning**: The original task is simple but its details are vague. It is **enhanced** by consolidating all given details (output format, content focus) into a single, precise, and self-contained instruction. This follows the "Enhance Simple Tasks" principle and does not invent new information.
-***
-
 ***
 **Example 1: Sequential Task for a Single Worker**
 

{camel_ai-0.2.74a1 → camel_ai-0.2.74a5}/camel/societies/workforce/workforce.py

@@ -84,7 +84,7 @@ logger = get_logger(__name__)
 # Constants for configuration values
 MAX_TASK_RETRIES = 3
 MAX_PENDING_TASKS_LIMIT = 20
-TASK_TIMEOUT_SECONDS = 180.0
+TASK_TIMEOUT_SECONDS = 480.0
 DEFAULT_WORKER_POOL_SIZE = 10
 
 
@@ -163,6 +163,11 @@ class Workforce(BaseNode):
             for graceful shutdown when a task fails 3 times. During this
             period, the workforce remains active for debugging.
             Set to 0 for immediate shutdown. (default: :obj:`15.0`)
+        task_timeout_seconds (Optional[float], optional): The timeout in
+            seconds for waiting for tasks to be returned by workers. If None,
+            uses the global TASK_TIMEOUT_SECONDS value (600.0 seconds).
+            Increase this value for tasks that require more processing time.
+            (default: :obj:`None`)
         share_memory (bool, optional): Whether to enable shared memory across
             SingleAgentWorker instances in the workforce. When enabled, all
             SingleAgentWorker instances, coordinator agent, and task planning
@@ -231,6 +236,7 @@ class Workforce(BaseNode):
         graceful_shutdown_timeout: float = 15.0,
         share_memory: bool = False,
         use_structured_output_handler: bool = True,
+        task_timeout_seconds: Optional[float] = None,
     ) -> None:
         super().__init__(description)
         self._child_listening_tasks: Deque[
@@ -241,6 +247,9 @@ class Workforce(BaseNode):
         self.graceful_shutdown_timeout = graceful_shutdown_timeout
         self.share_memory = share_memory
         self.use_structured_output_handler = use_structured_output_handler
+        self.task_timeout_seconds = (
+            task_timeout_seconds or TASK_TIMEOUT_SECONDS
+        )
         if self.use_structured_output_handler:
             self.structured_handler = StructuredOutputHandler()
         self.metrics_logger = WorkforceLogger(workforce_id=self.node_id)
@@ -343,12 +352,7 @@ class Workforce(BaseNode):
         # Set up task agent with default system message and required tools
         task_sys_msg = BaseMessage.make_assistant_message(
             role_name="Task Planner",
-            content="You are going to compose and decompose tasks. Keep "
-            "tasks that are sequential and require the same type of "
-            "agent together in one agent process. Only decompose tasks "
-            "that can be handled in parallel and require different types "
-            "of agents. This ensures efficient execution by minimizing "
-            "context switching between agents.",
+            content="You are going to handle tasks.",
         )
         task_planning_tools = TaskPlanningToolkit().get_tools()
 
@@ -2311,7 +2315,7 @@ 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=TASK_TIMEOUT_SECONDS,
+                timeout=self.task_timeout_seconds,
             )
         except Exception as e:
             error_msg = (
@@ -3066,6 +3070,7 @@ class Workforce(BaseNode):
             graceful_shutdown_timeout=self.graceful_shutdown_timeout,
             share_memory=self.share_memory,
             use_structured_output_handler=self.use_structured_output_handler,
+            task_timeout_seconds=self.task_timeout_seconds,
         )
 
         for child in self._children:

{camel_ai-0.2.74a1 → camel_ai-0.2.74a5}/camel/toolkits/note_taking_toolkit.py

@@ -138,7 +138,7 @@ class NoteTakingToolkit(BaseToolkit):
             self.registry.append(note_name)
             self._save_registry()
 
-    def create_note(self, note_name: str, content: str = "") -> str:
+    def create_note(self, note_name: str, content: str) -> str:
         r"""Creates a new note with a unique name.
 
         This function will create a new file for your note.
@@ -149,12 +149,11 @@ class NoteTakingToolkit(BaseToolkit):
         Args:
             note_name (str): The name for your new note (without the .md
                 extension). This name must be unique.
-            content (str, optional): The initial content to write in the note.
-                If not provided, an empty note will be created. Defaults to "".
+            content (str): The initial content to write in the note.
 
         Returns:
             str: A message confirming the creation of the note or an error if
-                 the note name is not valid or already exists.
+                the note name is not valid or already exists.
         """
         try:
             note_path = self.working_directory / f"{note_name}.md"

{camel_ai-0.2.74a1 → camel_ai-0.2.74a5}/camel/toolkits/search_toolkit.py

@@ -35,24 +35,19 @@ class SearchToolkit(BaseToolkit):
     def __init__(
         self,
         timeout: Optional[float] = None,
-        number_of_result_pages: int = 10,
         exclude_domains: Optional[List[str]] = None,
     ):
-        r"""Initializes the RedditToolkit with the specified number of retries
-        and delay.
+        r"""Initializes the SearchToolkit.
 
         Args:
             timeout (float): Timeout for API requests in seconds.
                 (default: :obj:`None`)
-            number_of_result_pages (int): The number of result pages to
-                retrieve. (default: :obj:`10`)
             exclude_domains (Optional[List[str]]): List of domains to
                 exclude from search results. Currently only supported
                 by the `search_google` function.
                 (default: :obj:`None`)
         """
         super().__init__(timeout=timeout)
-        self.number_of_result_pages = number_of_result_pages
         self.exclude_domains = exclude_domains
 
     @dependencies_required("wikipedia")
@@ -167,7 +162,10 @@ class SearchToolkit(BaseToolkit):
 
     @dependencies_required("duckduckgo_search")
     def search_duckduckgo(
-        self, query: str, source: str = "text"
+        self,
+        query: str,
+        source: str = "text",
+        number_of_result_pages: int = 10,
     ) -> List[Dict[str, Any]]:
         r"""Use DuckDuckGo search engine to search information for
         the given query.
@@ -180,6 +178,10 @@ class SearchToolkit(BaseToolkit):
             query (str): The query to be searched.
             source (str): The type of information to query (e.g., "text",
                 "images", "videos"). Defaults to "text".
+            number_of_result_pages (int): The number of result pages to
+                retrieve. Adjust this based on your task - use fewer results
+                for focused searches and more for comprehensive searches.
+                (default: :obj:`10`)
 
         Returns:
             List[Dict[str, Any]]: A list of dictionaries where each dictionary
@@ -194,7 +196,7 @@ class SearchToolkit(BaseToolkit):
         if source == "text":
             try:
                 results = ddgs.text(
-                    keywords=query, max_results=self.number_of_result_pages
+                    keywords=query, max_results=number_of_result_pages
                 )
             except RequestException as e:
                 # Handle specific exceptions or general request exceptions
@@ -214,7 +216,7 @@ class SearchToolkit(BaseToolkit):
         elif source == "images":
             try:
                 results = ddgs.images(
-                    keywords=query, max_results=self.number_of_result_pages
+                    keywords=query, max_results=number_of_result_pages
                 )
             except RequestException as e:
                 # Handle specific exceptions or general request exceptions
@@ -235,7 +237,7 @@ class SearchToolkit(BaseToolkit):
         elif source == "videos":
             try:
                 results = ddgs.videos(
-                    keywords=query, max_results=self.number_of_result_pages
+                    keywords=query, max_results=number_of_result_pages
                 )
             except RequestException as e:
                 # Handle specific exceptions or general request exceptions
@@ -279,6 +281,7 @@ class SearchToolkit(BaseToolkit):
         units: Optional[str] = None,
         extra_snippets: Optional[bool] = None,
         summary: Optional[bool] = None,
+        number_of_result_pages: int = 10,
     ) -> Dict[str, Any]:
         r"""This function queries the Brave search engine API and returns a
         dictionary, representing a search result.
@@ -365,6 +368,10 @@ class SearchToolkit(BaseToolkit):
             summary (Optional[bool]): This parameter enables summary key
                 generation in web search results. This is required for
                 summarizer to be enabled.
+            number_of_result_pages (int): The number of result pages to
+                retrieve. Adjust this based on your task - use fewer results
+                for focused searches and more for comprehensive searches.
+                (default: :obj:`10`)
 
         Returns:
             Dict[str, Any]: A dictionary representing a search result.
@@ -391,7 +398,7 @@ class SearchToolkit(BaseToolkit):
             "country": country,
             "search_lang": search_lang,
             "ui_lang": ui_lang,
-            "count": self.number_of_result_pages,
+            "count": number_of_result_pages,
             "offset": offset,
             "safesearch": safesearch,
             "freshness": freshness,
@@ -444,6 +451,8 @@ class SearchToolkit(BaseToolkit):
         self,
         query: str,
         search_type: str = "web",
+        number_of_result_pages: int = 10,
+        start_page: int = 1,
     ) -> List[Dict[str, Any]]:
         r"""Use Google search engine to search information for the given query.
 
@@ -451,6 +460,15 @@ class SearchToolkit(BaseToolkit):
             query (str): The query to be searched.
             search_type (str): The type of search to perform. Either "web" for
                 web pages or "image" for image search. (default: "web")
+            number_of_result_pages (int): The number of result pages to
+                retrieve. Adjust this based on your task - use fewer results
+                for focused searches and more for comprehensive searches.
+                (default: :obj:`10`)
+            start_page (int): The result page to start from. Use this for
+                pagination - e.g., start_page=1 for results 1-10,
+                start_page=11 for results 11-20, etc. This allows agents to
+                check initial results and continue searching if needed.
+                (default: :obj:`1`)
 
         Returns:
             List[Dict[str, Any]]: A list of dictionaries where each dictionary
@@ -503,8 +521,8 @@ class SearchToolkit(BaseToolkit):
         # https://cse.google.com/cse/all
         SEARCH_ENGINE_ID = os.getenv("SEARCH_ENGINE_ID")
 
-        # Using the first page
-        start_page_idx = 1
+        # Using the specified start page
+        start_page_idx = start_page
         # Different language may get different result
         search_language = "en"
 
@@ -522,7 +540,7 @@ class SearchToolkit(BaseToolkit):
         base_url = (
             f"https://www.googleapis.com/customsearch/v1?"
             f"key={GOOGLE_API_KEY}&cx={SEARCH_ENGINE_ID}&q={modified_query}&start="
-            f"{start_page_idx}&lr={search_language}&num={self.number_of_result_pages}"
+            f"{start_page_idx}&lr={search_language}&num={number_of_result_pages}"
         )
 
         # Add searchType parameter for image search
@@ -620,11 +638,17 @@ class SearchToolkit(BaseToolkit):
             responses.append({"error": f"google search failed: {e!s}"})
         return responses
 
-    def tavily_search(self, query: str, **kwargs) -> List[Dict[str, Any]]:
+    def tavily_search(
+        self, query: str, number_of_result_pages: int = 10, **kwargs
+    ) -> List[Dict[str, Any]]:
         r"""Use Tavily Search API to search information for the given query.
 
         Args:
             query (str): The query to be searched.
+            number_of_result_pages (int): The number of result pages to
+                retrieve. Adjust this based on your task - use fewer results
+                for focused searches and more for comprehensive searches.
+                (default: :obj:`10`)
             **kwargs: Additional optional parameters supported by Tavily's API:
                 - search_depth (str): "basic" or "advanced" search depth.
                 - topic (str): The search category, e.g., "general" or "news."
@@ -661,7 +685,7 @@ class SearchToolkit(BaseToolkit):
 
         try:
             results = client.search(
-                query, max_results=self.number_of_result_pages, **kwargs
+                query, max_results=number_of_result_pages, **kwargs
             )
             return results
         except Exception as e:
@@ -674,6 +698,7 @@ class SearchToolkit(BaseToolkit):
         freshness: str = "noLimit",
         summary: bool = False,
         page: int = 1,
+        number_of_result_pages: int = 10,
     ) -> Dict[str, Any]:
         r"""Query the Bocha AI search API and return search results.
 
@@ -689,6 +714,10 @@ class SearchToolkit(BaseToolkit):
             summary (bool): Whether to include text summaries in results.
                 Default is False.
             page (int): Page number of results. Default is 1.
+            number_of_result_pages (int): The number of result pages to
+                retrieve. Adjust this based on your task - use fewer results
+                for focused searches and more for comprehensive searches.
+                (default: :obj:`10`)
 
         Returns:
             Dict[str, Any]: A dictionary containing search results, including
@@ -710,7 +739,7 @@ class SearchToolkit(BaseToolkit):
                 "query": query,
                 "freshness": freshness,
                 "summary": summary,
-                "count": self.number_of_result_pages,
+                "count": number_of_result_pages,
                 "page": page,
             },
             ensure_ascii=False,
@@ -728,13 +757,19 @@ class SearchToolkit(BaseToolkit):
         except requests.exceptions.RequestException as e:
             return {"error": f"Bocha AI search failed: {e!s}"}
 
-    def search_baidu(self, query: str) -> Dict[str, Any]:
+    def search_baidu(
+        self, query: str, number_of_result_pages: int = 10
+    ) -> Dict[str, Any]:
         r"""Search Baidu using web scraping to retrieve relevant search
         results. This method queries Baidu's search engine and extracts search
         results including titles, descriptions, and URLs.
 
         Args:
             query (str): Search query string to submit to Baidu.
+            number_of_result_pages (int): The number of result pages to
+                retrieve. Adjust this based on your task - use fewer results
+                for focused searches and more for comprehensive searches.
+                (default: :obj:`10`)
 
         Returns:
             Dict[str, Any]: A dictionary containing search results or error
@@ -752,7 +787,7 @@ class SearchToolkit(BaseToolkit):
                 ),
                 "Referer": "https://www.baidu.com",
             }
-            params = {"wd": query, "rn": str(self.number_of_result_pages)}
+            params = {"wd": query, "rn": str(number_of_result_pages)}
 
             response = requests.get(url, headers=headers, params=params)
             response.encoding = "utf-8"
@@ -781,7 +816,7 @@ class SearchToolkit(BaseToolkit):
                         "url": link,
                     }
                 )
-                if len(results) >= self.number_of_result_pages:
+                if len(results) >= number_of_result_pages:
                     break
 
             if not results:
@@ -795,7 +830,9 @@ class SearchToolkit(BaseToolkit):
         except Exception as e:
             return {"error": f"Baidu scraping error: {e!s}"}
 
-    def search_bing(self, query: str) -> Dict[str, Any]:
+    def search_bing(
+        self, query: str, number_of_result_pages: int = 10
+    ) -> Dict[str, Any]:
         r"""Use Bing search engine to search information for the given query.
 
         This function queries the Chinese version of Bing search engine (cn.
@@ -807,6 +844,10 @@ class SearchToolkit(BaseToolkit):
         Args:
             query (str): The search query string to submit to Bing. Works best
                 with Chinese queries or when Chinese results are preferred.
+            number_of_result_pages (int): The number of result pages to
+                retrieve. Adjust this based on your task - use fewer results
+                for focused searches and more for comprehensive searches.
+                (default: :obj:`10`)
 
         Returns:
             Dict ([str, Any]): A dictionary containing either:
@@ -856,9 +897,7 @@ class SearchToolkit(BaseToolkit):
             result_items = b_results_tag.find_all("li")
 
             results: List[Dict[str, Any]] = []
-            for i in range(
-                min(len(result_items), self.number_of_result_pages)
-            ):
+            for i in range(min(len(result_items), number_of_result_pages)):
                 row = result_items[i]
                 if not isinstance(row, Tag):
                     continue
@@ -927,6 +966,7 @@ class SearchToolkit(BaseToolkit):
         exclude_text: Optional[List[str]] = None,
         use_autoprompt: bool = True,
         text: bool = False,
+        number_of_result_pages: int = 10,
     ) -> Dict[str, Any]:
         r"""Use Exa search API to perform intelligent web search with optional
         content extraction.
@@ -948,6 +988,10 @@ class SearchToolkit(BaseToolkit):
                 enhance the query. (default: :obj:`True`)
             text (bool): Whether to include webpage contents in results.
                 (default: :obj:`False`)
+            number_of_result_pages (int): The number of result pages to
+                retrieve. Must be between 1 and 100. Adjust this based on
+                your task - use fewer results for focused searches and more
+                for comprehensive searches. (default: :obj:`10`)
 
         Returns:
             Dict[str, Any]: A dict containing search results and metadata:
@@ -967,8 +1011,8 @@ class SearchToolkit(BaseToolkit):
             exa = Exa(EXA_API_KEY)
 
             if (
-                self.number_of_result_pages is not None
-                and not 0 < self.number_of_result_pages <= 100
+                number_of_result_pages is not None
+                and not 0 < number_of_result_pages <= 100
             ):
                 raise ValueError("num_results must be between 1 and 100")
 
@@ -996,7 +1040,7 @@ class SearchToolkit(BaseToolkit):
                         query=query,
                         type=search_type,
                         category=category,
-                        num_results=self.number_of_result_pages,
+                        num_results=number_of_result_pages,
                         include_text=include_text,
                         exclude_text=exclude_text,
                         use_autoprompt=use_autoprompt,
@@ -1010,7 +1054,7 @@ class SearchToolkit(BaseToolkit):
                         query=query,
                         type=search_type,
                         category=category,
-                        num_results=self.number_of_result_pages,
+                        num_results=number_of_result_pages,
                         include_text=include_text,
                         exclude_text=exclude_text,
                         use_autoprompt=use_autoprompt,
@@ -1043,6 +1087,7 @@ class SearchToolkit(BaseToolkit):
         return_main_text: bool = False,
         return_markdown_text: bool = True,
         enable_rerank: bool = True,
+        number_of_result_pages: int = 10,
     ) -> Dict[str, Any]:
         r"""Query the Alibaba Tongxiao search API and return search results.
 
@@ -1071,6 +1116,10 @@ class SearchToolkit(BaseToolkit):
             enable_rerank (bool): Whether to enable result reranking. If
                 response time is critical, setting this to False can reduce
                 response time by approximately 140ms. (default: :obj:`True`)
+            number_of_result_pages (int): The number of result pages to
+                retrieve. Adjust this based on your task - use fewer results
+                for focused searches and more for comprehensive searches.
+                (default: :obj:`10`)
 
         Returns:
             Dict[str, Any]: A dictionary containing either search results with
@@ -1096,7 +1145,7 @@ class SearchToolkit(BaseToolkit):
         params: Dict[str, Union[str, int]] = {
             "query": query,
             "timeRange": time_range,
-            "page": self.number_of_result_pages,
+            "page": number_of_result_pages,
             "returnMainText": str(return_main_text).lower(),
             "returnMarkdownText": str(return_markdown_text).lower(),
             "enableRerank": str(enable_rerank).lower(),

{camel_ai-0.2.74a1 → camel_ai-0.2.74a5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "camel-ai"
-version = "0.2.74a1"
+version = "0.2.74a5"
 description = "Communicative Agents for AI Society Study"
 authors = [{ name = "CAMEL-AI.org" }]
 requires-python = ">=3.10,<3.13"
@@ -302,6 +302,7 @@ eigent = [
     "exa-py>=1.10.0,<2",
     "reportlab>=4.4.2",
     "onnxruntime<=1.19.2",
+    "slack-sdk>=3.27.2,<4",
 ]
 all = [
     "numpy>=1.2,<=2.2",