Round trip serialization for array metadata v2/v3

Author: moradology

src/zarr/core/metadata/v2.py

@@ -170,7 +170,7 @@ def from_dict(cls, data: dict[str, Any]) -> ArrayV2Metadata:
         if dtype.kind in "SV":
             fill_value_encoded = _data.get("fill_value")
             if fill_value_encoded is not None:
-                fill_value = base64.standard_b64decode(fill_value_encoded)
+                fill_value: Any = base64.standard_b64decode(fill_value_encoded)
                 _data["fill_value"] = fill_value
         else:
             fill_value = _data.get("fill_value")
@@ -180,13 +180,11 @@ def from_dict(cls, data: dict[str, Any]) -> ArrayV2Metadata:
                         _data["fill_value"] = np.array("NaT", dtype=dtype)[()]
                     else:
                         _data["fill_value"] = np.array(fill_value, dtype=dtype)[()]
-                elif dtype.kind == "c" and isinstance(fill_value, list):
-                    if len(fill_value) == 2:
-                        val = complex(float(fill_value[0]), float(fill_value[1]))
-                        _data["fill_value"] = np.array(val, dtype=dtype)[()]
-                elif dtype.kind in "f" and isinstance(fill_value, str):
-                    if fill_value in {"NaN", "Infinity", "-Infinity"}:
-                        _data["fill_value"] = np.array(fill_value, dtype=dtype)[()]
+                elif dtype.kind == "c" and isinstance(fill_value, list) and len(fill_value) == 2:
+                    val = complex(float(fill_value[0]), float(fill_value[1]))
+                    _data["fill_value"] = np.array(val, dtype=dtype)[()]
+                elif dtype.kind in "f" and fill_value in {"NaN", "Infinity", "-Infinity"}:
+                    _data["fill_value"] = np.array(fill_value, dtype=dtype)[()]
         # zarr v2 allowed arbitrary keys in the metadata.
         # Filter the keys to only those expected by the constructor.
         expected = {x.name for x in fields(cls)}
@@ -196,21 +194,22 @@ def from_dict(cls, data: dict[str, Any]) -> ArrayV2Metadata:
         return cls(**_data)
 
     def to_dict(self) -> dict[str, JSON]:
-        def _sanitize_fill_value(fv: Any):
+        def _sanitize_fill_value(fv: Any) -> JSON:
             if fv is None:
                 return fv
             elif isinstance(fv, np.datetime64):
                 if np.isnat(fv):
                     return "NaT"
                 return np.datetime_as_string(fv)
             elif isinstance(fv, numbers.Real):
-                if np.isnan(fv):
+                float_fv = float(fv)
+                if np.isnan(float_fv):
                     fv = "NaN"
-                elif np.isinf(fv):
-                    fv = "Infinity" if fv > 0 else "-Infinity"
+                elif np.isinf(float_fv):
+                    fv = "Infinity" if float_fv > 0 else "-Infinity"
             elif isinstance(fv, numbers.Complex):
                 fv = [_sanitize_fill_value(fv.real), _sanitize_fill_value(fv.imag)]
-            return fv
+            return cast(JSON, fv)
 
         zarray_dict = super().to_dict()
 

src/zarr/testing/stateful.py

@@ -85,7 +85,7 @@ def add_group(self, name: str, data: DataObject) -> None:
     @rule(
         data=st.data(),
         name=node_names,
-        array_and_chunks=np_array_and_chunks(nparrays=numpy_arrays(zarr_formats=st.just(3))),
+        array_and_chunks=np_array_and_chunks(arrays=numpy_arrays(zarr_formats=st.just(3))),
     )
     def add_array(
         self,

src/zarr/testing/strategies.py

@@ -3,7 +3,6 @@
 
 import hypothesis.extra.numpy as npst
 import hypothesis.strategies as st
-import numcodecs
 import numpy as np
 from hypothesis import assume, given, settings  # noqa: F401
 from hypothesis.strategies import SearchStrategy
@@ -345,136 +344,3 @@ def make_request(start: int, length: int) -> RangeByteRequest:
     )
     key_tuple = st.tuples(keys, byte_ranges)
     return st.lists(key_tuple, min_size=1, max_size=10)
