Revert "returning npt.ArrayLike instead of NDArrayLike because of scalar return values"

This reverts commit 1a290c7.

Author: brokkoli71

src/zarr/api/asynchronous.py

@@ -232,7 +232,7 @@ async def load(
     path: str | None = None,
     zarr_format: ZarrFormat | None = None,
     zarr_version: ZarrFormat | None = None,
-) -> npt.ArrayLike | dict[str, npt.ArrayLike]:
+) -> NDArrayLike | dict[str, NDArrayLike]:
     """Load data from an array or group into memory.
 
     Parameters

src/zarr/core/array.py

@@ -1203,7 +1203,7 @@ async def _get_selection(
         prototype: BufferPrototype,
         out: NDBuffer | None = None,
         fields: Fields | None = None,
-    ) -> npt.ArrayLike:
+    ) -> NDArrayLike:
         # check fields are sensible
         out_dtype = check_fields(fields, self.dtype)
 
@@ -1253,7 +1253,7 @@ async def getitem(
         selection: BasicSelection,
         *,
         prototype: BufferPrototype | None = None,
-    ) -> npt.ArrayLike:
+    ) -> NDArrayLike:
         """
         Asynchronous function that retrieves a subset of the array's data based on the provided selection.
 
@@ -1266,7 +1266,7 @@ async def getitem(
 
         Returns
         -------
-        npt.ArrayLike
+        NDArrayLike
             The retrieved subset of the array's data.
 
         Examples
@@ -2224,7 +2224,7 @@ def __array__(
 
         return arr_np
 
-    def __getitem__(self, selection: Selection) -> npt.ArrayLike:
+    def __getitem__(self, selection: Selection) -> NDArrayLike:
         """Retrieve data for an item or region of the array.
 
         Parameters
@@ -2235,7 +2235,7 @@ def __getitem__(self, selection: Selection) -> npt.ArrayLike:
 
         Returns
         -------
-        npt.ArrayLike
+        NDArrayLike
              An array-like containing the data for the requested region.
 
         Examples
@@ -2482,7 +2482,7 @@ def get_basic_selection(
         out: NDBuffer | None = None,
         prototype: BufferPrototype | None = None,
         fields: Fields | None = None,
-    ) -> npt.ArrayLike:
+    ) -> NDArrayLike:
         """Retrieve data for an item or region of the array.
 
         Parameters
@@ -2702,7 +2702,7 @@ def get_orthogonal_selection(
         out: NDBuffer | None = None,
         fields: Fields | None = None,
         prototype: BufferPrototype | None = None,
-    ) -> npt.ArrayLike:
+    ) -> NDArrayLike:
         """Retrieve data by making a selection for each dimension of the array. For
         example, if an array has 2 dimensions, allows selecting specific rows and/or
         columns. The selection for each dimension can be either an integer (indexing a
@@ -2938,7 +2938,7 @@ def get_mask_selection(
         out: NDBuffer | None = None,
         fields: Fields | None = None,
         prototype: BufferPrototype | None = None,
-    ) -> npt.ArrayLike:
+    ) -> NDArrayLike:
         """Retrieve a selection of individual items, by providing a Boolean array of the
         same shape as the array against which the selection is being made, where True
         values indicate a selected item.
@@ -3100,7 +3100,7 @@ def get_coordinate_selection(
         out: NDBuffer | None = None,
         fields: Fields | None = None,
         prototype: BufferPrototype | None = None,
-    ) -> npt.ArrayLike:
+    ) -> NDArrayLike:
         """Retrieve a selection of individual items, by providing the indices
         (coordinates) for each selected item.
 
@@ -3288,7 +3288,7 @@ def get_block_selection(
         out: NDBuffer | None = None,
         fields: Fields | None = None,
         prototype: BufferPrototype | None = None,
-    ) -> npt.ArrayLike:
+    ) -> NDArrayLike:
         """Retrieve a selection of individual items, by providing the indices
         (coordinates) for each selected item.
 
@@ -3306,7 +3306,7 @@ def get_block_selection(
 
         Returns
         -------
-        npt.ArrayLike
+        NDArrayLike
             An array-like containing the data for the requested block selection.
 
         Examples

src/zarr/core/indexing.py

@@ -928,7 +928,7 @@ class OIndex:
     array: Array
 
     # TODO: develop Array generic and move zarr.Array[np.intp] | zarr.Array[np.bool_] to ArrayOfIntOrBool
-    def __getitem__(self, selection: OrthogonalSelection | Array) -> npt.ArrayLike:
+    def __getitem__(self, selection: OrthogonalSelection | Array) -> NDArrayLike:
         from zarr.core.array import Array
 
         # if input is a Zarr array, we materialize it now.
@@ -1037,7 +1037,7 @@ def __iter__(self) -> Iterator[ChunkProjection]:
 class BlockIndex:
     array: Array
 
-    def __getitem__(self, selection: BasicSelection) -> npt.ArrayLike:
+    def __getitem__(self, selection: BasicSelection) -> NDArrayLike:
         fields, new_selection = pop_fields(selection)
         new_selection = ensure_tuple(new_selection)
         new_selection = replace_lists(new_selection)
@@ -1226,7 +1226,7 @@ class VIndex:
     array: Array
 
     # TODO: develop Array generic and move zarr.Array[np.intp] | zarr.Array[np.bool_] to ArrayOfIntOrBool
-    def __getitem__(self, selection: CoordinateSelection | MaskSelection | Array) -> npt.ArrayLike:
+    def __getitem__(self, selection: CoordinateSelection | MaskSelection | Array) -> NDArrayLike:
         from zarr.core.array import Array
 
         # if input is a Zarr array, we materialize it now.