clean up array creation exceptions

Author: d-v-b

src/zarr/core/array.py

@@ -192,16 +192,16 @@ async def get_array_metadata(
         if zarr_json_bytes is not None and zarray_bytes is not None:
             # warn and favor v3
             msg = (
-                "Both zarr.json (Zarr format 3) and .zarray (Zarr format 2) metadata objects "
-                f"exist in store {store_path.store!r} at path {store_path.path!r}. "
+                "Both Zarr V3 Zarr V2 metadata documents "
+                f"were found in store {store_path.store!r} at path {store_path.path!r}. "
                 "The Zarr V3 metadata will be used."
                 "To open Zarr V2 arrays, set zarr_format=2."
             )
             warnings.warn(msg, stacklevel=1)
         if zarr_json_bytes is None and zarray_bytes is None:
             msg = (
-                f"Neither zarr.json (Zarr format 3) nor .zarray (Zarr format 2) metadata objects "
-                f"exist in store {store_path.store!r} at path {store_path.path!r}."
+                f"Neither Zarr V3 nor Zarr V2 array metadata documents "
+                f"were found in store {store_path.store!r} at path {store_path.path!r}."
             )
             raise ArrayNotFoundError(msg)
         # set zarr_format based on which keys were found

src/zarr/core/group.py

@@ -94,7 +94,7 @@ def parse_node_type(data: object) -> NodeType:
     """Parse the node_type field from metadata."""
     if data in get_args(NodeType):
         return cast(NodeType, data)
-    msg = (f"Invalid node_type. Expected 'array' or 'group'. Got {data!r}.",)
+    msg = f"Invalid node_type. Expected 'array' or 'group'. Got {data!r}."
     raise ValueError(msg)
 
 

src/zarr/core/metadata/v3.py

@@ -55,15 +55,15 @@
 def parse_zarr_format(data: object) -> Literal[3]:
     if data == 3:
         return 3
-    msg = f"Invalid value for zarr_format. Expected 3. Got {data!r}."
-    raise MetadataValidationError(msg)
+    msg = f"Invalid zarr_format. Expected 3. Got {data!r}."
+    raise ValueError(msg)
 
 
 def parse_node_type_array(data: object) -> Literal["array"]:
     if data == "array":
         return "array"
-    msg = f"Invalid value for node_type. Expected 'array'. Got {data!r}."
-    raise NodeTypeValidationError(msg)
+    msg = f"Invalid node_type. Expected 'array'. Got {data!r}."
+    raise ValueError(msg)
 
 
 def parse_codecs(data: object) -> tuple[Codec, ...]:

tests/test_api.py

@@ -1112,7 +1112,7 @@ async def test_metadata_validation_error() -> None:
 )
 def test_open_array_with_mode_r_plus(store: Store) -> None:
     # 'r+' means read/write (must exist)
-    msg = "Neither zarr.json (Zarr format 3) nor .zarray (Zarr format 2) metadata objects exist"
+    msg = "Neither Zarr V3 nor Zarr V2 array metadata documents were found"
     with pytest.raises(ArrayNotFoundError, match=re.escape(msg)):
         zarr.open_array(store=store, mode="r+")
     zarr.ones(store=store, shape=(3, 3))

tests/test_metadata/test_v3.py

@@ -62,7 +62,7 @@
 @pytest.mark.parametrize("data", [None, 1, 2, 4, 5, "3"])
 def test_parse_zarr_format_invalid(data: Any) -> None:
     with pytest.raises(
-        ValueError, match=f"Invalid value for 'zarr_format'. Expected '3'. Got '{data}'."
+        ValueError, match=f"Invalid value for zarr_format. Expected 3. Got {data!r}."
     ):
         parse_zarr_format(data)
 
@@ -79,16 +79,16 @@ def test_parse_node_type_valid() -> None:
 @pytest.mark.parametrize("node_type", [None, 2, "other"])
 def test_parse_node_type_invalid(node_type: Any) -> None:
     with pytest.raises(
-        MetadataValidationError,
-        match=f"Invalid value for node_type. Expected 'array' or 'group'. Got {node_type!r}.",
+        ValueError,
+        match=f"Invalid node_type. Expected 'array' or 'group'. Got {node_type!r}.",
     ):
         parse_node_type(node_type)
 
 
 @pytest.mark.parametrize("data", [None, "group"])
 def test_parse_node_type_array_invalid(data: Any) -> None:
     with pytest.raises(
-        ValueError, match=f"Invalid value for node_type. Expected 'array'. Got {data!r}."
+        ValueError, match=f"Invalid node_type. Expected 'array'. Got {data!r}."
     ):
         parse_node_type_array(data)