camel-ai 0.2.74a4__py3-none-any.whl → 0.2.75a0__py3-none-any.whl

camel/toolkits/search_toolkit.py

@@ -13,6 +13,7 @@
 # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
 import os
 from typing import Any, Dict, List, Literal, Optional, TypeAlias, Union, cast
+from urllib.parse import quote
 
 import requests
 
@@ -516,6 +517,29 @@ class SearchToolkit(BaseToolkit):
         """
         import requests
 
+        # Validate input parameters
+        if not isinstance(start_page, int) or start_page < 1:
+            raise ValueError("start_page must be a positive integer")
+
+        if (
+            not isinstance(number_of_result_pages, int)
+            or number_of_result_pages < 1
+        ):
+            raise ValueError(
+                "number_of_result_pages must be a positive integer"
+            )
+
+        # Google Custom Search API has a limit of 10 results per request
+        if number_of_result_pages > 10:
+            logger.warning(
+                f"Google API limits results to 10 per request. "
+                f"Requested {number_of_result_pages}, using 10 instead."
+            )
+            number_of_result_pages = 10
+
+        if search_type not in ["web", "image"]:
+            raise ValueError("search_type must be either 'web' or 'image'")
+
         # https://developers.google.com/custom-search/v1/overview
         GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
         # https://cse.google.com/cse/all
@@ -535,11 +559,13 @@ class SearchToolkit(BaseToolkit):
             modified_query = f"{query} {exclusion_terms}"
             logger.debug(f"Excluded domains, modified query: {modified_query}")
 
+        encoded_query = quote(modified_query)
+
         # Constructing the URL
         # Doc: https://developers.google.com/custom-search/v1/using_rest
         base_url = (
             f"https://www.googleapis.com/customsearch/v1?"
-            f"key={GOOGLE_API_KEY}&cx={SEARCH_ENGINE_ID}&q={modified_query}&start="
+            f"key={GOOGLE_API_KEY}&cx={SEARCH_ENGINE_ID}&q={encoded_query}&start="
             f"{start_page_idx}&lr={search_language}&num={number_of_result_pages}"
         )
 
@@ -552,8 +578,8 @@ class SearchToolkit(BaseToolkit):
         responses = []
         # Fetch the results given the URL
         try:
-            # Make the get
-            result = requests.get(url)
+            result = requests.get(url, timeout=30)
+            result.raise_for_status()  # Raise exception for bad status codes
             data = result.json()
 
             # Get the result items
@@ -592,28 +618,31 @@ class SearchToolkit(BaseToolkit):
 
                         responses.append(response)
                     else:
-                        # Process web search results (existing logic)
-                        # Check metatags are present
-                        if "pagemap" not in search_item:
-                            continue
-                        if "metatags" not in search_item["pagemap"]:
-                            continue
+                        title = search_item.get("title", "")
+                        snippet = search_item.get("snippet", "")
+                        link = search_item.get("link", "")
+
+                        long_description = "N/A"
                         if (
-                            "og:description"
-                            in search_item["pagemap"]["metatags"][0]
+                            "pagemap" in search_item
+                            and "metatags" in search_item["pagemap"]
                         ):
-                            long_description = search_item["pagemap"][
-                                "metatags"
-                            ][0]["og:description"]
-                        else:
-                            long_description = "N/A"
-                        # Get the page title
-                        title = search_item.get("title")
-                        # Page snippet
-                        snippet = search_item.get("snippet")
+                            metatags = search_item["pagemap"]["metatags"]
+                            if metatags and len(metatags) > 0:
+                                meta = metatags[0]
+                                long_description = (
+                                    meta.get("og:description")
+                                    or meta.get("description")
+                                    or meta.get("twitter:description")
+                                    or "N/A"
+                                )
+
+                        if not title and not snippet and not link:
+                            logger.debug(
+                                f"Skipping result {i} due to missing essential fields"
+                            )
+                            continue
 
-                        # Extract the page url
-                        link = search_item.get("link")
                         response = {
                             "result_id": i,
                             "title": title,
@@ -623,19 +652,74 @@ class SearchToolkit(BaseToolkit):
                         }
                         responses.append(response)
             else:
+                logger.debug(f"Google API response without items: {data}")
                 error_info = data.get("error", {})
-                logger.error(
-                    f"Google search failed - API response: {error_info}"
-                )
+                if error_info:
+                    error_code = error_info.get("code", "Unknown")
+                    error_message = error_info.get("message", "Unknown error")
+                    error_details = f"Error {error_code}: {error_message}"
+                else:
+                    error_details = (
+                        "No results found or API returned empty response"
+                    )
+
+                logger.error(f"Google search failed - {error_details}")
                 responses.append(
-                    {
-                        "error": f"Google search failed - "
-                        f"API response: {error_info}"
-                    }
+                    {"error": f"Google search failed - {error_details}"}
                 )
 
+        except requests.exceptions.Timeout:
+            logger.error("Google search request timed out")
+            responses.append(
+                {"error": "Google search request timed out after 30 seconds"}
+            )
+        except requests.exceptions.HTTPError as e:
+            error_message = f"Google API HTTP error: {e}"
+            try:
+                error_data = e.response.json()
+                if "error" in error_data and "message" in error_data["error"]:
+                    api_error_message = error_data["error"]["message"]
+                    error_code = error_data["error"].get(
+                        "code", e.response.status_code
+                    )
+                    error_message = (
+                        f"Google API error {error_code}: {api_error_message}"
+                    )
+
+                    if e.response.status_code == 429:
+                        error_message = f"Google API rate limit exceeded: {api_error_message}"
+                    elif e.response.status_code == 400:
+                        if "API key" in api_error_message:
+                            error_message = (
+                                f"Invalid Google API key: {api_error_message}"
+                            )
+                        else:
+                            error_message = f"Bad request to Google API: {api_error_message}"
+            except (ValueError, KeyError):
+                if e.response.status_code == 429:
+                    error_message = "Google API rate limit exceeded. Please try again later."
+                elif e.response.status_code == 400:
+                    error_message = "Google API bad request. Please check your API key and search engine ID."
+                elif e.response.status_code == 403:
+                    error_message = "Google API access forbidden. Please check your API key permissions."
+
+            logger.error(error_message)
+            responses.append({"error": error_message})
+        except requests.exceptions.RequestException as e:
+            logger.error(f"Google search network error: {e}")
+            responses.append(
+                {"error": f"Network error during Google search: {e!s}"}
+            )
+        except ValueError as e:
+            logger.error(f"Google search response parsing error: {e}")
+            responses.append(
+                {"error": f"Failed to parse Google search response: {e!s}"}
+            )
         except Exception as e:
-            responses.append({"error": f"google search failed: {e!s}"})
+            logger.error(f"Unexpected error during Google search: {e}")
+            responses.append(
+                {"error": f"Unexpected error during Google search: {e!s}"}
+            )
         return responses
 
     def tavily_search(
@@ -1233,6 +1317,73 @@ class SearchToolkit(BaseToolkit):
                 f"search: {e!s}"
             }
 
+    @api_keys_required([(None, 'METASO_API_KEY')])
+    def search_metaso(
+        self,
+        query: str,
+        page: int = 1,
+        include_summary: bool = False,
+        include_raw_content: bool = False,
+        concise_snippet: bool = False,
+        scope: Literal[
+            "webpage", "document", "scholar", "image", "video", "podcast"
+        ] = "webpage",
+    ) -> Dict[str, Any]:
+        r"""Perform a web search using the metaso.cn API.
+
+        Args:
+            query (str): The search query string.
+            page (int): Page number. (default: :obj:`1`)
+            include_summary (bool): Whether to include summary in the result.
+                (default: :obj:`False`)
+            include_raw_content (bool): Whether to include raw content in the
+                result. (default: :obj:`False`)
+            concise_snippet (bool): Whether to return concise snippet.
+                (default: :obj:`False`)
+            scope (Literal["webpage", "document", "scholar", "image", "video",
+                "podcast"]): Search scope. (default: :obj:`"webpage"`)
+
+        Returns:
+            Dict[str, Any]: Search results or error information.
+        """
+        import http.client
+        import json
+
+        # It is recommended to put the token in environment variable for
+        # security
+
+        METASO_API_KEY = os.getenv("METASO_API_KEY")
+
+        conn = http.client.HTTPSConnection("metaso.cn")
+        payload = json.dumps(
+            {
+                "q": query,
+                "scope": scope,
+                "includeSummary": include_summary,
+                "page": str(page),
+                "includeRawContent": include_raw_content,
+                "conciseSnippet": concise_snippet,
+            }
+        )
+        headers = {
+            'Authorization': f'Bearer {METASO_API_KEY}',
+            'Accept': 'application/json',
+            'Content-Type': 'application/json',
+        }
+        try:
+            conn.request("POST", "/api/v1/search", payload, headers)
+            res = conn.getresponse()
+            data = res.read()
+            result = data.decode("utf-8")
+            try:
+                return json.loads(result)
+            except Exception:
+                return {
+                    "error": f"Metaso returned content could not be parsed: {result}"
+                }
+        except Exception as e:
+            return {"error": f"Metaso search failed: {e}"}
+
     def get_tools(self) -> List[FunctionTool]:
         r"""Returns a list of FunctionTool objects representing the
         functions in the toolkit.
