Merge pull request #4 from Cognitive-Stacks/support_frameworks

Support frameworks

Author: hieutrtr

pyproject.toml

@@ -22,14 +22,14 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "motor>=3.7.0,<4.0.0",
     "python-dotenv>=1.0.0,<2.0.0",
     "build (>=1.2.2.post1,<2.0.0)",
     "twine (>=6.1.0,<7.0.0)",
-    "pyyaml (>=6.0.2,<7.0.0)",
     "openai-agents (>=0.0.9,<0.0.10)",
+    "langchain-mcp-adapters (>=0.0.7,<0.0.8)",
+    "autogen-ext[mcp] (>=0.5.1,<0.6.0)",
 ]
-requires-python = ">=3.10"
+requires-python = "<4.0,>=3.10"
 
 [project.urls]
 Documentation = "https://github.com/yourusername/mcphub#readme"

src/mcphub/mcp_servers/exceptions.py

@@ -0,0 +1,7 @@
+class ServerConfigNotFoundError(Exception):
+    """Raised when a server configuration is not found."""
+    pass
+
+class SetupError(Exception):
+    """Raised when there's an error during server setup."""
+    pass 

src/mcphub/mcp_servers/params.py

@@ -5,6 +5,8 @@
 
 from mcp import StdioServerParameters
 
+from .exceptions import ServerConfigNotFoundError
+
 
 @dataclass
 class MCPServerConfig:
@@ -18,10 +20,6 @@ class MCPServerConfig:
     setup_script: Optional[str] = None
     cwd: Optional[str] = None
 
-class ServerConfigNotFoundError(Exception):
-    """Raised when a server configuration is not found."""
-    pass
-
 class MCPServersParams:
     def __init__(self, config_path: str):
         self.config_path = config_path

src/mcphub/mcp_servers/servers.py

@@ -1,12 +1,15 @@
 import subprocess
 from pathlib import Path
+from typing import List
 
-from .params import MCPServerConfig, MCPServersParams
+from agents.mcp import MCPServerStdio, MCPServerStdioParams
+from langchain_core.tools import BaseTool
+from langchain_mcp_adapters.tools import load_mcp_tools
+from autogen_ext.tools.mcp import StdioMcpToolAdapter, StdioServerParams
 
+from .exceptions import ServerConfigNotFoundError, SetupError
+from .params import MCPServerConfig, MCPServersParams
 
-class SetupError(Exception):
-    """Raised when there's an error during server setup."""
-    pass
 
 class MCPServers:
     def __init__(self, servers_params: MCPServersParams):
@@ -120,4 +123,72 @@ def _setup_all_servers(self) -> None:
                 # Continue with other servers even if one fails
                 continue
 
-        print("Completed server setup process")
+        print("Completed server setup process")
+
+    def make_openai_mcp_server(self, mcp_name: str, cache_tools_list: bool = True) -> MCPServerStdio:
+        """
+        Create and return an OpenAI MCP server for the given MCP name.
+        
+        Args:
+            mcp_name: The name of the MCP server configuration to use
+            cache_tools_list: Whether to cache the tools list (default: True)
+            
+        Returns:
+            MCPServerStdio: The configured MCP server
+            
+        Raises:
+            ServerConfigNotFoundError: If the server configuration is not found
+        """
+        server_config = self.servers_params.retrieve_server_params(mcp_name)
+        if not server_config:
+            raise ServerConfigNotFoundError(f"Server configuration not found for '{mcp_name}'")
+
+        # Convert server config to StdioServerParameters
+        server_params = MCPServerStdioParams(
+            command=server_config.command,
+            args=server_config.args,
+            env=server_config.env,
+            cwd=server_config.cwd
+        )
+
+        return MCPServerStdio(
+            params=server_params,
+            cache_tools_list=cache_tools_list
+        )
+
+    async def get_langchain_mcp_tools(self, mcp_name: str, cache_tools_list: bool = True) -> List[BaseTool]:
+        """
+        Get a list of Langchain tools from an MCP server.
+        
+        Args:
+            mcp_name: The name of the MCP server configuration to use
+            cache_tools_list: Whether to cache the tools list (default: True)
+            
+        Returns:
+            List[Tool]: List of Langchain tools provided by the MCP server
+            
+        Raises:
+            ServerConfigNotFoundError: If the server configuration is not found
+        """
+        async with self.make_openai_mcp_server(mcp_name, cache_tools_list) as server:
+            tools = await load_mcp_tools(server.session)
+            return tools
+        
+    async def make_autogen_mcp_adapters(self, mcp_name: str) -> List[StdioMcpToolAdapter]:
+        server_config = self.servers_params.retrieve_server_params(mcp_name)
+        if not server_config:
+            raise ServerConfigNotFoundError(f"Server configuration not found for '{mcp_name}'")
+        
+        server_params = StdioServerParams(
+            command=server_config.command,
+            args=server_config.args,
+            env=server_config.env,
+            cwd=server_config.cwd
+        )
+
+        adapters = []
+        async with self.make_openai_mcp_server(mcp_name, cache_tools_list=True) as server:
+            for tool in await server.list_tools():
+                adapter = await StdioMcpToolAdapter.from_server_params(server_params, tool.name)
+                adapters.append(adapter)
+        return adapters