-
-
-def simple_text():
-    """A strategy for generating simple text strings."""
-    return st.text(st.characters(min_codepoint=32, max_codepoint=126), min_size=1, max_size=10)
-
-
-def simple_attrs():
-    """A strategy for generating simple attribute dictionaries."""
-    return st.dictionaries(
-        simple_text(),
-        st.one_of(
-            st.integers(),
-            st.floats(allow_nan=False, allow_infinity=False),
-            st.booleans(),
-            simple_text(),
-        ),
-    )
-
-
-def array_shapes(min_dims=1, max_dims=3, max_len=100):
-    """A strategy for generating array shapes."""
-    return st.lists(
-        st.integers(min_value=1, max_value=max_len), min_size=min_dims, max_size=max_dims
-    )
-
-
-# def zarr_compressors():
-#     """A strategy for generating Zarr compressors."""
-#     return st.sampled_from([None, Blosc(), GZip(), Zstd(), LZ4()])
-
-
-# def zarr_codecs():
-#     """A strategy for generating Zarr codecs."""
-#     return st.sampled_from([BytesCodec(), Blosc(), GZip(), Zstd(), LZ4()])
-
-
-def zarr_filters():
-    """A strategy for generating Zarr filters."""
-    return st.lists(
-        st.just(numcodecs.Delta(dtype="i4")), min_size=0, max_size=2
-    )  # Example filter, expand as needed
-
-
-def zarr_storage_transformers():
-    """A strategy for generating Zarr storage transformers."""
-    return st.lists(
-        st.dictionaries(
-            simple_text(), st.one_of(st.integers(), st.floats(), st.booleans(), simple_text())
-        ),
-        min_size=0,
-        max_size=2,
-    )
-
-
-@st.composite
-def array_metadata_v2(draw: st.DrawFn) -> ArrayV2Metadata:
-    """Generates valid ArrayV2Metadata objects for property-based testing."""
-    dims = draw(st.integers(min_value=1, max_value=3))  # Limit dimensions for complexity
-    shape = tuple(draw(array_shapes(min_dims=dims, max_dims=dims, max_len=100)))
-    max_chunk_len = max(shape) if shape else 100
-    chunks = tuple(
-        draw(
-            st.lists(
-                st.integers(min_value=1, max_value=max_chunk_len), min_size=dims, max_size=dims
-            )
-        )
-    )
-
-    # Validate shape and chunks relationship
-    assume(all(c <= s for s, c in zip(shape, chunks, strict=False)))  # Chunk size must be <= shape
-
-    dtype = draw(v2_dtypes())
-    fill_value = draw(st.one_of([st.none(), npst.from_dtype(dtype)]))
-    order = draw(st.sampled_from(["C", "F"]))
-    dimension_separator = draw(st.sampled_from([".", "/"]))
-    # compressor = draw(zarr_compressors())
-    filters = tuple(draw(zarr_filters())) if draw(st.booleans()) else None
-    attributes = draw(simple_attrs())
-
-    # Construct the metadata object.  Type hints are crucial here for correctness.
-    return ArrayV2Metadata(
-        shape=shape,
-        dtype=dtype,
-        chunks=chunks,
-        fill_value=fill_value,
-        order=order,
-        dimension_separator=dimension_separator,
-        #    compressor=compressor,
-        filters=filters,
-        attributes=attributes,
-    )
-
-
-@st.composite
-def array_metadata_v3(draw: st.DrawFn) -> ArrayV3Metadata:
-    """Generates valid ArrayV3Metadata objects for property-based testing."""
-    dims = draw(st.integers(min_value=1, max_value=3))
-    shape = tuple(draw(array_shapes(min_dims=dims, max_dims=dims, max_len=100)))
-    max_chunk_len = max(shape) if shape else 100
-    chunks = tuple(
-        draw(
-            st.lists(
-                st.integers(min_value=1, max_value=max_chunk_len), min_size=dims, max_size=dims
-            )
-        )
-    )
-    assume(all(c <= s for s, c in zip(shape, chunks, strict=False)))
-
-    dtype = draw(v3_dtypes())
-    fill_value = draw(npst.from_dtype(dtype))
-    chunk_grid = RegularChunkGrid(chunks)  # Ensure chunks is passed as tuple.
-    chunk_key_encoding = DefaultChunkKeyEncoding(separator="/")  # Or st.sampled_from(["/", "."])
-    # codecs = tuple(draw(st.lists(zarr_codecs(), min_size=0, max_size=3)))
-    attributes = draw(simple_attrs())
-    dimension_names = (
-        tuple(draw(st.lists(st.one_of(st.none(), simple_text()), min_size=dims, max_size=dims)))
-        if draw(st.booleans())
-        else None
-    )
-    storage_transformers = tuple(draw(zarr_storage_transformers()))
-
-    return ArrayV3Metadata(
-        shape=shape,
-        data_type=dtype,
-        chunk_grid=chunk_grid,
-        chunk_key_encoding=chunk_key_encoding,
-        fill_value=fill_value,
-        #    codecs=codecs,
-        attributes=attributes,
-        dimension_names=dimension_names,
-        storage_transformers=storage_transformers,
-    )

