Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix any generics in zarr.array #1861

Merged
merged 2 commits into from
May 11, 2024
Merged

Fix any generics in zarr.array #1861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49ff499
Disallow any generics in zarr.array
dstansby May 10, 2024
61d4495
Merge branch 'v3' into any-generics-array
jhamman May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@ module = [
"zarr.codecs.sharding",
"zarr.codecs.transpose",
"zarr.array_v2",
"zarr.array",
"zarr.sync",
]
disallow_any_generics = false

Expand Down
27 changes: 14 additions & 13 deletions src/zarr/array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from typing import Any, Dict, Iterable, Literal, Optional, Tuple, Union

import numpy as np
import numpy.typing as npt
from zarr.abc.codec import Codec


Expand Down Expand Up @@ -76,7 +77,7 @@ async def create(
store: StoreLike,
*,
shape: ChunkCoords,
dtype: Union[str, np.dtype],
dtype: npt.DTypeLike,
chunk_shape: ChunkCoords,
fill_value: Optional[Any] = None,
chunk_key_encoding: Union[
Expand Down Expand Up @@ -175,14 +176,14 @@ def size(self) -> int:
return np.prod(self.metadata.shape).item()

@property
def dtype(self) -> np.dtype:
def dtype(self) -> np.dtype[Any]:
return self.metadata.dtype

@property
def attrs(self) -> dict:
def attrs(self) -> dict[str, Any]:
return self.metadata.attributes

async def getitem(self, selection: Selection) -> np.ndarray:
async def getitem(self, selection: Selection) -> npt.NDArray[Any]:
assert isinstance(self.metadata.chunk_grid, RegularChunkGrid)
indexer = BasicIndexer(
selection,
Expand Down Expand Up @@ -220,7 +221,7 @@ async def _read_chunk(
chunk_coords: ChunkCoords,
chunk_selection: SliceSelection,
out_selection: SliceSelection,
out: np.ndarray,
out: npt.NDArray[Any],
) -> None:
chunk_spec = self.metadata.get_chunk_spec(chunk_coords, self.order)
chunk_key_encoding = self.metadata.chunk_key_encoding
Expand All @@ -242,7 +243,7 @@ async def _read_chunk(
else:
out[out_selection] = self.metadata.fill_value

async def setitem(self, selection: Selection, value: np.ndarray) -> None:
async def setitem(self, selection: Selection, value: npt.NDArray[Any]) -> None:
assert isinstance(self.metadata.chunk_grid, RegularChunkGrid)
chunk_shape = self.metadata.chunk_grid.chunk_shape
indexer = BasicIndexer(
Expand Down Expand Up @@ -282,7 +283,7 @@ async def setitem(self, selection: Selection, value: np.ndarray) -> None:

async def _write_chunk(
self,
value: np.ndarray,
value: npt.NDArray[Any],
chunk_shape: ChunkCoords,
chunk_coords: ChunkCoords,
chunk_selection: SliceSelection,
Expand Down Expand Up @@ -334,7 +335,7 @@ async def _write_chunk(
await self._write_chunk_to_store(store_path, chunk_array, chunk_spec)

async def _write_chunk_to_store(
self, store_path: StorePath, chunk_array: np.ndarray, chunk_spec: ArraySpec
self, store_path: StorePath, chunk_array: npt.NDArray[Any], chunk_spec: ArraySpec
) -> None:
if np.all(chunk_array == self.metadata.fill_value):
# chunks that only contain fill_value will be removed
Expand Down Expand Up @@ -402,7 +403,7 @@ def create(
store: StoreLike,
*,
shape: ChunkCoords,
dtype: Union[str, np.dtype],
dtype: npt.DTypeLike,
chunk_shape: ChunkCoords,
fill_value: Optional[Any] = None,
chunk_key_encoding: Union[
Expand Down Expand Up @@ -470,11 +471,11 @@ def size(self) -> int:
return self._async_array.size

@property
def dtype(self) -> np.dtype:
def dtype(self) -> np.dtype[Any]:
return self._async_array.dtype

@property
def attrs(self) -> dict:
def attrs(self) -> dict[str, Any]:
return self._async_array.attrs

@property
Expand All @@ -489,12 +490,12 @@ def store_path(self) -> StorePath:
def order(self) -> Literal["C", "F"]:
return self._async_array.order

def __getitem__(self, selection: Selection) -> np.ndarray:
def __getitem__(self, selection: Selection) -> npt.NDArray[Any]:
return sync(
self._async_array.getitem(selection),
)

def __setitem__(self, selection: Selection, value: np.ndarray) -> None:
def __setitem__(self, selection: Selection, value: npt.NDArray[Any]) -> None:
sync(
self._async_array.setitem(selection, value),
)
Expand Down
Loading