move zarr.store to zarr.storage

also fix failing ci

Author: jhamman

src/zarr/api/asynchronous.py

@@ -7,14 +7,16 @@
 import numpy as np
 import numpy.typing as npt
 
+from zarr.abc.store import Store
 from zarr.core.array import Array, AsyncArray
 from zarr.core.common import JSON, AccessModeLiteral, ChunkCoords, MemoryOrder, ZarrFormat
 from zarr.core.config import config
 from zarr.core.group import AsyncGroup
 from zarr.core.metadata.v2 import ArrayV2Metadata
 from zarr.core.metadata.v3 import ArrayV3Metadata
-from zarr.store import (
+from zarr.storage import (
     StoreLike,
+    StorePath,
     make_store_path,
 )
 
@@ -221,15 +223,16 @@ async def open(
         Return type depends on what exists in the given store.
     """
     zarr_format = _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)
+
     store_path = await make_store_path(store, mode=mode)
 
     if path is not None:
         store_path = store_path / path
 
     try:
-        return await open_array(store=store_path, zarr_format=zarr_format, mode=mode, **kwargs)
+        return await open_array(store=store_path, zarr_format=zarr_format, **kwargs)
     except KeyError:
-        return await open_group(store=store_path, zarr_format=zarr_format, mode=mode, **kwargs)
+        return await open_group(store=store_path, zarr_format=zarr_format, **kwargs)
 
 
 async def open_consolidated(*args: Any, **kwargs: Any) -> AsyncGroup:
@@ -299,7 +302,14 @@ async def save_array(
         or _default_zarr_version()
     )
 
-    store_path = await make_store_path(store, mode="w")
+    mode = kwargs.pop("mode", None)
+    if isinstance(store, Store):
+        if mode is not None:
+            raise ValueError("mode cannot be specified if store is a Store")
+    elif mode is None:
+        mode = cast(AccessModeLiteral, "a")
+
+    store_path = await make_store_path(store, mode=mode)
     if path is not None:
         store_path = store_path / path
     new = await AsyncArray.create(
@@ -453,7 +463,9 @@ async def group(
 
     zarr_format = _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)
 
-    store_path = await make_store_path(store)
+    mode = None if isinstance(store, Store) else cast(AccessModeLiteral, "a")
+
+    store_path = await make_store_path(store, mode=mode)
     if path is not None:
         store_path = store_path / path
 
@@ -551,6 +563,9 @@ async def open_group(
     if storage_options is not None:
         warnings.warn("storage_options is not yet implemented", RuntimeWarning, stacklevel=2)
 
+    if mode is not None and isinstance(store, Store | StorePath):
+        raise ValueError("store and mode cannot be specified at the same time")
+
     store_path = await make_store_path(store, mode=mode)
     if path is not None:
         store_path = store_path / path
@@ -724,7 +739,13 @@ async def create(
     if meta_array is not None:
         warnings.warn("meta_array is not yet implemented", RuntimeWarning, stacklevel=2)
 
-    mode = kwargs.pop("mode", cast(AccessModeLiteral, "r" if read_only else "a"))
+    mode = kwargs.pop("mode", None)
+    if isinstance(store, Store | StorePath):
+        if mode is not None:
+            raise ValueError("mode cannot be set when store is already initialized")
+    elif mode is None:
+        mode = cast(AccessModeLiteral, "r" if read_only else "a")
+
     store_path = await make_store_path(store, mode=mode)
     if path is not None:
         store_path = store_path / path
@@ -896,8 +917,11 @@ async def open_array(
         The opened array.
     """
 
-    store_path = await make_store_path(store)
-    if path is not None:
+    mode = kwargs.pop("mode", None)
+    store_path = await make_store_path(store, mode=mode)
+    if (
+        path is not None
+    ):  # FIXME: apply path before opening store in w or risk deleting existing data
         store_path = store_path / path
 
     zarr_format = _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)

src/zarr/api/synchronous.py

@@ -10,7 +10,7 @@
 if TYPE_CHECKING:
     from zarr.core.buffer import NDArrayLike
     from zarr.core.common import JSON, AccessModeLiteral, ChunkCoords, ZarrFormat
-    from zarr.store import StoreLike
+    from zarr.storage import StoreLike
 
 __all__ = [
     "consolidate_metadata",

src/zarr/core/array.py

@@ -59,8 +59,8 @@
 from zarr.core.metadata.v3 import ArrayV3Metadata
 from zarr.core.sync import sync
 from zarr.registry import get_pipeline_class
-from zarr.store import StoreLike, StorePath, make_store_path
-from zarr.store.common import (
+from zarr.storage import StoreLike, StorePath, make_store_path
+from zarr.storage.common import (
     ensure_no_existing_node,
 )
 
@@ -158,7 +158,7 @@ async def create(
         dtype = np.dtype(dtype)
         if chunks:
             _chunks = normalize_chunks(chunks, shape, dtype.itemsize)
-        if chunk_shape:
+        else:
             _chunks = normalize_chunks(chunk_shape, shape, dtype.itemsize)
 
         if zarr_format == 3:

src/zarr/core/group.py

@@ -28,8 +28,8 @@
 )
 from zarr.core.config import config
 from zarr.core.sync import SyncMixin, sync
-from zarr.store import StoreLike, StorePath, make_store_path
-from zarr.store.common import ensure_no_existing_node
+from zarr.storage import StoreLike, StorePath, make_store_path
+from zarr.storage.common import ensure_no_existing_node
 
 if TYPE_CHECKING:
     from collections.abc import AsyncGenerator, Iterable, Iterator

src/zarr/storage/__init__.py

@@ -0,0 +1,21 @@
+from zarr.storage.common import StoreLike, StorePath, make_store_path
+from zarr.storage.local import LocalStore
+from zarr.storage.memory import MemoryStore
+from zarr.storage.remote import RemoteStore
+from zarr.storage.zip import ZipStore
+
+# alias for backwards compatibility
+FSStore = RemoteStore
+DirectoryStore = LocalStore
+
+__all__ = [
+    "DirectoryStore",
+    "FSStore",
+    "StorePath",
+    "StoreLike",
+    "make_store_path",
+    "RemoteStore",
+    "LocalStore",
+    "MemoryStore",
+    "ZipStore",
+]

src/zarr/store/_utils.py renamed to src/zarr/storage/_utils.py

@@ -8,8 +8,8 @@
 from zarr.core.buffer import Buffer, default_buffer_prototype
 from zarr.core.common import ZARR_JSON, ZARRAY_JSON, ZGROUP_JSON, ZarrFormat
 from zarr.errors import ContainsArrayAndGroupError, ContainsArrayError, ContainsGroupError
-from zarr.store.local import LocalStore
-from zarr.store.memory import MemoryStore
+from zarr.storage.local import LocalStore
+from zarr.storage.memory import MemoryStore
 
 if TYPE_CHECKING:
     from zarr.core.buffer import BufferPrototype
@@ -79,11 +79,13 @@ async def make_store_path(
 ) -> StorePath:
     if isinstance(store_like, StorePath):
         if (mode is not None) and (AccessMode.from_literal(mode) != store_like.store.mode):
-            raise ValueError(f"mode mismatch (mode={mode} != store.mode={store_like.store.mode})")
+            raise ValueError(
+                f"mode mismatch (mode={mode} != store.mode={store_like.store.mode.str})"
+            )
         return store_like
     elif isinstance(store_like, Store):
         if (mode is not None) and (AccessMode.from_literal(mode) != store_like.mode):
-            raise ValueError(f"mode mismatch (mode={mode} != store.mode={store_like.mode})")
+            raise ValueError(f"mode mismatch (mode={mode} != store.mode={store_like.mode.str})")
         await store_like._ensure_open()
         return StorePath(store_like)
     elif store_like is None:

src/zarr/store/common.py renamed to src/zarr/storage/common.py

@@ -6,7 +6,7 @@
 from zarr.abc.store import Store
 from zarr.core.buffer import Buffer, gpu
 from zarr.core.common import concurrent_map
-from zarr.store._utils import _normalize_interval_index
+from zarr.storage._utils import _normalize_interval_index
 
 if TYPE_CHECKING:
     from collections.abc import AsyncGenerator, MutableMapping

src/zarr/store/local.py renamed to src/zarr/storage/local.py

@@ -5,7 +5,7 @@
 import fsspec
 
 from zarr.abc.store import Store
-from zarr.store.common import _dereference_path
+from zarr.storage.common import _dereference_path
 
 if TYPE_CHECKING:
     from collections.abc import AsyncGenerator