Trying to fix tests

Author: strawgate

pydantic_ai_slim/pydantic_ai/toolsets/fastmcp.py

@@ -4,15 +4,9 @@
 from asyncio import Lock
 from contextlib import AsyncExitStack
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Self
+from typing import TYPE_CHECKING, Any
 
-from mcp.types import (
-    AudioContent,
-    ContentBlock,
-    ImageContent,
-    TextContent,
-    Tool as MCPTool,
-)
+from typing_extensions import Self
 
 from pydantic_ai.exceptions import ModelRetry
 from pydantic_ai.mcp import TOOL_SCHEMA_VALIDATOR, messages
@@ -26,6 +20,14 @@
     from fastmcp.exceptions import ToolError
     from fastmcp.mcp_config import MCPConfig
     from fastmcp.server.server import FastMCP
+    from mcp.types import (
+        AudioContent,
+        ContentBlock,
+        ImageContent,
+        TextContent,
+        Tool as MCPTool,
+    )
+
 except ImportError as _import_error:
     raise ImportError(
         'Please install the `fastmcp` package to use the FastMCP server, '

pyproject.toml

@@ -89,6 +89,7 @@ dev = [
     "coverage[toml]>=7.10.3",
     "dirty-equals>=0.9.0",
     "duckduckgo-search>=7.0.0",
+    "fastmcp>=2.12.0",
     "inline-snapshot>=0.19.3",
     "pytest>=8.3.3",
     "pytest-examples>=0.0.18",

tests/test_fastmcp.py

@@ -7,7 +7,6 @@
 
 import pytest
 from inline_snapshot import snapshot
-from mcp.types import TextContent
 
 from pydantic_ai._run_context import RunContext
 from pydantic_ai.exceptions import ModelRetry
@@ -26,6 +25,7 @@
     from mcp.types import (
         AudioContent,
         ImageContent,
+        TextContent,
     )
 
     # Import the content mapping functions for testing