π The fast, Pythonic way to build MCP servers and clients.
Merge branch 'main' into protocol-update
Jeremiah Lowineb00f2238b99
diff --cc src/fastmcp/client/client.pyindex 54baa80be,203fcea14..e58b381b1--- a/src/fastmcp/client/client.py+++ b/src/fastmcp/client/client.py@@@ -7,9 -7,9 +7,10 @@@ from typing import Any, Generic, Literaimport anyioimport httpximport mcp.types+ import pydantic_corefrom exceptiongroup import catchfrom mcp import ClientSession+from mcp.types import ContentBlockfrom pydantic import AnyUrlimport fastmcpdiff --cc src/fastmcp/prompts/prompt.pyindex 28bc977f2,b0c99e971..a7103be8a--- a/src/fastmcp/prompts/prompt.py+++ b/src/fastmcp/prompts/prompt.py@@@ -3,15 -3,16 +3,16 @@@from __future__ import annotations as _annotationsimport inspect+ import jsonfrom abc import ABC, abstractmethodfrom collections.abc import Awaitable, Callable, Sequence- from typing import TYPE_CHECKING, Any+ from typing import Anyimport pydantic_core+from mcp.types import ContentBlock, PromptMessage, Role, TextContentfrom mcp.types import Prompt as MCPPromptfrom mcp.types import PromptArgument as MCPPromptArgument- from pydantic import Field, TypeAdapter, validate_call-from mcp.types import PromptMessage, Role, TextContent+ from pydantic import Field, TypeAdapterfrom fastmcp.exceptions import PromptErrorfrom fastmcp.server.dependencies import get_context