Max Isbey
8c88d2792b
Root `mcp` package: export `MCPServer` (alongside the existing `Client`, so `from mcp import MCPServer, Client` works) and `NoBackChannelError`; drop the v1-carryover `SamplingRole` alias (`mcp.types.Role`). `mcp.client` now re-exports the types `Client.listen()` yields and raises: `Subscription`, `SubscriptionLost`, `ListenNotSupportedError`. Remove dead surface: `StreamableHTTPError`/`ResumptionError` (never raised from a reachable path) and `StreamableHTTPTransport.get_session_id()` on the client transport; the no-op `RegistrationRequest`/`TokenSuccessResponse` auth-handler aliases; the `validate_extension_identifier` re-export alias; the unreachable `__main__` guard in `mcp/cli/__init__.py`. The unused lowlevel server `Context` moves to the private `mcp.server._context` module. `_handle_resumption_request` now takes the resumption token as a required argument instead of re-deriving it and carrying an unreachable no-token branch. Enable ruff `RUF022` and sort every `__all__`; `mcp_types/__init__.py` is exempted since its `__all__` is grouped by section comments on purpose.
50 lines
1.3 KiB
Python
50 lines
1.3 KiB
Python
"""The extension-identifier grammar in `mcp.shared.extension`, shared by server and client."""
|
|
|
|
from typing import Any
|
|
|
|
import pytest
|
|
|
|
from mcp.shared.extension import validate_extension_identifier
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"identifier",
|
|
[
|
|
"io.modelcontextprotocol/ui",
|
|
"com.example/my_ext",
|
|
"com.x-y.z2/n.a-b_c",
|
|
"example/x",
|
|
"a/b",
|
|
"com.example/9start",
|
|
],
|
|
)
|
|
def test_grammar_conformant_extension_identifiers_are_accepted(identifier: str) -> None:
|
|
"""Spec `_meta` key grammar: conformant `vendor-prefix/name` identifiers are accepted."""
|
|
validate_extension_identifier(identifier, owner="T")
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"identifier",
|
|
[
|
|
"noprefix",
|
|
"-foo/bar",
|
|
".leading/x",
|
|
"a..b/x",
|
|
"foo-/x",
|
|
"9foo/x",
|
|
"foo/-bar",
|
|
"foo/bar-",
|
|
"foo/",
|
|
"/bar",
|
|
"foo/ba r",
|
|
"io.modelcontextprotocol/ui\n",
|
|
"",
|
|
None,
|
|
42,
|
|
],
|
|
)
|
|
def test_malformed_extension_identifiers_are_rejected(identifier: Any) -> None:
|
|
"""Spec `_meta` key grammar: malformed prefixes, malformed names, and non-strings are rejected."""
|
|
with pytest.raises(TypeError):
|
|
validate_extension_identifier(identifier, owner="T")
|