Import the internal deferred_model decorator under a private name

Twenty public modules imported the decorator as `deferred_model`, so it
showed up as e.g. mcp.server.elicitation.deferred_model and
mcp_types.jsonrpc.deferred_model even though it is machinery of the
type-layer package, not part of any module's surface. Import it as
_deferred_model so the public namespaces list only what they mean to
export.

Author: maxisbey

src/mcp-types/mcp_types/jsonrpc.py

@@ -6,7 +6,7 @@
 
 from pydantic import BaseModel, ConfigDict, Field, TypeAdapter
 
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 
 __all__ = [
     "CONNECTION_CLOSED",
@@ -38,7 +38,7 @@
 """The JSON-RPC version string carried by every MCP message envelope."""
 
 
-@deferred_model
+@_deferred_model
 class JSONRPCRequest(BaseModel):
     """A JSON-RPC request that expects a response."""
 
@@ -50,7 +50,7 @@ class JSONRPCRequest(BaseModel):
     params: dict[str, Any] | None = None
 
 
-@deferred_model
+@_deferred_model
 class JSONRPCNotification(BaseModel):
     """A JSON-RPC notification which does not expect a response."""
 
@@ -61,7 +61,7 @@ class JSONRPCNotification(BaseModel):
     params: dict[str, Any] | None = None
 
 
-@deferred_model
+@_deferred_model
 class JSONRPCResponse(BaseModel):
     """A successful (non-error) response to a request.
 
@@ -121,7 +121,7 @@ class JSONRPCResponse(BaseModel):
 """
 
 
-@deferred_model
+@_deferred_model
 class ErrorData(BaseModel):
     """Error information for JSON-RPC error responses."""
 
@@ -143,7 +143,7 @@ class ErrorData(BaseModel):
     """
 
 
-@deferred_model
+@_deferred_model
 class JSONRPCError(BaseModel):
     """A response to a request that indicates an error occurred."""
 

src/mcp/client/auth/extensions/client_credentials.py

@@ -13,7 +13,7 @@
 
 import httpx2
 import jwt
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 from pydantic import BaseModel, ConfigDict, Field
 
 from mcp.client.auth import OAuthClientProvider, OAuthFlowError, TokenStorage
@@ -135,7 +135,7 @@ async def provider(audience: str) -> str:
     return provider
 
 
-@deferred_model
+@_deferred_model
 class SignedJWTParameters(BaseModel):
     """Parameters for creating SDK-signed JWT assertions.
 

src/mcp/client/auth/oauth2.py

@@ -16,7 +16,7 @@
 
 import anyio
 import httpx2
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 from mcp_types.version import is_version_at_least
 from pydantic import BaseModel, ConfigDict, Field, ValidationError
 
@@ -110,7 +110,7 @@ def check_registration_usable(client_info: OAuthClientInformationFull) -> None:
         )
 
 
-@deferred_model
+@_deferred_model
 class PKCEParameters(BaseModel):
     """PKCE (Proof Key for Code Exchange) parameters."""
 

src/mcp/client/session_group.py

@@ -16,7 +16,7 @@
 import anyio
 import httpx2
 import mcp_types as types
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import Self
 
@@ -33,7 +33,7 @@
 # import (import-time cost); the build is transparent at first construction/validation.
 
 
-@deferred_model
+@_deferred_model
 class SseServerParameters(BaseModel):
     """Parameters for initializing an sse_client."""
 
@@ -52,7 +52,7 @@ class SseServerParameters(BaseModel):
     sse_read_timeout: float = 300.0
 
 
-@deferred_model
+@_deferred_model
 class StreamableHttpParameters(BaseModel):
     """Parameters for initializing a streamable_http_client."""
 
@@ -111,7 +111,7 @@ class ClientSessionGroup:
         ```
     """
 
-    @deferred_model
+    @_deferred_model
     class _ComponentNames(BaseModel):
         """Used for reverse index to find components."""
 

src/mcp/client/stdio.py

@@ -21,7 +21,7 @@
 import mcp_types as types
 from anyio.abc import AsyncResource, Process
 from anyio.streams.text import TextReceiveStream
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 from pydantic import BaseModel, ConfigDict, Field
 
 from mcp.client._transport import TransportStreams
@@ -91,7 +91,7 @@ def get_default_environment() -> dict[str, str]:
     return env
 
 
-@deferred_model
+@_deferred_model
 class StdioServerParameters(BaseModel):
     # defer_build: build the validator on first use rather than at import (import-time cost).
     model_config = ConfigDict(defer_build=True)

src/mcp/server/apps.py

@@ -32,7 +32,7 @@ def get_time(ctx: Context) -> str:
 from collections.abc import Callable, Sequence
 from typing import Any, Literal, TypeVar
 
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 from pydantic import BaseModel, ConfigDict
 from pydantic.alias_generators import to_camel
 
@@ -53,7 +53,7 @@ def get_time(ctx: Context) -> str:
 _CallableT = TypeVar("_CallableT", bound=Callable[..., Any])
 
 
-@deferred_model
+@_deferred_model
 class ResourcePermissions(BaseModel):
     """Iframe permissions a `ui://` resource requests (`_meta.ui.permissions`)."""
 
