Skip to content

Replace discriminated unions with simple unions in models #385

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

Open
candleindark wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace discriminated unions with simple unions in models #385

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions dandischema/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,14 +1277,9 @@ class Activity(DandiBaseModel):

# isPartOf: Optional["Activity"] = Field(None, json_schema_extra={"nskey": "schema"})
# hasPart: Optional["Activity"] = Field(None, json_schema_extra={"nskey": "schema"})
wasAssociatedWith: Optional[
List[
Annotated[
Union[Person, Organization, Software, Agent],
Field(discriminator="schemaKey"),
]
]
] = Field(None, json_schema_extra={"nskey": "prov"})
wasAssociatedWith: Optional[List[Union[Person, Organization, Software, Agent],]] = (
Field(None, json_schema_extra={"nskey": "prov"})
)
used: Optional[List[Equipment]] = Field(
None,
description="A listing of equipment used for the activity.",
Expand Down Expand Up @@ -1566,21 +1561,13 @@ class CommonModel(DandiBaseModel):
description="A description of the item.",
json_schema_extra={"nskey": "schema"},
)
contributor: Optional[
List[Annotated[Union[Person, Organization], Field(discriminator="schemaKey")]]
] = Field(
contributor: Optional[List[Union[Person, Organization]]] = Field(
None,
title="Contributors",
description="Contributors to this item: persons or organizations.",
json_schema_extra={"nskey": "schema"},
)
about: Optional[
List[
Annotated[
Union[Disorder, Anatomy, GenericType], Field(discriminator="schemaKey")
]
]
] = Field(
about: Optional[List[Union[Disorder, Anatomy, GenericType]]] = Field(
None,
title="Subject matter of the dataset",
description="The subject matter of the content, such as disorders, brain anatomy.",
Expand Down Expand Up @@ -1711,9 +1698,7 @@ def contributor_musthave_contact(
max_length=10000,
json_schema_extra={"nskey": "schema"},
)
contributor: List[
Annotated[Union[Person, Organization], Field(discriminator="schemaKey")]
] = Field(
contributor: List[Union[Person, Organization]] = Field(
title="Dandiset contributors",
description="People or Organizations that have contributed to this Dandiset.",
json_schema_extra={"nskey": "schema"},
Expand Down
Loading