Split protocol types into a standalone mcp-types package (#2973)

tests/shared/test_dispatcher.py

@@ -12,13 +12,7 @@ from typing import TYPE_CHECKING, Any
 
 import anyio
 import pytest
-
-from mcp.shared._compat import resync_tracer
-from mcp.shared.direct_dispatcher import DirectDispatcher, create_direct_dispatcher_pair
-from mcp.shared.dispatcher import DispatchContext, Dispatcher, OnNotify, OnRequest, Outbound
-from mcp.shared.exceptions import MCPError
-from mcp.shared.transport_context import TransportContext
-from mcp.types import (
+from mcp_types import (
     CONNECTION_CLOSED,
     INTERNAL_ERROR,
     INVALID_PARAMS,
@@ -28,6 +22,12 @@ from mcp.types import (
     Tool,
 )
 
+from mcp.shared._compat import resync_tracer
+from mcp.shared.direct_dispatcher import DirectDispatcher, create_direct_dispatcher_pair
+from mcp.shared.dispatcher import DispatchContext, Dispatcher, OnNotify, OnRequest, Outbound
+from mcp.shared.exceptions import MCPError
+from mcp.shared.transport_context import TransportContext
+
 from .conftest import PairFactory, direct_pair
 
 

tests/shared/test_exceptions.py

@@ -1,9 +1,9 @@
 """Tests for MCP exception classes."""
 
 import pytest
+from mcp_types import URL_ELICITATION_REQUIRED, ElicitRequestURLParams, ErrorData, JSONRPCError
 
 from mcp.shared.exceptions import MCPError, UrlElicitationRequiredError
-from mcp.types import URL_ELICITATION_REQUIRED, ElicitRequestURLParams, ErrorData, JSONRPCError
 
 
 def test_url_elicitation_required_error_create_with_single_elicitation() -> None:

tests/shared/test_inbound.py

@@ -9,21 +9,12 @@ import dataclasses
 from typing import Any
 
 import pytest
-
-from mcp.shared.inbound import (
-    ERROR_CODE_HTTP_STATUS,
-    MCP_PROTOCOL_VERSION_HEADER,
-    InboundLadderRejection,
-    InboundModernRoute,
-    classify_inbound_request,
-)
-from mcp.shared.version import LATEST_HANDSHAKE_VERSION, LATEST_MODERN_VERSION, MODERN_PROTOCOL_VERSIONS
-from mcp.types import (
+from mcp_types import (
     CLIENT_CAPABILITIES_META_KEY,
     CLIENT_INFO_META_KEY,
     PROTOCOL_VERSION_META_KEY,
 )
-from mcp.types.jsonrpc import (
+from mcp_types.jsonrpc import (
     HEADER_MISMATCH,
     INVALID_PARAMS,
     INVALID_REQUEST,
@@ -32,6 +23,15 @@ from mcp.types.jsonrpc import (
     PARSE_ERROR,
     UNSUPPORTED_PROTOCOL_VERSION,
 )
+from mcp_types.version import LATEST_HANDSHAKE_VERSION, LATEST_MODERN_VERSION, MODERN_PROTOCOL_VERSIONS
+
+from mcp.shared.inbound import (
+    ERROR_CODE_HTTP_STATUS,
+    MCP_PROTOCOL_VERSION_HEADER,
+    InboundLadderRejection,
+    InboundModernRoute,
+    classify_inbound_request,
+)
 
 CLIENT_INFO = {"name": "t", "version": "0"}
 CLIENT_CAPS: dict[str, Any] = {}

tests/shared/test_jsonrpc_dispatcher.py

@@ -10,24 +10,7 @@ from typing import Any
 import anyio
 import anyio.lowlevel
 import pytest
-from trio.testing import MockClock
-
-from mcp import Client
-from mcp.server import Server, ServerRequestContext
-from mcp.shared._compat import resync_tracer
-from mcp.shared._context_streams import ContextReceiveStream, ContextSendStream
-from mcp.shared.dispatcher import CallOptions, DispatchContext
-from mcp.shared.exceptions import MCPError, NoBackChannelError
-from mcp.shared.jsonrpc_dispatcher import (  # pyright: ignore[reportPrivateUsage]
-    JSONRPCDispatcher,
-    _coerce_id,
-    _OutboundPlan,
-    _Pending,
-    _plan_outbound,
-)
-from mcp.shared.message import ClientMessageMetadata, MessageMetadata, ServerMessageMetadata, SessionMessage
-from mcp.shared.transport_context import TransportContext
-from mcp.types import (
+from mcp_types import (
     CONNECTION_CLOSED,
     INTERNAL_ERROR,
     INVALID_PARAMS,
@@ -45,6 +28,23 @@ from mcp.types import (
     RequestId,
     Tool,
 )
+from trio.testing import MockClock
+
+from mcp import Client
+from mcp.server import Server, ServerRequestContext
+from mcp.shared._compat import resync_tracer
+from mcp.shared._context_streams import ContextReceiveStream, ContextSendStream
+from mcp.shared.dispatcher import CallOptions, DispatchContext
+from mcp.shared.exceptions import MCPError, NoBackChannelError
+from mcp.shared.jsonrpc_dispatcher import (  # pyright: ignore[reportPrivateUsage]
+    JSONRPCDispatcher,
+    _coerce_id,
+    _OutboundPlan,
+    _Pending,
+    _plan_outbound,
+)
+from mcp.shared.message import ClientMessageMetadata, MessageMetadata, ServerMessageMetadata, SessionMessage
+from mcp.shared.transport_context import TransportContext
 
 from .conftest import jsonrpc_pair
 from .test_dispatcher import Recorder, echo_handlers, running_pair

tests/shared/test_otel.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+import mcp_types as types
 import pytest
 from logfire.testing import CaptureLogfire
 
-from mcp import types
 from mcp.client.client import Client
 from mcp.server.mcpserver import MCPServer
 

tests/shared/test_peer.py

@@ -10,12 +10,7 @@ from typing import Any
 
 import anyio
 import pytest
-
-from mcp.shared.dispatcher import DispatchContext
-from mcp.shared.exceptions import MCPDeprecationWarning
-from mcp.shared.peer import ClientPeer, dump_params
-from mcp.shared.transport_context import TransportContext
-from mcp.types import (
+from mcp_types import (
     CreateMessageResult,
     CreateMessageResultWithTools,
     ElicitResult,
@@ -25,6 +20,11 @@ from mcp.types import (
     Tool,
 )
 
+from mcp.shared.dispatcher import DispatchContext
+from mcp.shared.exceptions import MCPDeprecationWarning
+from mcp.shared.peer import ClientPeer, dump_params
+from mcp.shared.transport_context import TransportContext
+
 from .conftest import direct_pair
 from .test_dispatcher import running_pair
 

tests/shared/test_sse.py

@@ -8,24 +8,11 @@ from urllib.parse import urlparse
 
 import anyio
 import httpx
+import mcp_types as types
 import pytest
 from httpx_sse import ServerSentEvent
 from inline_snapshot import snapshot
-from starlette.applications import Starlette
-from starlette.requests import Request
-from starlette.responses import Response
-from starlette.routing import Mount, Route
-
-import mcp.client.sse
-from mcp import types
-from mcp.client.session import ClientSession
-from mcp.client.sse import _extract_session_id_from_endpoint, sse_client
-from mcp.server import Server, ServerRequestContext
-from mcp.server.sse import SseServerTransport
-from mcp.server.transport_security import TransportSecuritySettings
-from mcp.shared._httpx_utils import McpHttpClientFactory
-from mcp.shared.exceptions import MCPError
-from mcp.types import (
+from mcp_types import (
     CallToolRequestParams,
     CallToolResult,
     EmptyResult,
@@ -41,6 +28,19 @@ from mcp.types import (
     TextResourceContents,
     Tool,
 )
+from starlette.applications import Starlette
+from starlette.requests import Request
+from starlette.responses import Response
+from starlette.routing import Mount, Route
+
+import mcp.client.sse
+from mcp.client.session import ClientSession
+from mcp.client.sse import _extract_session_id_from_endpoint, sse_client
+from mcp.server import Server, ServerRequestContext
+from mcp.server.sse import SseServerTransport
+from mcp.server.transport_security import TransportSecuritySettings
+from mcp.shared._httpx_utils import McpHttpClientFactory
+from mcp.shared.exceptions import MCPError
 from tests.interaction.transports import StreamingASGITransport
 
 SERVER_NAME = "test_server_for_SSE"

tests/shared/test_streamable_http.py

@@ -17,15 +17,32 @@ from urllib.parse import urlparse
 
 import anyio
 import httpx
+import mcp_types as types
 import pytest
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from httpx_sse import ServerSentEvent
+from mcp_types import (
+    DEFAULT_NEGOTIATED_VERSION,
+    INVALID_PARAMS,
+    INVALID_REQUEST,
+    CallToolRequestParams,
+    CallToolResult,
+    InitializeResult,
+    JSONRPCRequest,
+    ListToolsResult,
+    PaginatedRequestParams,
+    ReadResourceRequestParams,
+    ReadResourceResult,
+    TextContent,
+    TextResourceContents,
+    Tool,
+)
 from starlette.applications import Starlette
 from starlette.requests import Request
 from starlette.routing import Mount
 from starlette.types import Message, Scope
 
-from mcp import MCPError, types
+from mcp import MCPError
 from mcp.client import ClientRequestContext
 from mcp.client.session import ClientSession
 from mcp.client.streamable_http import StreamableHTTPTransport, streamable_http_client
@@ -48,22 +65,6 @@ from mcp.shared._compat import resync_tracer
 from mcp.shared._context_streams import create_context_streams
 from mcp.shared.message import ClientMessageMetadata, ServerMessageMetadata, SessionMessage
 from mcp.shared.session import RequestResponder
-from mcp.types import (
-    DEFAULT_NEGOTIATED_VERSION,
-    INVALID_PARAMS,
-    INVALID_REQUEST,
-    CallToolRequestParams,
-    CallToolResult,
-    InitializeResult,
-    JSONRPCRequest,
-    ListToolsResult,
-    PaginatedRequestParams,
-    ReadResourceRequestParams,
-    ReadResourceResult,
-    TextContent,
-    TextResourceContents,
-    Tool,
-)
 from tests.interaction.transports import StreamingASGITransport
 
 # Test constants

tests/shared/test_version.py

@@ -1,8 +1,7 @@
 """Tests for the protocol-version registry and comparison helpers."""
 
 import pytest
-
-from mcp.shared.version import (
+from mcp_types.version import (
     HANDSHAKE_PROTOCOL_VERSIONS,
     KNOWN_PROTOCOL_VERSIONS,
     MODERN_PROTOCOL_VERSIONS,