camel-ai 0.2.64__py3-none-any.whl → 0.2.66__py3-none-any.whl

camel/toolkits/mcp_toolkit.py

@@ -98,8 +98,6 @@ class MCPToolkit(BaseToolkit):
         timeout (Optional[float], optional): Timeout for connection attempts
             in seconds. This timeout applies to individual client connections.
             (default: :obj:`None`)
-        strict (Optional[bool], optional): Flag to indicate strict mode.
-            (default: :obj:`False`)
 
     Note:
         At least one of :obj:`clients`, :obj:`config_path`, or
@@ -148,7 +146,6 @@ class MCPToolkit(BaseToolkit):
         config_path: Optional[str] = None,
         config_dict: Optional[Dict[str, Any]] = None,
         timeout: Optional[float] = None,
-        strict: Optional[bool] = False,
     ):
         # Call parent constructor first
         super().__init__(timeout=timeout)
@@ -165,7 +162,6 @@ class MCPToolkit(BaseToolkit):
             raise ValueError(error_msg)
 
         self.clients: List[MCPClient] = clients or []
-        self.strict = strict  # Store strict parameter
         self._is_connected = False
         self._exit_stack: Optional[AsyncExitStack] = None
 
@@ -313,7 +309,6 @@ class MCPToolkit(BaseToolkit):
         config_path: Optional[str] = None,
         config_dict: Optional[Dict[str, Any]] = None,
         timeout: Optional[float] = None,
-        strict: Optional[bool] = False,
     ) -> "MCPToolkit":
         r"""Factory method that creates and connects to all MCP servers.
 
@@ -331,8 +326,6 @@ class MCPToolkit(BaseToolkit):
                 config file. (default: :obj:`None`)
             timeout (Optional[float], optional): Timeout for connection
                 attempts in seconds. (default: :obj:`None`)
-            strict (Optional[bool], optional): Flag to indicate strict mode.
-                (default: :obj:`False`)
 
         Returns:
             MCPToolkit: A fully initialized and connected :obj:`MCPToolkit`
@@ -361,7 +354,6 @@ class MCPToolkit(BaseToolkit):
             config_path=config_path,
             config_dict=config_dict,
             timeout=timeout,
-            strict=strict,
         )
         try:
             await toolkit.connect()
@@ -381,11 +373,10 @@ class MCPToolkit(BaseToolkit):
         config_path: Optional[str] = None,
         config_dict: Optional[Dict[str, Any]] = None,
         timeout: Optional[float] = None,
-        strict: Optional[bool] = False,
     ) -> "MCPToolkit":
         r"""Synchronously create and connect to all MCP servers."""
         return run_async(cls.create)(
-            clients, config_path, config_dict, timeout, strict
+            clients, config_path, config_dict, timeout
         )
 
     def _load_clients_from_config(self, config_path: str) -> List[MCPClient]:
@@ -442,12 +433,10 @@ class MCPToolkit(BaseToolkit):
 
         try:
             # Use the new mcp_client factory function
-            # Pass timeout and strict from toolkit if available
+            # Pass timeout from toolkit if available
             kwargs = {}
             if hasattr(self, "timeout") and self.timeout is not None:
                 kwargs["timeout"] = self.timeout
-            if hasattr(self, "strict") and self.strict is not None:
-                kwargs["strict"] = self.strict
 
             client = create_mcp_client(cfg, **kwargs)
             return client
@@ -455,17 +444,68 @@ class MCPToolkit(BaseToolkit):
             error_msg = f"Failed to create client for server '{name}': {e}"
             raise ValueError(error_msg) from e
 
+    def _ensure_strict_tool_schema(self, tool: FunctionTool) -> FunctionTool:
+        r"""Ensure a tool has a strict schema compatible with OpenAI's
+        requirements.
+
+        Args:
+            tool (FunctionTool): The tool to check and update if necessary.
+
+        Returns:
+            FunctionTool: The tool with a strict schema.
+        """
+        try:
+            schema = tool.get_openai_tool_schema()
+
+            # Check if the tool already has strict mode enabled
+            if schema.get("function", {}).get("strict") is True:
+                return tool
+
+            # Update the schema to be strict
+            if "function" in schema:
+                schema["function"]["strict"] = True
+
+                # Ensure parameters have proper strict mode configuration
+                parameters = schema["function"].get("parameters", {})
+                if parameters:
+                    # Ensure additionalProperties is false
+                    parameters["additionalProperties"] = False
+
+                    # Process properties to handle optional fields
+                    properties = parameters.get("properties", {})
+                    parameters["required"] = list(properties.keys())
+
+                    # Apply the sanitization function from function_tool
+                    from camel.toolkits.function_tool import (
+                        sanitize_and_enforce_required,
+                    )
+
+                    schema = sanitize_and_enforce_required(schema)
+
+            tool.set_openai_tool_schema(schema)
+            logger.debug(
+                f"Updated tool '{tool.get_function_name()}' to strict mode"
+            )
+
+        except Exception as e:
+            logger.warning(f"Failed to ensure strict schema for tool: {e}")
+
+        return tool
+
     def get_tools(self) -> List[FunctionTool]:
         r"""Aggregates all tools from the managed MCP client instances.
 
         Collects and combines tools from all connected MCP clients into a
         single unified list. Each tool is converted to a CAMEL-compatible
