Refactor Grouper objects #8776
Merged
Refactor Grouper objects #8776
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
1. Rename to Resampler from ResampleGrouper 2. Move code from common.resample to TimeResampler
dcherian
commented
Feb 23, 2024
dcherian
commented
Feb 23, 2024
xarray/core/groupby.py
Outdated
|
|
||
|
|
||
| class Grouper(ABC): | ||
| @property |
There was a problem hiding this comment.
Didn't make this abstractmethod since it'll be deleted once the squeeze kwarg is completely deprecated.
mathause
reviewed
Feb 27, 2024
Illviljan
reviewed
Mar 3, 2024
| is accomplished by calling the `factorize` method on the encapsulated Grouper | ||
| object. | ||
|
|
||
| This class is private API, while Groupers are public. |
There was a problem hiding this comment.
Why not rename it to _ResolvedGrouper if it is private?
There was a problem hiding this comment.
We've just tended to not do this. Only things listed in api.rst and/or exposed in __init__.py are considered public. https://docs.xarray.dev/en/stable/getting-started-guide/faq.html#what-parts-of-xarray-are-considered-public-api
|
|
||
| @property | ||
| def size(self) -> int: | ||
| return len(self) | ||
|
|
||
| def __len__(self) -> int: | ||
| return len(self.full_index) # TODO: full_index not def, abstractmethod? | ||
| return len(self.full_index) |
There was a problem hiding this comment.
The default value of self.full_index is False (which doesn't have a __len__), should it be an empty pd.Index instead?
There was a problem hiding this comment.
The default is uninitialized (init=False). It will be assigned in the call to factorize in __post_init__ so should be fine.
| # This design makes it clear to mypy that | ||
| # codes, group_indices, unique_coord, and full_index | ||
| # are set by the factorize method on the derived class. | ||
| def factorize(self) -> None: |
There was a problem hiding this comment.
Why doesn't this one have a group argument, like the others?
There was a problem hiding this comment.
This one is a wrapper around the others, it knows what group is and passes it down to the Grouper instance.
Co-authored-by: Illviljan <14371165+Illviljan@users.noreply.github.com>
dcherian
added a commit
to dcherian/xarray
that referenced
this pull request
Mar 15, 2024
* main: (31 commits) correctly encode/decode _FillValues/missing_values/dtypes for packed data (pydata#8713) Expand use of `.oindex` and `.vindex` (pydata#8790) Return a dataclass from Grouper.factorize (pydata#8777) [skip-ci] Fix upstream-dev env (pydata#8839) Add dask-expr for windows envs (pydata#8837) [skip-ci] Add dask-expr dependency to doc.yml (pydata#8835) Add `dask-expr` to environment-3.12.yml (pydata#8827) Make list_chunkmanagers more resilient to broken entrypoints (pydata#8736) Do not attempt to broadcast when global option ``arithmetic_broadcast=False`` (pydata#8784) try to get the `upstream-dev` CI to complete again (pydata#8823) Bump the actions group with 1 update (pydata#8818) Update documentation for clarity (pydata#8817) DOC: link to zarr.convenience.consolidate_metadata (pydata#8816) Refactor Grouper objects (pydata#8776) Grouper object design doc (pydata#8510) Bump the actions group with 2 updates (pydata#8804) tokenize() should ignore difference between None and {} attrs (pydata#8797) fix: remove Coordinate from __all__ in xarray/__init__.py (pydata#8791) Fix non-nanosecond casting behavior for `expand_dims` (pydata#8782) Migrate treenode module. (pydata#8757) ...
dcherian
added a commit
to dcherian/xarray
that referenced
this pull request
Mar 16, 2024
* main: (42 commits) correctly encode/decode _FillValues/missing_values/dtypes for packed data (pydata#8713) Expand use of `.oindex` and `.vindex` (pydata#8790) Return a dataclass from Grouper.factorize (pydata#8777) [skip-ci] Fix upstream-dev env (pydata#8839) Add dask-expr for windows envs (pydata#8837) [skip-ci] Add dask-expr dependency to doc.yml (pydata#8835) Add `dask-expr` to environment-3.12.yml (pydata#8827) Make list_chunkmanagers more resilient to broken entrypoints (pydata#8736) Do not attempt to broadcast when global option ``arithmetic_broadcast=False`` (pydata#8784) try to get the `upstream-dev` CI to complete again (pydata#8823) Bump the actions group with 1 update (pydata#8818) Update documentation for clarity (pydata#8817) DOC: link to zarr.convenience.consolidate_metadata (pydata#8816) Refactor Grouper objects (pydata#8776) Grouper object design doc (pydata#8510) Bump the actions group with 2 updates (pydata#8804) tokenize() should ignore difference between None and {} attrs (pydata#8797) fix: remove Coordinate from __all__ in xarray/__init__.py (pydata#8791) Fix non-nanosecond casting behavior for `expand_dims` (pydata#8782) Migrate treenode module. (pydata#8757) ...
dcherian
added a commit
to kmsquire/xarray
that referenced
this pull request
Mar 21, 2024
* upstream/main: (765 commits) increase typing annotations coverage in `xarray/core/indexing.py` (pydata#8857) pandas 3 MultiIndex fixes (pydata#8847) FIX: adapt handling of copy keyword argument in scipy backend for numpy >= 2.0dev (pydata#8851) FIX: do not cast _FillValue/missing_value in CFMaskCoder if _Unsigned is provided (pydata#8852) Implement setitem syntax for `.oindex` and `.vindex` properties (pydata#8845) Support pandas copy-on-write behaviour (pydata#8846) correctly encode/decode _FillValues/missing_values/dtypes for packed data (pydata#8713) Expand use of `.oindex` and `.vindex` (pydata#8790) Return a dataclass from Grouper.factorize (pydata#8777) [skip-ci] Fix upstream-dev env (pydata#8839) Add dask-expr for windows envs (pydata#8837) [skip-ci] Add dask-expr dependency to doc.yml (pydata#8835) Add `dask-expr` to environment-3.12.yml (pydata#8827) Make list_chunkmanagers more resilient to broken entrypoints (pydata#8736) Do not attempt to broadcast when global option ``arithmetic_broadcast=False`` (pydata#8784) try to get the `upstream-dev` CI to complete again (pydata#8823) Bump the actions group with 1 update (pydata#8818) Update documentation for clarity (pydata#8817) DOC: link to zarr.convenience.consolidate_metadata (pydata#8816) Refactor Grouper objects (pydata#8776) ...
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.
Some refactoring towards the Grouper refactor described in #8510