fix: fix new add_tool interface

Author: wudidapaopao

mcp_clickhouse/mcp_server.py

@@ -10,6 +10,7 @@
 from clickhouse_connect.driver.binding import format_query_value
 from dotenv import load_dotenv
 from fastmcp import FastMCP
+from fastmcp.tools import Tool
 from fastmcp.prompts import Prompt
 from dataclasses import dataclass, field, asdict, is_dataclass
 
@@ -321,9 +322,9 @@ def _init_chdb_client():
 
 # Register tools based on configuration
 if os.getenv("CLICKHOUSE_ENABLED", "true").lower() == "true":
-    mcp.add_tool(list_databases)
-    mcp.add_tool(list_tables)
-    mcp.add_tool(run_select_query)
+    mcp.add_tool(Tool.from_function(list_databases))
+    mcp.add_tool(Tool.from_function(list_tables))
+    mcp.add_tool(Tool.from_function(run_select_query))
     logger.info("ClickHouse tools registered")
 
 
@@ -332,7 +333,7 @@ def _init_chdb_client():
     if _chdb_client:
         atexit.register(lambda: _chdb_client.close())
 
-    mcp.add_tool(run_chdb_select_query)
+    mcp.add_tool(Tool.from_function(run_chdb_select_query))
     chdb_prompt = Prompt.from_function(
         chdb_initial_prompt,
         name="chdb_initial_prompt",

tests/test_tool.py

@@ -42,29 +42,29 @@ def tearDownClass(cls):
 
     def test_list_databases(self):
         """Test listing databases."""
-        result = list_databases.fn()
+        result = list_databases()
         # Parse JSON response
         databases = json.loads(result)
         self.assertIn(self.test_db, databases)
 
     def test_list_tables_without_like(self):
         """Test listing tables without a 'LIKE' filter."""
-        result = list_tables.fn(self.test_db)
+        result = list_tables(self.test_db)
         self.assertIsInstance(result, list)
         self.assertEqual(len(result), 1)
         self.assertEqual(result[0]["name"], self.test_table)
 
     def test_list_tables_with_like(self):
         """Test listing tables with a 'LIKE' filter."""
-        result = list_tables.fn(self.test_db, like=f"{self.test_table}%")
+        result = list_tables(self.test_db, like=f"{self.test_table}%")
         self.assertIsInstance(result, list)
         self.assertEqual(len(result), 1)
         self.assertEqual(result[0]["name"], self.test_table)
 
     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.fn(query)
+        result = run_select_query(query)
         self.assertIsInstance(result, dict)
         self.assertEqual(len(result["rows"]), 2)
         self.assertEqual(result["rows"][0][0], 1)
@@ -73,14 +73,14 @@ def test_run_select_query_success(self):
     def test_run_select_query_failure(self):
         """Test running a SELECT query with an error."""
         query = f"SELECT * FROM {self.test_db}.non_existent_table"
-        result = run_select_query.fn(query)
+        result = run_select_query(query)
         self.assertIsInstance(result, dict)
         self.assertEqual(result["status"], "error")
         self.assertIn("Query failed", result["message"])
 
     def test_table_and_column_comments(self):
         """Test that table and column comments are correctly retrieved."""
-        result = list_tables.fn(self.test_db)
+        result = list_tables(self.test_db)
         self.assertIsInstance(result, list)
         self.assertEqual(len(result), 1)