@@ -1253,4 +1404,5 @@ class SearchToolkit(BaseToolkit):
             FunctionTool(self.search_bing),
             FunctionTool(self.search_exa),
             FunctionTool(self.search_alibaba_tongxiao),
+            FunctionTool(self.search_metaso),
         ]

camel/types/enums.py

@@ -59,6 +59,7 @@ class ModelType(UnifiedModelType, Enum):
     AWS_LLAMA_3_2_11B_INSTRUCT = "us.meta.llama3-2-11b-instruct-v1:0"
     AWS_CLAUDE_SONNET_4 = "anthropic.claude-sonnet-4-20250514-v1:0"
     AWS_CLAUDE_OPUS_4 = "anthropic.claude-opus-4-20250514-v1:0"
+    AWS_CLAUDE_OPUS_4_1 = "anthropic.claude-opus-4-1-20250805-v1:0"
 
     GLM_4 = "glm-4"
     GLM_4V = "glm-4v"
@@ -91,6 +92,7 @@ class ModelType(UnifiedModelType, Enum):
     OPENROUTER_LLAMA_4_SCOUT = "meta-llama/llama-4-scout"
     OPENROUTER_LLAMA_4_SCOUT_FREE = "meta-llama/llama-4-scout:free"
     OPENROUTER_OLYMPICODER_7B = "open-r1/olympiccoder-7b:free"
