fixup

Author: TomAugspurger

src/zarr/api/asynchronous.py

@@ -299,9 +299,9 @@ async def open(
 
 async def open_consolidated(*args: Any, use_consolidated: bool = True, **kwargs: Any) -> AsyncGroup:
     """
-    Alias for :func:`open_group`.
+    Alias for :func:`open_group` with ``use_consolidated=True``.
     """
-    return await open_group(*args, **kwargs)
+    return await open_group(*args, use_consolidated=use_consolidated, **kwargs)
 
 
 async def save(

src/zarr/core/group.py

@@ -397,6 +397,7 @@ async def open(
         store_path = await make_store_path(store)
 
         consolidated_key = ZMETADATA_V2_JSON
+
         if (zarr_format == 2 or zarr_format is None) and isinstance(use_consolidated, str):
             consolidated_key = use_consolidated
 
@@ -414,9 +415,6 @@ async def open(
             if use_consolidated or use_consolidated is None:
                 maybe_consolidated_metadata_bytes = rest[0]
 
-                if use_consolidated and maybe_consolidated_metadata_bytes is None:
-                    # the user requested consolidated metadata, but it was missing
-                    raise FileNotFoundError(paths[-1])
             else:
                 maybe_consolidated_metadata_bytes = None
 
@@ -453,6 +451,11 @@ async def open(
         if zarr_format == 2:
             # this is checked above, asserting here for mypy
             assert zgroup_bytes is not None
+
+            if use_consolidated and maybe_consolidated_metadata_bytes is None:
+                # the user requested consolidated metadata, but it was missing
+                raise ValueError(consolidated_key)
+
             return cls._from_bytes_v2(
                 store_path, zgroup_bytes, zattrs_bytes, maybe_consolidated_metadata_bytes
             )
@@ -517,7 +520,6 @@ def _from_bytes_v3(
         group_metadata = json.loads(zarr_json_bytes.to_bytes())
         if use_consolidated and group_metadata.get("consolidated_metadata") is None:
             msg = f"Consolidated metadata requested with 'use_consolidated=True' but not found in '{store_path.path}'."
-            # Use `FileNotFoundError` here to match the error from v2?
             raise ValueError(msg)
 
         elif use_consolidated is False:
@@ -1086,7 +1088,6 @@ def _members_consolidated(
                     self.store_path, key, prefix=self.name
                 )  # Metadata -> Group/Array
                 key = "/".join([prefix, key]).lstrip("/")
-                # breakpoint()
                 yield key, obj
 
                 if ((max_depth is None) or (current_depth < max_depth)) and isinstance(

tests/v3/test_metadata/test_consolidated.py

@@ -6,7 +6,9 @@
 import numpy as np
 import pytest
 
+import zarr.api.asynchronous
 import zarr.api.synchronous
+import zarr.store
 from zarr.api.asynchronous import (
     AsyncGroup,
     consolidate_metadata,
@@ -21,6 +23,7 @@
 
 if TYPE_CHECKING:
     from zarr.abc.store import Store
+    from zarr.core.common import ZarrFormat
 
 
 @pytest.fixture
@@ -472,3 +475,13 @@ def test_to_dict_empty(self):
             },
         }
         assert result == expected
+
+    @pytest.mark.parametrize("zarr_format", [2, 3])
+    async def test_open_consolidated_raises_async(self, zarr_format: ZarrFormat):
+        store = zarr.store.MemoryStore(mode="w")
+        await AsyncGroup.from_store(store, zarr_format=zarr_format)
+        with pytest.raises(ValueError):
+            await zarr.api.asynchronous.open_consolidated(store, zarr_format=zarr_format)
+
+        with pytest.raises(ValueError):
+            await zarr.api.asynchronous.open_consolidated(store, zarr_format=None)