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

examples/mcpserver/direct_call_tool_result_return.py

@@ -2,10 +2,10 @@
 
 from typing import Annotated
 
+from mcp_types import CallToolResult, TextContent
 from pydantic import BaseModel
 
 from mcp.server.mcpserver import MCPServer
-from mcp.types import CallToolResult, TextContent
 
 mcp = MCPServer("Echo Server")
 

examples/servers/everything-server/mcp_everything_server/server.py

@@ -15,7 +15,7 @@ from mcp.server.mcpserver import Context, MCPServer
 from mcp.server.mcpserver.prompts.base import UserMessage
 from mcp.server.streamable_http import EventCallback, EventMessage, EventStore
 from mcp.shared.exceptions import MCPError
-from mcp.types import (
+from mcp_types import (
     AudioContent,
     Completion,
     CompletionArgument,
@@ -33,7 +33,7 @@ from mcp.types import (
     TextResourceContents,
     UnsubscribeRequestParams,
 )
-from mcp.types.jsonrpc import MISSING_REQUIRED_CLIENT_CAPABILITY
+from mcp_types.jsonrpc import MISSING_REQUIRED_CLIENT_CAPABILITY
 from pydantic import BaseModel, Field
 
 logger = logging.getLogger(__name__)

examples/servers/simple-pagination/mcp_simple_pagination/server.py

@@ -8,7 +8,7 @@ from typing import TypeVar
 
 import anyio
 import click
-from mcp import types
+import mcp_types as types
 from mcp.server import Server, ServerRequestContext
 
 T = TypeVar("T")

examples/servers/simple-prompt/mcp_simple_prompt/server.py

@@ -1,6 +1,6 @@
 import anyio
 import click
-from mcp import types
+import mcp_types as types
 from mcp.server import Server, ServerRequestContext
 
 

examples/servers/simple-resource/README.md

@@ -22,7 +22,7 @@ Using the MCP client, you can retrieve resources like this using the STDIO trans
 
 ```python
 import asyncio
-from mcp.types import AnyUrl
+from pydantic import AnyUrl
 from mcp.client.session import ClientSession
 from mcp.client.stdio import StdioServerParameters, stdio_client
 

examples/servers/simple-resource/mcp_simple_resource/server.py

@@ -2,7 +2,7 @@ from urllib.parse import urlparse
 
 import anyio
 import click
-from mcp import types
+import mcp_types as types
 from mcp.server import Server, ServerRequestContext
 
 SAMPLE_RESOURCES = {

examples/servers/simple-streamablehttp-stateless/mcp_simple_streamablehttp_stateless/server.py

@@ -2,8 +2,8 @@ import logging
 
 import anyio
 import click
+import mcp_types as types
 import uvicorn
-from mcp import types
 from mcp.server import Server, ServerRequestContext
 from starlette.middleware.cors import CORSMiddleware
 

examples/servers/simple-streamablehttp/mcp_simple_streamablehttp/event_store.py

@@ -10,7 +10,7 @@ from dataclasses import dataclass
 from uuid import uuid4
 
 from mcp.server.streamable_http import EventCallback, EventId, EventMessage, EventStore, StreamId
-from mcp.types import JSONRPCMessage
+from mcp_types import JSONRPCMessage
 
 logger = logging.getLogger(__name__)
 

examples/servers/simple-streamablehttp/mcp_simple_streamablehttp/server.py

@@ -2,8 +2,8 @@ import logging
 
 import anyio
 import click
+import mcp_types as types
 import uvicorn
-from mcp import types
 from mcp.server import Server, ServerRequestContext
 from starlette.middleware.cors import CORSMiddleware
 

examples/servers/simple-tool/mcp_simple_tool/server.py

@@ -1,6 +1,6 @@
 import anyio
 import click
-from mcp import types
+import mcp_types as types
 from mcp.server import Server, ServerRequestContext
 from mcp.shared._httpx_utils import create_mcp_http_client
 

examples/servers/sse-polling-demo/mcp_sse_polling_demo/event_store.py

@@ -10,7 +10,7 @@ from dataclasses import dataclass
 from uuid import uuid4
 
 from mcp.server.streamable_http import EventCallback, EventId, EventMessage, EventStore, StreamId
-from mcp.types import JSONRPCMessage
+from mcp_types import JSONRPCMessage
 
 logger = logging.getLogger(__name__)
 

examples/servers/sse-polling-demo/mcp_sse_polling_demo/server.py

@@ -16,8 +16,8 @@ import logging
 
 import anyio
 import click
+import mcp_types as types
 import uvicorn
-from mcp import types
 from mcp.server import Server, ServerRequestContext
 
 from .event_store import InMemoryEventStore

examples/servers/structured-output-lowlevel/mcp_structured_output_lowlevel/__main__.py

@@ -10,8 +10,9 @@ import json
 import random
 from datetime import datetime
 
+import mcp_types as types
+
 import mcp.server.stdio
-from mcp import types
 from mcp.server import Server, ServerRequestContext
 
 

examples/snippets/clients/completion_client.py

@@ -5,9 +5,10 @@ uv run completion-client
 import asyncio
 import os
 
+from mcp_types import PromptReference, ResourceTemplateReference
+
 from mcp import ClientSession, StdioServerParameters
 from mcp.client.stdio import stdio_client
-from mcp.types import PromptReference, ResourceTemplateReference
 
 # Create server parameters for stdio connection
 server_params = StdioServerParameters(

examples/snippets/clients/pagination_client.py

@@ -2,9 +2,10 @@
 
 import asyncio
 
+from mcp_types import PaginatedRequestParams, Resource
+
 from mcp.client.session import ClientSession
 from mcp.client.stdio import StdioServerParameters, stdio_client
-from mcp.types import PaginatedRequestParams, Resource
 
 
 async def list_all_resources() -> None:

examples/snippets/clients/parsing_tool_results.py

@@ -2,7 +2,9 @@
 
 import asyncio
 
-from mcp import ClientSession, StdioServerParameters, types
+import mcp_types as types
+
+from mcp import ClientSession, StdioServerParameters
 from mcp.client.stdio import stdio_client
 
 

examples/snippets/clients/stdio_client.py

@@ -5,7 +5,9 @@ uv run client
 import asyncio
 import os
 
-from mcp import ClientSession, StdioServerParameters, types
+import mcp_types as types
+
+from mcp import ClientSession, StdioServerParameters
 from mcp.client.context import ClientRequestContext
 from mcp.client.stdio import stdio_client
 

examples/snippets/clients/url_elicitation_client.py

@@ -28,11 +28,13 @@ import webbrowser
 from typing import Any
 from urllib.parse import urlparse
 
-from mcp import ClientSession, types
+import mcp_types as types
+from mcp_types import URL_ELICITATION_REQUIRED
+
+from mcp import ClientSession
 from mcp.client.context import ClientRequestContext
 from mcp.client.sse import sse_client
 from mcp.shared.exceptions import MCPError, UrlElicitationRequiredError
-from mcp.types import URL_ELICITATION_REQUIRED
 
 
 async def handle_elicitation(

examples/snippets/servers/completion.py

@@ -1,5 +1,4 @@
-from mcp.server.mcpserver import MCPServer
-from mcp.types import (
+from mcp_types import (
     Completion,
     CompletionArgument,
     CompletionContext,
@@ -7,6 +6,8 @@ from mcp.types import (
     ResourceTemplateReference,
 )
 
+from mcp.server.mcpserver import MCPServer
+
 mcp = MCPServer(name="Example")
 
 

examples/snippets/servers/direct_call_tool_result.py

@@ -2,10 +2,10 @@
 
 from typing import Annotated
 
+from mcp_types import CallToolResult, TextContent
 from pydantic import BaseModel
 
 from mcp.server.mcpserver import MCPServer
-from mcp.types import CallToolResult, TextContent
 
 mcp = MCPServer("CallToolResult Example")