Consistent version error

Author: TomAugspurger

src/zarr/core/array.py

@@ -67,6 +67,7 @@
 from zarr.core.metadata.v2 import ArrayV2Metadata
 from zarr.core.metadata.v3 import ArrayV3Metadata
 from zarr.core.sync import collect_aiterator, sync
+from zarr.errors import MetadataValidationError
 from zarr.registry import get_pipeline_class
 from zarr.storage import StoreLike, make_store_path
 from zarr.storage.common import StorePath, ensure_no_existing_node
@@ -144,7 +145,7 @@ async def get_array_metadata(
         else:
             zarr_format = 2
     else:
-        raise ValueError(f"unexpected zarr_format: {zarr_format}")
+        raise MetadataValidationError("zarr_format", "2, 3, or None", zarr_format)
 
     metadata_dict: dict[str, Any]
     if zarr_format == 2:

src/zarr/core/group.py

@@ -29,6 +29,7 @@
 )
 from zarr.core.config import config
 from zarr.core.sync import SyncMixin, sync
+from zarr.errors import MetadataValidationError
 from zarr.storage import StoreLike, make_store_path
 from zarr.storage.common import StorePath, ensure_no_existing_node
 
@@ -196,7 +197,7 @@ async def open(
             else:
                 zarr_format = 2
         else:
-            raise ValueError(f"unexpected zarr_format: {zarr_format}")
+            raise MetadataValidationError("zarr_format", "2, 3, or None", zarr_format)
 
         if zarr_format == 2:
             # V2 groups are comprised of a .zgroup and .zattrs objects

src/zarr/core/metadata/v3.py

@@ -38,7 +38,7 @@
 def parse_zarr_format(data: object) -> Literal[3]:
     if data == 3:
         return 3
-    raise MetadataValidationError(3, data)
+    raise MetadataValidationError("zarr_format", 3, data)
 
 
 def parse_node_type_array(data: object) -> Literal["array"]:

src/zarr/errors.py

@@ -28,7 +28,7 @@ class ContainsArrayAndGroupError(_BaseZarrError):
 class MetadataValidationError(_BaseZarrError):
     """An exception raised when the Zarr metadata is invalid in some way"""
 
-    _msg = "Invalid value. Expected '{}'. Got '{}'."
+    _msg = "Invalid value for '{}'. Expected '{}'. Got '{}'."
 
 
 class NodeTypeValidationError(MetadataValidationError):