Split the client SDK into a standalone mcp-client package #3583
+14,829
−12,687
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| """Exercise an installed client distribution without the SDK's server dependencies. | ||
|
|
||
| The peer uses raw messages because the server package must be absent from this environment. | ||
| """ | ||
|
|
||
| import importlib | ||
| import importlib.util | ||
| import pkgutil | ||
| from collections.abc import AsyncIterator | ||
| from contextlib import asynccontextmanager | ||
| from typing import get_type_hints | ||
|
|
||
| import anyio | ||
| import mcp_client | ||
| from mcp_client.shared import exceptions | ||
| from mcp_client.shared.memory import MessageStream, create_client_server_memory_streams | ||
| from mcp_client.shared.message import SessionMessage | ||
| from mcp_types import JSONRPCRequest, JSONRPCResponse, ListToolsResult, Tool | ||
|
|
||
| get_type_hints(mcp_client.Client.__init__) | ||
|
|
||
| for error_type in ( | ||
| exceptions.MCPError, | ||
| exceptions.MCPDeprecationWarning, | ||
| exceptions.NoBackChannelError, | ||
| exceptions.UrlElicitationRequiredError, | ||
| ): | ||
| assert error_type.__module__ == "mcp_client.shared.exceptions" | ||
|
|
||
| for name in ("mcp", "starlette", "uvicorn", "sse_starlette", "multipart"): | ||
| assert importlib.util.find_spec(name) is None, name | ||
|
|
||
| for info in pkgutil.walk_packages(mcp_client.__path__, prefix="mcp_client."): | ||
| if not any(part.startswith("_") for part in info.name.split(".")): | ||
| importlib.import_module(info.name) | ||
|
|
||
| RESULT = ListToolsResult(tools=[Tool(name="example", input_schema={"type": "object"})]) | ||
|
|
||
|
|
||
| @asynccontextmanager | ||
| async def transport() -> AsyncIterator[MessageStream]: | ||
| async with create_client_server_memory_streams() as (client_streams, server_streams): | ||
| read, write = server_streams | ||
|
|
||
| async def respond() -> None: | ||
| received = await read.receive() | ||
| assert isinstance(received, SessionMessage) | ||
| message = received.message | ||
| assert isinstance(message, JSONRPCRequest) | ||
| assert message.method == "tools/list" | ||
| await write.send( | ||
| SessionMessage( | ||
| JSONRPCResponse( | ||
| jsonrpc="2.0", id=message.id, result=RESULT.model_dump(by_alias=True, exclude_none=True) | ||
| ) | ||
| ) | ||
| ) | ||
|
|
||
| async with anyio.create_task_group() as group: | ||
| group.start_soon(respond) | ||
| yield client_streams | ||
|
|
||
|
|
||
| async def main() -> None: | ||
| """Verify a client request and response through the installed public API.""" | ||
| with anyio.fail_after(5): | ||
| async with mcp_client.Client(transport(), mode="2026-07-28") as client: | ||
| assert await client.list_tools() == RESULT | ||
|
|
||
|
|
||
| anyio.run(main) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| """Type-check the installed client package and reject an invalid constructor argument.""" | ||
|
|
||
| import importlib.util | ||
| import json | ||
| import subprocess | ||
| import sys | ||
| import tempfile | ||
| from pathlib import Path | ||
|
|
||
| import mcp_client | ||
|
|
||
| assert importlib.util.find_spec("mcp") is None | ||
|
|
||
| with tempfile.TemporaryDirectory() as directory: | ||
| root = Path(directory) | ||
| consumer = root / "consumer.py" | ||
| consumer.write_text( | ||
| "from mcp_client import Client, StdioServerParameters\n" | ||
| 'Client("https://example.com/mcp")\n' | ||
| 'Client(StdioServerParameters(command="python"))\n' | ||
| "Client(42)\n", | ||
| encoding="utf-8", | ||
| ) | ||
| config = root / "pyrightconfig.json" | ||
| config.write_text( | ||
| json.dumps( | ||
| { | ||
| "pythonPath": sys.executable, | ||
| "typeCheckingMode": "strict", | ||
| } | ||
| ), | ||
| encoding="utf-8", | ||
| ) | ||
| result = subprocess.run( | ||
| ["pyright", "--project", str(config), "--outputjson", *mcp_client.__path__, str(consumer)], | ||
| cwd=root, | ||
| capture_output=True, | ||
| text=True, | ||
| encoding="utf-8", | ||
| check=False, | ||
| ) | ||
| diagnostics = json.loads(result.stdout)["generalDiagnostics"] | ||
| errors = [diagnostic for diagnostic in diagnostics if diagnostic["severity"] == "error"] | ||
| assert result.returncode == 1, result.stdout + result.stderr | ||
| assert len(errors) == 1, result.stdout | ||
| assert errors[0]["file"] == str(consumer), result.stdout | ||
| assert errors[0]["range"]["start"]["line"] == 3, result.stdout | ||
| assert errors[0]["rule"] == "reportArgumentType", result.stdout |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we have this job?