fastmcp 2.8.0__py3-none-any.whl → 2.8.1__py3-none-any.whl

fastmcp/__init__.py

@@ -1,5 +1,6 @@
 """FastMCP - An ergonomic MCP interface."""
 
+import warnings
 from importlib.metadata import version
 from fastmcp.settings import Settings
 
@@ -10,15 +11,40 @@ from fastmcp.server.context import Context
 import fastmcp.server
 
 from fastmcp.client import Client
-from fastmcp.utilities.types import Image
 from . import client
 
 __version__ = version("fastmcp")
+
+
+# ensure deprecation warnings are displayed by default
+if settings.deprecation_warnings:
+    warnings.simplefilter("default", DeprecationWarning)
+
+
+def __getattr__(name: str):
+    """
+    Used to deprecate the module-level Image class; can be removed once it is no longer imported to root.
+    """
+    if name == "Image":
+        # Deprecated in 2.8.1
+        if settings.deprecation_warnings:
+            warnings.warn(
+                "The top-level `fastmcp.Image` import is deprecated "
+                "and will be removed in a future version. "
+                "Please use `fastmcp.utilities.types.Image` instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        from fastmcp.utilities.types import Image
+
+        return Image
+    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
+
+
 __all__ = [
     "FastMCP",
     "Context",
     "client",
     "Client",
     "settings",
-    "Image",
 ]

fastmcp/client/client.py

@@ -29,6 +29,7 @@ from fastmcp.exceptions import ToolError
 from fastmcp.server import FastMCP
 from fastmcp.utilities.exceptions import get_catch_handlers
 from fastmcp.utilities.mcp_config import MCPConfig
+from fastmcp.utilities.types import MCPContent
 
 from .transports import (
     ClientTransportT,
@@ -658,9 +659,7 @@ class Client(Generic[ClientTransportT]):
         arguments: dict[str, Any] | None = None,
         timeout: datetime.timedelta | float | int | None = None,
         progress_handler: ProgressHandler | None = None,
-    ) -> list[
-        mcp.types.TextContent | mcp.types.ImageContent | mcp.types.EmbeddedResource
-    ]:
+    ) -> list[MCPContent]:
         """Call a tool on the server.
 
         Unlike call_tool_mcp, this method raises a ToolError if the tool call results in an error.
@@ -672,7 +671,7 @@ class Client(Generic[ClientTransportT]):
             progress_handler (ProgressHandler | None, optional): The progress handler to use for the tool call. Defaults to None.
 
         Returns:
-            list[mcp.types.TextContent | mcp.types.ImageContent | mcp.types.EmbeddedResource]:
+            list[mcp.types.TextContent | mcp.types.ImageContent | mcp.types.AudioContent | mcp.types.EmbeddedResource]:
                 The content returned by the tool.
 
         Raises:

fastmcp/client/sampling.py

@@ -9,13 +9,7 @@ from mcp.shared.context import LifespanContextT, RequestContext
 from mcp.types import CreateMessageRequestParams as SamplingParams
 from mcp.types import SamplingMessage
 
-__all__ = ["SamplingMessage", "SamplingParams", "MessageResult", "SamplingHandler"]
-
-
-class MessageResult(CreateMessageResult):
-    role: mcp.types.Role = "assistant"
-    content: mcp.types.TextContent | mcp.types.ImageContent
-    model: str = "client-model"
+__all__ = ["SamplingMessage", "SamplingParams", "SamplingHandler"]
 
 
 SamplingHandler: TypeAlias = Callable[
@@ -39,8 +33,10 @@ def create_sampling_callback(sampling_handler: SamplingHandler) -> SamplingFnT:
                 result = await result
 
             if isinstance(result, str):
-                result = MessageResult(
-                    content=mcp.types.TextContent(type="text", text=result)
+                result = CreateMessageResult(
+                    role="assistant",
+                    model="fastmcp-client",
+                    content=mcp.types.TextContent(type="text", text=result),
                 )
             return result
         except Exception as e:

fastmcp/client/transports.py

@@ -20,6 +20,7 @@ from mcp.shared.memory import create_client_server_memory_streams
 from pydantic import AnyUrl
 from typing_extensions import Unpack
 
+import fastmcp
 from fastmcp.client.auth.bearer import BearerAuth
 from fastmcp.client.auth.oauth import OAuth
 from fastmcp.server.dependencies import get_http_headers
@@ -109,11 +110,12 @@ class WSTransport(ClientTransport):
 
     def __init__(self, url: str | AnyUrl):
         # we never really used this transport, so it can be removed at any time
-        warnings.warn(
-            "WSTransport is a deprecated MCP transport and will be removed in a future version. Use StreamableHttpTransport instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
+        if fastmcp.settings.deprecation_warnings:
+            warnings.warn(
+                "WSTransport is a deprecated MCP transport and will be removed in a future version. Use StreamableHttpTransport instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
         if isinstance(url, AnyUrl):
             url = str(url)
         if not isinstance(url, str) or not url.startswith("ws"):

fastmcp/prompts/prompt.py

@@ -8,9 +8,9 @@ from collections.abc import Awaitable, Callable, Sequence
 from typing import TYPE_CHECKING, Any
 
 import pydantic_core
-from mcp.types import EmbeddedResource, ImageContent, PromptMessage, Role, TextContent
 from mcp.types import Prompt as MCPPrompt
 from mcp.types import PromptArgument as MCPPromptArgument
+from mcp.types import PromptMessage, Role, TextContent
 from pydantic import Field, TypeAdapter, validate_call
 
 from fastmcp.exceptions import PromptError
@@ -20,6 +20,7 @@ from fastmcp.utilities.json_schema import compress_schema
 from fastmcp.utilities.logging import get_logger
 from fastmcp.utilities.types import (
     FastMCPBaseModel,
+    MCPContent,
     find_kwarg_by_type,
     get_cached_typeadapter,
 )
@@ -27,13 +28,12 @@ from fastmcp.utilities.types import (
 if TYPE_CHECKING:
     pass
 
-CONTENT_TYPES = TextContent | ImageContent | EmbeddedResource
 
 logger = get_logger(__name__)
 
 
 def Message(
-    content: str | CONTENT_TYPES, role: Role | None = None, **kwargs: Any
+    content: str | MCPContent, role: Role | None = None, **kwargs: Any
 ) -> PromptMessage:
     """A user-friendly constructor for PromptMessage."""
     if isinstance(content, str):

fastmcp/prompts/prompt_manager.py

@@ -60,11 +60,12 @@ class PromptManager:
     ) -> FunctionPrompt:
         """Create a prompt from a function."""
         # deprecated in 2.7.0
-        warnings.warn(
-            "PromptManager.add_prompt_from_fn() is deprecated. Use Prompt.from_function() and call add_prompt() instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
+        if settings.deprecation_warnings:
+            warnings.warn(
+                "PromptManager.add_prompt_from_fn() is deprecated. Use Prompt.from_function() and call add_prompt() instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
         prompt = FunctionPrompt.from_function(
             fn, name=name, description=description, tags=tags
         )

fastmcp/resources/resource_manager.py

@@ -123,11 +123,12 @@ class ResourceManager:
             returns the existing resource.
         """
         # deprecated in 2.7.0
