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

Use annotation instead of field for tagged union #244

Merged
merged 1 commit into from
Sep 7, 2024
Merged

Use annotation instead of field for tagged union #244

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
13 changes: 6 additions & 7 deletions iohub/ngff/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
AfterValidator,
BaseModel,
ConfigDict,
Discriminator,
Field,
NonNegativeInt,
PositiveInt,
Expand Down Expand Up @@ -168,13 +169,11 @@ class TimeAxisMeta(NamedAxisMeta):
)


class NonstandardAxisMeta(NamedAxisMeta):
type: str | None
unit: str | None


"""https://ngff.openmicroscopy.org/0.4/index.html#axes-md"""
AxisMeta = TimeAxisMeta | ChannelAxisMeta | SpaceAxisMeta | NonstandardAxisMeta
AxisMeta = Annotated[
TimeAxisMeta | ChannelAxisMeta | SpaceAxisMeta,
Discriminator("type"),
]


class TransformationMeta(MetaBase):
Expand Down Expand Up @@ -227,7 +226,7 @@ class MultiScaleMeta(VersionMeta):
"""https://ngff.openmicroscopy.org/0.4/index.html#multiscale-md"""

# MUST
axes: list[AxisMeta] = Field(..., discriminator="type")
axes: list[AxisMeta]
# MUST
datasets: list[DatasetMeta]
# SHOULD
Expand Down
Loading