bubble zarr_format up

Author: ianhi

src/zarr/api/asynchronous.py

@@ -207,7 +207,7 @@ async def consolidate_metadata(
         consolidated metadata, this function raises a `TypeError`.
         See ``Store.supports_consolidated_metadata``.
     """
-    store_path = await make_store_path(store, path=path)
+    store_path, _ = await make_store_path(store, path=path)
 
     if not store_path.store.supports_consolidated_metadata:
         store_name = type(store_path.store).__name__
@@ -346,7 +346,13 @@ async def open(
             mode = "r"
         else:
             mode = "a"
-    store_path = await make_store_path(store, mode=mode, path=path, storage_options=storage_options)
+    store_path, url_format = await make_store_path(
+        store, mode=mode, path=path, storage_options=storage_options
+    )
+
+    # Use URL format if user didn't specify
+    if zarr_format is None:
+        zarr_format = url_format
 
     # TODO: the mode check below seems wrong!
     if "shape" not in kwargs and mode in {"a", "r", "r+", "w"}:
@@ -450,15 +456,20 @@ async def save_array(
     **kwargs
         Passed through to :func:`create`, e.g., compressor.
     """
-    zarr_format = (
-        _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)
-        or _default_zarr_format()
-    )
+    zarr_format = _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)
+
     if not isinstance(arr, NDArrayLike):
         raise TypeError("arr argument must be numpy or other NDArrayLike array")
 
     mode = kwargs.pop("mode", "a")
-    store_path = await make_store_path(store, path=path, mode=mode, storage_options=storage_options)
+    store_path, url_format = await make_store_path(
+        store, path=path, mode=mode, storage_options=storage_options
+    )
+
+    # Use URL format if user didn't specify, otherwise fall back to default
+    if zarr_format is None:
+        zarr_format = url_format or _default_zarr_format()
+
     if np.isscalar(arr):
         arr = np.array(arr)
     shape = arr.shape
