fix circular import

brokkoli71 · brokkoli71 · commit 0d91dc62a8d4 · 2025-04-10T15:21:06.000+02:00
diff --git a/src/zarr/codecs/blosc.py b/src/zarr/codecs/blosc.py
@@ -11,8 +11,12 @@
 
 from zarr.abc.codec import BytesBytesCodec
 from zarr.core.buffer.cpu import as_numpy_array_wrapper
-from zarr.core.common import JSON, parse_enum, parse_named_configuration
-from zarr.core.metadata.common import reject_must_understand_metadata
+from zarr.core.common import (
+    JSON,
+    parse_enum,
+    parse_named_configuration,
+    reject_must_understand_metadata,
+)
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
diff --git a/src/zarr/codecs/bytes.py b/src/zarr/codecs/bytes.py
@@ -9,8 +9,12 @@
 
 from zarr.abc.codec import ArrayBytesCodec
 from zarr.core.buffer import Buffer, NDArrayLike, NDBuffer
-from zarr.core.common import JSON, parse_enum, parse_named_configuration
-from zarr.core.metadata.common import reject_must_understand_metadata
+from zarr.core.common import (
+    JSON,
+    parse_enum,
+    parse_named_configuration,
+    reject_must_understand_metadata,
+)
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
diff --git a/src/zarr/codecs/crc32c_.py b/src/zarr/codecs/crc32c_.py
@@ -8,8 +8,7 @@
 from crc32c import crc32c
 
 from zarr.abc.codec import BytesBytesCodec
-from zarr.core.common import JSON, parse_named_configuration
-from zarr.core.metadata.common import reject_must_understand_metadata
+from zarr.core.common import JSON, parse_named_configuration, reject_must_understand_metadata
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
diff --git a/src/zarr/codecs/gzip.py b/src/zarr/codecs/gzip.py
@@ -8,8 +8,7 @@
 
 from zarr.abc.codec import BytesBytesCodec
 from zarr.core.buffer.cpu import as_numpy_array_wrapper
-from zarr.core.common import JSON, parse_named_configuration
-from zarr.core.metadata.common import reject_must_understand_metadata
+from zarr.core.common import JSON, parse_named_configuration, reject_must_understand_metadata
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
diff --git a/src/zarr/codecs/sharding.py b/src/zarr/codecs/sharding.py
@@ -42,6 +42,7 @@
     parse_named_configuration,
     parse_shapelike,
     product,
+    reject_must_understand_metadata,
 )
 from zarr.core.indexing import (
     BasicIndexer,
@@ -50,7 +51,6 @@
     get_indexer,
     morton_order_iter,
 )
-from zarr.core.metadata.common import reject_must_understand_metadata
 from zarr.core.metadata.v3 import parse_codecs
 from zarr.registry import get_ndbuffer_class, get_pipeline_class, register_codec
 
diff --git a/src/zarr/codecs/transpose.py b/src/zarr/codecs/transpose.py
@@ -8,8 +8,12 @@
 
 from zarr.abc.codec import ArrayArrayCodec
 from zarr.core.array_spec import ArraySpec
-from zarr.core.common import JSON, ChunkCoordsLike, parse_named_configuration
-from zarr.core.metadata.common import reject_must_understand_metadata
+from zarr.core.common import (
+    JSON,
+    ChunkCoordsLike,
+    parse_named_configuration,
+    reject_must_understand_metadata,
+)
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
diff --git a/src/zarr/codecs/vlen_utf8.py b/src/zarr/codecs/vlen_utf8.py
@@ -9,8 +9,7 @@
 
 from zarr.abc.codec import ArrayBytesCodec
 from zarr.core.buffer import Buffer, NDBuffer
-from zarr.core.common import JSON, parse_named_configuration
-from zarr.core.metadata.common import reject_must_understand_metadata
+from zarr.core.common import JSON, parse_named_configuration, reject_must_understand_metadata
 from zarr.core.strings import cast_to_string_dtype
 from zarr.registry import register_codec
 
diff --git a/src/zarr/codecs/zstd.py b/src/zarr/codecs/zstd.py
@@ -11,8 +11,7 @@
 
 from zarr.abc.codec import BytesBytesCodec
 from zarr.core.buffer.cpu import as_numpy_array_wrapper
