Skip to content

Commit 4654cbd

Browse files
committed
*params -> *like
1 parent f29b2d9 commit 4654cbd

File tree

6 files changed

+52
-52
lines changed

6 files changed

+52
-52
lines changed

src/zarr/api/asynchronous.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from typing_extensions import deprecated
1111

1212
from zarr.core.array import Array, AsyncArray, create_array, get_array_metadata
13-
from zarr.core.array_spec import ArrayConfig, ArrayConfigParams
13+
from zarr.core.array_spec import ArrayConfig, ArrayConfigLike
1414
from zarr.core.buffer import NDArrayLike
1515
from zarr.core.common import (
1616
JSON,
@@ -856,7 +856,7 @@ async def create(
856856
codecs: Iterable[Codec | dict[str, JSON]] | None = None,
857857
dimension_names: Iterable[str] | None = None,
858858
storage_options: dict[str, Any] | None = None,
859-
config: ArrayConfig | ArrayConfigParams | None = None,
859+
config: ArrayConfig | ArrayConfigLike | None = None,
860860
**kwargs: Any,
861861
) -> AsyncArray[ArrayV2Metadata] | AsyncArray[ArrayV3Metadata]:
862862
"""Create an array.
@@ -1017,7 +1017,7 @@ async def create(
10171017
mode = "a"
10181018
store_path = await make_store_path(store, path=path, mode=mode, storage_options=storage_options)
10191019

1020-
config_dict: ArrayConfigParams = {}
1020+
config_dict: ArrayConfigLike = {}
10211021

10221022
if write_empty_chunks is not None:
10231023
if config is not None:

src/zarr/api/synchronous.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
from zarr.abc.codec import Codec
2020
from zarr.api.asynchronous import ArrayLike, PathLike
21-
from zarr.core.array import CompressorsParam, FiltersParam
22-
from zarr.core.array_spec import ArrayConfig, ArrayConfigParams
21+
from zarr.core.array import CompressorsLike, FiltersLike
22+
from zarr.core.array_spec import ArrayConfig, ArrayConfigLike
2323
from zarr.core.buffer import NDArrayLike
24-
from zarr.core.chunk_key_encodings import ChunkKeyEncoding, ChunkKeyEncodingParams
24+
from zarr.core.chunk_key_encodings import ChunkKeyEncoding, ChunkKeyEncodingLike
2525
from zarr.core.common import (
2626
JSON,
2727
AccessModeLiteral,
@@ -592,7 +592,7 @@ def create(
592592
codecs: Iterable[Codec | dict[str, JSON]] | None = None,
593593
dimension_names: Iterable[str] | None = None,
594594
storage_options: dict[str, Any] | None = None,
595-
config: ArrayConfig | ArrayConfigParams | None = None,
595+
config: ArrayConfig | ArrayConfigLike | None = None,
596596
**kwargs: Any,
597597
) -> Array:
598598
"""Create an array.
@@ -716,17 +716,17 @@ def create_array(
716716
dtype: npt.DTypeLike,
717717
chunks: ChunkCoords | Literal["auto"] = "auto",
718718
shards: ChunkCoords | Literal["auto"] | None = None,
719-
filters: FiltersParam = "auto",
720-
compressors: CompressorsParam = "auto",
719+
filters: FiltersLike = "auto",
720+
compressors: CompressorsLike = "auto",
721721
fill_value: Any | None = None,
722722
order: MemoryOrder | None = None,
723723
zarr_format: ZarrFormat | None = 3,
724724
attributes: dict[str, JSON] | None = None,
725-
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingParams | None = None,
725+
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingLike | None = None,
726726
dimension_names: Iterable[str] | None = None,
727727
storage_options: dict[str, Any] | None = None,
728728
overwrite: bool = False,
729-
config: ArrayConfig | ArrayConfigParams | None = None,
729+
config: ArrayConfig | ArrayConfigLike | None = None,
730730
) -> Array:
731731
"""Create an ``Array``. This function wraps :mod:`zarr.core.array.create_array`.
732732

src/zarr/core/array.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from zarr.abc.store import Store, set_or_delete
2020
from zarr.codecs._v2 import V2Codec
2121
from zarr.core._info import ArrayInfo
22-
from zarr.core.array_spec import ArrayConfig, ArrayConfigParams, parse_array_config
22+
from zarr.core.array_spec import ArrayConfig, ArrayConfigLike, parse_array_config
2323
from zarr.core.attributes import Attributes
2424
from zarr.core.buffer import (
2525
BufferPrototype,
@@ -30,7 +30,7 @@
3030
from zarr.core.chunk_grids import RegularChunkGrid, _auto_partition, normalize_chunks
3131
from zarr.core.chunk_key_encodings import (
3232
ChunkKeyEncoding,
33-
ChunkKeyEncodingParams,
33+
ChunkKeyEncodingLike,
3434
DefaultChunkKeyEncoding,
3535
V2ChunkKeyEncoding,
3636
)
@@ -289,7 +289,7 @@ async def create(
289289
# runtime
290290
overwrite: bool = False,
291291
data: npt.ArrayLike | None = None,
292-
config: ArrayConfig | ArrayConfigParams | None = None,
292+
config: ArrayConfig | ArrayConfigLike | None = None,
293293
) -> AsyncArray[ArrayV2Metadata]: ...
294294

295295
# this overload defines the function signature when zarr_format is 3
@@ -318,7 +318,7 @@ async def create(
318318
# runtime
319319
overwrite: bool = False,
320320
data: npt.ArrayLike | None = None,
321-
config: ArrayConfig | ArrayConfigParams | None = None,
321+
config: ArrayConfig | ArrayConfigLike | None = None,
322322
) -> AsyncArray[ArrayV3Metadata]: ...
323323

324324
@overload
@@ -346,7 +346,7 @@ async def create(
346346
# runtime
347347
overwrite: bool = False,
348348
data: npt.ArrayLike | None = None,
349-
config: ArrayConfig | ArrayConfigParams | None = None,
349+
config: ArrayConfig | ArrayConfigLike | None = None,
350350
) -> AsyncArray[ArrayV3Metadata]: ...
351351
@overload
352352
@classmethod
@@ -379,7 +379,7 @@ async def create(
379379
# runtime
380380
overwrite: bool = False,
381381
data: npt.ArrayLike | None = None,
382-
config: ArrayConfig | ArrayConfigParams | None = None,
382+
config: ArrayConfig | ArrayConfigLike | None = None,
383383
) -> AsyncArray[ArrayV3Metadata] | AsyncArray[ArrayV2Metadata]: ...
384384

385385
@classmethod
@@ -412,7 +412,7 @@ async def create(
412412
# runtime
413413
overwrite: bool = False,
414414
data: npt.ArrayLike | None = None,
415-
config: ArrayConfig | ArrayConfigParams | None = None,
415+
config: ArrayConfig | ArrayConfigLike | None = None,
416416
) -> AsyncArray[ArrayV2Metadata] | AsyncArray[ArrayV3Metadata]:
417417
"""
418418
Method to create a new asynchronous array instance.
@@ -1566,7 +1566,7 @@ def create(
15661566
compressor: dict[str, JSON] | None = None,
15671567
# runtime
15681568
overwrite: bool = False,
1569-
config: ArrayConfig | ArrayConfigParams | None = None,
1569+
config: ArrayConfig | ArrayConfigLike | None = None,
15701570
) -> Array:
15711571
"""Creates a new Array instance from an initialized store.
15721572
@@ -3499,15 +3499,15 @@ def _get_default_codecs(
34993499
return cast(list[dict[str, JSON]], default_codecs[dtype_key])
35003500

35013501

3502-
FiltersParam: TypeAlias = (
3502+
FiltersLike: TypeAlias = (
35033503
Iterable[dict[str, JSON] | ArrayArrayCodec | numcodecs.abc.Codec]
35043504
| ArrayArrayCodec
35053505
| Iterable[numcodecs.abc.Codec]
35063506
| numcodecs.abc.Codec
35073507
| Literal["auto"]
35083508
| None
35093509
)
3510-
CompressorsParam: TypeAlias = (
3510+
CompressorsLike: TypeAlias = (
35113511
Iterable[dict[str, JSON] | BytesBytesCodec]
35123512
| BytesBytesCodec
35133513
| numcodecs.abc.Codec
@@ -3524,17 +3524,17 @@ async def create_array(
35243524
dtype: npt.DTypeLike,
35253525
chunks: ChunkCoords | Literal["auto"] = "auto",
35263526
shards: ChunkCoords | Literal["auto"] | None = None,
3527-
filters: FiltersParam = "auto",
3528-
compressors: CompressorsParam = "auto",
3527+
filters: FiltersLike = "auto",
3528+
compressors: CompressorsLike = "auto",
35293529
fill_value: Any | None = None,
35303530
order: MemoryOrder | None = None,
35313531
zarr_format: ZarrFormat | None = 3,
35323532
attributes: dict[str, JSON] | None = None,
3533-
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingParams | None = None,
3533+
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingLike | None = None,
35343534
dimension_names: Iterable[str] | None = None,
35353535
storage_options: dict[str, Any] | None = None,
35363536
overwrite: bool = False,
3537-
config: ArrayConfig | ArrayConfigParams | None = None,
3537+
config: ArrayConfig | ArrayConfigLike | None = None,
35383538
) -> AsyncArray[ArrayV2Metadata] | AsyncArray[ArrayV3Metadata]:
35393539
"""Create an ``AsyncArray``.
35403540
@@ -3716,7 +3716,7 @@ async def create_array(
37163716

37173717

37183718
def _parse_chunk_key_encoding(
3719-
data: ChunkKeyEncoding | ChunkKeyEncodingParams | None, zarr_format: ZarrFormat
3719+
data: ChunkKeyEncoding | ChunkKeyEncodingLike | None, zarr_format: ZarrFormat
37203720
) -> ChunkKeyEncoding:
37213721
"""
37223722
Take an implicit specification of a chunk key encoding and parse it into a ChunkKeyEncoding object.
@@ -3804,8 +3804,8 @@ def _get_default_chunk_encoding_v2(
38043804

38053805
def _parse_chunk_encoding_v2(
38063806
*,
3807-
compressor: CompressorsParam,
3808-
filters: FiltersParam,
3807+
compressor: CompressorsLike,
3808+
filters: FiltersLike,
38093809
dtype: np.dtype[Any],
38103810
) -> tuple[tuple[numcodecs.abc.Codec, ...] | None, numcodecs.abc.Codec | None]:
38113811
"""
@@ -3848,8 +3848,8 @@ def _parse_chunk_encoding_v2(
38483848

38493849
def _parse_chunk_encoding_v3(
38503850
*,
3851-
compressors: CompressorsParam,
3852-
filters: FiltersParam,
3851+
compressors: CompressorsLike,
3852+
filters: FiltersLike,
38533853
dtype: np.dtype[Any],
38543854
) -> tuple[tuple[ArrayArrayCodec, ...], ArrayBytesCodec, tuple[BytesBytesCodec, ...]]:
38553855
"""

src/zarr/core/array_spec.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from zarr.core.common import ChunkCoords
2222

2323

24-
class ArrayConfigParams(TypedDict):
24+
class ArrayConfigLike(TypedDict):
2525
"""
2626
A TypedDict model of the attributes of an ArrayConfig class, but with no required fields.
2727
This allows for partial construction of an ArrayConfig, with the assumption that the unset
@@ -56,13 +56,13 @@ def __init__(self, order: MemoryOrder, write_empty_chunks: bool) -> None:
5656
object.__setattr__(self, "write_empty_chunks", write_empty_chunks_parsed)
5757

5858
@classmethod
59-
def from_dict(cls, data: ArrayConfigParams) -> Self:
59+
def from_dict(cls, data: ArrayConfigLike) -> Self:
6060
"""
6161
Create an ArrayConfig from a dict. The keys of that dict are a subset of the
6262
attributes of the ArrayConfig class. Any keys missing from that dict will be set to the
6363
the values in the ``array`` namespace of ``zarr.config``.
6464
"""
65-
kwargs_out: ArrayConfigParams = {}
65+
kwargs_out: ArrayConfigLike = {}
6666
for f in fields(ArrayConfig):
6767
field_name = cast(Literal["order", "write_empty_chunks"], f.name)
6868
if field_name not in data:
@@ -72,7 +72,7 @@ def from_dict(cls, data: ArrayConfigParams) -> Self:
7272
return cls(**kwargs_out)
7373

7474

75-
def parse_array_config(data: ArrayConfig | ArrayConfigParams | None) -> ArrayConfig:
75+
def parse_array_config(data: ArrayConfig | ArrayConfigLike | None) -> ArrayConfig:
7676
"""
7777
Convert various types of data to an ArrayConfig.
7878
"""

src/zarr/core/chunk_key_encodings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def parse_separator(data: JSON) -> SeparatorLiteral:
2020
return cast(SeparatorLiteral, data)
2121

2222

23-
class ChunkKeyEncodingParams(TypedDict):
23+
class ChunkKeyEncodingLike(TypedDict):
2424
name: Literal["v2", "default"]
2525
separator: SeparatorLiteral
2626

@@ -37,7 +37,7 @@ def __init__(self, *, separator: SeparatorLiteral) -> None:
3737

3838
@classmethod
3939
def from_dict(
40-
cls, data: dict[str, JSON] | ChunkKeyEncoding | ChunkKeyEncodingParams
40+
cls, data: dict[str, JSON] | ChunkKeyEncoding | ChunkKeyEncodingLike
4141
) -> ChunkKeyEncoding:
4242
if isinstance(data, ChunkKeyEncoding):
4343
return data

src/zarr/core/group.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
from zarr.core.array import (
2222
Array,
2323
AsyncArray,
24-
CompressorsParam,
25-
FiltersParam,
24+
CompressorsLike,
25+
FiltersLike,
2626
_build_parents,
2727
create_array,
2828
)
@@ -53,9 +53,9 @@
5353
from collections.abc import AsyncGenerator, Generator, Iterable, Iterator
5454
from typing import Any
5555

56-
from zarr.core.array_spec import ArrayConfig, ArrayConfigParams
56+
from zarr.core.array_spec import ArrayConfig, ArrayConfigLike
5757
from zarr.core.buffer import Buffer, BufferPrototype
58-
from zarr.core.chunk_key_encodings import ChunkKeyEncoding, ChunkKeyEncodingParams
58+
from zarr.core.chunk_key_encodings import ChunkKeyEncoding, ChunkKeyEncodingLike
5959
from zarr.core.common import MemoryOrder
6060

6161
logger = logging.getLogger("zarr.group")
@@ -1009,16 +1009,16 @@ async def create_array(
10091009
dtype: npt.DTypeLike,
10101010
chunks: ChunkCoords | Literal["auto"] = "auto",
10111011
shards: ChunkCoords | Literal["auto"] | None = None,
1012-
filters: FiltersParam = "auto",
1013-
compressors: CompressorsParam = "auto",
1012+
filters: FiltersLike = "auto",
1013+
compressors: CompressorsLike = "auto",
10141014
fill_value: Any | None = 0,
10151015
order: MemoryOrder | None = None,
10161016
attributes: dict[str, JSON] | None = None,
1017-
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingParams | None = None,
1017+
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingLike | None = None,
10181018
dimension_names: Iterable[str] | None = None,
10191019
storage_options: dict[str, Any] | None = None,
10201020
overwrite: bool = False,
1021-
config: ArrayConfig | ArrayConfigParams | None = None,
1021+
config: ArrayConfig | ArrayConfigLike | None = None,
10221022
) -> AsyncArray[ArrayV2Metadata] | AsyncArray[ArrayV3Metadata]:
10231023
"""
10241024
Create a Zarr array within this AsyncGroup.
@@ -2202,16 +2202,16 @@ def create_array(
22022202
dtype: npt.DTypeLike,
22032203
chunks: ChunkCoords | Literal["auto"] = "auto",
22042204
shards: ChunkCoords | None = None,
2205-
filters: FiltersParam = "auto",
2206-
compressors: CompressorsParam = "auto",
2205+
filters: FiltersLike = "auto",
2206+
compressors: CompressorsLike = "auto",
22072207
fill_value: Any | None = 0,
22082208
order: MemoryOrder | None = "C",
22092209
attributes: dict[str, JSON] | None = None,
2210-
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingParams | None = None,
2210+
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingLike | None = None,
22112211
dimension_names: Iterable[str] | None = None,
22122212
storage_options: dict[str, Any] | None = None,
22132213
overwrite: bool = False,
2214-
config: ArrayConfig | ArrayConfigParams | None = None,
2214+
config: ArrayConfig | ArrayConfigLike | None = None,
22152215
) -> Array:
22162216
"""
22172217
Create a Zarr array within this AsyncGroup.
@@ -2534,16 +2534,16 @@ def array(
25342534
dtype: npt.DTypeLike,
25352535
chunks: ChunkCoords | Literal["auto"] = "auto",
25362536
shards: ChunkCoords | Literal["auto"] | None = None,
2537-
filters: FiltersParam = "auto",
2538-
compressors: CompressorsParam = "auto",
2537+
filters: FiltersLike = "auto",
2538+
compressors: CompressorsLike = "auto",
25392539
fill_value: Any | None = 0,
25402540
order: MemoryOrder | None = "C",
25412541
attributes: dict[str, JSON] | None = None,
2542-
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingParams | None = None,
2542+
chunk_key_encoding: ChunkKeyEncoding | ChunkKeyEncodingLike | None = None,
25432543
dimension_names: Iterable[str] | None = None,
25442544
storage_options: dict[str, Any] | None = None,
25452545
overwrite: bool = False,
2546-
config: ArrayConfig | ArrayConfigParams | None = None,
2546+
config: ArrayConfig | ArrayConfigLike | None = None,
25472547
data: npt.ArrayLike | None = None,
25482548
) -> Array:
25492549
"""

0 commit comments

Comments
 (0)