Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug with JSON schema for sequence of discriminated union #7647

Merged
merged 1 commit into from Sep 26, 2023
Merged

Fix bug with JSON schema for sequence of discriminated union #7647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 1 addition & 9 deletions pydantic/_internal/_generate_schema.py
View file
Open in desktop
Expand Up @@ -1252,12 +1252,6 @@ def _sequence_schema(self, sequence_type: Any) -> core_schema.CoreSchema:
"""Generate schema for a Sequence, e.g. `Sequence[int]`."""
item_type = self._get_first_arg_or_any(sequence_type)

def json_schema_func(_schema: CoreSchemaOrField, handler: GetJsonSchemaHandler) -> JsonSchemaValue:
items_schema = self._generate_schema(item_type)
return handler(core_schema.list_schema(items_schema))

metadata = build_metadata_dict(js_functions=[json_schema_func])

list_schema = core_schema.list_schema(self.generate_schema(item_type))
python_schema = core_schema.is_instance_schema(typing.Sequence, cls_repr='Sequence')
if item_type != Any:
Expand All @@ -1266,9 +1260,7 @@ def json_schema_func(_schema: CoreSchemaOrField, handler: GetJsonSchemaHandler)
python_schema = core_schema.chain_schema(
[python_schema, core_schema.no_info_wrap_validator_function(sequence_validator, list_schema)],
)
return core_schema.json_or_python_schema(
json_schema=list_schema, python_schema=python_schema, metadata=metadata
)
return core_schema.json_or_python_schema(json_schema=list_schema, python_schema=python_schema)

def _iterable_schema(self, type_: Any) -> core_schema.GeneratorSchema:
"""Generate a schema for an `Iterable`."""
Expand Down
19 changes: 15 additions & 4 deletions tests/test_discriminated_union.py
View file
Open in desktop
Expand Up @@ -1296,17 +1296,17 @@ class Model(BaseModel):
'$defs': {
'Cat': {
'properties': {
'meows': {'title': 'Meows', 'type': 'integer'},
'pet_type': {'const': 'cat', 'title': 'Pet Type'},
'meows': {'title': 'Meows', 'type': 'integer'},
},
'required': ['pet_type', 'meows'],
'title': 'Cat',
'type': 'object',
},
'Dog': {
'properties': {
'barks': {'title': 'Barks', 'type': 'number'},
'pet_type': {'const': 'dog', 'title': 'Pet Type'},
'barks': {'title': 'Barks', 'type': 'number'},
},
'required': ['pet_type', 'barks'],
'title': 'Dog',
Expand All @@ -1323,12 +1323,23 @@ class Model(BaseModel):
},
},
'properties': {
'n': {'title': 'N', 'type': 'integer'},
'pet': {
'items': {'anyOf': [{'$ref': '#/$defs/Cat'}, {'$ref': '#/$defs/Dog'}, {'$ref': '#/$defs/Lizard'}]},
'items': {
'discriminator': {
'mapping': {
'cat': '#/$defs/Cat',
'dog': '#/$defs/Dog',
'lizard': '#/$defs/Lizard',
'reptile': '#/$defs/Lizard',
},
'propertyName': 'pet_type',
},
'oneOf': [{'$ref': '#/$defs/Cat'}, {'$ref': '#/$defs/Dog'}, {'$ref': '#/$defs/Lizard'}],
},
'title': 'Pet',
'type': 'array',
},
'n': {'title': 'N', 'type': 'integer'},
},
'required': ['pet', 'n'],
'title': 'Model',
Expand Down