ENH: Implement ObjectDataProvider as a Provider #663
Merged
Conversation
This file contains 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
It now sets its state on initialization and returns a Pydantic model via the prescribed method. Does not do much of the possible clean-ups within the base class.
mferrera
commented
May 28, 2024
mferrera
commented
May 28, 2024
mferrera
commented
May 28, 2024
tnatt
reviewed
May 28, 2024
Comment on lines
269
to
288
| rv = DerivedNamedStratigraphy( | ||
| name=name if no_start_or_missing_name else strat[name].get("name", name), | ||
| alias=[] if no_start_or_missing_name else strat[name].get("alias", []), | ||
| stratigraphic=False | ||
| if no_start_or_missing_name | ||
| else strat[name].get("stratigraphic", False), | ||
| stratigraphic_alias=[] | ||
| if no_start_or_missing_name | ||
| else strat[name].get("stratigraphic_alias"), | ||
| offset=0.0 if no_start_or_missing_name else strat[name].get("offset", 0.0), | ||
| top=None if no_start_or_missing_name else strat[name].get("top"), | ||
| base=None if no_start_or_missing_name else strat[name].get("base"), | ||
| name=name if no_stratigraphy_or_name else strat[name].get("name", name), | ||
| alias=[] if no_stratigraphy_or_name else strat[name].get("alias", []), | ||
| stratigraphic=( | ||
| False | ||
| if no_stratigraphy_or_name | ||
| else strat[name].get("stratigraphic", False) | ||
| ), | ||
| stratigraphic_alias=( | ||
| [] | ||
| if no_stratigraphy_or_name | ||
| else strat[name].get("stratigraphic_alias") | ||
| ), | ||
| offset=0.0 if no_stratigraphy_or_name else strat[name].get("offset", 0.0), | ||
| top=None if no_stratigraphy_or_name else strat[name].get("top"), | ||
| base=None if no_stratigraphy_or_name else strat[name].get("base"), | ||
| ) | ||
|
|
||
| if not no_start_or_missing_name and rv.name != "name": | ||
| if not no_stratigraphy_or_name and rv.name != "name": | ||
| rv.alias.append(name) |
There was a problem hiding this comment.
I know this was not part of this PR but I have a feeling it would improve the readability to split this up.
if no_stratigraphy_or_name:
rv = DerivedNameStratigraphy(name=name, ...)
else:
rv = DerivedNameStratigraphy(name=strat["name"].get("name", name), ...)
if rv.name != "name":
rv.alias.append(name)There was a problem hiding this comment.
Great idea. I cleaned it up with inspiration from your suggestion.
tnatt
approved these changes
May 28, 2024
Also fixed an annotation error.
mferrera
force-pushed
the
pydantic-objectdata-provider
branch
from
c69eb87 to
9292639
Compare
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.
Resolves #564
It now sets its state on initialization and returns a Pydantic model via the prescribed method. Does not do much of the possible clean-ups within the base class.
There is still more work to be within the object data provider base class but this should have the inputs (spec, bbox, etc) and outputs (content) where they need to be.