more extensive api x store testing

pyproject.toml

@@ -61,7 +61,7 @@ test = [
     "msgpack",
     "s3fs",
     "pytest-asyncio",
-    "moto[s3]",
+    "moto[s3, server]",
     "flask-cors",
     "flask",
     "requests",
@@ -198,7 +198,7 @@ dependencies = [
     'pytest',
     'pytest-cov',
     'pytest-asyncio',
-    'moto[s3]',
+    'moto[s3, server]'
 ]
 
 [tool.hatch.envs.upstream.env-vars]
@@ -231,7 +231,7 @@ dependencies = [
     'pytest',
     'pytest-cov',
     'pytest-asyncio',
-    'moto[s3]',
+    'moto[s3, server]',
 ]
 
 [tool.hatch.envs.min_deps.scripts]

src/zarr/abc/store.py

@@ -412,6 +412,18 @@ async def getsize_prefix(self, prefix: str) -> int:
         sizes = await concurrent_map(keys, self.getsize, limit=limit)
         return sum(sizes)
 
+    def _as_immutable(self: Self) -> Self:
+        """
+        Return a mutable copy of the store.
+        """
+        raise NotImplementedError
+
+    def _as_mutable(self: Self) -> Self:
+        """
+        Return an immutable (read-only) copy of the store.
+        """
+        raise NotImplementedError
+
 
 @runtime_checkable
 class ByteGetter(Protocol):

src/zarr/api/asynchronous.py

@@ -52,7 +52,6 @@
     "ones",
     "ones_like",
     "open",
-    "open_array",
     "open_consolidated",
     "open_group",
     "open_like",
@@ -301,7 +300,7 @@ async def open(
     store_path = await make_store_path(store, mode=mode, path=path, storage_options=storage_options)
 
     # TODO: the mode check below seems wrong!
-    if "shape" not in kwargs and mode in {"a", "r", "r+"}:
+    if "shape" not in kwargs and mode in _READ_MODES:
         try:
             metadata_dict = await get_array_metadata(store_path, zarr_format=zarr_format)
             # TODO: remove this cast when we fix typing for array metadata dicts
@@ -1093,7 +1092,6 @@ async def open_array(
     store_path = 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)
-
     try:
         return await AsyncArray.open(store_path, zarr_format=zarr_format)
     except FileNotFoundError:

src/zarr/core/group.py

@@ -804,7 +804,6 @@ async def _save_metadata(self, ensure_parents: bool = False) -> None:
                         ).items()
                     ]
                 )
-
         await asyncio.gather(*awaitables)
 
     @property
@@ -1844,27 +1843,6 @@ def __setitem__(self, key: str, value: Any) -> None:
     def __repr__(self) -> str:
         return f"<Group {self.store_path}>"
 
-    async def update_attributes_async(self, new_attributes: dict[str, Any]) -> Group:
-        """Update the attributes of this group.
-
-        Example
-        -------
-        >>> import zarr
-        >>> group = zarr.group()
-        >>> await group.update_attributes_async({"foo": "bar"})
-        >>> group.attrs.asdict()
-        {'foo': 'bar'}
-        """
-        new_metadata = replace(self.metadata, attributes=new_attributes)
-
-        # Write new metadata
-        to_save = new_metadata.to_buffer_dict(default_buffer_prototype())
-        awaitables = [set_or_delete(self.store_path / key, value) for key, value in to_save.items()]
-        await asyncio.gather(*awaitables)
-
-        async_group = replace(self._async_group, metadata=new_metadata)
-        return replace(self, _async_group=async_group)
-
     @property
     def store_path(self) -> StorePath:
         """Path-like interface for the Store."""

src/zarr/storage/common.py

@@ -12,8 +12,6 @@
 from zarr.storage.local import LocalStore
 from zarr.storage.memory import MemoryStore
 
-# from zarr.store.remote import RemoteStore
-
 if TYPE_CHECKING:
     from zarr.core.buffer import BufferPrototype
 
