define ZarrFormat in top-level types

Author: d-v-b

src/zarr/api/asynchronous.py

@@ -57,9 +57,9 @@
         ChunkCoords,
         DimensionNames,
         MemoryOrder,
-        ZarrFormat,
     )
     from zarr.storage import StoreLike
+    from zarr.types import ZarrFormat
 
     # TODO: this type could use some more thought
     ArrayLike = AsyncArray[ArrayV2Metadata] | AsyncArray[ArrayV3Metadata] | Array | npt.NDArray[Any]

src/zarr/api/synchronous.py

@@ -38,9 +38,9 @@
         DimensionNames,
         MemoryOrder,
         ShapeLike,
-        ZarrFormat,
     )
     from zarr.storage import StoreLike
+    from zarr.types import ZarrFormat
 
 __all__ = [
     "array",

src/zarr/core/_info.py

@@ -9,7 +9,7 @@
 
     from zarr.abc.codec import ArrayArrayCodec, ArrayBytesCodec, BytesBytesCodec
     from zarr.core.dtype.wrapper import TBaseDType, TBaseScalar, ZDType
-    from zarr.core.types import ZarrFormat
+    from zarr.types import ZarrFormat
 
 
 @dataclasses.dataclass(kw_only=True)

src/zarr/core/array.py

@@ -119,7 +119,6 @@
     DimensionNames,
     MemoryOrder,
     ShapeLike,
-    ZarrFormat,
 )
 from zarr.errors import MetadataValidationError, ZarrDeprecationWarning, ZarrUserWarning
 from zarr.registry import (
@@ -142,6 +141,7 @@
     from zarr.core.dtype.wrapper import TBaseDType, TBaseScalar
     from zarr.core.group import AsyncGroup
     from zarr.storage import StoreLike
+    from zarr.types import ZarrFormat
 
 
 # Array and AsyncArray are defined in the base ``zarr`` namespace

src/zarr/core/common.py

@@ -27,7 +27,8 @@
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Callable, Iterable, Iterator
 
-    from zarr.core.types import ChunkCoords, ZarrFormat
+    from zarr.core.types import ChunkCoords
+    from zarr.types import ZarrFormat
 
 
 def product(tup: ChunkCoords) -> int:

src/zarr/core/dtype/__init__.py

@@ -32,7 +32,7 @@
 )
 
 if TYPE_CHECKING:
-    from zarr.core.types import ZarrFormat
+    from zarr.types import ZarrFormat
 
 from collections.abc import Mapping
 

src/zarr/core/dtype/npy/bool.py

@@ -15,7 +15,8 @@
 from zarr.core.dtype.wrapper import TBaseDType, ZDType
 
 if TYPE_CHECKING:
-    from zarr.core.types import JSON, ZarrFormat
+    from zarr.core.types import JSON
+    from zarr.types import ZarrFormat
 
 
 @dataclass(frozen=True, kw_only=True, slots=True)

src/zarr/core/dtype/npy/bytes.py

@@ -3,7 +3,7 @@
 import base64
 import re
 from dataclasses import dataclass
-from typing import ClassVar, Literal, Self, TypedDict, TypeGuard, cast, overload
+from typing import TYPE_CHECKING, ClassVar, Literal, Self, TypedDict, TypeGuard, cast, overload
 
 import numpy as np
 
@@ -19,7 +19,10 @@
 )
 from zarr.core.dtype.npy.common import check_json_str
 from zarr.core.dtype.wrapper import TBaseDType, ZDType
-from zarr.core.types import JSON, NamedConfig, ZarrFormat
+from zarr.core.types import JSON, NamedConfig
+
+if TYPE_CHECKING:
+    from zarr.types import ZarrFormat
 
 BytesLike = np.bytes_ | str | bytes | int
 

src/zarr/core/dtype/npy/common.py

@@ -28,7 +28,8 @@
 )
 
 if TYPE_CHECKING:
-    from zarr.core.types import JSON, ZarrFormat
+    from zarr.core.types import JSON
+    from zarr.types import ZarrFormat
 
 IntLike = SupportsInt | SupportsIndex | bytes | str
 FloatLike = SupportsIndex | SupportsFloat | bytes | str

src/zarr/core/dtype/npy/complex.py

@@ -36,7 +36,8 @@
 from zarr.core.dtype.wrapper import TBaseDType, ZDType
 
 if TYPE_CHECKING:
-    from zarr.core.types import JSON, ZarrFormat
+    from zarr.core.types import JSON
+    from zarr.types import ZarrFormat
 
 
 @dataclass(frozen=True)