+    OPENROUTER_HORIZON_ALPHA = "openrouter/horizon-alpha"
 
     # LMStudio models
     LMSTUDIO_GEMMA_3_1B = "gemma-3-1b"
@@ -157,6 +159,7 @@ class ModelType(UnifiedModelType, Enum):
     CLAUDE_3_7_SONNET = "claude-3-7-sonnet-latest"
     CLAUDE_SONNET_4 = "claude-sonnet-4-20250514"
     CLAUDE_OPUS_4 = "claude-opus-4-20250514"
+    CLAUDE_OPUS_4_1 = "claude-opus-4-1-20250805"
 
     # Netmind models
     NETMIND_LLAMA_4_MAVERICK_17B_128E_INSTRUCT = (
@@ -513,6 +516,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.AWS_LLAMA_3_2_11B_INSTRUCT,
             ModelType.AWS_CLAUDE_SONNET_4,
             ModelType.AWS_CLAUDE_OPUS_4,
+            ModelType.AWS_CLAUDE_OPUS_4_1,
         }
 
     @property
@@ -577,6 +581,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.CLAUDE_3_7_SONNET,
             ModelType.CLAUDE_SONNET_4,
             ModelType.CLAUDE_OPUS_4,
+            ModelType.CLAUDE_OPUS_4_1,
         }
 
     @property