-from zarr.core.common import JSON, parse_named_configuration
-from zarr.core.metadata.common import reject_must_understand_metadata
+from zarr.core.common import JSON, parse_named_configuration, reject_must_understand_metadata
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
diff --git a/src/zarr/core/chunk_grids.py b/src/zarr/core/chunk_grids.py
@@ -20,9 +20,9 @@
     ShapeLike,
     parse_named_configuration,
     parse_shapelike,
+    reject_must_understand_metadata,
 )
 from zarr.core.indexing import ceildiv
-from zarr.core.metadata.common import reject_must_understand_metadata
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
diff --git a/src/zarr/core/chunk_key_encodings.py b/src/zarr/core/chunk_key_encodings.py
@@ -4,8 +4,6 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Literal, TypeAlias, TypedDict, cast
 
-from zarr.core.metadata.common import reject_must_understand_metadata
-
 if TYPE_CHECKING:
     from typing import NotRequired
 
@@ -14,6 +12,7 @@
     JSON,
     ChunkCoords,
     parse_named_configuration,
+    reject_must_understand_metadata,
 )
 
 SeparatorLiteral = Literal[".", "/"]
diff --git a/src/zarr/core/common.py b/src/zarr/core/common.py
@@ -19,7 +19,6 @@
 import numpy as np
 
 from zarr.core.config import config as zarr_config
-from zarr.core.metadata.common import reject_must_understand_metadata
 from zarr.core.strings import _STRING_DTYPE
 
 if TYPE_CHECKING:
@@ -215,3 +214,10 @@ def _warn_order_kwarg() -> None:
 def _default_zarr_format() -> ZarrFormat:
     """Return the default zarr_version"""
     return cast(ZarrFormat, int(zarr_config.get("default_zarr_format", 3)))
+
+
+def reject_must_understand_metadata(data: dict[str, Any] | None, dict_name: str) -> None:
+    if data and not all(
+        isinstance(value, dict) and value.get("must_understand") is False for value in data.values()
+    ):
+        raise ValueError(f"Unexpected {dict_name} keys: {list(data.keys())}")
diff --git a/src/zarr/core/metadata/common.py b/src/zarr/core/metadata/common.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from zarr.core.common import JSON
@@ -11,10 +11,3 @@ def parse_attributes(data: dict[str, JSON] | None) -> dict[str, JSON]:
         return {}
 
     return data
-
-
-def reject_must_understand_metadata(data: dict[str, Any] | None, dict_name: str) -> None:
-    if data and not all(
-        isinstance(value, dict) and value.get("must_understand") is False for value in data.values()
-    ):
-        raise ValueError(f"Unexpected {dict_name} keys: {list(data.keys())}")
diff --git a/src/zarr/core/metadata/v3.py b/src/zarr/core/metadata/v3.py
@@ -34,9 +34,10 @@
     ChunkCoords,
     parse_named_configuration,
     parse_shapelike,
+    reject_must_understand_metadata,
 )
 from zarr.core.config import config
-from zarr.core.metadata.common import parse_attributes, reject_must_understand_metadata
+from zarr.core.metadata.common import parse_attributes
 from zarr.core.strings import _NUMPY_SUPPORTS_VLEN_STRING
 from zarr.core.strings import _STRING_DTYPE as STRING_NP_DTYPE
 from zarr.errors import MetadataValidationError, NodeTypeValidationError

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`	`parse_named_configuration,`
`43`	`43`	`parse_shapelike,`
`44`	`44`	`product,`
	`45`	`+ reject_must_understand_metadata,`
`45`	`46`	`)`
`46`	`47`	`from zarr.core.indexing import (`
`47`	`48`	`BasicIndexer,`
`@@ -50,7 +51,6 @@`
`50`	`51`	`get_indexer,`
`51`	`52`	`morton_order_iter,`
`52`	`53`	`)`
`53`		`-from zarr.core.metadata.common import reject_must_understand_metadata`
`54`	`54`	`from zarr.core.metadata.v3 import parse_codecs`
`55`	`55`	`from zarr.registry import get_ndbuffer_class, get_pipeline_class, register_codec`
`56`	`56`