tests/test_properties.py

@@ -14,12 +14,11 @@
 from hypothesis import assume, given
 
 from zarr.abc.store import Store
-from zarr.core.common import ZARRAY_JSON, ZATTRS_JSON
+from zarr.core.common import ZARR_JSON, ZARRAY_JSON, ZATTRS_JSON
 from zarr.core.metadata import ArrayV2Metadata, ArrayV3Metadata
 from zarr.core.sync import sync
 from zarr.testing.strategies import (
     array_metadata,
-    array_metadata_v2,
     arrays,
     basic_indices,
     numpy_arrays,
@@ -84,7 +83,7 @@ def deep_equal(a, b):
 
 
 @given(data=st.data(), zarr_format=zarr_formats)
-def test_roundtrip(data: st.DataObject, zarr_format: int) -> None:
+def test_array_roundtrip(data: st.DataObject, zarr_format: int) -> None:
     nparray = data.draw(numpy_arrays(zarr_formats=st.just(zarr_format)))
     zarray = data.draw(arrays(arrays=st.just(nparray), zarr_formats=st.just(zarr_format)))
     assert_array_equal(nparray, zarray[:])
@@ -197,16 +196,20 @@ async def test_roundtrip_array_metadata(
 #     assert_array_equal(nparray, zarray[:])
 
 
-@given(array_metadata_v2())
-def test_v2meta_roundtrip(metadata):
+@given(data=st.data(), zarr_format=zarr_formats)
+def test_meta_roundtrip(data: st.DataObject, zarr_format: int) -> None:
+    metadata = data.draw(array_metadata(zarr_formats=st.just(zarr_format)))
     buffer_dict = metadata.to_buffer_dict(prototype=default_buffer_prototype())
-    zarray_dict = json.loads(buffer_dict[ZARRAY_JSON].to_bytes().decode())
-    zattrs_dict = json.loads(buffer_dict[ZATTRS_JSON].to_bytes().decode())
 
-    # zattrs and zarray are separate in v2, we have to add attributes back prior to `from_dict`
-    zarray_dict["attributes"] = zattrs_dict
-
-    metadata_roundtripped = ArrayV2Metadata.from_dict(zarray_dict)
+    if zarr_format == 2:
+        zarray_dict = json.loads(buffer_dict[ZARRAY_JSON].to_bytes().decode())
+        zattrs_dict = json.loads(buffer_dict[ZATTRS_JSON].to_bytes().decode())
+        # zattrs and zarray are separate in v2, we have to add attributes back prior to `from_dict`
+        zarray_dict["attributes"] = zattrs_dict
+        metadata_roundtripped = ArrayV2Metadata.from_dict(zarray_dict)
+    else:
+        zarray_dict = json.loads(buffer_dict[ZARR_JSON].to_bytes().decode())
+        metadata_roundtripped = ArrayV3Metadata.from_dict(zarray_dict)
 
     # Convert both metadata instances to dictionaries.
     orig = dataclasses.asdict(metadata)