@@ -72,6 +70,8 @@ async def open(
         """
 
         await store._ensure_open()
+        if mode == "r" and not store.read_only:
+            store = store._as_immutable()
         self = cls(store, path)
 
         # fastpath if mode is None

src/zarr/storage/local.py

@@ -5,7 +5,7 @@
 import os
 import shutil
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Self
 
 from zarr.abc.store import ByteRangeRequest, Store
 from zarr.core.buffer import Buffer
@@ -229,3 +229,9 @@ async def list_dir(self, prefix: str) -> AsyncIterator[str]:
 
     async def getsize(self, key: str) -> int:
         return os.path.getsize(self.root / key)
+
+    def _as_immutable(self: Self) -> Self:
+        return type(self)(self.root, read_only=True)
+
+    def _as_mutable(self: Self) -> Self:
+        return type(self)(self.root, read_only=False)

src/zarr/storage/logging.py

@@ -5,7 +5,7 @@
 import time
 from collections import defaultdict
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Self
 
 from zarr.abc.store import ByteRangeRequest, Store
 
@@ -233,3 +233,15 @@ async def getsize(self, key: str) -> int:
     async def getsize_prefix(self, prefix: str) -> int:
         with self.log(prefix):
             return await self._store.getsize_prefix(prefix)
+
+    def _as_immutable(self: Self) -> Self:
+        return type(self)(
+            store=self._store._as_immutable(),
+            log_level=self.log_level,
+            log_handler=self.log_handler,
+        )
+
+    def _as_mutable(self: Self) -> Self:
+        return type(self)(
+            store=self._store._as_mutable(), log_level=self.log_level, log_handler=self.log_handler
+        )

src/zarr/storage/memory.py

@@ -169,6 +169,12 @@ async def list_dir(self, prefix: str) -> AsyncIterator[str]:
         for key in keys_unique:
             yield key
 
+    def _as_immutable(self: Self) -> Self:
+        return type(self)(self._store_dict, read_only=True)
+
+    def _as_mutable(self: Self) -> Self:
+        return type(self)(self._store_dict, read_only=False)
+
 
 class GpuMemoryStore(MemoryStore):
     """A GPU only memory store that stores every chunk in GPU memory irrespective
@@ -236,3 +242,9 @@ async def set(self, key: str, value: Buffer, byte_range: tuple[int, int] | None
         # Convert to gpu.Buffer
         gpu_value = value if isinstance(value, gpu.Buffer) else gpu.Buffer.from_buffer(value)
         await super().set(key, gpu_value, byte_range=byte_range)
+
+    def _as_immutable(self: Self) -> Self:
+        return type(self)(self._store_dict, read_only=True)
+
+    def _as_mutable(self: Self) -> Self:
+        return type(self)(self._store_dict, read_only=False)

src/zarr/storage/remote.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import warnings
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Self
 
 from zarr.abc.store import ByteRangeRequest, Store
 from zarr.storage.common import _dereference_path
@@ -338,3 +338,13 @@ async def getsize(self, key: str) -> int:
         else:
             # fsspec doesn't have typing. We'll need to assume or verify this is true
             return int(size)
+
+    def _as_immutable(self: Self) -> Self:
+        return type(self)(
+            self.fs, read_only=True, path=self.path, allowed_exceptions=self.allowed_exceptions
+        )
+
+    def _as_mutable(self: Self) -> Self:
+        return type(self)(
+            self.fs, read_only=False, path=self.path, allowed_exceptions=self.allowed_exceptions
+        )

src/zarr/storage/zip.py

@@ -5,7 +5,7 @@
 import time
 import zipfile
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Literal
+from typing import TYPE_CHECKING, Any, Literal, Self
 
 from zarr.abc.store import ByteRangeRequest, Store
 from zarr.core.buffer import Buffer, BufferPrototype
@@ -269,3 +269,27 @@ async def list_dir(self, prefix: str) -> AsyncIterator[str]:
                     if k not in seen:
                         seen.add(k)
                         yield k
+
+    def _as_immutable(self: Self) -> Self:
+        self.close()
+        new_store = type(self)(
+            self.path,
+            read_only=True,
+            mode="r",
+            compression=self.compression,
+            allowZip64=self.allowZip64,
+        )
+        new_store._sync_open()
+        return new_store
+
+    def _as_mutable(self: Self) -> Self:
+        self.close()
+        new_store = type(self)(
+            self.path,
+            read_only=False,
+            mode="a",
+            compression=self.compression,
+            allowZip64=self.allowZip64,
+        )
+        new_store._sync_open()
+        return new_store