-        :obj:`FunctionTool` that can be used with CAMEL agents.
+        :obj:`FunctionTool` that can be used with CAMEL agents. All tools
+        are ensured to have strict schemas compatible with OpenAI's
+        requirements.
 
         Returns:
             List[FunctionTool]: Combined list of all available function tools
-                from all connected MCP servers. Returns an empty list if no
-                clients are connected or if no tools are available.
+                from all connected MCP servers with strict schemas. Returns an
+                empty list if no clients are connected or if no tools are
+                available.
 
         Note:
             This method can be called even when the toolkit is not connected,
@@ -492,14 +532,25 @@ class MCPToolkit(BaseToolkit):
         for i, client in enumerate(self.clients):
             try:
                 client_tools = client.get_tools()
-                all_tools.extend(client_tools)
+
+                # Ensure all tools have strict schemas
+                strict_tools = []
+                for tool in client_tools:
+                    strict_tool = self._ensure_strict_tool_schema(tool)
+                    strict_tools.append(strict_tool)
+
+                all_tools.extend(strict_tools)
                 logger.debug(
-                    f"Client {i+1} contributed {len(client_tools)} tools"
+                    f"Client {i+1} contributed {len(strict_tools)} "
+                    f"tools (strict mode enabled)"
                 )
             except Exception as e:
                 logger.error(f"Failed to get tools from client {i+1}: {e}")
 
-        logger.info(f"Total tools available: {len(all_tools)}")
+        logger.info(
+            f"Total tools available: {len(all_tools)} (all with strict "
+            f"schemas)"
+        )
         return all_tools
 
     def get_text_tools(self) -> str:

camel/toolkits/playwright_mcp_toolkit.py

@@ -27,17 +27,29 @@ class PlaywrightMCPToolkit(BaseToolkit):
     Attributes:
         timeout (Optional[float]): Connection timeout in seconds.
             (default: :obj:`None`)
+        additional_args (Optional[List[str]]): Additional command-line
+            arguments to pass to the Playwright MCP server. For example,
+            `["--cdp-endpoint=http://localhost:9222"]`.
+            (default: :obj:`None`)
 
     Note:
         Currently only supports asynchronous operation mode.
     """
 
-    def __init__(self, timeout: Optional[float] = None) -> None:
-        r"""Initializes the PlaywrightMCPToolkit with the specified timeout.
+    def __init__(
+        self,
+        timeout: Optional[float] = None,
+        additional_args: Optional[List[str]] = None,
+    ) -> None:
+        r"""Initializes the PlaywrightMCPToolkit.
 
         Args:
             timeout (Optional[float]): Connection timeout in seconds.
                 (default: :obj:`None`)
+            additional_args (Optional[List[str]]): Additional command-line
+                arguments to pass to the Playwright MCP server. For example,
+                `["--cdp-endpoint=http://localhost:9222"]`.
+                (default: :obj:`None`)
         """
         super().__init__(timeout=timeout)
 
