fix more things

Author: iskakaushik

.gitignore

@@ -1,3 +1,5 @@
+.ruff_cache/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

README.md

@@ -6,15 +6,15 @@ An MCP server for ClickHouse.
 
 ### Tools
 
-* `run-select-query`
+* `run_select_query`
   - Execute SQL queries on your ClickHouse cluster.
   - Input: `sql` (string): The SQL query to execute.
   - All ClickHouse queries are run with `readonly = 1` to ensure they are safe.
 
-* `list-databases`
+* `list_databases`
   - List all databases on your ClickHouse cluster.
 
-* `list-tables`
+* `list_tables`
   - List all tables in a database.
   - Input: `database` (string): The name of the database.
 

hello.py

@@ -1,7 +1,8 @@
+from .mcp_server import mcp
 
 
 def main():
-    print("Hello, World!")
+    mcp.run()
 
 
 if __name__ == "__main__":

mcp_clickhouse/main.py

@@ -0,0 +1,85 @@
+from fastmcp import FastMCP
+from typing import Sequence
+from dotenv import load_dotenv
+import clickhouse_connect
+import os
+
+
+MCP_SERVER_NAME = "mcp-clickhouse"
+
+load_dotenv()
+mcp = FastMCP(MCP_SERVER_NAME)
+
+
+@mcp.tool()
+def list_databases():
+    client = create_clickhouse_client()
+    return client.command("SHOW DATABASES")
+
+
+@mcp.tool()
+def list_tables(database: str, like: str = None):
+    client = create_clickhouse_client()
+    query = f"SHOW TABLES FROM {database}"
+    if like:
+        query += f" LIKE '{like}'"
+    result = client.command(query)
+
+    def get_table_info(table):
+        schema_query = f"DESCRIBE TABLE {database}.{table}"
+        schema_result = client.query(schema_query)
+
+        columns = []
+        column_names = schema_result.column_names
+        for row in schema_result.result_rows:
+            column_dict = {}
+            for i, col_name in enumerate(column_names):
+                column_dict[col_name] = row[i]
+            columns.append(column_dict)
+
+        create_table_query = f"SHOW CREATE TABLE {database}.{table}"
+        create_table_result = client.command(create_table_query)
+
+        return {
+            "database": database,
+            "name": table,
+            "columns": columns,
+            "create_table_query": create_table_result,
+        }
+
+    tables = []
+    if isinstance(result, str):
+        # Single table result
+        tables.append(get_table_info(result))
+    elif isinstance(result, Sequence):
+        # Multiple table results
+        for table in result:
+            tables.append(get_table_info(table))
+
+    return tables
+
+
+@mcp.tool()
+def run_select_query(query: str):
+    client = create_clickhouse_client()
+    try:
+        res = client.query(query, settings={"readonly": 1})
+        column_names = res.column_names
+        rows = []
+        for row in res.result_rows:
+            row_dict = {}
+            for i, col_name in enumerate(column_names):
+                row_dict[col_name] = row[i]
+            rows.append(row_dict)
+        return rows
+    except Exception as err:
+        return f"error running query: {err}"
+
+
+def create_clickhouse_client():
+    return clickhouse_connect.get_client(
+        host=os.getenv("CLICKHOUSE_HOST"),
+        port=os.getenv("CLICKHOUSE_PORT"),
+        username=os.getenv("CLICKHOUSE_USER"),
+        password=os.getenv("CLICKHOUSE_PASSWORD"),
+    )

mcp_clickhouse/mcp_server.py

@@ -7,6 +7,9 @@ requires-python = ">=3.13"
 dependencies = [
      "mcp>=1.0.0",
      "python-dotenv>=1.0.1",
+     "fastmcp>=0.4.0",
+     "uvicorn>=0.34.0",
+     "clickhouse-connect>=0.8.0",
 ]
 
 [project.scripts]

pyproject.toml

@@ -0,0 +1,15 @@
+services:
+  clickhouse:
+    image: clickhouse/clickhouse-server:latest
+    ports:
+      - "8123:8123"
+      - "9000:9000"
+    volumes:
+      - clickhouse-data:/var/lib/clickhouse
+    environment:
+      - CLICKHOUSE_USER=default
+      - CLICKHOUSE_PASSWORD=clickhouse
+      - CLICKHOUSE_DB=default
+
+volumes:
+  clickhouse-data: