Skip to content

fix: check_capability now validates elicitation sub-capabilities (form/url) #2966

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

Closed
Robin1987China wants to merge 1 commit into from
+31 −2
Closed

fix: check_capability now validates elicitation sub-capabilities (form/url) #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/mcp/server/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,13 @@ def check_capability(self, capability: ClientCapabilities) -> bool:
return False
if capability.sampling.tools is not None and have.sampling.tools is None:
return False
if capability.elicitation is not None and have.elicitation is None:
return False
if capability.elicitation is not None:
if have.elicitation is None:
return False
if capability.elicitation.form is not None and have.elicitation.form is None:
return False
if capability.elicitation.url is not None and have.elicitation.url is None:
return False
if capability.experimental is not None:
if have.experimental is None:
return False
Expand Down
24 changes: 24 additions & 0 deletions tests/server/test_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
CreateMessageRequestParams,
ElicitationCapability,
EmptyResult,
FormElicitationCapability,
Implementation,
ListRootsRequest,
ListRootsResult,
Expand All @@ -37,6 +38,7 @@
SamplingCapability,
SamplingContextCapability,
SamplingToolsCapability,
UrlElicitationCapability,
)

_CLIENT_INFO = Implementation(name="t", version="0")
Expand Down Expand Up @@ -365,6 +367,28 @@ def test_connection_check_capability_false_when_no_client_params_recorded():
(ClientCapabilities(experimental={"a": {}}), ClientCapabilities(experimental={"b": {}}), False),
(ClientCapabilities(experimental={"a": {"x": 1}}), ClientCapabilities(experimental={"a": {"x": 2}}), False),
(ClientCapabilities(experimental={"a": {}}), ClientCapabilities(experimental={"a": {}}), True),
# Elicitation sub-capability checks (form / url)
(ClientCapabilities(elicitation=None), ClientCapabilities(elicitation=ElicitationCapability()), False),
(
ClientCapabilities(elicitation=ElicitationCapability(form=FormElicitationCapability())),
ClientCapabilities(elicitation=ElicitationCapability(url=UrlElicitationCapability())),
False,
),
(
ClientCapabilities(elicitation=ElicitationCapability(url=UrlElicitationCapability())),
ClientCapabilities(elicitation=ElicitationCapability(form=FormElicitationCapability())),
False,
),
(
ClientCapabilities(elicitation=ElicitationCapability(form=FormElicitationCapability(), url=UrlElicitationCapability())),
ClientCapabilities(elicitation=ElicitationCapability(form=FormElicitationCapability())),
True,
),
(
ClientCapabilities(elicitation=ElicitationCapability(form=FormElicitationCapability())),
ClientCapabilities(elicitation=ElicitationCapability(form=FormElicitationCapability())),
True,
),
],
)
def test_check_capability_per_field_branches(have: ClientCapabilities, want: ClientCapabilities, expected: bool):
Expand Down
Loading