π The fast, Pythonic way to build MCP servers and clients.
fix(openapi): keep both values when a query object property matches another parameter (#6256)
nate nowack4447f10f0ffb
diff --git a/fastmcp_slim/fastmcp/utilities/openapi/director.py b/fastmcp_slim/fastmcp/utilities/openapi/director.pyindex 6c99747b9..428147dc5 100644--- a/fastmcp_slim/fastmcp/utilities/openapi/director.py+++ b/fastmcp_slim/fastmcp/utilities/openapi/director.py@@ -401,6 +401,19 @@ class RequestDirector:}serialized: dict[str, Any] = {}++ def add(name: str, value: Any) -> None:+ # Exploded form objects emit bare property names, which can match+ # another parameter's name; keep every value so the key repeats.+ if name not in serialized:+ serialized[name] = value+ return+ existing = serialized[name]+ serialized[name] = [+ *(existing if isinstance(existing, list) else [existing]),+ *(value if isinstance(value, list) else [value]),+ ]+for key, value in query_params.items():param_info = param_lookup.get(key)if param_info is not None:@@ -422,7 +435,7 @@ class RequestDirector:property_name = _query_scalar_to_str(k)if param_info.style == "deepObject":property_name = f"{key}[{property_name}]"- serialized[property_name] = _query_scalar_to_str(v)+ add(property_name, _query_scalar_to_str(v))else:delimiter = self._STYLE_DELIMITERS.get(style, ",")# form,explode=false on objects: key,value pairs@@ -431,18 +444,16 @@ class RequestDirector:for k, v in value.items():parts.append(_query_scalar_to_str(k))parts.append(_query_scalar_to_str(v))- serialized[key] = delimiter.join(parts)+ add(key, delimiter.join(parts))continueif not explode:delimiter = self._STYLE_DELIMITERS.get(style, ",")if isinstance(value, list):if not value:continue- serialized[key] = delimiter.join(- _query_scalar_to_str(v) for v in value- )+ add(key, delimiter.join(_query_scalar_to_str(v) for v in value))continue- serialized[key] = value+ add(key, value)return serialized@staticmethoddiff --git a/tests/server/providers/openapi/test_query_key_collisions.py b/tests/server/providers/openapi/test_query_key_collisions.pynew file mode 100644index 000000000..7ad2dbb35--- /dev/null+++ b/tests/server/providers/openapi/test_query_key_collisions.py@@ -0,0 +1,102 @@+"""Exploded form objects share the query namespace with other parameters.++OpenAPI treats a route's form-style query parameters as one RFC 6570 variable+list (`{?filter*,q}`), so an exploded object property named like another+parameter sends both values rather than one overwriting the other.+"""++from typing import Any++import httpx2+import pytest++from fastmcp import Client, FastMCP+++def make_spec(q_parameter: dict[str, Any]) -> dict[str, Any]:+ return {+ "openapi": "3.1.0",+ "info": {"title": "Query collisions", "version": "1"},+ "paths": {+ "/items": {+ "get": {+ "operationId": "list_items",+ "parameters": [+ {+ "name": "filter",+ "in": "query",+ "schema": {+ "type": "object",+ "properties": {"q": {"type": "integer"}},+ },+ },+ {"name": "q", "in": "query", **q_parameter},+ ],+ "responses": {"200": {"description": "OK"}},+ }+ }+ },+ }+++async def sent_query(spec: dict[str, Any], args: dict[str, Any]) -> list[tuple]:+ requests: list[httpx2.Request] = []++ def capture(request: httpx2.Request) -> httpx2.Response:+ requests.append(request)+ return httpx2.Response(200, json={})++ async with httpx2.AsyncClient(+ base_url="https://example.test", transport=httpx2.MockTransport(capture)+ ) as http_client:+ server = FastMCP.from_openapi(openapi_spec=spec, client=http_client)+ async with Client(server) as client:+ await client.call_tool("list_items", args)++ assert len(requests) == 1+ return requests[0].url.params.multi_items()+++ "q_parameter,q_value,q_items",+ [+ ({"schema": {"type": "boolean"}}, False, [("q", "false")]),+ (+ {"schema": {"type": "array", "items": {"type": "integer"}}},+ [2, 3],+ [("q", "2"), ("q", "3")],+ ),+ (+ {+ "explode": False,+ "schema": {"type": "array", "items": {"type": "integer"}},+ },+ [2, 3],+ [("q", "2,3")],+ ),+ ],+)[email protected]("filter_first", [True, False])+async def test_exploded_object_property_and_parameter_both_send(+ q_parameter: dict[str, Any],+ q_value: Any,+ q_items: list[tuple[str, str]],+ filter_first: bool,+) -> None:+ spec = make_spec(q_parameter)+ filter_arg = {"filter": {"q": 1}}+ q_arg = {"q": q_value}+ args = {**filter_arg, **q_arg} if filter_first else {**q_arg, **filter_arg}++ sent = await sent_query(spec, args)++ expected = [("q", "1"), *q_items] if filter_first else [*q_items, ("q", "1")]+ assert sent == expected+++async def test_non_colliding_object_properties_are_unchanged() -> None:+ spec = make_spec({"schema": {"type": "boolean"}})++ sent = await sent_query(spec, {"filter": {"r": 1}, "q": True})++ assert sent == [("r", "1"), ("q", "true")]