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.

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

Refactor to take advantage of Pydantic validation #55

Merged
merged 14 commits into from
Nov 27, 2024

Conversation

davemfish
Copy link
Collaborator

@davemfish davemfish commented Nov 22, 2024

This PR refactors the data models to inherit from Pydantic's BaseModel.

Pydantic is useful for type-checking (aka "validation"). And using BaseModel instead of pydantic.dataclasses neatly works around the problem described in #54

We're now validating metadata documents on Resource.__init__, in other words, when a new dataset is described or an existing document is loaded from a file. And we also validate fields on assignment.

One change to the metadata specification:
schema is a reserved attribute by Pydantic. So I renamed our schema attribute to data_model, and added a clause to do that migration when an existing yaml doc is loaded, if needed. We should do some future planning around metadata schema versioning.

Fixes #54
Fixes #29

@davemfish davemfish marked this pull request as ready for review November 25, 2024 21:00
@davemfish davemfish requested a review from phargogh November 25, 2024 21:00
Copy link
Member

@phargogh phargogh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks @davemfish !

try:
eband = existing_resource.get_band_description(band.index)
# TODO: rewrite this as __eq__ of BandSchema?
if (band.numpy_type, band.gdal_type, band.nodata) == (
eband.numpy_type, eband.gdal_type, eband.nodata):
band = dataclasses.replace(band, **eband.__dict__)
updated_dict = band.model_dump() | eband.model_dump()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fun! I was not aware that you could bitwise-or two dicts to take their union.

@phargogh phargogh merged commit 9092462 into natcap:main Nov 27, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

support Python 3.9 Improve validation of metadata documents
2 participants