Skip to content

Commit 27438a5

Browse files
committed
Adapt story suite to the mcp-types package split after rebase
1 parent c223fec commit 27438a5

58 files changed

Lines changed: 108 additions & 72 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

examples/stories/_harness.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
import anyio
2121
import httpx
22+
from mcp_types.version import LATEST_MODERN_VERSION
2223

2324
from mcp import StdioServerParameters, stdio_client
2425
from mcp.client import Transport
2526
from mcp.client.streamable_http import streamable_http_client
2627
from mcp.server import Server
2728
from mcp.server.mcpserver import MCPServer
28-
from mcp.shared.version import LATEST_MODERN_VERSION
2929

3030
if sys.version_info >= (3, 11):
3131
import tomllib

examples/stories/bearer_auth/server_lowlevel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
from typing import Any
44

5+
import mcp_types as types
56
from pydantic import AnyHttpUrl
67
from starlette.applications import Starlette
78

8-
from mcp import types
99
from mcp.server.auth.middleware.auth_context import get_access_token
1010
from mcp.server.auth.settings import AuthSettings
1111
from mcp.server.context import ServerRequestContext

examples/stories/custom_methods/client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
from typing import Literal, cast
44

5-
from mcp import types
5+
import mcp_types as types
6+
67
from mcp.client import Client
78
from stories._harness import Target, run_client
89

examples/stories/custom_methods/server.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
from typing import Any
88

9-
from mcp import types
9+
import mcp_types as types
10+
1011
from mcp.server.context import ServerRequestContext
1112
from mcp.server.lowlevel import Server
1213
from stories._hosting import run_server_from_args

examples/stories/dual_era/client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
"""Connect to the same server factory twice — once per era, so `main` takes `targets` — and assert both are served."""
22

3-
from mcp import types
3+
import mcp_types as types
4+
from mcp_types.version import LATEST_HANDSHAKE_VERSION, LATEST_MODERN_VERSION
5+
46
from mcp.client import Client
5-
from mcp.shared.version import LATEST_HANDSHAKE_VERSION, LATEST_MODERN_VERSION
67
from stories._harness import TargetFactory, run_client
78

89

examples/stories/dual_era/server.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
"""One MCPServer factory that serves both the 2025 handshake era and the 2026 stateless era."""
22

3+
from mcp_types.version import MODERN_PROTOCOL_VERSIONS
4+
35
from mcp.server.mcpserver import Context, MCPServer
4-
from mcp.shared.version import MODERN_PROTOCOL_VERSIONS
56
from stories._hosting import run_server_from_args
67

78

examples/stories/dual_era/server_lowlevel.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
from typing import Any
44

5-
from mcp import types
5+
import mcp_types as types
6+
from mcp_types.version import MODERN_PROTOCOL_VERSIONS
7+
68
from mcp.server.context import ServerRequestContext
79
from mcp.server.lowlevel import Server
8-
from mcp.shared.version import MODERN_PROTOCOL_VERSIONS
910
from stories._hosting import run_server_from_args
1011

1112
GREET_INPUT_SCHEMA: dict[str, Any] = {

examples/stories/error_handling/client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
"""Prove the two error channels: is_error results return; MCPError raises."""
22

3+
from mcp_types import INVALID_PARAMS, TextContent
4+
35
from mcp import MCPError
46
from mcp.client import Client
5-
from mcp.types import INVALID_PARAMS, TextContent
67
from stories._harness import Target, run_client
78

89

examples/stories/error_handling/server.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
"""Two error channels: ToolError -> is_error result; MCPError -> JSON-RPC protocol error."""
22

3+
from mcp_types import INVALID_PARAMS
4+
35
from mcp.server.mcpserver import MCPServer
46
from mcp.server.mcpserver.exceptions import ToolError
57
from mcp.shared.exceptions import MCPError
6-
from mcp.types import INVALID_PARAMS
78
from stories._hosting import run_server_from_args
89

910

examples/stories/error_handling/server_lowlevel.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
from typing import Any
44

5-
from mcp import types
5+
import mcp_types as types
6+
67
from mcp.server.context import ServerRequestContext
78
from mcp.server.lowlevel import Server
89
from mcp.shared.exceptions import MCPError

0 commit comments

Comments
 (0)