Extract _first_json_element helper in mcp/auth.py#216
Merged
Conversation
_extract_tool_name, _extract_method and _extract_corpus_id all shared the same JSON-body preamble (empty check, decode, list-unwrap). Pulled it into a shared static helper. Behavior-preserving: same exception class caught (JSONDecodeError only), same edge cases, same return values.
ancongui
pushed a commit
that referenced
this pull request
May 31, 2026
_extract_tool_name, _extract_method and _extract_corpus_id all shared the same JSON-body preamble (empty check, decode, list-unwrap). Pulled it into a shared static helper. Behavior-preserving: same exception class caught (JSONDecodeError only), same edge cases, same return values. Co-authored-by: miguelgfierro <miguelgfierro@users.noreply.github.com>
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
1 participant
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
_extract_tool_name,_extract_methodand_extract_corpus_idonOAuthJWTMiddlewareall shared the same JSON-body preamble: empty-body check,json.loads, and list-unwrap (taking the first element if the decoded value is a list). Extracted that preamble into a single static helper,_first_json_element().Behavior preservation
json.JSONDecodeError(no broadening toValueErrororException).None; non-dict / non-list decoded payloads fall through unchanged; list payloads still unwrap to their first element.Tests
Full suite green: 1763 passed.