|
6 | 6 |
|
7 | 7 | import zarr.api.asynchronous as async_api |
8 | 8 | import zarr.core.array |
9 | | -from zarr.core.array import DEFAULT_FILL_VALUE, Array, AsyncArray, CompressorLike |
| 9 | +from zarr.core.array import DEFAULT_FILL_VALUE, Array, AsyncArray, CompressorLike, FilterLike |
10 | 10 | from zarr.core.group import Group |
11 | 11 | from zarr.core.sync import sync |
12 | 12 | from zarr.core.sync_group import create_hierarchy |
13 | 13 |
|
14 | 14 | if TYPE_CHECKING: |
15 | 15 | from collections.abc import Iterable |
16 | 16 |
|
17 | | - import numcodecs.abc |
18 | 17 | import numpy as np |
19 | 18 | import numpy.typing as npt |
20 | 19 |
|
21 | 20 | from zarr.abc.codec import Codec |
22 | 21 | from zarr.api.asynchronous import ArrayLike, PathLike |
23 | 22 | from zarr.core.array import ( |
24 | | - CompressorsLike, |
25 | | - FiltersLike, |
| 23 | + CompressorLike, |
26 | 24 | SerializerLike, |
27 | 25 | ShardsLike, |
28 | 26 | ) |
@@ -601,15 +599,15 @@ def create( |
601 | 599 | *, # Note: this is a change from v2 |
602 | 600 | chunks: ChunkCoords | int | bool | None = None, |
603 | 601 | dtype: ZDTypeLike | None = None, |
604 | | - compressor: CompressorLike = "auto", |
| 602 | + compressor: CompressorLike | None | Literal["auto"] = "auto", |
605 | 603 | fill_value: Any | None = DEFAULT_FILL_VALUE, # TODO: need type |
606 | 604 | order: MemoryOrder | None = None, |
607 | 605 | store: str | StoreLike | None = None, |
608 | 606 | synchronizer: Any | None = None, |
609 | 607 | overwrite: bool = False, |
610 | 608 | path: PathLike | None = None, |
611 | 609 | chunk_store: StoreLike | None = None, |
612 | | - filters: Iterable[dict[str, JSON] | numcodecs.abc.Codec] | None = None, |
| 610 | + filters: Iterable[FilterLike] | None = None, |
613 | 611 | cache_metadata: bool | None = None, |
614 | 612 | cache_attrs: bool | None = None, |
615 | 613 | read_only: bool | None = None, |
@@ -756,9 +754,9 @@ def create_array( |
756 | 754 | data: np.ndarray[Any, np.dtype[Any]] | None = None, |
757 | 755 | chunks: ChunkCoords | Literal["auto"] = "auto", |
758 | 756 | shards: ShardsLike | None = None, |
759 | | - filters: FiltersLike = "auto", |
760 | | - compressors: CompressorsLike = "auto", |
761 | | - serializer: SerializerLike = "auto", |
| 757 | + filters: Iterable[FilterLike] | None | Literal["auto"] = "auto", |
| 758 | + compressors: CompressorLike | Iterable[CompressorLike] | None | Literal["auto"] = "auto", |
| 759 | + serializer: SerializerLike | Literal["auto"] = "auto", |
762 | 760 | fill_value: Any | None = DEFAULT_FILL_VALUE, |
763 | 761 | order: MemoryOrder | None = None, |
764 | 762 | zarr_format: ZarrFormat | None = 3, |
@@ -922,8 +920,8 @@ def from_array( |
922 | 920 | name: str | None = None, |
923 | 921 | chunks: Literal["auto", "keep"] | ChunkCoords = "keep", |
924 | 922 | shards: ShardsLike | None | Literal["keep"] = "keep", |
925 | | - filters: FiltersLike | Literal["keep"] = "keep", |
926 | | - compressors: CompressorsLike | Literal["keep"] = "keep", |
| 923 | + filters: Iterable[FilterLike] | Literal["keep"] = "keep", |
| 924 | + compressors: Iterable[CompressorLike] | Literal["keep"] = "keep", |
927 | 925 | serializer: SerializerLike | Literal["keep"] = "keep", |
928 | 926 | fill_value: Any | None = DEFAULT_FILL_VALUE, |
929 | 927 | order: MemoryOrder | None = None, |
|
0 commit comments