camel-ai 0.2.56__py3-none-any.whl → 0.2.58__py3-none-any.whl

camel/__init__.py

@@ -14,11 +14,10 @@
 
 from camel.logger import disable_logging, enable_logging, set_log_level
 
-__version__ = '0.2.56'
+__version__ = '0.2.58'
 
 __all__ = [
     '__version__',
-    'camel',
     'disable_logging',
     'enable_logging',
     'set_log_level',

camel/agents/chat_agent.py

@@ -442,6 +442,11 @@ class ChatAgent(BaseAgent):
         new_tool = convert_to_function_tool(tool)
         self._internal_tools[new_tool.get_function_name()] = new_tool
 
+    def add_tools(self, tools: List[Union[FunctionTool, Callable]]) -> None:
+        r"""Add a list of tools to the agent."""
+        for tool in tools:
+            self.add_tool(tool)
+
     def add_external_tool(
         self, tool: Union[FunctionTool, Callable, Dict[str, Any]]
     ) -> None:
@@ -462,6 +467,11 @@ class ChatAgent(BaseAgent):
             return True
         return False
 
+    def remove_tools(self, tool_names: List[str]) -> None:
+        r"""Remove a list of tools from the agent by name."""
+        for tool_name in tool_names:
+            self.remove_tool(tool_name)
+
     def remove_external_tool(self, tool_name: str) -> bool:
         r"""Remove an external tool from the agent by name.
 
@@ -1311,7 +1321,9 @@ class ChatAgent(BaseAgent):
         response_id: str = ""
         # All choices in one response share one role
         for chunk in response:
-            response_id = chunk.id
+            # Some model platforms like siliconflow may return None for the
+            # chunk.id
+            response_id = chunk.id if chunk.id else str(uuid.uuid4())
             self._handle_chunk(
                 chunk, content_dict, finish_reasons_dict, output_messages
             )
@@ -1351,7 +1363,9 @@ class ChatAgent(BaseAgent):
         response_id: str = ""
         # All choices in one response share one role
         async for chunk in response:
-            response_id = chunk.id
+            # Some model platforms like siliconflow may return None for the
+            # chunk.id
+            response_id = chunk.id if chunk.id else str(uuid.uuid4())
             self._handle_chunk(
                 chunk, content_dict, finish_reasons_dict, output_messages
             )

camel/agents/mcp_agent.py

@@ -12,18 +12,26 @@
 # limitations under the License.
 # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
 
+import asyncio
 import json
+import platform
 import re
-from typing import Optional
+from typing import Any, Callable, Dict, List, Optional, Union, cast
 
 from camel.agents import ChatAgent
 from camel.logger import get_logger
 from camel.messages import BaseMessage
-from camel.models import BaseModelBackend
+from camel.models import BaseModelBackend, ModelFactory
 from camel.prompts import TextPrompt
 from camel.responses import ChatAgentResponse
-from camel.toolkits import MCPToolkit
-from camel.types import RoleType
+from camel.toolkits import FunctionTool, MCPToolkit
+from camel.types import (
+    BaseMCPRegistryConfig,
+    MCPRegistryType,
+    ModelPlatformType,
+    ModelType,
+    RoleType,
+)
 
 # AgentOps decorator setting
 try:
@@ -38,6 +46,7 @@ except (ImportError, AttributeError):
 
 logger = get_logger(__name__)
 
+
 SYS_MSG_CONTENT = """
 You are a helpful assistant, and you prefer to use tools provided by the user 
 to solve problems.
@@ -80,22 +89,62 @@ Please answer me according to the result directly.
 
 @track_agent(name="MCPAgent")
 class MCPAgent(ChatAgent):
+    r"""A specialized agent designed to interact with MCP registries.
+    The MCPAgent enhances a base ChatAgent by integrating MCP tools from
+    various registries for search capabilities.
+
+    Attributes:
+        system_message (Optional[str]): The system message for the chat agent.
+            (default: :str:`"You are an assistant with search capabilities
+            using MCP tools."`)
+        model (BaseModelBackend): The model backend to use for generating
+            responses. (default: :obj:`ModelPlatformType.DEFAULT` with
+            `ModelType.DEFAULT`)
+        registry_configs (List[BaseMCPRegistryConfig]): List of registry
+            configurations (default: :obj:`None`)
+        local_config (Optional[Dict[str, Any]]): The local configuration for
+            the MCP agent. (default: :obj:`None`)
+        local_config_path (Optional[str]): The path to the local configuration
+            file for the MCP agent. (default: :obj:`None`)
+        function_calling_available (bool): Flag indicating whether the
+            model is equipped with the function calling ability.
+            (default: :obj:`True`)
+        **kwargs: Inherited from ChatAgent
+    """
+
     def __init__(
         self,
-        config_path: str,
+        system_message: Optional[Union[str, BaseMessage]] = (
+            "You are an assistant with search capabilities using MCP tools."
+        ),
         model: Optional[BaseModelBackend] = None,
-        function_calling_available: bool = False,
-    ) -> None:
-        r"""A class for the MCP agent that assists using MCP tools.
+        registry_configs: Optional[
+            Union[List[BaseMCPRegistryConfig], BaseMCPRegistryConfig]
+        ] = None,
+        local_config: Optional[Dict[str, Any]] = None,
+        local_config_path: Optional[str] = None,
+        tools: Optional[List[Union[FunctionTool, Callable]]] = None,
+        function_calling_available: bool = True,
+        **kwargs,
+    ):
+        if model is None:
+            model = ModelFactory.create(
+                model_platform=ModelPlatformType.DEFAULT,
+                model_type=ModelType.DEFAULT,
+            )
+
+        if isinstance(registry_configs, BaseMCPRegistryConfig):
+            self.registry_configs = [registry_configs]
+        else:
+            self.registry_configs = registry_configs or []
+
+        if local_config_path:
+            with open(local_config_path, 'r') as f:
+                local_config = json.load(f)
+
+        self.local_config = local_config
+        self.function_calling_available = function_calling_available
 
-        Args:
-            config_path (str): Path to the MCP configuration file.
-            model (Optional[BaseModelBackend]): Model backend for the agent.
-                (default: :obj:`None`)
-            function_calling_available (bool): Flag indicating whether the
-                model is equipped with the function calling ability.
-                (default: :obj:`False`)
-        """
         if function_calling_available:
             sys_msg_content = "You are a helpful assistant, and you prefer "
             "to use tools provided by the user to solve problems."
@@ -109,63 +158,182 @@ class MCPAgent(ChatAgent):
             content=sys_msg_content,
         )
 