src/mcphub/mcphub.py

@@ -1,10 +1,12 @@
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Optional
+from typing import List, Optional
 
+from agents.mcp import MCPServerStdio
+from autogen_ext.tools.mcp import StdioMcpToolAdapter
+from langchain_core.tools import BaseTool
 from mcp import StdioServerParameters
-
-from mcp_servers import MCPServerConfig, MCPServersParams, MCPServers
+from mcp_servers import MCPServerConfig, MCPServers, MCPServersParams
 
 
 @dataclass
@@ -28,4 +30,42 @@ def fetch_server_params(self, mcp_name: str) -> Optional[MCPServerConfig]:
         return self.servers_params.retrieve_server_params(mcp_name)
 
     def fetch_stdio_server_config(self, mcp_name: str) -> Optional[StdioServerParameters]:
-        return self.servers_params.convert_to_stdio_params(mcp_name)
+        return self.servers_params.convert_to_stdio_params(mcp_name)
+    
+    def fetch_openai_mcp_server(self, mcp_name: str, cache_tools_list: bool = True) -> MCPServerStdio:
+        """
+        Fetch and return an OpenAI MCP server instance.
+        
+        Args:
+            mcp_name: The name of the MCP server to fetch
+            cache_tools_list: Whether to cache the tools list
+            
+        Returns:
+            MCPServerStdio: The configured MCP server
+        """
+        return self.servers.make_openai_mcp_server(mcp_name, cache_tools_list)
+    
+    async def fetch_langchain_mcp_tools(self, mcp_name: str, cache_tools_list: bool = True) -> List[BaseTool]:
+        """
+        Fetch and return a list of Langchain MCP tools.
+        
+        Args:
+            mcp_name: The name of the MCP server to fetch
+            cache_tools_list: Whether to cache the tools list
+            
+        Returns:
+            List[BaseTool]: A list of Langchain MCP tools
+        """
+        return await self.servers.get_langchain_mcp_tools(mcp_name, cache_tools_list)
+    
+    async def fetch_autogen_mcp_adapters(self, mcp_name: str) -> List[StdioMcpToolAdapter]:
+        """
+        Fetch and return an Autogen MCP adapter.
+        
+        Args:
+            mcp_name: The name of the MCP server to fetch
+            
+        Returns:
+            StdioMcpToolAdapter: The configured MCP adapter
+        """
+        return await self.servers.make_autogen_mcp_adapters(mcp_name)

src/mcphub/test.py

@@ -6,7 +6,7 @@
 
 # Create an instance of MCPHub, which automatically loads the configuration
 mcphub = MCPHub()
-sequential_thinking_server = mcphub.fetch_server_params("azure-storage-mcp")
+sequential_thinking_server = mcphub.fetch_server_params("sequential-thinking-mcp")
 
 print(f"Using MCP server: {sequential_thinking_server}")