@@ -46,7 +58,8 @@ class PlaywrightMCPToolkit(BaseToolkit):
                 "mcpServers": {
                     "playwright": {
                         "command": "npx",
-                        "args": ["@playwright/mcp@latest"],
+                        "args": ["@playwright/mcp@latest"]
+                        + (additional_args or []),
                     }
                 }
             }

camel/toolkits/task_planning_toolkit.py

@@ -0,0 +1,134 @@
+# ========= 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. =========
+import uuid
+from typing import List, Optional
+
+from camel.logger import get_logger
+from camel.tasks import Task
+from camel.toolkits import BaseToolkit, FunctionTool
+
+logger = get_logger(__name__)
+
+
+class TaskPlanningToolkit(BaseToolkit):
+    r"""A toolkit for task decomposition and re-planning."""
+
+    def __init__(
+        self,
+        timeout: Optional[float] = None,
+    ):
+        r"""Initialize the TaskPlanningToolkit.
+
+        Args:
+            timeout (Optional[float]): The timeout for the toolkit.
+                (default: :obj: `None`)
+        """
+        super().__init__(timeout=timeout)
+
+    def decompose_task(
+        self,
+        original_task_content: str,
+        sub_task_contents: List[str],
+        original_task_id: Optional[str] = None,
+    ) -> List[Task]:
+        r"""Use the tool to decompose an original task into several sub-tasks.
+        It creates new Task objects from the provided original task content,
+        used when the original task is complex and needs to be decomposed.
+
+        Args:
+            original_task_content (str): The content of the task to be
+                decomposed.
+            sub_task_contents (List[str]): A list of strings, where each
+                string is the content for a new sub-task.
+            original_task_id (Optional[str]): The id of the task to be
+                decomposed. If not provided, a new id will be generated.
+                (default: :obj: `None`)
+
+        Returns:
+            List[Task]: A list of newly created sub-task objects.
+        """
+        # Create the original task object from its content
+        original_task = Task(
+            content=original_task_content,
+            id=original_task_id if original_task_id else str(uuid.uuid4()),
+        )
+
+        new_tasks: List[Task] = []
+        for i, content in enumerate(sub_task_contents):
+            new_task = Task(
+                content=content,
+                id=f"{original_task.id}.{i}",
+                parent=original_task,
+            )
+            new_tasks.append(new_task)
+            original_task.subtasks.append(new_task)
+
+        logger.debug(
+            f"Decomposed task (content: '{original_task.content[:50]}...', "
+            f"id: {original_task.id}) into {len(new_tasks)} sub-tasks: "
+            f"{[task.id for task in new_tasks]}"
+        )
+
+        return new_tasks
+
+    def replan_tasks(
+        self,
+        original_task_content: str,
+        sub_task_contents: List[str],
+        original_task_id: Optional[str] = None,
+    ) -> List[Task]:
+        r"""Use the tool to re_decompose a task into several subTasks.
+        It creates new Task objects from the provided original task content,
+        used when the decomposed tasks are not good enough to help finish
+        the task.
+
+        Args:
+            original_task_content (str): The content of the task to be
+                decomposed.
+            sub_task_contents (List[str]): A list of strings, where each
+                string is the content for a new sub-task.
+            original_task_id (Optional[str]): The id of the task to be
+                decomposed. (default: :obj: `None`)
+
+        Returns:
+            List[Task]: Reordered or modified tasks.
+        """
+        original_task = Task(
+            content=original_task_content,
+            id=original_task_id if original_task_id else str(uuid.uuid4()),
+        )
+
+        new_tasks: List[Task] = []
+        for i, content in enumerate(sub_task_contents):
+            new_task = Task(
+                content=content,
+                id=f"{original_task.id}.{i}",
+                parent=original_task,
+            )
+            new_tasks.append(new_task)
+            original_task.subtasks.append(new_task)
+
+        logger.debug(
+            f"RePlan task (content: '{original_task.content[:50]}...', "
+            f"id: {original_task.id}) into {len(new_tasks)} sub-tasks: "
+            f"{[task.id for task in new_tasks]}"
+        )
+
+        return new_tasks
+
+    def get_tools(self) -> List[FunctionTool]:
+        return [
+            FunctionTool(self.decompose_task),
+            FunctionTool(self.replan_tasks),
+        ]

