camel-ai 0.2.54__tar.gz → 0.2.55__tar.gz

{camel_ai-0.2.54 → camel_ai-0.2.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.54
+Version: 0.2.55
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel

{camel_ai-0.2.54 → camel_ai-0.2.55}/camel/__init__.py

@@ -14,7 +14,7 @@
 
 from camel.logger import disable_logging, enable_logging, set_log_level
 
-__version__ = '0.2.54'
+__version__ = '0.2.55'
 
 __all__ = [
     '__version__',

{camel_ai-0.2.54 → camel_ai-0.2.55}/camel/agents/chat_agent.py

@@ -752,7 +752,7 @@ class ChatAgent(BaseAgent):
             try:
                 openai_messages, num_tokens = self.memory.get_context()
             except RuntimeError as e:
-                return self._step_token_exceed(
+                return self._step_terminate(
                     e.args[1], tool_call_records, "max_tokens_exceeded"
                 )
             # Get response from model backend
@@ -765,8 +765,8 @@ class ChatAgent(BaseAgent):
 
             # Terminate Agent if stop_event is set
             if self.stop_event and self.stop_event.is_set():
-                # Use the _step_token_exceed to terminate the agent with reason
-                return self._step_token_exceed(
+                # Use the _step_terminate to terminate the agent with reason
+                return self._step_terminate(
                     num_tokens, tool_call_records, "termination_triggered"
                 )
 
@@ -851,7 +851,7 @@ class ChatAgent(BaseAgent):
             try:
                 openai_messages, num_tokens = self.memory.get_context()
             except RuntimeError as e:
-                return self._step_token_exceed(
+                return self._step_terminate(
                     e.args[1], tool_call_records, "max_tokens_exceeded"
                 )
 
@@ -864,8 +864,8 @@ class ChatAgent(BaseAgent):
 
             # Terminate Agent if stop_event is set
             if self.stop_event and self.stop_event.is_set():
-                # Use the _step_token_exceed to terminate the agent with reason
-                return self._step_token_exceed(
+                # Use the _step_terminate to terminate the agent with reason
+                return self._step_terminate(
                     num_tokens, tool_call_records, "termination_triggered"
                 )
 
@@ -1396,24 +1396,30 @@ class ChatAgent(BaseAgent):
             )
             output_messages.append(chat_message)
 
-    def _step_token_exceed(
+    def _step_terminate(
         self,
         num_tokens: int,
         tool_calls: List[ToolCallingRecord],
         termination_reason: str,
     ) -> ChatAgentResponse:
-        r"""Return trivial response containing number of tokens and information
-        of called functions when the number of tokens exceeds.
+        r"""Create a response when the agent execution is terminated.
+
+        This method is called when the agent needs to terminate its execution
+        due to various reasons such as token limit exceeded, or other
+        termination conditions. It creates a response with empty messages but
+        includes termination information in the info dictionary.
 
         Args:
             num_tokens (int): Number of tokens in the messages.
             tool_calls (List[ToolCallingRecord]): List of information
                 objects of functions called in the current step.
-            termination_reason (str): String of termination reason.
+            termination_reason (str): String describing the reason for
+                termination.
 
         Returns:
-            ChatAgentResponse: The struct containing trivial outputs and
-                information about token number and called functions.
+            ChatAgentResponse: A response object with empty message list,
+                terminated flag set to True, and an info dictionary containing
+                termination details, token counts, and tool call information.
         """
         self.terminated = True
 

{camel_ai-0.2.54 → camel_ai-0.2.55}/camel/models/model_factory.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
 import json
-from typing import Dict, Optional, Type, Union
+from typing import ClassVar, Dict, Optional, Type, Union
 
 import yaml
 
@@ -62,6 +62,44 @@ class ModelFactory:
         ValueError: in case the provided model type is unknown.
     """
 
+    _MODEL_PLATFORM_TO_CLASS_MAP: ClassVar[
+        Dict[ModelPlatformType, Type[BaseModelBackend]]
+    ] = {
+        ModelPlatformType.OLLAMA: OllamaModel,
+        ModelPlatformType.VLLM: VLLMModel,
+        ModelPlatformType.SGLANG: SGLangModel,
+        ModelPlatformType.OPENAI_COMPATIBLE_MODEL: OpenAICompatibleModel,
+        ModelPlatformType.SAMBA: SambaModel,
+        ModelPlatformType.TOGETHER: TogetherAIModel,
+        ModelPlatformType.LITELLM: LiteLLMModel,
+        ModelPlatformType.AWS_BEDROCK: AWSBedrockModel,
+        ModelPlatformType.NVIDIA: NvidiaModel,
+        ModelPlatformType.SILICONFLOW: SiliconFlowModel,
+        ModelPlatformType.AIML: AIMLModel,
+        ModelPlatformType.VOLCANO: VolcanoModel,
+        ModelPlatformType.NETMIND: NetmindModel,
+        ModelPlatformType.OPENAI: OpenAIModel,
+        ModelPlatformType.AZURE: AzureOpenAIModel,
+        ModelPlatformType.ANTHROPIC: AnthropicModel,
+        ModelPlatformType.GROQ: GroqModel,
+        ModelPlatformType.LMSTUDIO: LMStudioModel,
+        ModelPlatformType.OPENROUTER: OpenRouterModel,
+        ModelPlatformType.ZHIPU: ZhipuAIModel,
+        ModelPlatformType.GEMINI: GeminiModel,
+        ModelPlatformType.MISTRAL: MistralModel,
+        ModelPlatformType.REKA: RekaModel,
+        ModelPlatformType.COHERE: CohereModel,
+        ModelPlatformType.YI: YiModel,
+        ModelPlatformType.QWEN: QwenModel,
+        ModelPlatformType.DEEPSEEK: DeepSeekModel,
+        ModelPlatformType.PPIO: PPIOModel,
+        ModelPlatformType.INTERNLM: InternLMModel,
+        ModelPlatformType.MOONSHOT: MoonshotModel,
+        ModelPlatformType.MODELSCOPE: ModelScopeModel,
+        ModelPlatformType.NOVITA: NovitaModel,
+        ModelPlatformType.WATSONX: WatsonXModel,
+    }
+
     @staticmethod
     def create(
         model_platform: Union[ModelPlatformType, str],
@@ -124,81 +162,15 @@ class ModelFactory:
         model_class: Optional[Type[BaseModelBackend]] = None
         model_type = UnifiedModelType(model_type)
 
-        if model_platform.is_ollama:
-            model_class = OllamaModel
-        elif model_platform.is_vllm:
-            model_class = VLLMModel
-        elif model_platform.is_sglang:
-            model_class = SGLangModel
-        elif model_platform.is_openai_compatible_model:
-            model_class = OpenAICompatibleModel
-        elif model_platform.is_samba:
-            model_class = SambaModel
-        elif model_platform.is_together:
-            model_class = TogetherAIModel
-        elif model_platform.is_litellm:
-            model_class = LiteLLMModel
-        elif model_platform.is_aws_bedrock:
-            model_class = AWSBedrockModel
-        elif model_platform.is_nvidia:
-            model_class = NvidiaModel
-        elif model_platform.is_siliconflow:
-            model_class = SiliconFlowModel
-        elif model_platform.is_aiml:
-            model_class = AIMLModel
-        elif model_platform.is_volcano:
-            model_class = VolcanoModel
-        elif model_platform.is_netmind:
-            model_class = NetmindModel
-
-        elif model_platform.is_openai and model_type.is_openai:
-            model_class = OpenAIModel
-        elif model_platform.is_azure and model_type.is_azure_openai:
-            model_class = AzureOpenAIModel
-        elif model_platform.is_anthropic and model_type.is_anthropic:
-            model_class = AnthropicModel
-        elif model_platform.is_groq and model_type.is_groq:
-            model_class = GroqModel
-        elif model_platform.is_lmstudio and model_type.is_lmstudio:
-            model_class = LMStudioModel
-        elif model_platform.is_openrouter and model_type.is_openrouter:
-            model_class = OpenRouterModel
-        elif model_platform.is_zhipuai and model_type.is_zhipuai:
-            model_class = ZhipuAIModel
-        elif model_platform.is_gemini and model_type.is_gemini:
-            model_class = GeminiModel
-        elif model_platform.is_mistral and model_type.is_mistral:
-            model_class = MistralModel
-        elif model_platform.is_reka and model_type.is_reka:
-            model_class = RekaModel
-        elif model_platform.is_cohere and model_type.is_cohere:
-            model_class = CohereModel
-        elif model_platform.is_yi and model_type.is_yi:
-            model_class = YiModel
-        elif model_platform.is_qwen and model_type.is_qwen:
-            model_class = QwenModel
-        elif model_platform.is_deepseek:
-            model_class = DeepSeekModel
-        elif model_platform.is_ppio:
-            model_class = PPIOModel
-        elif model_platform.is_internlm and model_type.is_internlm:
-            model_class = InternLMModel
-        elif model_platform.is_moonshot and model_type.is_moonshot:
-            model_class = MoonshotModel
-        elif model_platform.is_modelscope:
-            model_class = ModelScopeModel
-        elif model_platform.is_novita:
-            model_class = NovitaModel
-        elif model_type == ModelType.STUB:
+        model_class = ModelFactory._MODEL_PLATFORM_TO_CLASS_MAP.get(
+            model_platform
+        )
+
+        if model_type == ModelType.STUB:
             model_class = StubModel
-        elif model_type.is_watsonx:
-            model_class = WatsonXModel
 
         if model_class is None:
-            raise ValueError(
-                f"Unknown pair of model platform `{model_platform}` "
-                f"and model type `{model_type}`."
-            )
+            raise ValueError(f"Unknown model platform `{model_platform}`")
 
         return model_class(
             model_type=model_type,

{camel_ai-0.2.54 → camel_ai-0.2.55}/camel/toolkits/__init__.py

@@ -68,6 +68,7 @@ from .pyautogui_toolkit import PyAutoGUIToolkit
 from .openai_agent_toolkit import OpenAIAgentToolkit
 from .searxng_toolkit import SearxNGToolkit
 from .jina_reranker_toolkit import JinaRerankerToolkit
+from .pulse_mcp_search_toolkit import PulseMCPSearchToolkit
 from .klavis_toolkit import KlavisToolkit
 from .aci_toolkit import ACIToolkit
 
@@ -126,6 +127,7 @@ __all__ = [
     'OpenAIAgentToolkit',
     'SearxNGToolkit',
     'JinaRerankerToolkit',
+    'PulseMCPSearchToolkit',
     'KlavisToolkit',
     'ACIToolkit',
 ]

{camel_ai-0.2.54 → camel_ai-0.2.55}/camel/toolkits/klavis_toolkit.py

@@ -13,6 +13,7 @@
 # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
 
 import os
+import urllib.parse
 from typing import Any, Dict, List, Optional
 
 import requests
@@ -169,18 +170,6 @@ class KlavisToolkit(BaseToolkit):
         endpoint = f"/mcp-server/instance/delete/{instance_id}"
         return self._request('DELETE', endpoint)
 
-    def get_server_tools(self, server_name: str) -> Dict[str, Any]:
-        r"""Get list of tool names for a specific MCP server.
-
-        Args:
-            server_name (str): The name of the target MCP server.
-
-        Returns:
-            Dict[str, Any]: List of tools available for the specified server.
-        """
-        endpoint = f"/mcp-server/tools/{server_name}"
-        return self._request('GET', endpoint)
-
     def get_all_servers(self) -> Dict[str, Any]:
         r"""Get all MCP servers with their basic information.
 
@@ -209,6 +198,60 @@ class KlavisToolkit(BaseToolkit):
             'POST', endpoint, payload=payload, additional_headers=headers
         )
 
+    def list_tools(self, server_url: str) -> Dict[str, Any]:
+        r"""Lists all tools available for a specific remote MCP server.
+
+        Args:
+            server_url (str): The full URL for connecting to the MCP server
+                via Server-Sent Events (SSE).
+
+        Returns:
+            Dict[str, Any]: Response containing the list of tools or an error.
+        """
+
+        encoded_server_url = urllib.parse.quote(server_url, safe='')
+        endpoint = f"/mcp-server/list-tools/{encoded_server_url}"
+        return self._request('GET', endpoint)
+
+    def call_tool(
+        self,
+        server_url: str,
+        tool_name: str,
+        tool_args: Optional[Dict[str, Any]] = None,
+    ) -> Dict[str, Any]:
+        r"""Calls a remote MCP server tool directly using the provided server
+        URL.
+
+        Args:
+            server_url (str): The full URL for connecting to the MCP server
+                via Server-Sent Events (SSE).
+            tool_name (str): The name of the tool to call.
+            tool_args (Optional[Dict[str, Any]]): The input parameters for
+                the tool. Defaults to None, which might be treated as empty
+                args by the server. (default: :obj:`None`)
+
+        Returns:
+            Dict[str, Any]: Response containing the result of the tool call
+                or an error.
+        """
+        endpoint = "/mcp-server/call-tool"
+        payload: Dict[str, Any] = {
+            "serverUrl": server_url,
+            "toolName": tool_name,
+        }
+        # Add toolArgs only if provided, otherwise server might expect empty
+        # dict
+        if tool_args is not None:
+            payload["toolArgs"] = tool_args
+        else:
+            # Explicitly setting to empty dict based on schema interpretation
+            payload["toolArgs"] = {}
+
+        headers = {'Content-Type': 'application/json'}
+        return self._request(
+            'POST', endpoint, payload=payload, additional_headers=headers
+        )
+
     def get_tools(self) -> List[FunctionTool]:
         r"""Returns a list of FunctionTool objects representing the functions
         in the toolkit.
@@ -222,7 +265,8 @@ class KlavisToolkit(BaseToolkit):
             FunctionTool(self.get_server_instance),
             FunctionTool(self.delete_auth_data),
             FunctionTool(self.delete_server_instance),
-            FunctionTool(self.get_server_tools),
             FunctionTool(self.get_all_servers),
             FunctionTool(self.set_auth_token),
+            FunctionTool(self.list_tools),
+            FunctionTool(self.call_tool),
         ]

{camel_ai-0.2.54 → camel_ai-0.2.55}/camel/toolkits/mcp_toolkit.py

@@ -16,6 +16,7 @@ import json
 import os
 import shlex
 from contextlib import AsyncExitStack, asynccontextmanager
+from datetime import timedelta
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -52,14 +53,15 @@ class MCPClient(BaseToolkit):
 
     Attributes:
         command_or_url (str): URL for SSE mode or command executable for stdio
-            mode. (default: :obj:`'None'`)
+            mode. (default: :obj:`None`)
         args (List[str]): List of command-line arguments if stdio mode is used.
-            (default: :obj:`'None'`)
+            (default: :obj:`None`)
         env (Dict[str, str]): Environment variables for the stdio mode command.
-            (default: :obj:`'None'`)
-        timeout (Optional[float]): Connection timeout. (default: :obj:`'None'`)
+            (default: :obj:`None`)
+        timeout (Optional[float]): Connection timeout.
+            (default: :obj:`None`)
         headers (Dict[str, str]): Headers for the HTTP request.
-            (default: :obj:`'None'`)
+            (default: :obj:`None`)
         strict (Optional[bool]): Whether to enforce strict mode for the
             function call. (default: :obj:`False`)
     """
@@ -111,6 +113,7 @@ class MCPClient(BaseToolkit):
                     sse_client(
                         self.command_or_url,
                         headers=self.headers,
+                        timeout=self.timeout,
                     )
                 )
             else:
@@ -138,7 +141,11 @@ class MCPClient(BaseToolkit):
                 )
 
             self._session = await self._exit_stack.enter_async_context(
-                ClientSession(read_stream, write_stream)
+                ClientSession(
+                    read_stream,
+                    write_stream,
+                    timedelta(seconds=self.timeout) if self.timeout else None,
+                )
             )
             await self._session.initialize()
             list_tools_result = await self.list_mcp_tools()
@@ -399,17 +406,20 @@ class MCPToolkit(BaseToolkit):
 
     Args:
         servers (Optional[List[MCPClient]]): List of MCPClient
-            instances to manage.
+            instances to manage. (default: :obj:`None`)
         config_path (Optional[str]): Path to a JSON configuration file
-            defining MCP servers.
+            defining MCP servers. (default: :obj:`None`)
+        config_dict (Optional[Dict[str, Any]]): Dictionary containing MCP
+            server configurations in the same format as the config file.
+            (default: :obj:`None`)
         strict (Optional[bool]): Whether to enforce strict mode for the
             function call. (default: :obj:`False`)
 
     Note:
-        Either `servers` or `config_path` must be provided. If both are
-        provided, servers from both sources will be combined.
+        Either `servers`, `config_path`, or `config_dict` must be provided.
+        If multiple are provided, servers from all sources will be combined.
 
-        For web servers in the config file, you can specify authorization
+        For web servers in the config, you can specify authorization
         headers using the "headers" field to connect to protected MCP server
         endpoints.
 
@@ -438,14 +448,19 @@ class MCPToolkit(BaseToolkit):
         self,
         servers: Optional[List[MCPClient]] = None,
         config_path: Optional[str] = None,
+        config_dict: Optional[Dict[str, Any]] = None,
         strict: Optional[bool] = False,
     ):
         super().__init__()
 
-        if servers and config_path:
+        sources_provided = sum(
+            1 for src in [servers, config_path, config_dict] if src is not None
+        )
+        if sources_provided > 1:
             logger.warning(
-                "Both servers and config_path are provided. "
-                "Servers from both sources will be combined."
+                "Multiple configuration sources provided "
+                f"({sources_provided}). Servers from all sources "
+                "will be combined."
             )
 
         self.servers: List[MCPClient] = servers or []
@@ -455,6 +470,9 @@ class MCPToolkit(BaseToolkit):
                 self._load_servers_from_config(config_path, strict)
             )
 
+        if config_dict:
+            self.servers.extend(self._load_servers_from_dict(config_dict))
+
         self._exit_stack = AsyncExitStack()
         self._connected = False
 
@@ -484,9 +502,25 @@ class MCPToolkit(BaseToolkit):
             logger.warning(f"Config file not found: '{config_path}'")
             raise e
 
+        return self._load_servers_from_dict(config=data, strict=strict)
+
+    def _load_servers_from_dict(
+        self, config: Dict[str, Any], strict: Optional[bool] = False
+    ) -> List[MCPClient]:
+        r"""Loads MCP server configurations from a dictionary.
+
+        Args:
+            config (Dict[str, Any]): Dictionary containing server
+                configurations.
+            strict (bool): Whether to enforce strict mode for the
+                function call. (default: :obj:`False`)
+
+        Returns:
+            List[MCPClient]: List of configured MCPClient instances.
+        """
         all_servers = []
 
-        mcp_servers = data.get("mcpServers", {})
+        mcp_servers = config.get("mcpServers", {})
         if not isinstance(mcp_servers, dict):
             logger.warning("'mcpServers' is not a dictionary, skipping...")
             mcp_servers = {}
@@ -505,11 +539,16 @@ class MCPToolkit(BaseToolkit):
                 )
                 continue
 
+            # Include headers if provided in the configuration
+            headers = cfg.get("headers", {})
+
+            cmd_or_url = cast(str, cfg.get("command") or cfg.get("url"))
             server = MCPClient(
-                command_or_url=cast(str, cfg.get("command") or cfg.get("url")),
+                command_or_url=cmd_or_url,
                 args=cfg.get("args", []),
                 env={**os.environ, **cfg.get("env", {})},
                 timeout=cfg.get("timeout", None),
+                headers=headers,
                 strict=strict,
             )
             all_servers.append(server)

camel_ai-0.2.55/camel/toolkits/pulse_mcp_search_toolkit.py

@@ -0,0 +1,132 @@
+# ========= 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 typing import Any, Dict, List, Optional
+
+import requests
+
+from camel.toolkits.base import BaseToolkit
+from camel.toolkits.function_tool import FunctionTool
+from camel.utils import MCPServer
+
+
+@MCPServer()
+class PulseMCPSearchToolkit(BaseToolkit):
+    r"""A toolkit for searching MCP servers using the PulseMCP API."""
+
+    def __init__(self, timeout: Optional[float] = None):
+        super().__init__(timeout=timeout)
+        self.api_base_url = "https://api.pulsemcp.com/v0beta"
+
+    def search_mcp_servers(
+        self,
+        query: Optional[str] = None,
+        top_k: Optional[int] = 5,
+        package_registry: Optional[str] = None,
+        count_per_page: int = 5000,
+        offset: int = 0,
+    ) -> Dict[str, Any]:
+        r"""Search for MCP servers using the PulseMCP API.
+
+        Args:
+            query (Optional[str]): The query to search for.
+                (default: :obj:`None`)
+            top_k (Optional[int]): After sorting, return only the top_k
+                servers. (default: :obj:`5`)
+            package_registry (Optional[str]): The package registry to search
+                for. (default: :obj:`None`)
+            count_per_page (int): The number of servers to return per page.
+                (default: :obj:`5000`)
+            offset (int): The offset to start the search from.
+                (default: :obj:`0`)
+
+        Returns:
+            Dict[str, Any]: A dictionary containing the search results or
+                an error message.
+        """
+        params: Dict[str, Any] = {
+            "count_per_page": min(count_per_page, 5000),
+            "offset": offset,
+        }
+        if query:
+            params["query"] = query
+
+        response = requests.get(f"{self.api_base_url}/servers", params=params)
+
+        if response.status_code != 200:
+            error_msg = f"Error searching MCP servers: {response.status_code}"
+            if response.text:
+                try:
+                    error_info = response.json()
+                    if "error" in error_info:
+                        msg = error_info['error'].get('message', '')
+                        error_msg = f"{error_msg} - {msg}"
+                except Exception:
+                    error_msg = f"{error_msg} - {response.text}"
+            return {"error": error_msg}
+
+        data = response.json()
+        servers = data.get("servers", [])
+
+        if package_registry:
+            package_registry_lower = package_registry.lower()
+            servers = [
+                server
+                for server in servers
+                if isinstance(server.get("package_registry"), str)
+                and server.get("package_registry").lower()
+                == package_registry_lower
+            ]
+
+        if query:
+            query_lower = query.lower()
+            # Helper function to calculate score
+            # 1. With name +5
+            # 2. With description +3
+            # 3. With stars +1
+
+            def score(server: Dict[str, Any]) -> float:
+                name = server.get("name", "").lower()
+                desc = server.get("short_description", "").lower()
+                stars = server.get("github_stars", 0) or 0
+                score: float = 0.0
+                if query_lower in name:
+                    score += 5
+                if query_lower in desc:
+                    score += 3
+                score += stars / 1000
+                return score
+
+            servers = sorted(servers, key=score, reverse=True)
+        else:
+            servers = sorted(
+                servers,
+                key=lambda x: x.get("github_stars", 0) or 0,
+                reverse=True,
+            )
+
+        if top_k is not None:
+            servers = servers[:top_k]
+
+        return {"servers": servers}
+
+    def get_tools(self) -> List[FunctionTool]:
+        r"""Returns a list of FunctionTool objects representing the
+        functions in the toolkit.
+
+        Returns:
+            List[FunctionTool]: A list of FunctionTool objects.
+        """
+        return [
+            FunctionTool(self.search_mcp_servers),
+        ]

{camel_ai-0.2.54 → camel_ai-0.2.55}/camel/types/enums.py

@@ -475,6 +475,16 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.GPT_4_TURBO,
             ModelType.GPT_4O,
             ModelType.GPT_4O_MINI,
+            ModelType.O1,
+            ModelType.O1_PREVIEW,
+            ModelType.O1_MINI,
+            ModelType.O3_MINI,
+            ModelType.GPT_4_5_PREVIEW,
+            ModelType.GPT_4_1,
+            ModelType.GPT_4_1_MINI,
+            ModelType.GPT_4_1_NANO,
+            ModelType.O4_MINI,
+            ModelType.O3,
         }
 
     @property
@@ -1389,6 +1399,7 @@ class ModelPlatformType(Enum):
     MISTRAL = "mistral"
     REKA = "reka"
     TOGETHER = "together"
+    STUB = "stub"
     OPENAI_COMPATIBLE_MODEL = "openai-compatible-model"
     SAMBA = "samba-nova"
     COHERE = "cohere"
@@ -1577,6 +1588,11 @@ class ModelPlatformType(Enum):
         r"""Returns whether this platform is Novita."""
         return self is ModelPlatformType.NOVITA
 
+    @property
+    def is_watsonx(self) -> bool:
+        r"""Returns whether this platform is WatsonX."""
+        return self is ModelPlatformType.WATSONX
+
 
 class AudioModelType(Enum):
     TTS_1 = "tts-1"