Dependencies: Update to FastMCP 2.0

Author: amotl

CHANGES.md

@@ -5,6 +5,12 @@
   standardizing on common naming conventions
 - CLI: Added subcommand `cratedb-mcp serve` using Click, with
   dedicated options `--transport` and `--port`
+- Dependencies: Updated to FastMCP 2.0. It significantly expands on 1.0 by
+  introducing powerful client capabilities, server proxying & composition,
+  OpenAPI/FastAPI integration, and more advanced features.
+  See [FastMCP 2.0 and the Official MCP SDK].
+
+[FastMCP 2.0 and the Official MCP SDK]: https://gofastmcp.com/getting-started/welcome#fastmcp-2-0-and-the-official-mcp-sdk
 
 ## v0.0.0 - 2025-05-16
 - Project: Established project layout

cratedb_mcp/__main__.py

@@ -1,5 +1,5 @@
 import httpx
-from mcp.server.fastmcp import FastMCP
+from fastmcp import FastMCP
 
 from . import __appname__
 from .knowledge import DocumentationIndex, Queries
@@ -10,7 +10,7 @@
 documentation_index = DocumentationIndex()
 
 # Create FastMCP application object.
-mcp = FastMCP(__appname__)
+mcp: FastMCP = FastMCP(__appname__)
 
 
 def query_cratedb(query: str) -> list[dict]:

pyproject.toml

@@ -74,8 +74,8 @@ dependencies = [
   "cachetools<6",
   "click<9",
   "cratedb-about==0.0.4",
+  "fastmcp<3",
   "hishel<0.2",
-  "mcp[cli]>=1.5.0",
   "pueblo==0.0.11",
   "sqlparse<0.6",
 ]

tests/test_cli.py

@@ -1,6 +1,5 @@
 from unittest import mock
 
-import anyio
 from click.testing import CliRunner
 
 from cratedb_mcp import __version__
@@ -67,7 +66,7 @@ def test_cli_valid_default(mocker, capsys):
 
     The test needs to mock `anyio.run`, otherwise the call would block forever.
     """
-    run_mock = mocker.patch.object(anyio, "run")
+    run_mock = mocker.patch.object(mcp, "run_async")
 
     # Invoke the program.
     runner = CliRunner()
@@ -79,7 +78,7 @@ def test_cli_valid_default(mocker, capsys):
 
     # Verify the outcome.
     assert run_mock.call_count == 1
-    assert run_mock.call_args == mock.call(mcp.run_stdio_async)
+    assert run_mock.call_args == mock.call("stdio")
     assert mcp.settings.port == 8000
 
 
@@ -89,7 +88,7 @@ def test_cli_valid_custom(mocker, capsys):
 
     The test needs to mock `anyio.run`, otherwise the call would block forever.
     """
-    run_mock = mocker.patch.object(anyio, "run")
+    run_mock = mocker.patch.object(mcp, "run_async")
 
     # Invoke the program.
     runner = CliRunner()
@@ -101,7 +100,7 @@ def test_cli_valid_custom(mocker, capsys):
 
     # Verify the outcome.
     assert run_mock.call_count == 1
-    assert run_mock.call_args == mock.call(mcp.run_streamable_http_async)
+    assert run_mock.call_args == mock.call("streamable-http")
     assert mcp.settings.port == 65535