fix: correct MCPServer.call_tool return type and remove dead code#2700
Open
Ar-maan05 wants to merge 1 commit into
Open
fix: correct MCPServer.call_tool return type and remove dead code#2700Ar-maan05 wants to merge 1 commit into
Ar-maan05 wants to merge 1 commit into
Conversation
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR addresses the dead-code path and incorrect return type annotation on MCPServer.call_tool() described in #2695.
src/mcp/server/mcpserver/server.py, theisinstance(result, dict)check inside_handle_call_tool()is unreachable. As traced in the issue,self.call_tool()invokes the tool manager withconvert_result=True, which delegates toFuncMetadata.convert_result. This converter function never returns a raw dict (returningCallToolResult,Sequence[ContentBlock], ortuple[Sequence[ContentBlock], dict[str, Any]]instead).import jsonfromsrc/mcp/server/mcpserver/server.py.MCPServer.call_tool()'s return type signature to accurately reflect the actual runtime types:CallToolResult | Sequence[ContentBlock] | tuple[Sequence[ContentBlock], dict[str, Any]]docs/migration.mdto assist developers migrating to v2.Related Issues
Closes #2695
Verification
• Verified that the test suite passes successfully (1,194 passed).
• Verified type checking passes cleanly with
pyright(0 errors, 0 warnings).• Ran
coverageandstrict-no-coverto verify that code coverage remains at100.00%and no unused coverage pragmas exist.