Migrate to fastmcp - it's receiving more regular updates (#59)

1. Also >= python 3.10
2. Allow for configurable transports
3. Add comprehensive test suite using mcp client as well

Author: iskakaushik

.github/workflows/ci.yaml

@@ -46,7 +46,7 @@ jobs:
 
   docker-build:
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -67,7 +67,11 @@ jobs:
       - name: Test Docker image import
         run: |
           docker run --rm mcp-clickhouse:test python -c "import mcp_clickhouse; print('✅ MCP ClickHouse Docker image works!')"
-          
+
       - name: Test Docker image default command
         run: |
-          timeout 10s docker run --rm mcp-clickhouse:test || [ $? = 124 ] && echo "✅ Docker container starts successfully"
+          timeout 10s docker run --rm \
+            -e CLICKHOUSE_HOST=localhost \
+            -e CLICKHOUSE_USER=default \
+            -e CLICKHOUSE_PASSWORD="" \
+            mcp-clickhouse:test || [ $? = 124 ] && echo "✅ Docker container starts successfully"

mcp_clickhouse/main.py

@@ -1,8 +1,11 @@
 from .mcp_server import mcp
+from .mcp_env import get_config
 
 
 def main():
-    mcp.run()
+    config = get_config()
+    transport = config.mcp_server_transport
+    mcp.run(transport=transport)
 
 
 if __name__ == "__main__":

mcp_clickhouse/mcp_env.py

@@ -29,6 +29,7 @@ class ClickHouseConfig:
         CLICKHOUSE_SEND_RECEIVE_TIMEOUT: Send/receive timeout in seconds (default: 300)
         CLICKHOUSE_DATABASE: Default database to use (default: None)
         CLICKHOUSE_PROXY_PATH: Path to be added to the host URL. For instance, for servers behind an HTTP proxy (default: None)
+        CLICKHOUSE_MCP_SERVER_TRANSPORT: MCP server transport method - "stdio", "http", or "sse" (default: stdio)
     """
 
     def __init__(self):
@@ -97,11 +98,26 @@ def send_receive_timeout(self) -> int:
         Default: 300 (ClickHouse default)
         """
         return int(os.getenv("CLICKHOUSE_SEND_RECEIVE_TIMEOUT", "300"))
-    
+
     @property
     def proxy_path(self) -> str:
         return os.getenv("CLICKHOUSE_PROXY_PATH")
 
+    @property
+    def mcp_server_transport(self) -> str:
+        """Get the MCP server transport method.
+
+        Valid options: "stdio", "http", "sse"
+        Default: "stdio"
+        """
+        transport = os.getenv("CLICKHOUSE_MCP_SERVER_TRANSPORT", "stdio").lower()
+        valid_transports = "stdio", "http", "streamable-http", "sse"
+        if transport not in valid_transports:
+            raise ValueError(
+                f"Invalid transport '{transport}'. Valid options: {', '.join(valid_transports)}"
+            )
+        return transport
+
     def get_client_config(self) -> dict:
         """Get the configuration dictionary for clickhouse_connect client.
 
@@ -123,7 +139,7 @@ def get_client_config(self) -> dict:
         # Add optional database if set
         if self.database:
             config["database"] = self.database
-        
+
         if self.proxy_path:
             config["proxy_path"] = self.proxy_path
 

mcp_clickhouse/mcp_server.py

@@ -7,7 +7,7 @@
 import clickhouse_connect
 from clickhouse_connect.driver.binding import format_query_value
 from dotenv import load_dotenv
-from mcp.server.fastmcp import FastMCP
+from fastmcp import FastMCP
 from dataclasses import dataclass, field, asdict, is_dataclass
 
 from mcp_clickhouse.mcp_env import get_config
@@ -59,14 +59,14 @@ class Table:
 
 load_dotenv()
 
-deps = [
-    "clickhouse-connect",
-    "python-dotenv",
-    "uvicorn",
-    "pip-system-certs",
-]
-
-mcp = FastMCP(MCP_SERVER_NAME, dependencies=deps)
+mcp = FastMCP(
+    name=MCP_SERVER_NAME,
+    dependencies=[
+        "clickhouse-connect",
+        "python-dotenv",
+        "pip-system-certs",
+    ],
+)
 
 
 def result_to_table(query_columns, result) -> List[Table]:
@@ -93,14 +93,19 @@ def list_databases():
     logger.info("Listing all databases")
     client = create_clickhouse_client()
     result = client.command("SHOW DATABASES")
-    logger.info(f"Found {len(result) if isinstance(result, list) else 1} databases")
-    return result
+
+    # Convert newline-separated string to list and trim whitespace
+    if isinstance(result, str):
+        databases = [db.strip() for db in result.strip().split("\n")]
+    else:
+        databases = [result]
+
+    logger.info(f"Found {len(databases)} databases")
+    return json.dumps(databases)
 
 
 @mcp.tool()
-def list_tables(
-    database: str, like: Optional[str] = None, not_like: Optional[str] = None
-):
+def list_tables(database: str, like: Optional[str] = None, not_like: Optional[str] = None):
     """List available ClickHouse tables in a database, including schema, comment,
     row count, and column count."""
     logger.info(f"Listing tables in database '{database}'")
@@ -165,9 +170,7 @@ def run_select_query(query: str):
                 }
             return result
         except concurrent.futures.TimeoutError:
-            logger.warning(
-                f"Query timed out after {SELECT_QUERY_TIMEOUT_SECS} seconds: {query}"
-            )
+            logger.warning(f"Query timed out after {SELECT_QUERY_TIMEOUT_SECS} seconds: {query}")
             future.cancel()
             # Return a properly structured response for timeout errors
             return {

pyproject.toml

@@ -5,11 +5,10 @@ description = "An MCP server for ClickHouse."
 readme = "README.md"
 license = "Apache-2.0"
 license-files = ["LICENSE"]
-requires-python = ">=3.13"
+requires-python = ">=3.10"
 dependencies = [
-     "mcp[cli]>=1.3.0",
+     "fastmcp>=2.0.0",
      "python-dotenv>=1.0.1",
-     "uvicorn>=0.34.0",
      "clickhouse-connect>=0.8.16",
      "pip-system-certs>=4.0",
 ]
@@ -23,7 +22,8 @@ Home = "https://github.com/ClickHouse/mcp-clickhouse"
 [project.optional-dependencies]
 dev = [
     "ruff",
-    "pytest"
+    "pytest",
+    "pytest-asyncio"
 ]
 
 [tool.hatch.build.targets.wheel]