fix: Fix logic that determines standard resource vs. resource template to account for context param (#1635) #1666
+270
−57
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.
func_metadata.call_fn_with_arg_validation()to validate arguments in resources while ignoring injected context param, to avoid Pydantic model validation issuesis_async_callable()as a public utilityMotivation and Context
This solves the issue of context not being properly injected into regular resources. Per #1635, when registering a resource with
@mcp.resource(), the logic that determines whether to create a standard resource or a resource template was incorrectly counting the Context parameter as a function parameter. This caused functions with only a Context parameter (no URI parameters) to be incorrectly treated as templates.How Has This Been Tested?
I added unit tests plus used the following test application to ensure the fix worked as expected and didn't affect existing functionality around resources and resource templates. I tested reading resources and resource templates with and without context params
Breaking Changes
Technically yes, because the signature of the
read()function on theResourcetype now includes an additional optionalcontextparam, but this shouldn't break at runtime since the arg is optionalTypes of changes
Checklist
Additional context