fix: adapt to zarr-metadata 0.4 type renames

pyproject.toml

@@ -21,7 +21,7 @@ dynamic = ["version"]
 dependencies = [
     # Type-only package providing Zarr v3 metadata TypedDicts/Literals used in
     # the `.pyi` stubs (data-type names, codec configs, array metadata).
-    "zarr-metadata>=0.3",
+    "zarr-metadata>=0.4",
 ]
 
 [tool.maturin]

python/zarrista/_array.pyi

@@ -2,7 +2,7 @@ from collections.abc import Buffer
 from types import EllipsisType
 from typing import TypeAlias, Unpack
 
-from zarr_metadata import ArrayMetadataV3, JSONValue
+from zarr_metadata import JSONValue, ZarrV3ArrayMetadataJSON
 
 from zarrista.codec import (
     ArrayToArrayCodec,
@@ -37,7 +37,7 @@ class Array:
         """Open the array stored at `path` in `store`."""
     @staticmethod
     def from_metadata(
-        metadata: ArrayMetadataV3,
+        metadata: ZarrV3ArrayMetadataJSON,
         store: FilesystemStore | MemoryStore,
         path: str = "/",
     ) -> Array:
@@ -96,7 +96,7 @@ class Array:
     def fill_value(self) -> FillValue:
         """The array's fill value."""
     @property
-    def metadata(self) -> ArrayMetadataV3:
+    def metadata(self) -> ZarrV3ArrayMetadataJSON:
         """The array's full Zarr v3 metadata."""
     @property
     def ndim(self) -> int:
@@ -267,7 +267,7 @@ class AsyncArray:
         """
     @staticmethod
     def from_metadata(
-        metadata: ArrayMetadataV3,
+        metadata: ZarrV3ArrayMetadataJSON,
         store: AsyncStore,
         path: str = "/",
     ) -> AsyncArray:
@@ -327,7 +327,7 @@ class AsyncArray:
     def fill_value(self) -> FillValue:
         """The array's fill value."""
     @property
-    def metadata(self) -> ArrayMetadataV3:
+    def metadata(self) -> ZarrV3ArrayMetadataJSON:
         """The array's full Zarr v3 metadata."""
     @property
     def ndim(self) -> int:

python/zarrista/_builder.pyi

@@ -1,6 +1,6 @@
 from collections.abc import Mapping, Sequence
 
-from zarr_metadata import ArrayMetadataV3, JSONValue
+from zarr_metadata import JSONValue, ZarrV3ArrayMetadataJSON
 
 from zarrista.codec import (
     ArrayToArrayCodec,
@@ -93,7 +93,7 @@ class ArrayBuilder:
         [`ArrayBuilder.create_metadata`][zarrista.ArrayBuilder.create_metadata]
         to build metadata without touching a store.
         """
-    def create_metadata(self) -> ArrayMetadataV3:
+    def create_metadata(self) -> ZarrV3ArrayMetadataJSON:
         """Build the array's Zarr v3 metadata without touching a store.
 
         Nothing is written. Pass the result to

python/zarrista/_chunk_key_encoding.pyi

@@ -1,6 +1,6 @@
 from typing import Literal
 
-from zarr_metadata import NamedConfigV3
+from zarr_metadata import ZarrV3NamedConfigJSON
 
 class ChunkKeyEncoding:
     """How an array maps chunk grid indices to store keys."""
@@ -9,10 +9,10 @@ class ChunkKeyEncoding:
     def default(sep: Literal[".", "/"]) -> ChunkKeyEncoding:
         """Construct the `default` chunk key encoding with the given separator."""
     @staticmethod
-    def from_metadata(metadata: NamedConfigV3) -> ChunkKeyEncoding:
+    def from_metadata(metadata: ZarrV3NamedConfigJSON) -> ChunkKeyEncoding:
         """Build a chunk key encoding from its Zarr v3 metadata."""
     @property
-    def metadata(self) -> NamedConfigV3:
+    def metadata(self) -> ZarrV3NamedConfigJSON:
         """The chunk key encoding's Zarr v3 metadata."""
     @property
     def name(self) -> str | None:

python/zarrista/_chunks.pyi

@@ -1,7 +1,7 @@
 from collections.abc import Sequence
 from typing import TypeAlias
 
-from zarr_metadata import NamedConfigV3
+from zarr_metadata import ZarrV3NamedConfigJSON
 
 _RunLength: TypeAlias = int | tuple[int, int]
 """One run of a rectilinear chunk edge: a single chunk size, or a
@@ -33,10 +33,13 @@ class ChunkGrid:
         Experimental and may be incompatible with other Zarr V3 implementations.
         """
     @staticmethod
-    def from_metadata(metadata: NamedConfigV3, shape: Sequence[int]) -> ChunkGrid:
+    def from_metadata(
+        metadata: ZarrV3NamedConfigJSON,
+        shape: Sequence[int],
+    ) -> ChunkGrid:
         """Build a chunk grid from its Zarr v3 metadata and the array shape."""
     @property
-    def metadata(self) -> NamedConfigV3:
+    def metadata(self) -> ZarrV3NamedConfigJSON:
         """The chunk grid's Zarr v3 metadata."""
     @property
     def ndim(self) -> int:

python/zarrista/_dtype.pyi

@@ -1,6 +1,6 @@
 from typing import TypeAlias
 
-from zarr_metadata import NamedConfigV3
+from zarr_metadata import ZarrV3NamedConfigJSON
 from zarr_metadata.v3.data_type import (
     BoolDataTypeName,
     BytesDataTypeName,
@@ -50,7 +50,7 @@ class DataType:
     """A Zarr v3 data type."""
 
     @staticmethod
-    def from_metadata(metadata: NamedConfigV3) -> DataType:
+    def from_metadata(metadata: ZarrV3NamedConfigJSON) -> DataType:
         """Construct a data type from its Zarr v3 metadata."""
     @staticmethod
     def from_string(name: DataTypeName | str) -> DataType:

python/zarrista/_group.pyi

@@ -1,4 +1,8 @@
-from zarr_metadata import ConsolidatedMetadataV3, GroupMetadataV3, JSONValue
+from zarr_metadata import (
+    JSONValue,
+    ZarrV3ConsolidatedMetadataJSON,
+    ZarrV3GroupMetadataJSON,
+)
 
 from ._array import Array, AsyncArray
 from ._store import AsyncStore, FilesystemStore, MemoryStore
@@ -13,10 +17,10 @@ class Group:
     def attrs(self) -> dict[str, JSONValue]:
         """The group's user attributes as a dict."""
     @property
-    def metadata(self) -> GroupMetadataV3:
+    def metadata(self) -> ZarrV3GroupMetadataJSON:
         """The group's full Zarr v3 metadata."""
     @property
-    def consolidated_metadata(self) -> ConsolidatedMetadataV3 | None:
+    def consolidated_metadata(self) -> ZarrV3ConsolidatedMetadataJSON | None:
         """The consolidated metadata, if present in the group metadata."""
     @property
     def path(self) -> str:
@@ -62,10 +66,10 @@ class AsyncGroup:
     def attrs(self) -> dict[str, JSONValue]:
         """The group's user attributes as a dict."""
     @property
-    def metadata(self) -> GroupMetadataV3:
+    def metadata(self) -> ZarrV3GroupMetadataJSON:
         """The group's full Zarr v3 metadata."""
     @property
-    def consolidated_metadata(self) -> ConsolidatedMetadataV3 | None:
+    def consolidated_metadata(self) -> ZarrV3ConsolidatedMetadataJSON | None:
         """The consolidated metadata, if present in the group metadata."""
     @property
     def path(self) -> str:

tests/array/test_array.py

@@ -4,7 +4,7 @@
 from zarrista.store import MemoryStore
 
 if TYPE_CHECKING:
-    from zarr_metadata import ArrayMetadataV3
+    from zarr_metadata import ZarrV3ArrayMetadataJSON
 
 
 def test_array_from_metadata() -> None:
@@ -13,7 +13,7 @@ def test_array_from_metadata() -> None:
     """
     store = MemoryStore()
 
-    meta: ArrayMetadataV3 = {
+    meta: ZarrV3ArrayMetadataJSON = {
         "zarr_format": 3,
         "attributes": {},
         "chunk_grid": {"name": "regular", "configuration": {"chunk_shape": (2, 2)}},

tests/array/test_store_metadata.py

@@ -11,10 +11,10 @@
 from zarrista.store import FilesystemStore, MemoryStore
 
 if TYPE_CHECKING:
-    from zarr_metadata import ArrayMetadataV3
+    from zarr_metadata import ZarrV3ArrayMetadataJSON
 
 
-def _metadata(data_type: str = "int16") -> "ArrayMetadataV3":
+def _metadata(data_type: str = "int16") -> "ZarrV3ArrayMetadataJSON":
     return {
         "zarr_format": 3,
         "attributes": {},