-        super().__init__(system_message, model=model)
+        # Initialize the toolkit if configuration is provided
+        self.mcp_toolkit = self._initialize_mcp_toolkit()
+
+        super().__init__(
+            system_message=system_message,
+            model=model,
+            tools=tools,
+            **kwargs,
+        )
+
+    def _initialize_mcp_toolkit(self) -> MCPToolkit:
+        r"""Initialize the MCP toolkit from the provided configuration."""
+        config_dict = {}
+        for registry_config in self.registry_configs:
+            config_dict.update(registry_config.get_config())
 
-        self._mcp_toolkit = MCPToolkit(config_path=config_path)
-        self._function_calling_available = function_calling_available
-        self._text_tools = None
+        if self.local_config:
+            config_dict.update(self.local_config)
 
-    async def connect(self):
-        r"""Explicitly connect to all MCP servers."""
-        await self._mcp_toolkit.connect()
+        return MCPToolkit(config_dict=config_dict)
 
-    async def close(self):
-        r"""Explicitly disconnect from all MCP servers."""
-        await self._mcp_toolkit.disconnect()
+    def add_registry(self, registry_config: BaseMCPRegistryConfig) -> None:
+        r"""Add a new registry configuration to the agent.
 
-    def add_mcp_tools(self):
-        r"""Get the MCP tools and wrap into the models"""
+        Args:
+            registry_config (BaseMCPRegistryConfig): The registry
+                configuration to add.
+        """
+        self.registry_configs.append(registry_config)
+        # Reinitialize the toolkit with the updated configurations
+        self.mcp_toolkit = self._initialize_mcp_toolkit()
+
+        # If already connected, reconnect to apply changes
+        if self.mcp_toolkit and self.mcp_toolkit.is_connected():
+            try:
+                asyncio.run(self.disconnect())
+                asyncio.run(self.connect())
+            except RuntimeError as e:
+                # Handle case where we're already in an event loop
+                logger.warning(
+                    f"Could not reconnect synchronously: {e}. "
+                    f"Manual reconnection may be required."
+                )
+
+    @classmethod
+    async def create(
+        cls,
+        config_path: Optional[str] = None,
+        registry_configs: Optional[
+            Union[List[BaseMCPRegistryConfig], BaseMCPRegistryConfig]
+        ] = None,
+        model: Optional[BaseModelBackend] = None,
+        function_calling_available: bool = False,
+        **kwargs,
+    ) -> "MCPAgent":
+        r"""Create and connect an MCPAgent instance.
+
+        Args:
+            config_path (Optional[str]): Path to the MCP configuration file.
+                If provided, will load registry configs from this file.
+                (default: :obj:`None`)
+            registry_configs (Optional[Union[List[BaseMCPRegistryConfig],
+                BaseMCPRegistryConfig]]): Registry configurations to use.
+                Can be a single config or list of configs. If both config_path
+                and registry_configs are provided, configs from both sources
+                will be combined. (default: :obj:`None`)
+            model (Optional[BaseModelBackend]): The model backend to use.
+                If None, will use the default model. (default: :obj:`None`)
+            function_calling_available (bool): Whether the model supports
+                function calling. (default: :obj:`False`)
+            **kwargs: Additional arguments to pass to MCPAgent constructor.
 
-        if not self._mcp_toolkit.is_connected():
-            raise RuntimeError("The MCP server is not connected")
+        Returns:
+            MCPAgent: A connected MCPAgent instance ready to use.
+
+        Example:
+            >>> agent = await MCPAgent.create(
+            ...     config_path="path/to/config.json",
+            ...     function_calling_available=True
+            ... )
+            >>> response = await agent.run("Hello!")
+        """
+        # Initialize registry_configs list
+        final_registry_configs = []
 
