explicitly set interface based on secure value (#87)

* explicitly set interface based on secure value

* use monkeypatch to prevent env var leakage

* fix deprecated deps in fastmcp constructor

* ruff fix

Author: joe-clickhouse

fastmcp.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://gofastmcp.com/public/schemas/fastmcp.json/v1.json",
+  "source": {
+    "path": "mcp_clickhouse/mcp_server.py",
+    "entrypoint": "mcp"
+  },
+  "environment": {
+    "dependencies": [
+      "clickhouse-connect",
+      "python-dotenv",
+      "pip-system-certs",
+      "chdb"
+    ]
+  }
+}
+

mcp_clickhouse/mcp_env.py

@@ -173,6 +173,7 @@ def get_client_config(self) -> dict:
             "port": self.port,
             "username": self.username,
             "password": self.password,
+            "interface": "https" if self.secure else "http",
             "secure": self.secure,
             "verify": self.verify,
             "connect_timeout": self.connect_timeout,

mcp_clickhouse/mcp_server.py

@@ -67,15 +67,7 @@ class Table:
 
 load_dotenv()
 
-mcp = FastMCP(
-    name=MCP_SERVER_NAME,
-    dependencies=[
-        "clickhouse-connect",
-        "python-dotenv",
-        "pip-system-certs",
-        "chdb",
-    ],
-)
+mcp = FastMCP(name=MCP_SERVER_NAME)
 
 
 @mcp.custom_route("/health", methods=["GET"])

tests/test_config_interface.py

@@ -0,0 +1,83 @@
+import pytest
+
+from mcp_clickhouse.mcp_env import ClickHouseConfig
+
+
+def test_interface_http_when_secure_false(monkeypatch: pytest.MonkeyPatch):
+    """Test that interface is set to 'http' when CLICKHOUSE_SECURE=false."""
+    monkeypatch.setenv("CLICKHOUSE_HOST", "localhost")
+    monkeypatch.setenv("CLICKHOUSE_USER", "test")
+    monkeypatch.setenv("CLICKHOUSE_PASSWORD", "test")
+    monkeypatch.setenv("CLICKHOUSE_SECURE", "false")
+    monkeypatch.setenv("CLICKHOUSE_PORT", "8123")
+
+    config = ClickHouseConfig()
+    client_config = config.get_client_config()
+
+    assert client_config["interface"] == "http"
+    assert client_config["secure"] is False
+    assert client_config["port"] == 8123
+
+
+def test_interface_https_when_secure_true(monkeypatch: pytest.MonkeyPatch):
+    """Test that interface is set to 'https' when CLICKHOUSE_SECURE=true."""
+    monkeypatch.setenv("CLICKHOUSE_HOST", "example.com")
+    monkeypatch.setenv("CLICKHOUSE_USER", "test")
+    monkeypatch.setenv("CLICKHOUSE_PASSWORD", "test")
+    monkeypatch.setenv("CLICKHOUSE_SECURE", "true")
+    monkeypatch.setenv("CLICKHOUSE_PORT", "8443")
+
+    config = ClickHouseConfig()
+    client_config = config.get_client_config()
+
+    assert client_config["interface"] == "https"
+    assert client_config["secure"] is True
+    assert client_config["port"] == 8443
+
+
+def test_interface_https_by_default(monkeypatch: pytest.MonkeyPatch):
+    """Test that interface defaults to 'https' when CLICKHOUSE_SECURE is not set."""
+    monkeypatch.setenv("CLICKHOUSE_HOST", "example.com")
+    monkeypatch.setenv("CLICKHOUSE_USER", "test")
+    monkeypatch.setenv("CLICKHOUSE_PASSWORD", "test")
+    monkeypatch.delenv("CLICKHOUSE_SECURE", raising=False)
+    monkeypatch.delenv("CLICKHOUSE_PORT", raising=False)
+
+    config = ClickHouseConfig()
+    client_config = config.get_client_config()
+
+    assert client_config["interface"] == "https"
+    assert client_config["secure"] is True
+    assert client_config["port"] == 8443
+
+
+def test_interface_http_with_custom_port(monkeypatch: pytest.MonkeyPatch):
+    """Test that interface is 'http' with custom port when CLICKHOUSE_SECURE=false."""
+    monkeypatch.setenv("CLICKHOUSE_HOST", "localhost")
+    monkeypatch.setenv("CLICKHOUSE_USER", "test")
+    monkeypatch.setenv("CLICKHOUSE_PASSWORD", "test")
+    monkeypatch.setenv("CLICKHOUSE_SECURE", "false")
+    monkeypatch.setenv("CLICKHOUSE_PORT", "9000")
+
+    config = ClickHouseConfig()
+    client_config = config.get_client_config()
+
+    assert client_config["interface"] == "http"
+    assert client_config["secure"] is False
+    assert client_config["port"] == 9000
+
+
+def test_interface_https_with_custom_port(monkeypatch: pytest.MonkeyPatch):
+    """Test that interface is 'https' with custom port when CLICKHOUSE_SECURE=true."""
+    monkeypatch.setenv("CLICKHOUSE_HOST", "example.com")
+    monkeypatch.setenv("CLICKHOUSE_USER", "test")
+    monkeypatch.setenv("CLICKHOUSE_PASSWORD", "test")
+    monkeypatch.setenv("CLICKHOUSE_SECURE", "true")
+    monkeypatch.setenv("CLICKHOUSE_PORT", "9443")
+
+    config = ClickHouseConfig()
+    client_config = config.get_client_config()
+
+    assert client_config["interface"] == "https"
+    assert client_config["secure"] is True
+    assert client_config["port"] == 9443