Remove ArrayV2 (#1857)

* adds wrapper codecs for the v2 codec pipeline

* encode_chunk_key

* refactor ArrayV2 away

* empty zattrs

* Apply suggestions from code review

Co-authored-by: Davis Bennett <davis.v.bennett@gmail.com>

* unify ArrayMetadata

* abstract ArrayMetadata

* unified Array.create

* use zarr.config for batch_size

* __init__.py aktualisieren

Co-authored-by: Joe Hamman <joe@earthmover.io>

* ruff

---------

Co-authored-by: Davis Bennett <davis.v.bennett@gmail.com>
Co-authored-by: Joe Hamman <joe@earthmover.io>

Author: 3 people

src/zarr/__init__.py

@@ -1,10 +1,7 @@
 from __future__ import annotations
 
-from typing import Union
-
 import zarr.codecs  # noqa: F401
 from zarr.array import Array, AsyncArray
-from zarr.array_v2 import ArrayV2
 from zarr.config import config  # noqa: F401
 from zarr.group import AsyncGroup, Group
 from zarr.store import (
@@ -18,19 +15,15 @@
 assert not __version__.startswith("0.0.0")
 
 
-async def open_auto_async(
-    store: StoreLike,
-) -> Union[AsyncArray, AsyncGroup]:
+async def open_auto_async(store: StoreLike) -> AsyncArray | AsyncGroup:
     store_path = make_store_path(store)
     try:
         return await AsyncArray.open(store_path)
     except KeyError:
         return await AsyncGroup.open(store_path)
 
 
-def open_auto(
-    store: StoreLike,
-) -> Union[Array, ArrayV2, Group]:
+def open_auto(store: StoreLike) -> Array | Group:
     object = _sync(
         open_auto_async(store),
     )

src/zarr/abc/codec.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
 from abc import abstractmethod
-from typing import TYPE_CHECKING, Generic, Iterable, Protocol, TypeVar, runtime_checkable
+from typing import TYPE_CHECKING, Generic, Iterable, TypeVar
 
 import numpy as np
 from zarr.abc.metadata import Metadata
+from zarr.abc.store import ByteGetter, ByteSetter
 from zarr.common import BytesLike
 
 
@@ -14,20 +15,6 @@
     from zarr.metadata import ArrayMetadata
 
 
-@runtime_checkable
-class ByteGetter(Protocol):
-    async def get(self, byte_range: tuple[int, int | None] | None = None) -> BytesLike | None: ...
-
-
-@runtime_checkable
-class ByteSetter(Protocol):
-    async def get(self, byte_range: tuple[int, int | None] | None = None) -> BytesLike | None: ...
-
-    async def set(self, value: BytesLike, byte_range: tuple[int, int] | None = None) -> None: ...
-
-    async def delete(self) -> None: ...
-
-
 CodecInput = TypeVar("CodecInput", bound=np.ndarray | BytesLike)
 CodecOutput = TypeVar("CodecOutput", bound=np.ndarray | BytesLike)
 

src/zarr/abc/store.py

@@ -1,7 +1,8 @@
 from abc import abstractmethod, ABC
 from collections.abc import AsyncGenerator
+from typing import List, Protocol, Tuple, Optional, runtime_checkable
 
-from typing import List, Tuple, Optional
+from zarr.common import BytesLike
 
 
 class Store(ABC):
@@ -61,13 +62,13 @@ def supports_writes(self) -> bool:
         ...
 
     @abstractmethod
-    async def set(self, key: str, value: bytes) -> None:
+    async def set(self, key: str, value: BytesLike) -> None:
         """Store a (key, value) pair.
 
         Parameters
         ----------
         key : str
-        value : bytes
+        value : BytesLike
         """
         ...
 
@@ -88,12 +89,12 @@ def supports_partial_writes(self) -> bool:
         ...
 
     @abstractmethod
-    async def set_partial_values(self, key_start_values: List[Tuple[str, int, bytes]]) -> None:
+    async def set_partial_values(self, key_start_values: list[tuple[str, int, BytesLike]]) -> None:
         """Store values at a given key, starting at byte range_start.
 
         Parameters
         ----------
-        key_start_values : list[tuple[str, int, bytes]]
+        key_start_values : list[tuple[str, int, BytesLike]]
             set of key, range_start, values triples, a key may occur multiple times with different
             range_starts, range_starts (considering the length of the respective values) must not
             specify overlapping ranges for the same key
@@ -145,3 +146,28 @@ def list_dir(self, prefix: str) -> AsyncGenerator[str, None]:
         AsyncGenerator[str, None]
         """
         ...
+
+
+@runtime_checkable
+class ByteGetter(Protocol):
+    async def get(
+        self, byte_range: Optional[Tuple[int, Optional[int]]] = None
+    ) -> Optional[BytesLike]: ...
+
+
+@runtime_checkable
+class ByteSetter(Protocol):
+    async def get(
+        self, byte_range: Optional[Tuple[int, Optional[int]]] = None
+    ) -> Optional[BytesLike]: ...
+
+    async def set(self, value: BytesLike, byte_range: Optional[Tuple[int, int]] = None) -> None: ...
+
+    async def delete(self) -> None: ...
+
+
+async def set_or_delete(byte_setter: ByteSetter, value: BytesLike | None) -> None:
+    if value is None:
+        await byte_setter.delete()
+    else:
+        await byte_setter.set(value)