-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Split ValueError from unexpected errors during logs. #3347
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.
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
Draft
StarsExpress
wants to merge
12
commits into
modelcontextprotocol:main
Choose a base branch
from
StarsExpress:fix-value-error-logs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+100
−5
Draft
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
b83a222
Split ValueError from unexpected errors during logs.
StarsExpress 809dafb
Created PromptValidationError for user-input validation failures.
StarsExpress 445e6e3
Re-trigger CI.
StarsExpress 97ee03f
Reduced caplog.at_level layers from 4 to 3.
StarsExpress 98885e2
Clarified docstring and enhanced readability.
StarsExpress 8c30d12
Ensured no traceback at dispatcher boundary.
StarsExpress ae720ad
Revert "Ensured no traceback at dispatcher boundary."
StarsExpress ae6caf0
Merge branch 'main' into fix-value-error-logs
StarsExpress 21a9d6e
Adjusted test function to match upstream main.
StarsExpress 48b3f62
Merge branch 'main' into fix-value-error-logs
StarsExpress 38ac665
Merge branch 'main' into fix-value-error-logs
StarsExpress 09ed63d
Merge branch 'main' into fix-value-error-logs
StarsExpress File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| from .base import Prompt | ||
| from .base import Prompt, PromptValidationError | ||
| from .manager import PromptManager | ||
|
|
||
| __all__ = ["Prompt", "PromptManager"] | ||
| __all__ = ["Prompt", "PromptManager", "PromptValidationError"] |
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
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.
P2: This regression test only inspects
mcp.server.mcpserver.server, so it can pass even if the same missing-arg failure still emits a traceback frommcp.shared.jsonrpc_dispatcher. Assert the dispatcher logger too, or this test gives false confidence about the reported no-traceback behavior.Prompt for AI agents
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.
This was already investigated — see earlier discussion with @keeltrace on this PR.
I tried exactly this — raising
MCPErrorfrom thePromptValidationErrorbranch so the dispatcher recognizes it as expected too — in 8c30d12, and it broketests/interaction/mcpserver/test_prompts.pyandtests/docs_src/test_prompts.py::test_missing_required_argument_is_a_protocol_error.Legacy
JSONRPCDispatcherand modern Client/HTTP entry deliberately return different wire shapes —code=0, message=str(e) verbatim vs generic code=-32603, message="Internal server error"— for an unrecognized exception at that boundary, so a single exception raised fromget_promptcan't satisfy both.Reverted at ae720ad. Test's docstring documents this scoping decision — asserting dispatcher logger here would make the test fail against expected. This is intentional behavior and not a bug.