bump version to 0.2.2, increase default query timeout to 300s and add DATABEND_QUERY_TIMEOUT config

Author: BohuTANG

README.md

@@ -113,6 +113,7 @@ Add to your MCP client configuration (e.g., Claude Desktop, Windsurf):
 - `DATABEND_DSN`: Databend connection string
 - `LOCAL_MODE`: Set to `true` to use local Databend
 - `SAFE_MODE`: Set to `false` to disable safe mode
+- `DATABEND_QUERY_TIMEOUT`: Query execution timeout in seconds (default: `300`)
 - `DATABEND_MCP_SERVER_TRANSPORT`: Default to `stdio`, set to `http` or `sse` to enable HTTP/SSE transport
 - `DATABEND_MCP_BIND_HOST`: Default to `127.0.0.1`, set to bind host for HTTP/SSE transport
 - `DATABEND_MCP_BIND_PORT`: Default to `8001`, set to bind port for HTTP/SSE transport

mcp_databend/env.py

@@ -25,6 +25,7 @@ class DatabendConfig:
         DATABEND_DSN: The dsn connect string (defaults to: "databend://default:@127.0.0.1:8000/?sslmode=disable")
         SAFE_MODE: Enable safe mode to restrict dangerous SQL operations (defaults to: "true")
         LOCAL_MODE: Enable local mode to use in-memory Databend (defaults to: "false")
+        DATABEND_QUERY_TIMEOUT: Query execution timeout in seconds (defaults to: "300")
     """
 
     def __init__(self):
@@ -93,6 +94,23 @@ def mcp_bind_port(self) -> int:
                 raise ValueError(f"Invalid port value '{port_str}'. Must be a valid integer.")
             raise
 
+    @property
+    def query_timeout(self) -> int:
+        """Get the query execution timeout in seconds.
+
+        Default: 300
+        """
+        timeout_str = os.getenv("DATABEND_QUERY_TIMEOUT", "300")
+        try:
+            timeout = int(timeout_str)
+            if timeout < 1:
+                raise ValueError(f"Query timeout must be greater than 0, got {timeout}")
+            return timeout
+        except ValueError as e:
+            if "invalid literal" in str(e):
+                raise ValueError(f"Invalid query timeout value '{timeout_str}'. Must be a valid integer.")
+            raise
+
 
 # Global instance placeholder for the singleton pattern
 _CONFIG_INSTANCE = None

mcp_databend/server.py

@@ -14,7 +14,6 @@
 
 # Constants
 SERVER_NAME = "mcp-databend"
-DEFAULT_TIMEOUT = 60  # seconds
 
 # Configure logging
 logging.basicConfig(
@@ -158,9 +157,10 @@ def _execute_sql(sql: str) -> dict:
     try:
         # Submit query to thread pool
         future = QUERY_EXECUTOR.submit(execute_databend_query, sql)
+        query_timeout = config.query_timeout
         try:
             # Wait for query to complete with timeout
-            result = future.result(timeout=DEFAULT_TIMEOUT)
+            result = future.result(timeout=query_timeout)
 
             if isinstance(result, dict) and "error" in result:
                 error_msg = f"Query execution failed: {result['error']}"
@@ -174,7 +174,7 @@ def _execute_sql(sql: str) -> dict:
                 return {"status": "success", "data": result}
 
         except concurrent.futures.TimeoutError:
-            error_msg = f"Query timed out after {DEFAULT_TIMEOUT} seconds"
+            error_msg = f"Query timed out after {query_timeout} seconds"
             logger.warning(f"{error_msg}: {sql}")
             future.cancel()
             return {"status": "error", "message": error_msg}

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp-databend"
-version = "0.2.1"
+version = "0.2.2"
 description = "An MCP server for Databend."
 readme = "README.md"
 requires-python = ">=3.12"