feat: add time_units and calendar metadata to CMIP6/CMIP7 datasets#574
Open
lewisjared wants to merge 7 commits intomainfrom
Open
feat: add time_units and calendar metadata to CMIP6/CMIP7 datasets#574lewisjared wants to merge 7 commits intomainfrom
lewisjared wants to merge 7 commits intomainfrom
Conversation
During partial DRS finalization, subgroups can contain cftime objects from different but equivalent calendars (e.g., "standard" vs "proleptic_gregorian"). Add try-except fallback that converts to string-based comparison when direct cftime subtraction raises TypeError.
Codecov Report✅ All modified and coverable lines are covered by tests.
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
PostgreSQL's sourcedatasettype enum stores enum names (CMIP6, CMIP7), not Python enum values (cmip6, cmip7). SQLite accepted lowercase since it has no native enum type, but PostgreSQL rejects the invalid values.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Adds
time_unitsandcalendarmetadata columns to CMIP6 and CMIP7 dataset models, enabling proper handling of non-standard CF calendars (e.g.,360_day,noleap,proleptic_gregorian).Previously,
start_time/end_timewere stored asdatetime.datetime, which cannot represent dates like Feb 30 in a 360-day calendar. This PR:time_unitsandcalendarcolumns to bothCMIP6DatasetandCMIP7DatasetSQLAlchemy modelsDatasetFile.start_time/end_timefromDateTimetoStringcolumn type in the DBcmip6_parsers.py,cmip7_parsers.py)parse_datetimewithparse_cftime_datesinutils.py, producingcftime.datetimeobjects that support all CF calendarsPartialDateTime,RequireContiguousTimerange,RequireOverlappingTimerange) to work withcftime.datetimevia duck typing and mixed-calendar fallbackssolve_helpers.pyfinalised=Falseto trigger re-finalisationKey design decisions
cftime.datetimeobjects stored as strings in DB (cftime doesn't subclassdatetime.datetime)climate-ref-coredoes NOT depend oncftime;PartialDateTimeuses duck typing (getattr) instead ofisinstanceChecklist
Please confirm that this pull request has done the following:
changelog/