π The fast, Pythonic way to build MCP servers and clients.
Improve matching logic for quoted chars
Jeremiah Lowin4de2469d29f9
diff --git a/src/fastmcp/resources/template.py b/src/fastmcp/resources/template.pyindex 08f39585c..bba1c4467 100644--- a/src/fastmcp/resources/template.py+++ b/src/fastmcp/resources/template.py@@ -6,6 +6,7 @@ import inspectimport refrom collections.abc import Callablefrom typing import Annotated, Any+from urllib.parse import unquotefrom mcp.types import ResourceTemplate as MCPResourceTemplatefrom pydantic import (@@ -38,7 +39,9 @@ def build_regex(template: str) -> re.Pattern:def match_uri_template(uri: str, uri_template: str) -> dict[str, str] | None:regex = build_regex(uri_template)match = regex.match(uri)- return match.groupdict() if match else None+ if match:+ return {k: unquote(v) for k, v in match.groupdict().items()}+ return Noneclass MyModel(BaseModel):diff --git a/tests/resources/test_resource_template.py b/tests/resources/test_resource_template.pyindex 4f6638ed8..68b408aab 100644--- a/tests/resources/test_resource_template.py+++ b/tests/resources/test_resource_template.py@@ -1,4 +1,5 @@import json+from urllib.parse import quoteimport pytestfrom pydantic import BaseModel@@ -312,6 +313,18 @@ class TestMatchUriTemplate:("test://foo/123", {"x": "foo", "y": "123"}),("test://bar/456", {"x": "bar", "y": "456"}),("test://foo/bar", {"x": "foo", "y": "bar"}),+ ("test://foo/bar/baz", None),+ ("test://foo/[email protected]", {"x": "foo", "y": "[email protected]"}),+ ("test://two words/foo", {"x": "two words", "y": "foo"}),+ ("test://two.words/foo+bar", {"x": "two.words", "y": "foo+bar"}),+ (+ f"test://escaped{quote('/', safe='')}word/bar",+ {"x": "escaped/word", "y": "bar"},+ ),+ (+ f"test://escaped{quote('{', safe='')}x{quote('}', safe='')}word/bar",+ {"x": "escaped{x}word", "y": "bar"},+ ),("prefix+test://foo/123", None),("test://foo", None),("other://foo/123", None),