fix: chain exceptions in get_prompt and read_resource handlers#2542
Open
blackwell-systems wants to merge 1 commit intomodelcontextprotocol:mainfrom
Open
fix: chain exceptions in get_prompt and read_resource handlers#2542blackwell-systems wants to merge 1 commit intomodelcontextprotocol:mainfrom
blackwell-systems wants to merge 1 commit intomodelcontextprotocol:mainfrom
Conversation
Two raise statements discarded the causal exception chain: - Line 1112: raise ValueError(str(e)) → raise ValueError(str(e)) from e - Line 451: raise ResourceError(...) → raise ResourceError(...) from exc The same file already uses `from exc` correctly at line 459. Without `from`, callers lose the original traceback and cannot programmatically inspect the root cause via __cause__. Fixes modelcontextprotocol#2541
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.
Summary
Two
raisestatements inserver/mcpserver/server.pydiscard the causal exception chain:raise ValueError(str(e))→raise ValueError(str(e)) from eraise ResourceError(...)→raise ResourceError(...) from excMotivation and Context
The same file uses
from exccorrectly at line 459. These two sites are inconsistent and lose the original traceback, making it impossible for callers to programmatically inspect the root cause via__cause__.Without
from, Python shows "During handling of the above exception, another exception occurred" which is confusing. Withfrom, it shows "The above exception was the direct cause of the following exception" and preserves the chain forisinstance()checks on__cause__.How Has This Been Tested?
The change is purely additive (adds
fromclause) and does not alter control flow or exception types. Existing tests pass unchanged.Fixes #2541