🚀 The fast, Pythonic way to build MCP servers and clients.
Fix resource templates with query params on proxied servers (#4251)
René Mulder0f4f78c46491
diff --git a/fastmcp_slim/fastmcp/server/providers/proxy.py b/fastmcp_slim/fastmcp/server/providers/proxy.pyindex ce0beb3a9..b3bcae43d 100644--- a/fastmcp_slim/fastmcp/server/providers/proxy.py+++ b/fastmcp_slim/fastmcp/server/providers/proxy.py@@ -43,6 +43,7 @@ from fastmcp.prompts import Message, Prompt, PromptResultfrom fastmcp.prompts.base import PromptArgumentfrom fastmcp.resources import Resource, ResourceTemplatefrom fastmcp.resources.base import ResourceContent, ResourceResult+from fastmcp.resources.template import expand_uri_template, extract_query_paramsfrom fastmcp.server.context import Contextfrom fastmcp.server.dependencies import get_contextfrom fastmcp.server.middleware import CallNext, Middleware, MiddlewareContext@@ -395,9 +396,15 @@ class ProxyTemplate(ResourceTemplate):# uri_template on the remote server.# quote params to ensure they are valid for the uri_templatebackend_template = self._backend_uri_template or self.uri_template- parameterized_uri = backend_template.format(- **{k: quote(v, safe="") for k, v in params.items()}- )+ # Normalize to underscored keys to match how match_uri_template normalizes incoming params+ query_param_names = {+ p.replace("-", "_") for p in extract_query_params(backend_template)+ }+ quoted_params = {+ k: (v if k in query_param_names else quote(str(v), safe=""))+ for k, v in params.items()+ }+ parameterized_uri = expand_uri_template(backend_template, quoted_params)client = await self._get_client()async with client:result = await client.read_resource(parameterized_uri)diff --git a/tests/server/providers/proxy/test_proxy_server.py b/tests/server/providers/proxy/test_proxy_server.pyindex 120e40b08..bfd717cac 100644--- a/tests/server/providers/proxy/test_proxy_server.py+++ b/tests/server/providers/proxy/test_proxy_server.py@@ -711,6 +711,96 @@ class TestResourceTemplates:assert user_template.name == "overwritten_get_user"+class TestResourceTemplateQueryParams:+ """Resource templates with RFC 6570 {?param} query params work through proxy."""++ async def test_query_param_forwarded(self):+ remote = FastMCP("Remote")++ @remote.resource("data://{id}{?format}")+ def get_data(id: str, format: str = "json") -> str:+ return f"id={id} format={format}"++ proxy = create_proxy(Client(remote))+ async with Client(proxy) as client:+ result = await client.read_resource("data://123?format=xml")+ assert isinstance(result[0], TextResourceContents)+ assert result[0].text == "id=123 format=xml"++ async def test_query_param_default_used_when_omitted(self):+ remote = FastMCP("Remote")++ @remote.resource("data://{id}{?format}")+ def get_data(id: str, format: str = "json") -> str:+ return f"id={id} format={format}"++ proxy = create_proxy(Client(remote))+ async with Client(proxy) as client:+ result = await client.read_resource("data://123")+ assert isinstance(result[0], TextResourceContents)+ assert result[0].text == "id=123 format=json"++ async def test_multiple_query_params_forwarded(self):+ remote = FastMCP("Remote")++ @remote.resource("data://{id}{?limit,offset}")+ def get_data(id: str, limit: int = 10, offset: int = 0) -> str:+ return f"id={id} limit={limit} offset={offset}"++ proxy = create_proxy(Client(remote))+ async with Client(proxy) as client:+ result = await client.read_resource("data://abc?limit=5&offset=20")+ assert isinstance(result[0], TextResourceContents)+ assert result[0].text == "id=abc limit=5 offset=20"++ async def test_encoded_path_param_preserved(self):+ remote = FastMCP("Remote")++ @remote.resource("data://{id}")+ def get_data(id: str) -> str:+ return f"id={id}"++ proxy = create_proxy(Client(remote))+ async with Client(proxy) as client:+ result = await client.read_resource("data://a%2Fb")+ assert isinstance(result[0], TextResourceContents)+ assert result[0].text == "id=a/b"++ async def test_hyphenated_query_param_forwarded(self):+ remote = FastMCP("Remote")++ @remote.resource("data://{id}{?api-version}")+ def get_data(id: str, api_version: str = "v1") -> str:+ return f"id={id} api_version={api_version}"++ proxy = create_proxy(Client(remote))+ async with Client(proxy) as client:+ result = await client.read_resource("data://123?api-version=v2")+ assert isinstance(result[0], TextResourceContents)+ assert result[0].text == "id=123 api_version=v2"++ def test_same_name_in_path_and_query_is_rejected(self):+ remote = FastMCP("Remote")+ with pytest.raises(ValueError, match="must be optional"):++ @remote.resource("data://{id}{?id}")+ def get_data(id: str) -> str:+ return id++ async def test_hyphenated_query_param_not_double_encoded(self):+ remote = FastMCP("Remote")++ @remote.resource("data://{id}{?api-version}")+ def get_data(id: str, api_version: str = "v1") -> str:+ return f"id={id} api_version={api_version}"++ proxy = create_proxy(Client(remote))+ async with Client(proxy) as client:+ result = await client.read_resource("data://123?api-version=a%2Fb")+ assert isinstance(result[0], TextResourceContents)+ assert result[0].text == "id=123 api_version=a/b"++class TestPrompts:async def test_get_prompts_server_method(self, proxy_server: FastMCPProxy):prompts = await proxy_server.list_prompts()