@@ -603,6 +608,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.OPENROUTER_LLAMA_4_SCOUT,
             ModelType.OPENROUTER_LLAMA_4_SCOUT_FREE,
             ModelType.OPENROUTER_OLYMPICODER_7B,
+            ModelType.OPENROUTER_HORIZON_ALPHA,
         }
 
     @property
@@ -1262,6 +1268,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.CLAUDE_3_7_SONNET,
             ModelType.CLAUDE_SONNET_4,
             ModelType.CLAUDE_OPUS_4,
+            ModelType.CLAUDE_OPUS_4_1,
             ModelType.YI_MEDIUM_200K,
             ModelType.AWS_CLAUDE_3_5_SONNET,
             ModelType.AWS_CLAUDE_3_HAIKU,
@@ -1269,6 +1276,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.AWS_CLAUDE_3_7_SONNET,
             ModelType.AWS_CLAUDE_SONNET_4,
             ModelType.AWS_CLAUDE_OPUS_4,
+            ModelType.AWS_CLAUDE_OPUS_4_1,
             ModelType.O4_MINI,
             ModelType.O3,
         }:
@@ -1276,6 +1284,7 @@ class ModelType(UnifiedModelType, Enum):
         elif self in {
             ModelType.MISTRAL_CODESTRAL_MAMBA,
             ModelType.OPENROUTER_LLAMA_4_MAVERICK_FREE,
+            ModelType.OPENROUTER_HORIZON_ALPHA,
         }:
             return 256_000
 

camel/utils/mcp.py

@@ -106,11 +106,11 @@ class MCPServer:
         """
         from mcp.server.fastmcp import FastMCP
 
-        from camel.toolkits.base import BaseToolkit
-
         original_init = cls.__init__
 
         def new_init(instance, *args, **kwargs):
+            from camel.toolkits.base import BaseToolkit
+
             original_init(instance, *args, **kwargs)
             self.server_name = self.server_name or cls.__name__
             instance.mcp = FastMCP(self.server_name)

camel/utils/token_counting.py

@@ -280,15 +280,26 @@ class OpenAITokenCounter(BaseTokenCounter):
 
 class AnthropicTokenCounter(BaseTokenCounter):
     @dependencies_required('anthropic')
-    def __init__(self, model: str):
+    def __init__(
+        self,
+        model: str,
+        api_key: Optional[str] = None,
+        base_url: Optional[str] = None,
+    ):
         r"""Constructor for the token counter for Anthropic models.
 
         Args:
             model (str): The name of the Anthropic model being used.