@@ -506,7 +517,9 @@ async def save_group(
         NumPy arrays with data to save.
     """
 
-    store_path = await make_store_path(store, path=path, mode="w", storage_options=storage_options)
+    store_path, _ = await make_store_path(
+        store, path=path, mode="w", storage_options=storage_options
+    )
 
     zarr_format = (
         _handle_zarr_version_or_format(
@@ -725,12 +738,15 @@ async def create_group(
         The new group.
     """
 
-    if zarr_format is None:
-        zarr_format = _default_zarr_format()
-
     mode: Literal["a"] = "a"
 
-    store_path = await make_store_path(store, path=path, mode=mode, storage_options=storage_options)
+    store_path, url_format = await make_store_path(
+        store, path=path, mode=mode, storage_options=storage_options
+    )
+
+    # Use URL format if user didn't specify, otherwise fall back to default
+    if zarr_format is None:
+        zarr_format = url_format or _default_zarr_format()
 
     return await AsyncGroup.from_store(
         store=store_path,
@@ -828,7 +844,14 @@ async def open_group(
     if chunk_store is not None:
         warnings.warn("chunk_store is not yet implemented", ZarrRuntimeWarning, stacklevel=2)
 
-    store_path = await make_store_path(store, mode=mode, storage_options=storage_options, path=path)
+    store_path, url_format = await make_store_path(
+        store, mode=mode, storage_options=storage_options, path=path
+    )
+
+    # Use URL format if user didn't specify
+    if zarr_format is None:
+        zarr_format = url_format
+
     if attributes is None:
         attributes = {}
 
@@ -999,10 +1022,7 @@ async def create(
     z : array
         The array.
     """
-    zarr_format = (
-        _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)
-        or _default_zarr_format()
-    )
+    zarr_format = _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)
 
     if synchronizer is not None:
         warnings.warn("synchronizer is not yet implemented", ZarrRuntimeWarning, stacklevel=2)
@@ -1025,7 +1045,13 @@ async def create(
     mode = kwargs.pop("mode", None)
     if mode is None:
         mode = "a"
-    store_path = await make_store_path(store, path=path, mode=mode, storage_options=storage_options)
+    store_path, url_format = await make_store_path(
+        store, path=path, mode=mode, storage_options=storage_options
+    )
+
+    # Use URL format if user didn't specify, otherwise fall back to default
+    if zarr_format is None:
+        zarr_format = url_format or _default_zarr_format()
 
     config_parsed = parse_array_config(config)
 
@@ -1236,10 +1262,16 @@ async def open_array(
     """
 
     mode = kwargs.pop("mode", None)
-    store_path = await make_store_path(store, path=path, mode=mode, storage_options=storage_options)
+    store_path, url_format = await make_store_path(
+        store, path=path, mode=mode, storage_options=storage_options
+    )
 
     zarr_format = _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)
 
+    # Use URL format if user didn't specify
+    if zarr_format is None:
+        zarr_format = url_format
+
     if "write_empty_chunks" in kwargs:
         _warn_write_empty_chunks_kwarg()
 

src/zarr/core/array.py

@@ -637,7 +637,7 @@ async def _create(
         """
 
         dtype_parsed = parse_dtype(dtype, zarr_format=zarr_format)
-        store_path = await make_store_path(store)
+        store_path, _ = await make_store_path(store)
 
         shape = parse_shapelike(shape)
 
@@ -976,7 +976,7 @@ async def open(
         >>>  async_arr = await AsyncArray.open(store) # doctest: +ELLIPSIS
         <AsyncArray memory://... shape=(100, 100) dtype=int32>
         """
-        store_path = await make_store_path(store)
+        store_path, _ = await make_store_path(store)
         metadata_dict = await get_array_metadata(store_path, zarr_format=zarr_format)
         # TODO: remove this cast when we have better type hints
         _metadata_dict = cast("ArrayV3MetadataDict", metadata_dict)
@@ -4351,7 +4351,9 @@ async def from_array(
     """
     mode: Literal["a"] = "a"
     config_parsed = parse_array_config(config)
-    store_path = await make_store_path(store, path=name, mode=mode, storage_options=storage_options)
+    store_path, _ = await make_store_path(
+        store, path=name, mode=mode, storage_options=storage_options
+    )
 
     (
         chunks,
@@ -4809,7 +4811,7 @@ async def create_array(
     else:
         mode: Literal["a"] = "a"
 
-        store_path = await make_store_path(
+        store_path, _ = await make_store_path(
             store, path=name, mode=mode, storage_options=storage_options
         )
         return await init_array(

src/zarr/core/group.py

@@ -463,7 +463,7 @@ async def from_store(
         overwrite: bool = False,
         zarr_format: ZarrFormat = 3,
     ) -> AsyncGroup:
-        store_path = await make_store_path(store)
+        store_path, _ = await make_store_path(store)
 
         if overwrite:
             if store_path.store.supports_deletes:
@@ -511,7 +511,7 @@ async def open(
             (``.zmetadata`` by default). Specify the custom key as ``use_consolidated``
             to load consolidated metadata from a non-default key.
         """
-        store_path = await make_store_path(store)
+        store_path, _ = await make_store_path(store)
         if not store_path.store.supports_consolidated_metadata:
             # Fail if consolidated metadata was requested but the Store doesn't support it
             if use_consolidated:

src/zarr/storage/_common.py

@@ -269,7 +269,7 @@ async def make_store_path(
     path: str | None = "",
     mode: AccessModeLiteral | None = None,
     storage_options: dict[str, Any] | None = None,
-) -> StorePath:
+) -> tuple[StorePath, ZarrFormat | None]:
     """
     Convert a `StoreLike` object into a StorePath object.
 
@@ -309,8 +309,9 @@ async def make_store_path(
 
     Returns
     -------
-    StorePath
-        The converted StorePath object.
+    tuple[StorePath, ZarrFormat | None]
+        The converted StorePath object and the zarr format (2, 3, or None) extracted
+        from the URL if it was a ZEP 8 URL, otherwise None.
 
     Raises
     ------
@@ -325,6 +326,7 @@ async def make_store_path(
     _read_only = mode == "r"
 
     path_normalized = normalize_path(path)
+    zarr_format = None  # Default: no format specified
 
     # Check if store_like is a ZEP 8 URL
     if isinstance(store_like, str) and is_zep8_url(store_like):
@@ -335,11 +337,13 @@ async def make_store_path(
         if storage_options:
             store_kwargs["storage_options"] = storage_options
 
-        # Resolve URL and extract path in a single pass (more efficient than separate calls)
-        store, url_path = await resolver.resolve_url_with_path(store_like, **store_kwargs)
+        # Resolve URL and extract path and format in a single pass
+        store, url_path, zarr_format = await resolver.resolve_url_with_path(
+            store_like, **store_kwargs
+        )
         combined_path = _combine_paths(url_path, path_normalized)
 
-        return await StorePath.open(store, path=combined_path, mode=mode)
+        return await StorePath.open(store, path=combined_path, mode=mode), zarr_format
 
     if storage_options is not None:
         raise TypeError(
@@ -350,7 +354,7 @@ async def make_store_path(
 
     if isinstance(store_like, StorePath):
         # Already a StorePath
-        return store_like / path_normalized
+        return store_like / path_normalized, None
 
     elif isinstance(store_like, Store):
         # Already a Store
@@ -384,7 +388,7 @@ async def make_store_path(
     else:
         raise TypeError(f"Unsupported type for store_like: '{type(store_like).__name__}'")
 
-    return await StorePath.open(store, path=path_normalized, mode=mode)
+    return await StorePath.open(store, path=path_normalized, mode=mode), None
 
 
 def _combine_paths(url_path: str, additional_path: str) -> str: