Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

Strip discriminator under properties named default, const, enum or examples (#5619)

Asem ahmed85844e01d2b7
diff --git a/fastmcp_slim/fastmcp/utilities/json_schema.py b/fastmcp_slim/fastmcp/utilities/json_schema.py
index e9f2ec778..3fdafcbd9 100644
--- a/fastmcp_slim/fastmcp/utilities/json_schema.py
+++ b/fastmcp_slim/fastmcp/utilities/json_schema.py
@@ -228,11 +228,17 @@ def _strip_discriminator(obj: Any) -> Any:
obj = require_discriminator_property(obj)
# Keys that hold instance data, not sub-schemas β€” don't recurse.
_DATA_KEYS = {"default", "const", "examples", "enum"}
- return {
- k: (v if k in _DATA_KEYS else _strip_discriminator(v))
- for k, v in obj.items()
- if not (k == "discriminator" and skip)
- }
+ result: dict[str, Any] = {}
+ for k, v in obj.items():
+ if k == "discriminator" and skip:
+ continue
+ if k in _SUBSCHEMA_MAP_KEYS and isinstance(v, dict):
+ # The keys here are user property/definition names, so one
+ # named like a keyword above still holds a sub-schema.
+ result[k] = {name: _strip_discriminator(sub) for name, sub in v.items()}
+ else:
+ result[k] = v if k in _DATA_KEYS else _strip_discriminator(v)
+ return result
if isinstance(obj, list):
return [_strip_discriminator(item) for item in obj]
return obj
diff --git a/tests/utilities/test_json_schema.py b/tests/utilities/test_json_schema.py
index 62d4a3e1b..a2861f15f 100644
--- a/tests/utilities/test_json_schema.py
+++ b/tests/utilities/test_json_schema.py
@@ -382,6 +382,38 @@ class TestDereferenceRefs:
assert "$defs" not in result
assert "discriminator" in result["properties"]["item"]["properties"]
+ @pytest.mark.parametrize("name", ["default", "const", "enum", "examples"])
+ def test_strips_discriminator_under_property_named_like_a_keyword(self, name: str):
+ """A property named like a data keyword still holds a sub-schema."""
+ schema = {
+ "$defs": {
+ "Cat": {
+ "type": "object",
+ "properties": {"kind": {"const": "cat", "type": "string"}},
+ },
+ "Dog": {
+ "type": "object",
+ "properties": {"kind": {"const": "dog", "type": "string"}},
+ },
+ },
+ "type": "object",
+ "properties": {
+ name: {
+ "anyOf": [{"$ref": "#/$defs/Cat"}, {"$ref": "#/$defs/Dog"}],
+ "discriminator": {
+ "mapping": {"cat": "#/$defs/Cat", "dog": "#/$defs/Dog"},
+ "propertyName": "kind",
+ },
+ },
+ },
+ }
+ result = dereference_refs(schema)
+
+ assert "$defs" not in result
+ assert "discriminator" not in result["properties"][name]
+ for variant in result["properties"][name]["anyOf"]:
+ assert variant["required"] == ["kind"]
+
class TestCompressSchema:
"""Tests for the compress_schema function."""