Merge branch 'main' into add-chdb-mcp

Author: wudidapaopao

.dockerignore

@@ -0,0 +1,72 @@
+# Git
+.git/
+.gitignore
+.github/
+
+# Documentation
+LICENSE
+# README.md is needed for package build
+# *.md files may be needed for package metadata
+
+# Development environment
+.venv/
+.env
+.envrc
+.python-version
+
+# IDE and editor files
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# Cache directories
+.ruff_cache/
+.pytest_cache/
+__pycache__/
+*.pyc
+*.pyo
+*.pyd
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Test files and directories
+tests/
+test-services/
+.coverage
+.coverage.*
+htmlcov/
+.tox/
+.nox/
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+cover/
+
+# Build artifacts
+build/
+dist/
+*.egg-info/
+.eggs/
+*.egg
+MANIFEST
+
+# Temporary files
+*.tmp
+*.temp
+*.log
+.DS_Store
+Thumbs.db
+
+# Docker files (avoid copying Dockerfile into itself)
+Dockerfile
+.dockerignore
+
+# Editor config (not needed at runtime)
+.editorconfig
+
+# Claude AI files
+.claude/ 

.github/workflows/ci.yaml

@@ -45,3 +45,31 @@ jobs:
 
       - name: Lint with Ruff
         run: uv run ruff check .
+
+  docker-build:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: false
+          load: true
+          tags: mcp-clickhouse:test
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - 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"

Dockerfile

@@ -0,0 +1,43 @@
+# Build stage - Use a Python image with uv pre-installed
+FROM ghcr.io/astral-sh/uv:python3.13-alpine AS builder
+
+# Install the project into `/app`
+WORKDIR /app
+
+# Enable bytecode compilation
+ENV UV_COMPILE_BYTECODE=1
+
+# Copy from the cache instead of linking since it's a mounted volume
+ENV UV_LINK_MODE=copy
+
+# Install git and build dependencies for ClickHouse client
+RUN --mount=type=cache,target=/var/cache/apk \
+    apk add git build-base
+
+# Install the project's dependencies using the lockfile and settings
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    --mount=type=bind,source=README.md,target=README.md \
+    uv sync --locked --no-install-project --no-dev
+
+# Then, add the rest of the project source code and install it
+# Installing separately from its dependencies allows optimal layer caching
+COPY . /app
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked --no-dev --no-editable
+
+# Production stage - Use minimal Python image
+FROM python:3.13-alpine
+
+# Set the working directory
+WORKDIR /app
+
+# Copy the virtual environment from the builder stage
+COPY --from=builder /app/.venv /app/.venv
+
+# Place executables in the environment at the front of the path
+ENV PATH="/app/.venv/bin:$PATH"
+
+# Run the MCP ClickHouse server by default
+CMD ["python", "-m", "mcp_clickhouse.main"]

mcp_clickhouse/mcp_server.py

@@ -139,15 +139,8 @@ def execute_query(query: str):
     try:
         read_only = get_readonly_setting(client)
         res = client.query(query, settings={"readonly": read_only})
-        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)
-        logger.info(f"Query returned {len(rows)} rows")
-        return rows
+        logger.info(f"Query returned {len(res.result_rows)} rows")
+        return {"columns": res.column_names, "rows": res.result_rows}
     except Exception as err:
         logger.error(f"Error executing query: {err}")
         # Return a structured dictionary rather than a string to ensure proper serialization

tests/test_tool.py

@@ -62,10 +62,10 @@ def test_run_select_query_success(self):
         """Test running a SELECT query successfully."""
         query = f"SELECT * FROM {self.test_db}.{self.test_table}"
         result = run_select_query(query)
-        self.assertIsInstance(result, list)
+        self.assertIsInstance(result, dict)
         self.assertEqual(len(result), 2)
-        self.assertEqual(result[0]["id"], 1)
-        self.assertEqual(result[0]["name"], "Alice")
+        self.assertEqual(result["rows"][0][0], 1)
+        self.assertEqual(result["rows"][0][1], "Alice")
 
     def test_run_select_query_failure(self):
         """Test running a SELECT query with an error."""