Skip to content

ref(mcp): Use mcp_types package #6763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexander-alderman-webb wants to merge 3 commits into
base: webb/mcp/use-middleware-3
Choose a base branch
from
Open

ref(mcp): Use mcp_types package #6763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15c7bdd
ref(mcp): Use mcp_types package
alexander-alderman-webb Jul 7, 2026
b3cacc8
Merge branch 'webb/mcp/use-middleware-3' into webb/mcp/use-middleware-4
alexander-alderman-webb Jul 7, 2026
3f6d93b
Merge branch 'webb/mcp/use-middleware-3' into webb/mcp/use-middleware-4
alexander-alderman-webb Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion scripts/populate_tox/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@
"deps": {
"*": ["pytest-asyncio"],
},
"include": "<2.0.0a1", # Alphas are currently being released, will come back to these before the release that's expected at the end of July 2026
},
"fastmcp": {
"package": "fastmcp",
Expand Down
49 changes: 27 additions & 22 deletions scripts/populate_tox/package_dependencies.jsonl
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions scripts/populate_tox/releases.jsonl
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 13 additions & 5 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,22 @@
try:
from anyio import EndOfStream, create_memory_object_stream, create_task_group
from mcp.shared.message import SessionMessage
from mcp.types import (
JSONRPCMessage,
JSONRPCNotification,
JSONRPCRequest,
)

_MCP_VERSION = package_version("mcp")
_IS_MCP_V2 = _MCP_VERSION is not None and _MCP_VERSION >= (2, 0, 0)

if _IS_MCP_V2:
from mcp_types import (
JSONRPCMessage,
JSONRPCNotification,
JSONRPCRequest,
)
else:
from mcp.types import (
JSONRPCMessage,
JSONRPCNotification,
JSONRPCRequest,
)
except ImportError:
create_memory_object_stream = None
create_task_group = None
Expand Down
8 changes: 6 additions & 2 deletions tests/integrations/mcp/test_mcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ async def __call__(self, *args, **kwargs):

from mcp.server.lowlevel import Server
from mcp.server.lowlevel.helper_types import ReadResourceContents
from mcp.types import GetPromptResult, PromptMessage, TextContent

MCP_PACKAGE_VERSION = package_version("mcp")
IS_MCP_V2 = MCP_PACKAGE_VERSION is not None and MCP_PACKAGE_VERSION >= (2, 0, 0)
Expand All @@ -52,14 +51,19 @@ async def __call__(self, *args, **kwargs):
request_ctx = None

if IS_MCP_V2:
from mcp.types import (
from mcp_types import (
CallToolRequestParams,
CallToolResult,
GetPromptRequestParams,
GetPromptResult,
PromptMessage,
ReadResourceRequestParams,
ReadResourceResult,
TextContent,
TextResourceContents,
)
else:
from mcp.types import GetPromptResult, PromptMessage, TextContent

from mcp.server.sse import SseServerTransport
from mcp.server.streamable_http_manager import StreamableHTTPSessionManager
Expand Down
Loading
Loading