camel/types/enums.py

@@ -30,7 +30,7 @@ class RoleType(Enum):
 
 
 class ModelType(UnifiedModelType, Enum):
-    DEFAULT = os.getenv("DEFAULT_MODEL_TYPE", "gpt-4o-mini")
+    DEFAULT = os.getenv("DEFAULT_MODEL_TYPE", "gpt-4.1-mini-2025-04-14")
 
     GPT_3_5_TURBO = "gpt-3.5-turbo"
     GPT_4 = "gpt-4"
@@ -47,6 +47,7 @@ class ModelType(UnifiedModelType, Enum):
     GPT_4_1_NANO = "gpt-4.1-nano-2025-04-14"
     O4_MINI = "o4-mini"
     O3 = "o3"
+    O3_PRO = "o3-pro"
 
     AWS_CLAUDE_3_7_SONNET = "anthropic.claude-3-7-sonnet-20250219-v1:0"
     AWS_CLAUDE_3_5_SONNET = "anthropic.claude-3-5-sonnet-20241022-v2:0"
@@ -472,6 +473,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.O1,
             ModelType.O1_PREVIEW,
             ModelType.O1_MINI,
+            ModelType.O3_PRO,
             ModelType.O3_MINI,
             ModelType.GPT_4_5_PREVIEW,
             ModelType.GPT_4_1,
@@ -512,6 +514,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.O1_PREVIEW,
             ModelType.O1_MINI,
             ModelType.O3_MINI,
+            ModelType.O3_PRO,
             ModelType.GPT_4_5_PREVIEW,
             ModelType.GPT_4_1,
             ModelType.GPT_4_1_MINI,
@@ -1207,6 +1210,7 @@ class ModelType(UnifiedModelType, Enum):
         elif self in {
             ModelType.O1,
             ModelType.O3_MINI,
+            ModelType.O3_PRO,
             ModelType.CLAUDE_2_1,
             ModelType.CLAUDE_3_OPUS,
             ModelType.CLAUDE_3_SONNET,

camel/utils/mcp_client.py

@@ -173,8 +173,6 @@ class MCPClient:
             initialization. (default: :obj:`None`)
         timeout (Optional[float], optional): Timeout for waiting for messages
             from the server in seconds. (default: :obj:`10.0`)
-        strict (Optional[bool], optional): Strict mode for generating
-            FunctionTool objects. (default: :obj:`False`)
 
     Examples:
         STDIO server:
@@ -209,20 +207,6 @@ class MCPClient:
             async with MCPClient({"url": "ws://localhost:8080/mcp"}) as client:
                 tools = client.get_tools()
 
-        With strict mode enabled:
-
-        .. code-block:: python
-
-            async with MCPClient({
-                "command": "npx",
-                "args": [
-                    "-y",
-                    "@modelcontextprotocol/server-filesystem",
-                    "/path"
-                ]
-            }, strict=True) as client:
-                tools = client.get_tools()
-
     Attributes:
         config (ServerConfig): The server configuration object.
         client_info (Optional[types.Implementation]): Client implementation
@@ -235,14 +219,12 @@ class MCPClient:
         config: Union[ServerConfig, Dict[str, Any]],
         client_info: Optional[types.Implementation] = None,
         timeout: Optional[float] = 10.0,
-        strict: Optional[bool] = False,
     ):
         # Convert dict config to ServerConfig if needed
         if isinstance(config, dict):
             config = ServerConfig(**config)
 
         self.config = config
-        self.strict = strict
 
         # Validate transport type early (this will raise ValueError if invalid)
         _ = self.config.transport_type
