GEOPY-2632: Simplify the BaseForm.infer method #829
+262
−97
Conversation
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
# Conflicts: # geoh5py/shared/utils.py
github-actions
bot
changed the title
![github-code-quality[bot]](https://avatars.githubusercontent.com/u/9919?s=60&v=4){kind=small}
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #829 +/- ##
===========================================
- Coverage 91.15% 91.13% -0.03%
===========================================
Files 113 113
Lines 9999 10009 +10
Branches 1883 1875 -8
===========================================
+ Hits 9115 9122 +7
- Misses 468 474 +6
+ Partials 416 413 -3
🚀 New features to boost your workflow:
|
domfournier
reviewed
Jan 14, 2026
Co-authored-by: domfournier <dominiquef@mirageoscience.com>
…n check in favor of double return statements.
domfournier
reviewed
Jan 16, 2026
Contributor
domfournier
left a comment
domfournier
left a comment
There was a problem hiding this comment.
The logic is pretty complicated - I have flashbacks from InputFile.
Can you comment the lines for the different cases?
| raise ValueError(f"Could not infer form from data: {data}") | ||
|
|
||
| form = {to_snake(k): v for k, v in form.items()} | ||
| children = all_subclasses(cls) |
Contributor
There was a problem hiding this comment.
This doesn't have to happen here, everytime we infer a form. It could technically be stashed on import
| def best_match_subclass(parent: T, children: list[T], data: dict[str, Any]) -> T: | ||
| """Choose the subclass with the best matching attributes""" | ||
|
|
||
| strong_indicators, weak_indicators = indicator_attributes(parent, children) |
Contributor
There was a problem hiding this comment.
Same with this line - could be a constant on import.
Comment on lines
+1380
to
+1382
| n_weak = np.array( | ||
| [len(weak_indicators[i].intersection(data)) for i, c in enumerate(children)] | ||
| ) |
Contributor
There was a problem hiding this comment.
Why do we care for the "weak" non-required?
| if len(candidates) == 1: | ||
| return candidates | ||
| if len(candidates) > 1 and len(candidates) < len(children): | ||
| return candidates[np.argmin([len(k.model_fields) for k in candidates])] |
geoh5py/shared/utils.py
Outdated
| raise ValueError(f"Could not match data: {data} to any of the children.") | ||
|
|
||
|
|
||
| def no_required_indicators(parent: T, children: list[T]) -> list[T]: |
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.
GEOPY-2632 - Simplify the BaseForm.infer method