-        warnings.warn(
-            "add_resource_from_fn is deprecated. Use Resource.from_function() and call add_resource() instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
+        if settings.deprecation_warnings:
+            warnings.warn(
+                "add_resource_from_fn is deprecated. Use Resource.from_function() and call add_resource() instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
         resource = Resource.from_function(
             fn=fn,
             uri=uri,
@@ -180,11 +181,12 @@ class ResourceManager:
     ) -> ResourceTemplate:
         """Create a template from a function."""
         # deprecated in 2.7.0
-        warnings.warn(
-            "add_template_from_fn is deprecated. Use ResourceTemplate.from_function() and call add_template() instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
+        if settings.deprecation_warnings:
+            warnings.warn(
+                "add_template_from_fn is deprecated. Use ResourceTemplate.from_function() and call add_template() instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
         template = ResourceTemplate.from_function(
             fn,
             uri_template=uri_template,

fastmcp/server/auth/providers/in_memory.py

@@ -184,7 +184,7 @@ class InMemoryOAuthProvider(OAuthProvider):
 
         return OAuthToken(
             access_token=access_token_value,
-            token_type="bearer",
+            token_type="Bearer",
             expires_in=DEFAULT_ACCESS_TOKEN_EXPIRY_SECONDS,
             refresh_token=refresh_token_value,
             scope=" ".join(authorization_code.scopes),
@@ -254,7 +254,7 @@ class InMemoryOAuthProvider(OAuthProvider):
 
         return OAuthToken(
             access_token=new_access_token_value,
-            token_type="bearer",
+            token_type="Bearer",
             expires_in=DEFAULT_ACCESS_TOKEN_EXPIRY_SECONDS,
             refresh_token=new_refresh_token_value,
             scope=" ".join(scopes),

fastmcp/server/context.py

@@ -11,7 +11,6 @@ from mcp.server.lowlevel.helper_types import ReadResourceContents
 from mcp.shared.context import RequestContext
 from mcp.types import (
     CreateMessageResult,
-    ImageContent,
     ModelHint,
     ModelPreferences,
     Root,
@@ -22,8 +21,10 @@ from pydantic.networks import AnyUrl
 from starlette.requests import Request
 
 import fastmcp.server.dependencies
+from fastmcp import settings
 from fastmcp.server.server import FastMCP
 from fastmcp.utilities.logging import get_logger
+from fastmcp.utilities.types import MCPContent
 
 logger = get_logger(__name__)
 
@@ -203,7 +204,7 @@ class Context:
         temperature: float | None = None,
         max_tokens: int | None = None,
         model_preferences: ModelPreferences | str | list[str] | None = None,
-    ) -> TextContent | ImageContent:
+    ) -> MCPContent:
         """
         Send a sampling request to the client and await the response.
 
@@ -242,14 +243,15 @@ class Context:
     def get_http_request(self) -> Request:
         """Get the active starlette request."""
 
-        # Deprecation warning, added in FastMCP 2.2.11
-        warnings.warn(
-            "Context.get_http_request() is deprecated and will be removed in a future version. "
-            "Use get_http_request() from fastmcp.server.dependencies instead. "
-            "See https://gofastmcp.com/patterns/http-requests for more details.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
+        # Deprecated in 2.2.11
+        if settings.deprecation_warnings:
+            warnings.warn(
+                "Context.get_http_request() is deprecated and will be removed in a future version. "
+                "Use get_http_request() from fastmcp.server.dependencies instead. "
+                "See https://gofastmcp.com/patterns/http-requests for more details.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
 
         return fastmcp.server.dependencies.get_http_request()
 

fastmcp/server/openapi.py

@@ -13,9 +13,10 @@ from re import Pattern
 from typing import TYPE_CHECKING, Any, Literal
 
 import httpx
-from mcp.types import EmbeddedResource, ImageContent, TextContent, ToolAnnotations
+from mcp.types import ToolAnnotations
 from pydantic.networks import AnyUrl
 
+import fastmcp
 from fastmcp.exceptions import ToolError
 from fastmcp.resources import Resource, ResourceTemplate
 from fastmcp.server.dependencies import get_http_headers
@@ -28,6 +29,7 @@ from fastmcp.utilities.openapi import (
     _combine_schemas,
     format_description_with_responses,
 )
+from fastmcp.utilities.types import MCPContent
 
 if TYPE_CHECKING:
     from fastmcp.server import Context
@@ -129,27 +131,30 @@ class RouteMap:
         """Validate and process the route map after initialization."""
         # Handle backward compatibility for route_type, deprecated in 2.5.0
         if self.mcp_type is None and self.route_type is not None:
-            warnings.warn(
-                "The 'route_type' parameter is deprecated and will be removed in a future version. "
-                "Use 'mcp_type' instead with the appropriate MCPType value.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            if isinstance(self.route_type, RouteType):
+            if fastmcp.settings.deprecation_warnings:
                 warnings.warn(
-                    "The RouteType class is deprecated and will be removed in a future version. "
-                    "Use MCPType instead.",
+                    "The 'route_type' parameter is deprecated and will be removed in a future version. "
+                    "Use 'mcp_type' instead with the appropriate MCPType value.",
                     DeprecationWarning,
                     stacklevel=2,
                 )
+            if isinstance(self.route_type, RouteType):
+                if fastmcp.settings.deprecation_warnings:
+                    warnings.warn(
+                        "The RouteType class is deprecated and will be removed in a future version. "
+                        "Use MCPType instead.",
+                        DeprecationWarning,
+                        stacklevel=2,
+                    )
             # Check for the deprecated IGNORE value
             if self.route_type == RouteType.IGNORE:
-                warnings.warn(
-                    "RouteType.IGNORE is deprecated and will be removed in a future version. "
-                    "Use MCPType.EXCLUDE instead.",
-                    DeprecationWarning,
-                    stacklevel=2,
-                )
+                if fastmcp.settings.deprecation_warnings:
+                    warnings.warn(
+                        "RouteType.IGNORE is deprecated and will be removed in a future version. "
+                        "Use MCPType.EXCLUDE instead.",
+                        DeprecationWarning,
+                        stacklevel=2,
+                    )
 
             # Convert from RouteType to MCPType if needed
             if isinstance(self.route_type, RouteType):
@@ -250,9 +255,7 @@ class OpenAPITool(Tool):
         """Custom representation to prevent recursion errors when printing."""
         return f"OpenAPITool(name={self.name!r}, method={self._route.method}, path={self._route.path})"
 
-    async def run(
-        self, arguments: dict[str, Any]
-    ) -> list[TextContent | ImageContent | EmbeddedResource]:
+    async def run(self, arguments: dict[str, Any]) -> list[MCPContent]:
         """Execute the HTTP request based on the route configuration."""
 
         # Prepare URL

fastmcp/server/proxy.py

@@ -9,10 +9,7 @@ from mcp.shared.exceptions import McpError
 from mcp.types import (
     METHOD_NOT_FOUND,
     BlobResourceContents,
-    EmbeddedResource,
     GetPromptResult,
-    ImageContent,
-    TextContent,
     TextResourceContents,
 )
 from pydantic.networks import AnyUrl
@@ -25,6 +22,7 @@ from fastmcp.server.context import Context
 from fastmcp.server.server import FastMCP
 from fastmcp.tools.tool import Tool
 from fastmcp.utilities.logging import get_logger
+from fastmcp.utilities.types import MCPContent
 
 if TYPE_CHECKING:
     from fastmcp.server import Context
@@ -50,7 +48,7 @@ class ProxyTool(Tool):
         self,
         arguments: dict[str, Any],
         context: Context | None = None,
-    ) -> list[TextContent | ImageContent | EmbeddedResource]:
+    ) -> list[MCPContent]:
         # the client context manager will swallow any exceptions inside a TaskGroup
         # so we return the raw result and raise an exception ourselves
         async with self._client:
@@ -254,9 +252,7 @@ class FastMCPProxy(FastMCP):
 
         return prompts
 
-    async def _call_tool(
-        self, key: str, arguments: dict[str, Any]
-    ) -> list[TextContent | ImageContent | EmbeddedResource]:
+    async def _call_tool(self, key: str, arguments: dict[str, Any]) -> list[MCPContent]:
         try:
             result = await super()._call_tool(key, arguments)
             return result