@@ -766,7 +748,6 @@ class MCPClient:
                 "name": mcp_tool.name,
                 "description": mcp_tool.description
                 or "No description provided.",
-                "strict": self.strict,
                 "parameters": parameters,
             },
         }
@@ -932,8 +913,7 @@ def create_mcp_client(
             dictionary is provided, it will be automatically converted to
             a :obj:`ServerConfig`.
         **kwargs: Additional keyword arguments passed to the :obj:`MCPClient`
-            constructor, such as :obj:`client_info`, :obj:`timeout`, and
-            :obj:`strict`.
+            constructor, such as :obj:`client_info`, :obj:`timeout`.
 
     Returns:
         MCPClient: A configured :obj:`MCPClient` instance ready for use as
@@ -972,20 +952,6 @@ def create_mcp_client(
                 "url": "ws://localhost:8080/mcp"
             }) as client:
                 tools = client.get_tools()
-
-        With strict mode enabled:
-
-        .. code-block:: python
-
-            async with create_mcp_client({
-                "command": "npx",
-                "args": [
-                    "-y",
-                    "@modelcontextprotocol/server-filesystem",
-                    "/path",
-                ],
-            }, strict=True) as client:
-                tools = client.get_tools()
     """
     return MCPClient(config, **kwargs)
 

{camel_ai-0.2.64.dist-info → camel_ai-0.2.66.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.64
+Version: 0.2.66
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel
@@ -21,7 +21,6 @@ Requires-Dist: psutil<6,>=5.9.8
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: tiktoken<0.8,>=0.7.0
 Provides-Extra: all
-Requires-Dist: accelerate<0.27,>=0.26.0; extra == 'all'
 Requires-Dist: aci-sdk>=1.0.0b1; extra == 'all'
 Requires-Dist: agentops<0.4,>=0.3.21; extra == 'all'
 Requires-Dist: aiosqlite<0.21,>=0.20.0; extra == 'all'
@@ -53,6 +52,7 @@ Requires-Dist: fastapi>=0.115.11; extra == 'all'
 Requires-Dist: ffmpeg-python<0.3,>=0.2.0; extra == 'all'
 Requires-Dist: firecrawl-py<2,>=1.0.0; extra == 'all'
 Requires-Dist: fish-audio-sdk<2025,>=2024.12.5; extra == 'all'
+Requires-Dist: flask>=2.0; extra == 'all'
 Requires-Dist: fpdf>=1.7.2; extra == 'all'
 Requires-Dist: google-api-python-client==2.166.0; extra == 'all'
 Requires-Dist: google-auth-httplib2==0.2.0; extra == 'all'
@@ -83,9 +83,7 @@ Requires-Dist: newspaper3k<0.3,>=0.2.8; extra == 'all'
 Requires-Dist: notion-client<3,>=2.2.1; extra == 'all'
 Requires-Dist: numpy<=2.2,>=1.2; extra == 'all'
 Requires-Dist: openapi-spec-validator<0.8,>=0.7.1; extra == 'all'
-Requires-Dist: opencv-python<5,>=4; extra == 'all'
 Requires-Dist: openpyxl>=3.1.5; extra == 'all'
-Requires-Dist: outlines<0.2,>=0.1.7; extra == 'all'
 Requires-Dist: pandas<2,>=1.5.3; extra == 'all'
 Requires-Dist: pandasai<3,>=2.3.0; extra == 'all'
 Requires-Dist: playwright>=1.50.0; extra == 'all'
@@ -115,7 +113,6 @@ Requires-Dist: rouge<2,>=1.0.1; extra == 'all'
 Requires-Dist: scenedetect>=0.6.5.2; extra == 'all'
 Requires-Dist: scholarly[tor]==1.7.11; extra == 'all'
 Requires-Dist: scrapegraph-py<2,>=1.12.0; extra == 'all'
-Requires-Dist: sentence-transformers<4,>=3.0.1; extra == 'all'
 Requires-Dist: sentencepiece<0.3,>=0.2; extra == 'all'
 Requires-Dist: slack-bolt<2,>=1.20.1; extra == 'all'
 Requires-Dist: slack-sdk<4,>=3.27.2; extra == 'all'
@@ -125,7 +122,6 @@ Requires-Dist: sympy<2,>=1.13.3; extra == 'all'
 Requires-Dist: tabulate>=0.9.0; extra == 'all'
 Requires-Dist: tavily-python<0.6,>=0.5.0; extra == 'all'
 Requires-Dist: textblob<0.18,>=0.17.1; extra == 'all'
-Requires-Dist: torch; extra == 'all'
 Requires-Dist: transformers<5,>=4; extra == 'all'
 Requires-Dist: tree-sitter-python<0.24,>=0.23.6; extra == 'all'
 Requires-Dist: tree-sitter<0.24,>=0.23.2; extra == 'all'
@@ -162,6 +158,7 @@ Requires-Dist: rouge<2,>=1.0.1; extra == 'data-tools'
 Requires-Dist: stripe<12,>=11.3.0; extra == 'data-tools'
 Requires-Dist: textblob<0.18,>=0.17.1; extra == 'data-tools'
 Provides-Extra: dev
+Requires-Dist: flask>=2.0; extra == 'dev'
 Requires-Dist: gradio<4,>=3; extra == 'dev'
 Requires-Dist: mock<6,>=5; extra == 'dev'
 Requires-Dist: mypy<2,>=1.5.1; extra == 'dev'
@@ -218,13 +215,11 @@ Requires-Dist: tabulate>=0.9.0; extra == 'document-tools'
 Requires-Dist: unstructured==0.16.20; extra == 'document-tools'
 Requires-Dist: xls2xlsx>=0.2.0; extra == 'document-tools'
 Provides-Extra: huggingface
-Requires-Dist: accelerate<0.27,>=0.26.0; extra == 'huggingface'
 Requires-Dist: datasets<4,>=3; extra == 'huggingface'
 Requires-Dist: diffusers<0.26,>=0.25.0; extra == 'huggingface'
-Requires-Dist: opencv-python<5,>=4; extra == 'huggingface'
+Requires-Dist: huggingface-hub; extra == 'huggingface'
 Requires-Dist: sentencepiece<0.3,>=0.2; extra == 'huggingface'
 Requires-Dist: soundfile<0.14,>=0.13; extra == 'huggingface'
-Requires-Dist: torch; extra == 'huggingface'
 Requires-Dist: transformers<5,>=4; extra == 'huggingface'
 Provides-Extra: media-tools
 Requires-Dist: ffmpeg-python<0.3,>=0.2.0; extra == 'media-tools'
@@ -261,9 +256,7 @@ Requires-Dist: mcp-simple-arxiv==0.2.2; extra == 'owl'
 Requires-Dist: newspaper3k<0.3,>=0.2.8; extra == 'owl'
 Requires-Dist: numpy<=2.2,>=1.2; extra == 'owl'
 Requires-Dist: openapi-spec-validator<0.8,>=0.7.1; extra == 'owl'
-Requires-Dist: opencv-python<5,>=4; extra == 'owl'
 Requires-Dist: openpyxl>=3.1.5; extra == 'owl'
-Requires-Dist: outlines<0.2,>=0.1.7; extra == 'owl'
 Requires-Dist: pandas<2,>=1.5.3; extra == 'owl'
 Requires-Dist: pandasai<3,>=2.3.0; extra == 'owl'
 Requires-Dist: playwright>=1.50.0; extra == 'owl'
@@ -304,7 +297,6 @@ Requires-Dist: pyobvector>=0.1.18; extra == 'rag'
 Requires-Dist: pytidb-experimental==0.0.1.dev4; extra == 'rag'
 Requires-Dist: qdrant-client<2,>=1.9.0; extra == 'rag'
 Requires-Dist: rank-bm25<0.3,>=0.2.2; extra == 'rag'
-Requires-Dist: sentence-transformers<4,>=3.0.1; extra == 'rag'
 Requires-Dist: unstructured==0.16.20; extra == 'rag'
 Requires-Dist: weaviate-client>=4.15.0; extra == 'rag'
 Provides-Extra: research-tools