initial refactor for NamedArray (#8075)

* initial prototype for NamedArray * move NDArrayMixin and NdimSizeLenMixin inside named_array * vendor is_duck_dask_array * vendor Frozen object * update import * move _default sentinel value * rename subpackage to namedarray per @TomNicholas suggestion * Remove NdimSizeLenMixin * fix typing * add annotations * Remove NDArrayMixin * Apply suggestions from code review Co-authored-by: Illviljan <[email protected]> * fix typing * fix return type * revert NDArrayMixin * [WIP] as_compatible_data refactor * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * duplicate sentinel value and leave the original sentinel object alone * Apply suggestions from code review Co-authored-by: Stephan Hoyer <[email protected]> * use DuckArray * Apply suggestions from code review Co-authored-by: Stephan Hoyer <[email protected]> * use sentinel value from xarray * remove unused code * fix variable constructor * fix as_compatible_data utility function * move _to_dense and _non_zero to NamedArray * more typing * add initial tests * Apply suggestions from code review Co-authored-by: Illviljan <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * attempt to fix some mypy errors * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update core.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update core.py * All input data can be arraylike * Update core.py * Update core.py * get and set attrs at the same level. * data doesn't have to be ndarray * avoid redefining typing use new variable names instead * import on runtime as well to be able to cast * requires ufunc and function to be a valid duck array * Add array_namespace * Update test_dataset.py * Update test_dataset.py * remove Frozen * update tests * update tests * switch to functional API * add fastpath * Test making sizes dict[Hashable, int] * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * A lot of errors... Try Mapping instead * Update groupby.py * Update types.py * Apply suggestions from code review Co-authored-by: Illviljan <[email protected]> Co-authored-by: Deepak Cherian <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * update docstrings * update error messages * update tests * test explicitly index array * update tests * remove unused types * Update xarray/tests/test_namedarray.py Co-authored-by: Illviljan <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * use Self --------- Co-authored-by: Illviljan <[email protected]> Co-authored-by: dcherian <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Stephan Hoyer <[email protected]> Co-authored-by: Deepak Cherian <[email protected]>
pydata · Sep 27, 2023 · c3b5ead · c3b5ead
1 parent 84f5a0d
commit c3b5ead
Show file tree

Hide file tree

Showing 10 changed files with 700 additions and 293 deletions.
diff --git a/xarray/core/common.py b/xarray/core/common.py
@@ -223,7 +223,7 @@ def _get_axis_num(self: Any, dim: Hashable) -> int:
             raise ValueError(f"{dim!r} not found in array dimensions {self.dims!r}")
 
     @property
-    def sizes(self: Any) -> Frozen[Hashable, int]:
+    def sizes(self: Any) -> Mapping[Hashable, int]:
         """Ordered mapping from dimension names to lengths.
 
         Immutable.

diff --git a/xarray/core/groupby.py b/xarray/core/groupby.py
@@ -699,7 +699,7 @@ class GroupBy(Generic[T_Xarray]):
 
     _groups: dict[GroupKey, GroupIndex] | None
     _dims: tuple[Hashable, ...] | Frozen[Hashable, int] | None
-    _sizes: Frozen[Hashable, int] | None
+    _sizes: Mapping[Hashable, int] | None
 
     def __init__(
         self,
@@ -746,7 +746,7 @@ def __init__(
         self._sizes = None
 
     @property
-    def sizes(self) -> Frozen[Hashable, int]:
+    def sizes(self) -> Mapping[Hashable, int]:
         """Ordered mapping from dimension names to lengths.
 
         Immutable.

diff --git a/xarray/core/types.py b/xarray/core/types.py
@@ -106,7 +106,7 @@ def dims(self) -> Frozen[Hashable, int] | tuple[Hashable, ...]:
         ...
 
     @property
-    def sizes(self) -> Frozen[Hashable, int]:
+    def sizes(self) -> Mapping[Hashable, int]:
         ...
 
     @property