Add resources parameter to MCPServer - #2414
Merged
Kludex merged 3 commits intoApr 12, 2026
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Kludex
reviewed
Apr 12, 2026
Comment thread
tests/server/mcpserver/resources/test_resource_manager.py
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
I've refactored this file.
Sorry, something went wrong.
Kludex
approved these changes
Apr 12, 2026
Kludex
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
Thanks!
Sorry, something went wrong.
8 tasks
maxisbey
added a commit
that referenced
this pull request
Jun 26, 2026
Replaces the regex-based resource template matcher with a linear-time RFC 6570 implementation, adds configurable path-safety validation, and ships a standalone UriTemplate utility usable from the low-level server. Rebased onto main@4caa41f6 (squashed from 47 commits at 8b5ca89). Absorbs mcp-types split (#2973), ResourceNotFoundError (#2920), ResourceError chaining (#2542), resources= ctor param (#2414), is_async_callable (#2389), and sync-handler offloading (#2380). ResourceSecurityError now re-raises as ResourceNotFoundError in ResourceManager.get_resource so security rejections map to -32602 (SEP-2164) and halt template iteration.
maxisbey
added a commit
that referenced
this pull request
Jun 26, 2026
Replaces the regex-based resource template matcher with a linear-time RFC 6570 implementation, adds configurable path-safety validation, and ships a standalone UriTemplate utility usable from the low-level server. Rebased onto main@4caa41f6 (squashed from 47 commits at 8b5ca89). Absorbs mcp-types split (#2973), ResourceNotFoundError (#2920), ResourceError chaining (#2542), resources= ctor param (#2414), is_async_callable (#2389), and sync-handler offloading (#2380). ResourceSecurityError now re-raises as ResourceNotFoundError in ResourceManager.get_resource so security rejections map to -32602 (SEP-2164) and halt template iteration.
maxisbey
added a commit
that referenced
this pull request
Jun 26, 2026
Replaces the regex-based resource template matcher with a linear-time RFC 6570 implementation, adds configurable path-safety validation, and ships a standalone UriTemplate utility usable from the low-level server. Rebased onto main@4caa41f6 (squashed from 47 commits at 8b5ca89). Absorbs mcp-types split (#2973), ResourceNotFoundError (#2920), ResourceError chaining (#2542), resources= ctor param (#2414), is_async_callable (#2389), and sync-handler offloading (#2380). ResourceSecurityError now re-raises as ResourceNotFoundError in ResourceManager.get_resource so security rejections map to -32602 (SEP-2164) and halt template iteration.
maxisbey
added a commit
that referenced
this pull request
Jun 26, 2026
Replaces the regex-based resource template matcher with a linear-time RFC 6570 implementation, adds configurable path-safety validation, and ships a standalone UriTemplate utility usable from the low-level server. Rebased onto main@4caa41f6 (squashed from 47 commits at 8b5ca89). Absorbs mcp-types split (#2973), ResourceNotFoundError (#2920), ResourceError chaining (#2542), resources= ctor param (#2414), is_async_callable (#2389), and sync-handler offloading (#2380). ResourceSecurityError now re-raises as ResourceNotFoundError in ResourceManager.get_resource so security rejections map to -32602 (SEP-2164) and halt template iteration.
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
Add constructor-time resource seeding to ResourceManager and wire MCPServer through it so servers can preload concrete resources at initialization, matching the existing tool manager pattern.
Motivation and Context
This makes resource registration consistent with tool registration and removes the manual loop from MCPServer.__init__. It also makes it easier to create pre-populated servers without adding extra setup code after construction.
How Has This Been Tested?
Breaking Changes
None. ResourceManager(resources=...) and MCPServer(resources=...) are additive.
Types of changes
Checklist
Additional context
Resource seeding now happens inside ResourceManager.__init__, so MCPServer no longer needs a manual registration loop. Duplicate resources continue to flow through add_resource(...), preserving first-write-wins behavior and existing duplicate warnings.