-        prompt = TextPrompt(TOOLS_PROMPT)
-        self._text_tools = prompt.format(
-            tools=self._mcp_toolkit.get_text_tools()
+        # Add configs from registry_configs argument if provided
+        if registry_configs is not None:
+            if isinstance(registry_configs, BaseMCPRegistryConfig):
+                final_registry_configs.append(registry_configs)
+            else:
+                final_registry_configs.extend(registry_configs)
+
+        # Load additional configs from file if provided
+        if config_path:
+            try:
+                with open(config_path, 'r') as f:
+                    config_data = json.load(f)
+
+                # Create registry configs from the loaded data
+                for _, server_config in config_data.get(
+                    "mcpServers", {}
+                ).items():
+                    # Create a custom registry config for each server
+                    registry_config = BaseMCPRegistryConfig(
+                        type=MCPRegistryType.CUSTOM,
+                        os=platform.system().lower(),  # type: ignore [arg-type]
+                        **server_config,
+                    )
+                    final_registry_configs.append(registry_config)
+            except Exception as e:
+                logger.error(f"Failed to load config from {config_path}: {e}")
+                raise
+
+        # Create the agent instance
+        agent = cls(
+            registry_configs=final_registry_configs,
+            model=model,
+            function_calling_available=function_calling_available,
+            **kwargs,
         )
-        if self._function_calling_available:
-            tools = self._mcp_toolkit.get_tools()
-            for tool in tools:
-                self.add_tool(tool)
 
-    async def run(
-        self,
-        prompt: str,
+        # Connect to MCP servers
+        try:
+            await agent.connect()
+        except Exception as e:
+            logger.error(f"Failed to connect to MCP servers: {e}")
+            await agent.disconnect()  # Clean up if connection fails
+            raise
+
+        return agent
+
+    async def connect(self) -> None:
+        r"""Connect to the MCP servers."""
+        if self.mcp_toolkit:
+            await self.mcp_toolkit.connect()
+            if self.function_calling_available:
+                self.add_tools(
+                    cast(
+                        list[FunctionTool | Callable[..., Any]],
+                        self.mcp_toolkit.get_tools(),
+                    )
+                )
+            else:
+                prompt = TextPrompt(TOOLS_PROMPT)
+                self._text_tools = prompt.format(
+                    tools=self.mcp_toolkit.get_text_tools()
+                )
+
+    async def disconnect(self) -> None:
+        r"""Disconnect from the MCP servers."""
+        if self.mcp_toolkit:
+            await self.mcp_toolkit.disconnect()
+
+    async def astep(
+        self, input_message: Union[BaseMessage, str], *args, **kwargs
     ) -> ChatAgentResponse:
-        r"""Run the agent to interact with the MCP tools.
+        r"""Asynchronous step function. Make sure MCP toolkit is connected
+        before proceeding.
 
         Args:
-            prompt (str): The user's input prompt or query to be processed by
-                the agent.
+            input_message (Union[BaseMessage, str]): The input message.
+            *args: Additional arguments.
+            **kwargs: Additional keyword arguments.
 
         Returns:
-            ChatAgentResponse: The agent's response after processing the
-                prompt and potentially executing MCP tool calls.
-
-        Raises:
-            RuntimeError: If the MCP server is not connected when attempting
-                to run.
+            ChatAgentResponse: The response from the agent.
         """
+        if self.mcp_toolkit and not self.mcp_toolkit.is_connected():
+            await self.connect()
 
-        if not self._mcp_toolkit.is_connected():
-            raise RuntimeError("The MCP server is not connected")
-
-        if self._function_calling_available:
-            response = await self.astep(prompt)
-            return response
+        if self.function_calling_available:
+            return await super().astep(input_message, *args, **kwargs)
         else:
-            task = f"## Task:\n  {prompt}"
-            response = await self.astep(str(self._text_tools) + task)
+            task = f"## Task:\n  {input_message}"
+            input_message = str(self._text_tools) + task
+            response = await super().astep(input_message, *args, **kwargs)
             content = response.msgs[0].content.lower()
 
             tool_calls = []
@@ -193,12 +361,45 @@ class MCPAgent(ChatAgent):
             else:
                 tools_results = []
                 for tool_call in tool_calls:
-                    server_idx = tool_call['server_idx']
-                    tool_name = tool_call['tool_name']
-                    tool_args = tool_call['tool_args']
-                    server = self._mcp_toolkit.servers[server_idx]
-                    result = await server.call_tool(tool_name, tool_args)
-                    tools_results.append({tool_name: result.content[0].text})
+                    try:
+                        server_idx = tool_call.get('server_idx')
+                        tool_name = tool_call.get('tool_name')
+                        tool_args = tool_call.get('tool_args', {})
+
+                        # Validate required fields
+                        if server_idx is None or tool_name is None:
+                            logger.warning(
+                                f"Missing required fields in tool "
+                                f"call: {tool_call}"
+                            )
+                            continue
+
+                        # Check server index is valid
+                        if (
+                            not isinstance(server_idx, int)
+                            or server_idx < 0
+                            or server_idx >= len(self.mcp_toolkit.servers)
+                        ):
+                            logger.warning(
+                                f"Invalid server index: {server_idx}"
+                            )
+                            continue
+
+                        server = self.mcp_toolkit.servers[server_idx]
+                        result = await server.call_tool(tool_name, tool_args)
+
+                        # Safely access content
+                        if result.content and len(result.content) > 0:
+                            tools_results.append(
+                                {tool_name: result.content[0].text}
+                            )
+                        else:
+                            tools_results.append(
+                                {tool_name: "No result content available"}
+                            )
+                    except Exception as e:
+                        logger.error(f"Error processing tool call: {e}")
+                        tools_results.append({"error": str(e)})
                 results = json.dumps(tools_results)
                 final_prompt = TextPrompt(FINAL_RESPONSE_PROMPT).format(
                     results=results
@@ -206,28 +407,40 @@ class MCPAgent(ChatAgent):
                 response = await self.astep(final_prompt)
                 return response
 
-    @classmethod
-    async def create(
-        cls,
-        config_path: str,
-        model: Optional[BaseModelBackend] = None,
-        function_calling_available: bool = False,
-    ) -> "MCPAgent":
-        r"""Factory method to create and initialize an MCPAgent.
+    def step(
+        self, input_message: Union[BaseMessage, str], *args, **kwargs
+    ) -> ChatAgentResponse:
+        r"""Synchronous step function. Make sure MCP toolkit is connected
+        before proceeding.
 
         Args:
-            config_path (str): Path to the MCP configuration file that contains
-                server settings and other configuration parameters.
-            model (Optional[BaseModelBackend]): Model backend for the agent.
-                If None, the default model will be used. (default: :obj:`None`)
-            function_calling_available (bool): Flag indicating whether the
-                model is equipped with function calling ability. This affects
-                the system message content. (default: :obj:`False`)
+            input_message (Union[BaseMessage, str]): The input message.
+            *args: Additional arguments.
+            **kwargs: Additional keyword arguments.
 
         Returns:
-            MCPAgent: A fully initialized MCPAgent instance ready for use.
+            ChatAgentResponse: The response from the agent.
         """
-        agent = cls(config_path, model, function_calling_available)
-        await agent.connect()
-        agent.add_mcp_tools()
-        return agent
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            loop = None
+
+        if loop and loop.is_running():
+            # Running inside an existing loop (e.g., Jupyter/FastAPI)
+            # Use create_task and run with a future
+            coro = self.astep(input_message, *args, **kwargs)
+            future = asyncio.ensure_future(coro)
+            return asyncio.run_coroutine_threadsafe(future, loop).result()
+        else:
+            # Safe to run normally
+            return asyncio.run(self.astep(input_message, *args, **kwargs))
+
+    async def __aenter__(self):
+        r"""Async context manager entry."""
+        await self.connect()
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        r"""Async context manager exit."""
+        await self.disconnect()

camel/loaders/__init__.py

@@ -18,6 +18,7 @@ from .chunkr_reader import ChunkrReader
 from .crawl4ai_reader import Crawl4AI
 from .firecrawl_reader import Firecrawl
 from .jina_url_reader import JinaURLReader
+from .markitdown import MarkItDownLoader
 from .mineru_extractor import MinerU
 from .pandas_reader import PandasReader
 from .scrapegraph_reader import ScrapeGraphAI
@@ -35,5 +36,6 @@ __all__ = [
     'PandasReader',
     'MinerU',
     'Crawl4AI',
+    'MarkItDownLoader',
     'ScrapeGraphAI',
 ]