+            api_key (Optional[str], optional): The API key for authenticating
+                with the Anthropic service. If not provided, it will use the
+                ANTHROPIC_API_KEY environment variable. (default: :obj:`None`)
+            base_url (Optional[str], optional): The URL of the Anthropic
+                service. If not provided, it will use the default Anthropic
+                URL. (default: :obj:`None`)
         """
         from anthropic import Anthropic
 
-        self.client = Anthropic()
+        self.client = Anthropic(api_key=api_key, base_url=base_url)
         self.model = model
 
     @dependencies_required('anthropic')

{camel_ai-0.2.74a4.dist-info → camel_ai-0.2.75a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.74a4
+Version: 0.2.75a0
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel
@@ -32,7 +32,7 @@ Requires-Dist: azure-storage-blob<13,>=12.21.0; extra == 'all'
 Requires-Dist: beautifulsoup4<5,>=4; extra == 'all'
 Requires-Dist: botocore<2,>=1.35.3; extra == 'all'
 Requires-Dist: chromadb<1.0.0,>=0.6.0; extra == 'all'
-Requires-Dist: chunkr-ai>=0.0.50; extra == 'all'
+Requires-Dist: chunkr-ai<0.1.0,>=0.0.50; extra == 'all'
 Requires-Dist: cohere<6,>=5.11.0; extra == 'all'
 Requires-Dist: crawl4ai>=0.4.0; extra == 'all'
 Requires-Dist: dappier<0.4,>=0.3.3; extra == 'all'
@@ -206,7 +206,7 @@ Requires-Dist: sphinx<8,>=7; extra == 'docs'
 Requires-Dist: sphinxext-rediraffe<0.3,>=0.2.7; extra == 'docs'
 Provides-Extra: document-tools
 Requires-Dist: beautifulsoup4<5,>=4; extra == 'document-tools'
-Requires-Dist: chunkr-ai>=0.0.50; extra == 'document-tools'
+Requires-Dist: chunkr-ai<0.1.0,>=0.0.50; extra == 'document-tools'
 Requires-Dist: crawl4ai>=0.3.745; extra == 'document-tools'
 Requires-Dist: docx2txt<0.9,>=0.8; extra == 'document-tools'
 Requires-Dist: docx>=0.2.4; extra == 'document-tools'
@@ -227,8 +227,8 @@ Requires-Dist: xls2xlsx>=0.2.0; extra == 'document-tools'
 Provides-Extra: eigent
 Requires-Dist: aci-sdk>=1.0.0b1; extra == 'eigent'
 Requires-Dist: anthropic<0.50.0,>=0.47.0; extra == 'eigent'
+Requires-Dist: chunkr-ai<0.1.0,>=0.0.50; extra == 'eigent'
 Requires-Dist: chunkr-ai>=0.0.41; extra == 'eigent'
-Requires-Dist: chunkr-ai>=0.0.50; extra == 'eigent'
 Requires-Dist: crawl4ai>=0.3.745; extra == 'eigent'
 Requires-Dist: datasets<4,>=3; extra == 'eigent'
 Requires-Dist: docx>=0.2.4; extra == 'eigent'
@@ -286,8 +286,8 @@ Provides-Extra: owl
 Requires-Dist: aci-sdk>=1.0.0b1; extra == 'owl'
 Requires-Dist: anthropic<0.50.0,>=0.47.0; extra == 'owl'
 Requires-Dist: beautifulsoup4<5,>=4; extra == 'owl'
+Requires-Dist: chunkr-ai<0.1.0,>=0.0.50; extra == 'owl'
 Requires-Dist: chunkr-ai>=0.0.41; extra == 'owl'
-Requires-Dist: chunkr-ai>=0.0.50; extra == 'owl'
 Requires-Dist: crawl4ai>=0.3.745; extra == 'owl'
 Requires-Dist: datasets<4,>=3; extra == 'owl'
 Requires-Dist: docx2txt<0.9,>=0.8; extra == 'owl'
@@ -335,7 +335,7 @@ Requires-Dist: xls2xlsx>=0.2.0; extra == 'owl'
 Requires-Dist: yt-dlp<2025,>=2024.11.4; extra == 'owl'
 Provides-Extra: rag
 Requires-Dist: chromadb<1.0.0,>=0.6.0; extra == 'rag'
-Requires-Dist: chunkr-ai>=0.0.50; extra == 'rag'
+Requires-Dist: chunkr-ai<0.1.0,>=0.0.50; extra == 'rag'
 Requires-Dist: cohere<6,>=5.11.0; extra == 'rag'
 Requires-Dist: crawl4ai>=0.3.745; extra == 'rag'
 Requires-Dist: faiss-cpu<2,>=1.7.2; extra == 'rag'