Clean up zarr.core.metadata API

src/zarr/api/asynchronous.py

@@ -25,7 +25,7 @@
 )
 from zarr.core.group import AsyncGroup, ConsolidatedMetadata, GroupMetadata
 from zarr.core.metadata import ArrayMetadataDict, ArrayV2Metadata, ArrayV3Metadata
-from zarr.core.metadata.v2 import _default_compressor, _default_filters
+from zarr.core.metadata._v2 import _default_compressor, _default_filters
 from zarr.errors import NodeTypeValidationError
 from zarr.storage import (
     StoreLike,

src/zarr/codecs/sharding.py

@@ -44,7 +44,7 @@
     get_indexer,
     morton_order_iter,
 )
-from zarr.core.metadata.v3 import parse_codecs
+from zarr.core.metadata._v3 import parse_codecs
 from zarr.registry import get_ndbuffer_class, get_pipeline_class, register_codec
 
 if TYPE_CHECKING:

src/zarr/core/_info.py

@@ -7,7 +7,7 @@
 
 from zarr.abc.codec import Codec
 from zarr.core.common import ZarrFormat
-from zarr.core.metadata.v3 import DataType
+from zarr.core.metadata import DataType
 
 
 @dataclasses.dataclass(kw_only=True)

src/zarr/core/array.py

@@ -96,13 +96,13 @@
     ArrayV3MetadataDict,
     T_ArrayMetadata,
 )
-from zarr.core.metadata.v2 import (
+from zarr.core.metadata._v2 import (
     _default_compressor,
     _default_filters,
     parse_compressor,
     parse_filters,
 )
-from zarr.core.metadata.v3 import DataType, parse_node_type_array
+from zarr.core.metadata._v3 import DataType, parse_node_type_array
 from zarr.core.sync import sync
 from zarr.errors import MetadataValidationError
 from zarr.registry import (

src/zarr/core/codec_pipeline.py

@@ -17,7 +17,7 @@
 from zarr.core.common import ChunkCoords, concurrent_map
 from zarr.core.config import config
 from zarr.core.indexing import SelectorTuple, is_scalar, is_total_slice
-from zarr.core.metadata.v2 import _default_fill_value
+from zarr.core.metadata._v2 import _default_fill_value
 from zarr.registry import register_pipeline
 
 if TYPE_CHECKING:

src/zarr/core/group.py

@@ -47,7 +47,7 @@
 )
 from zarr.core.config import config
 from zarr.core.metadata import ArrayV2Metadata, ArrayV3Metadata
-from zarr.core.metadata.v3 import V3JsonEncoder
+from zarr.core.metadata._v3 import V3JsonEncoder
 from zarr.core.sync import SyncMixin, sync
 from zarr.errors import MetadataValidationError
 from zarr.storage import StoreLike, StorePath, make_store_path

src/zarr/core/metadata/__init__.py

@@ -1,7 +1,7 @@
 from typing import TypeAlias, TypeVar
 
-from .v2 import ArrayV2Metadata, ArrayV2MetadataDict
-from .v3 import ArrayV3Metadata, ArrayV3MetadataDict
+from ._v2 import ArrayV2Metadata, ArrayV2MetadataDict
+from ._v3 import ArrayV3Metadata, ArrayV3MetadataDict, DataType
 
 ArrayMetadata: TypeAlias = ArrayV2Metadata | ArrayV3Metadata
 ArrayMetadataDict: TypeAlias = ArrayV2MetadataDict | ArrayV3MetadataDict
@@ -14,4 +14,5 @@
     "ArrayV2MetadataDict",
     "ArrayV3Metadata",
     "ArrayV3MetadataDict",
+    "DataType",
 ]

src/zarr/core/metadata/v2.py → src/zarr/core/metadata/_v2.py

@@ -29,7 +29,7 @@
 from zarr.core.chunk_key_encodings import parse_separator
 from zarr.core.common import JSON, ZARRAY_JSON, ZATTRS_JSON, MemoryOrder, parse_shapelike
 from zarr.core.config import config, parse_indexing_order
-from zarr.core.metadata.common import parse_attributes
+from zarr.core.metadata._common import parse_attributes
 
 
 class ArrayV2MetadataDict(TypedDict):

src/zarr/core/metadata/v3.py → src/zarr/core/metadata/_v3.py

@@ -35,7 +35,7 @@
     parse_shapelike,
 )
 from zarr.core.config import config
-from zarr.core.metadata.common import parse_attributes
+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

tests/test_array.py

@@ -37,7 +37,7 @@
 from zarr.core.common import JSON, MemoryOrder, ZarrFormat
 from zarr.core.group import AsyncGroup
 from zarr.core.indexing import ceildiv
-from zarr.core.metadata.v3 import DataType
+from zarr.core.metadata import DataType
 from zarr.core.sync import sync
 from zarr.errors import ContainsArrayError, ContainsGroupError
 from zarr.storage import LocalStore, MemoryStore, StorePath

tests/test_codecs/test_vlen.py

@@ -8,7 +8,7 @@
 from zarr.abc.codec import Codec
 from zarr.abc.store import Store
 from zarr.codecs import ZstdCodec
-from zarr.core.metadata.v3 import ArrayV3Metadata, DataType
+from zarr.core.metadata import ArrayV3Metadata, DataType
 from zarr.core.strings import _NUMPY_SUPPORTS_VLEN_STRING
 from zarr.storage import StorePath
 

tests/test_metadata/test_consolidated.py

@@ -19,8 +19,7 @@
 )
 from zarr.core.buffer import default_buffer_prototype
 from zarr.core.group import ConsolidatedMetadata, GroupMetadata
-from zarr.core.metadata import ArrayV3Metadata
-from zarr.core.metadata.v2 import ArrayV2Metadata
+from zarr.core.metadata import ArrayV2Metadata, ArrayV3Metadata
 from zarr.storage import StorePath
 
 if TYPE_CHECKING:

tests/test_metadata/test_v2.py

@@ -11,7 +11,7 @@
 from zarr.core.buffer import cpu
 from zarr.core.group import ConsolidatedMetadata, GroupMetadata
 from zarr.core.metadata import ArrayV2Metadata
-from zarr.core.metadata.v2 import parse_zarr_format
+from zarr.core.metadata._v2 import parse_zarr_format
 
 if TYPE_CHECKING:
     from typing import Any

tests/test_metadata/test_v3.py

@@ -11,9 +11,11 @@
 from zarr.core.buffer import default_buffer_prototype
 from zarr.core.chunk_key_encodings import DefaultChunkKeyEncoding, V2ChunkKeyEncoding
 from zarr.core.group import parse_node_type
-from zarr.core.metadata.v3 import (
+from zarr.core.metadata import (
     ArrayV3Metadata,
     DataType,
+)
+from zarr.core.metadata._v3 import (
     default_fill_value,
     parse_dimension_names,
     parse_fill_value,
@@ -29,7 +31,7 @@
     from zarr.core.common import JSON
 
 
-from zarr.core.metadata.v3 import (
+from zarr.core.metadata._v3 import (
     parse_node_type_array,
 )