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

tests/interaction/mcpserver/test_completion.py

@@ -1,9 +1,7 @@
 """Completion behaviour against MCPServer, driven through the public Client API."""
 
 import pytest
-
-from mcp.server.mcpserver import MCPServer
-from mcp.types import (
+from mcp_types import (
     Completion,
     CompletionArgument,
     CompletionContext,
@@ -11,6 +9,8 @@ from mcp.types import (
     PromptReference,
     ResourceTemplateReference,
 )
+
+from mcp.server.mcpserver import MCPServer
 from tests.interaction._connect import Connect
 from tests.interaction._requirements import requirement
 

tests/interaction/mcpserver/test_context.py

@@ -2,13 +2,7 @@
 
 import pytest
 from inline_snapshot import snapshot
-from pydantic import BaseModel
-
-from mcp import MCPError
-from mcp.client import ClientRequestContext
-from mcp.server.elicitation import AcceptedElicitation
-from mcp.server.mcpserver import Context, MCPServer
-from mcp.types import (
+from mcp_types import (
     METHOD_NOT_FOUND,
     CallToolResult,
     ElicitRequestFormParams,
@@ -20,6 +14,12 @@ from mcp.types import (
     LoggingMessageNotificationParams,
     TextContent,
 )
+from pydantic import BaseModel
+
+from mcp import MCPError
+from mcp.client import ClientRequestContext
+from mcp.server.elicitation import AcceptedElicitation
+from mcp.server.mcpserver import Context, MCPServer
 from tests.interaction._connect import Connect
 from tests.interaction._helpers import IncomingMessage
 from tests.interaction._requirements import requirement

tests/interaction/mcpserver/test_prompts.py

@@ -2,10 +2,7 @@
 
 import pytest
 from inline_snapshot import snapshot
-
-from mcp import MCPError
-from mcp.server.mcpserver import MCPServer
-from mcp.types import (
+from mcp_types import (
     ErrorData,
     GetPromptResult,
     ListPromptsResult,
@@ -14,6 +11,9 @@ from mcp.types import (
     PromptMessage,
     TextContent,
 )
+
+from mcp import MCPError
+from mcp.server.mcpserver import MCPServer
 from tests.interaction._connect import Connect
 from tests.interaction._requirements import requirement
 

tests/interaction/mcpserver/test_resources.py

@@ -2,10 +2,7 @@
 
 import pytest
 from inline_snapshot import snapshot
-
-from mcp import MCPError
-from mcp.server.mcpserver import MCPServer
-from mcp.types import (
+from mcp_types import (
     ErrorData,
     ListResourcesResult,
     ListResourceTemplatesResult,
@@ -14,6 +11,9 @@ from mcp.types import (
     ResourceTemplate,
     TextResourceContents,
 )
+
+from mcp import MCPError
+from mcp.server.mcpserver import MCPServer
 from tests.interaction._connect import Connect
 from tests.interaction._requirements import requirement
 

tests/interaction/mcpserver/test_tools.py

@@ -5,13 +5,7 @@ from typing import Annotated, Literal
 
 import pytest
 from inline_snapshot import snapshot
-from pydantic import BaseModel, Field
-
-from mcp import MCPError
-from mcp.server.mcpserver import Context, MCPServer
-from mcp.server.mcpserver.exceptions import ToolError
-from mcp.shared.exceptions import UrlElicitationRequiredError
-from mcp.types import (
+from mcp_types import (
     URL_ELICITATION_REQUIRED,
     CallToolResult,
     ElicitRequestURLParams,
@@ -20,6 +14,12 @@ from mcp.types import (
     LoggingMessageNotificationParams,
     TextContent,
 )
+from pydantic import BaseModel, Field
+
+from mcp import MCPError
+from mcp.server.mcpserver import Context, MCPServer
+from mcp.server.mcpserver.exceptions import ToolError
+from mcp.shared.exceptions import UrlElicitationRequiredError
 from tests.interaction._connect import Connect
 from tests.interaction._helpers import IncomingMessage
 from tests.interaction._requirements import requirement