avoid circular imports by importing lower-level routines exactly where needed

Author: d-v-b

examples/custom_dtype.py

@@ -22,14 +22,14 @@
 import pytest
 
 import zarr
-from zarr.core.common import JSON, ZarrFormat
 from zarr.core.dtype import ZDType, data_type_registry
 from zarr.core.dtype.common import (
     DataTypeValidationError,
     DTypeConfig_V2,
     DTypeJSON,
     check_dtype_spec_v2,
 )
+from zarr.core.types import JSON, ZarrFormat
 
 # This is the int2 array data type
 int2_dtype_cls = type(np.dtype("int2"))

src/zarr/abc/codec.py

@@ -5,7 +5,7 @@
 
 from zarr.abc.metadata import Metadata
 from zarr.core.buffer import Buffer, NDBuffer
-from zarr.core.common import ChunkCoords, concurrent_map
+from zarr.core.common import concurrent_map
 from zarr.core.config import config
 
 if TYPE_CHECKING:
@@ -18,6 +18,7 @@
     from zarr.core.dtype.wrapper import TBaseDType, TBaseScalar, ZDType
     from zarr.core.indexing import SelectorTuple
     from zarr.core.metadata import ArrayMetadata
+    from zarr.core.types import ChunkCoords
 
 __all__ = [
     "ArrayArrayCodec",

src/zarr/abc/metadata.py

@@ -6,7 +6,7 @@
 if TYPE_CHECKING:
     from typing import Self
 
-    from zarr.core.common import JSON
+    from zarr.core.types import JSON
 
 from dataclasses import dataclass, fields
 

src/zarr/abc/store.py

@@ -16,7 +16,7 @@
     from typing import Any, Self, TypeAlias
 
     from zarr.core.buffer import Buffer, BufferPrototype
-    from zarr.core.common import BytesLike
+    from zarr.core.types import BytesLike
 
 __all__ = ["ByteGetter", "ByteSetter", "Store", "set_or_delete"]
 

src/zarr/api/asynchronous.py

@@ -22,12 +22,6 @@
 from zarr.core.array_spec import ArrayConfigLike, parse_array_config
 from zarr.core.buffer import NDArrayLike
 from zarr.core.common import (
-    JSON,
-    AccessModeLiteral,
-    ChunkCoords,
-    DimensionNames,
-    MemoryOrder,
-    ZarrFormat,
     _default_zarr_format,
     _warn_write_empty_chunks_kwarg,
 )
@@ -57,6 +51,14 @@
     from zarr.abc.codec import Codec
     from zarr.core.buffer import NDArrayLikeOrScalar
     from zarr.core.chunk_key_encodings import ChunkKeyEncoding
+    from zarr.core.types import (
+        JSON,
+        AccessModeLiteral,
+        ChunkCoords,
+        DimensionNames,
+        MemoryOrder,
+        ZarrFormat,
+    )
     from zarr.storage import StoreLike
 
     # TODO: this type could use some more thought

src/zarr/api/synchronous.py

@@ -30,7 +30,8 @@
     from zarr.core.array_spec import ArrayConfigLike
     from zarr.core.buffer import NDArrayLike, NDArrayLikeOrScalar
     from zarr.core.chunk_key_encodings import ChunkKeyEncoding, ChunkKeyEncodingLike
-    from zarr.core.common import (
+    from zarr.core.dtype import ZDTypeLike
+    from zarr.core.types import (
         JSON,
         AccessModeLiteral,
         ChunkCoords,
@@ -39,7 +40,6 @@
         ShapeLike,
         ZarrFormat,
     )
-    from zarr.core.dtype import ZDTypeLike
     from zarr.storage import StoreLike
 
 __all__ = [

src/zarr/codecs/blosc.py

@@ -12,7 +12,7 @@
 
 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.common import parse_enum, parse_named_configuration
 from zarr.core.dtype.common import HasItemSize
 from zarr.registry import register_codec
 
@@ -21,6 +21,7 @@
 
     from zarr.core.array_spec import ArraySpec
     from zarr.core.buffer import Buffer
+    from zarr.core.types import JSON
 
 
 class BloscShuffle(Enum):

src/zarr/codecs/bytes.py

@@ -9,14 +9,15 @@
 
 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.common import parse_enum, parse_named_configuration
 from zarr.core.dtype.common import HasEndianness
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
     from typing import Self
 
     from zarr.core.array_spec import ArraySpec
+    from zarr.core.types import JSON
 
 
 class Endian(Enum):

src/zarr/codecs/crc32c_.py

@@ -8,14 +8,15 @@
 from crc32c import crc32c
 
 from zarr.abc.codec import BytesBytesCodec
-from zarr.core.common import JSON, parse_named_configuration
+from zarr.core.common import parse_named_configuration
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
     from typing import Self
 
     from zarr.core.array_spec import ArraySpec
     from zarr.core.buffer import Buffer
+    from zarr.core.types import JSON
 
 
 @dataclass(frozen=True)

src/zarr/codecs/gzip.py

@@ -8,14 +8,15 @@
 
 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.common import parse_named_configuration
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
     from typing import Self
 
     from zarr.core.array_spec import ArraySpec
     from zarr.core.buffer import Buffer
+    from zarr.core.types import JSON
 
 
 def parse_gzip_level(data: JSON) -> int: