Fixed ArrayV2Metadata parameter names

For things like dataclasses.repalce to work, we need the parameter names
to match the attribute names.

All the name change between what we have in memory and what the specs
requires should happen during serialization / deserialization.

Closes #2269

Author: TomAugspurger

src/zarr/core/array.py

@@ -372,8 +372,8 @@ async def _create_v2(
 
         metadata = ArrayV2Metadata(
             shape=shape,
-            dtype=np.dtype(dtype),
-            chunks=chunks,
+            data_type=np.dtype(dtype),
+            chunk_grid=chunks,
             order=order,
             dimension_separator=dimension_separator,
             fill_value=0 if fill_value is None else fill_value,

src/zarr/core/common.py

@@ -19,6 +19,8 @@
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Callable, Iterator
 
+    from zarr.core.chunk_grids import RegularChunkGrid
+
 
 ZARR_JSON = "zarr.json"
 ZARRAY_JSON = ".zarray"
@@ -133,11 +135,15 @@ def parse_named_configuration(
     return name_parsed, configuration_parsed
 
 
-def parse_shapelike(data: int | Iterable[int]) -> tuple[int, ...]:
+def parse_shapelike(data: int | Iterable[int] | RegularChunkGrid) -> tuple[int, ...]:
+    from zarr.core.chunk_grids import RegularChunkGrid
+
     if isinstance(data, int):
         if data < 0:
             raise ValueError(f"Expected a non-negative integer. Got {data} instead")
         return (data,)
+    elif isinstance(data, RegularChunkGrid):
+        return data.chunk_shape
     try:
         data_tuple = tuple(data)
     except TypeError as e:

src/zarr/core/metadata/v2.py

@@ -43,8 +43,8 @@ def __init__(
         self,
         *,
         shape: ChunkCoords,
-        dtype: npt.DTypeLike,
-        chunks: ChunkCoords,
+        data_type: npt.DTypeLike,
+        chunk_grid: ChunkCoords,
         fill_value: Any,
         order: Literal["C", "F"],
         dimension_separator: Literal[".", "/"] = ".",
@@ -56,8 +56,8 @@ def __init__(
         Metadata for a Zarr version 2 array.
         """
         shape_parsed = parse_shapelike(shape)
-        data_type_parsed = parse_dtype(dtype)
-        chunks_parsed = parse_shapelike(chunks)
+        data_type_parsed = parse_dtype(data_type)
+        chunks_parsed = parse_shapelike(chunk_grid)
         compressor_parsed = parse_compressor(compressor)
         order_parsed = parse_indexing_order(order)
         dimension_separator_parsed = parse_separator(dimension_separator)
@@ -140,6 +140,9 @@ def from_dict(cls, data: dict[str, Any]) -> ArrayV2Metadata:
         _data = data.copy()
         # check that the zarr_format attribute is correct
         _ = parse_zarr_format(_data.pop("zarr_format"))
+
+        _data["chunk_grid"] = _data.pop("chunks")
+        _data["data_type"] = _data.pop("dtype")
         return cls(**_data)
 
     def to_dict(self) -> dict[str, JSON]:

tests/v3/test_v2.py

@@ -46,3 +46,16 @@ def test_codec_pipeline() -> None:
     result = array[:]
     expected = np.ones(1)
     np.testing.assert_array_equal(result, expected)
+
+
+def test_attrs(store: StorePath) -> None:
+    data = np.arange(0, 8, dtype="uint16")
+    a = Array.create(
+        store / "simple_v2",
+        zarr_format=2,
+        shape=data.shape,
+        chunks=(4,),
+        dtype=data.dtype,
+        fill_value=0,
+    )
+    a.attrs.put({"key": 0})