@@ -66,7 +66,7 @@ class ResourcePermissions(BaseModel):
     clipboard_write: dict[str, Any] | None = None
 
 
-@deferred_model
+@_deferred_model
 class ResourceCsp(BaseModel):
     """Content-Security-Policy domains for a `ui://` resource (`_meta.ui.csp`)."""
 

src/mcp/server/auth/handlers/authorize.py

@@ -3,7 +3,7 @@
 from typing import Any, Literal
 
 # TODO(Marcelo): We should drop the `RootModel`.
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 from pydantic import AnyUrl, BaseModel, ConfigDict, Field, RootModel, ValidationError  # noqa: TID251
 from starlette.datastructures import FormData, QueryParams
 from starlette.requests import Request
@@ -27,7 +27,7 @@
 # import (import-time cost); the build is transparent at first construction/validation.
 
 
-@deferred_model
+@_deferred_model
 class AuthorizationRequest(BaseModel):
     model_config = ConfigDict(defer_build=True)
 
@@ -50,7 +50,7 @@ class AuthorizationRequest(BaseModel):
     )
 
 
-@deferred_model
+@_deferred_model
 class AuthorizationErrorResponse(BaseModel):
     model_config = ConfigDict(defer_build=True)
 
@@ -70,7 +70,7 @@ def best_effort_extract_string(key: str, params: None | FormData | QueryParams)
     return None
 
 
-@deferred_model
+@_deferred_model
 class AnyUrlModel(RootModel[AnyUrl]):
     model_config = ConfigDict(defer_build=True)
 

src/mcp/server/auth/handlers/register.py

@@ -4,7 +4,7 @@
 from typing import Any
 from uuid import uuid4
 
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 from pydantic import BaseModel, ConfigDict, ValidationError
 from starlette.requests import Request
 from starlette.responses import Response
@@ -20,7 +20,7 @@
 RegistrationRequest = OAuthClientMetadata
 
 
-@deferred_model
+@_deferred_model
 class RegistrationErrorResponse(BaseModel):
     # defer_build: build the validator on first use rather than at import (import-time cost).
     model_config = ConfigDict(defer_build=True)

src/mcp/server/auth/handlers/revoke.py

@@ -2,7 +2,7 @@
 from functools import partial
 from typing import Any, Literal
 
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 from pydantic import BaseModel, ConfigDict, ValidationError
 from starlette.requests import Request
 from starlette.responses import Response
@@ -18,7 +18,7 @@
 # import (import-time cost); the build is transparent at first construction/validation.
 
 
-@deferred_model
+@_deferred_model
 class RevocationRequest(BaseModel):
     """See https://datatracker.ietf.org/doc/html/rfc7009#section-2.1"""
 
@@ -30,7 +30,7 @@ class RevocationRequest(BaseModel):
     client_secret: str | None
 
 
-@deferred_model
+@_deferred_model
 class RevocationErrorResponse(BaseModel):
     model_config = ConfigDict(defer_build=True)
 

src/mcp/server/auth/handlers/token.py

@@ -4,7 +4,7 @@
 from dataclasses import dataclass
 from typing import Annotated, Any, Literal
 
-from mcp_types._deferred import deferred_model
+from mcp_types._deferred import deferred_model as _deferred_model
 from pydantic import AnyHttpUrl, AnyUrl, BaseModel, ConfigDict, Field, TypeAdapter, ValidationError
 from starlette.requests import Request
 
@@ -23,7 +23,7 @@
 # import (import-time cost); the build is transparent at first construction/validation.
 
 
-@deferred_model
+@_deferred_model
 class AuthorizationCodeRequest(BaseModel):
     model_config = ConfigDict(defer_build=True)
 
@@ -40,7 +40,7 @@ class AuthorizationCodeRequest(BaseModel):
     resource: str | None = Field(None, description="Resource indicator for the token")
 
 
-@deferred_model
+@_deferred_model
 class RefreshTokenRequest(BaseModel):
     model_config = ConfigDict(defer_build=True)
 
@@ -55,7 +55,7 @@ class RefreshTokenRequest(BaseModel):
     resource: str | None = Field(None, description="Resource indicator for the token")
 
 
-@deferred_model
+@_deferred_model
 class JwtBearerRequest(BaseModel):
     model_config = ConfigDict(defer_build=True)
 
@@ -79,7 +79,7 @@ class JwtBearerRequest(BaseModel):
 token_request_adapter = TypeAdapter[TokenRequest](TokenRequest, config=ConfigDict(defer_build=True))
 
 
-@deferred_model
+@_deferred_model
 class TokenErrorResponse(BaseModel):
     """See https://datatracker.ietf.org/doc/html/rfc6749#section-5.2"""