revert buffer chnages

Author: TomAugspurger

docs/guide/storage.rst

@@ -97,13 +97,5 @@ Zarr-Python :class:`zarr.abc.store.Store` API is meant to be extended. The Store
 Class includes all of the methods needed to be a fully operational store in Zarr Python.
 Zarr also provides a test harness for custom stores: :class:`zarr.testing.store.StoreTests`.
 
-``Store.get``
-~~~~~~~~~~~~~
-
-The ``prototype`` keyword of :func:`zarr.abc.store.Store.get` uses a default of
-``None``.  When given ``None``, implementations should use
-:func:`zarr.buffer.default_buffer_prototype` to look up the prototype users have
-configured.
-
 .. _Zip Store Specification: https://github.com/zarr-developers/zarr-specs/pull/311
 .. _Fsspec: https://zarr-specs.readthedocs.io/en/latest/v3/core/v3.0.html#consolidated-metadata

src/zarr/abc/store.py

@@ -201,17 +201,14 @@ def __eq__(self, value: object) -> bool:
     async def get(
         self,
         key: str,
-        prototype: BufferPrototype | None = None,
+        prototype: BufferPrototype,
         byte_range: ByteRangeRequest | None = None,
     ) -> Buffer | None:
         """Retrieve the value associated with a given key.
 
         Parameters
         ----------
         key : str
-        prototype : BufferPrototype, optional
-            The prototype giving the buffer classes to use for buffers and nbuffers.
-            By default, :func:`zarr.buffer.default_buffer_prototype` is used.
         byte_range : tuple[int | None, int | None], optional
 
         Returns

src/zarr/buffer.py

@@ -159,7 +159,7 @@ def __eq__(self, other: object) -> bool:
     async def get(
         self,
         key: str,
-        prototype: BufferPrototype | None = None,
+        prototype: BufferPrototype,
         byte_range: tuple[int | None, int | None] | None = None,
     ) -> Buffer | None:
         # docstring inherited

src/zarr/storage/logging.py

@@ -5,7 +5,6 @@
 
 from zarr.abc.store import ByteRangeRequest, Store
 from zarr.core.buffer import Buffer, gpu
-from zarr.core.buffer.core import default_buffer_prototype
 from zarr.core.common import concurrent_map
 from zarr.storage._utils import _normalize_interval_index
 
@@ -84,12 +83,10 @@ def __eq__(self, other: object) -> bool:
     async def get(
         self,
         key: str,
-        prototype: BufferPrototype | None = None,
+        prototype: BufferPrototype,
         byte_range: tuple[int | None, int | None] | None = None,
     ) -> Buffer | None:
         # docstring inherited
-        if prototype is None:
-            prototype = default_buffer_prototype()
         if not self._is_open:
             await self._open()
         assert isinstance(key, str)

src/zarr/storage/memory.py

@@ -4,7 +4,6 @@
 from typing import TYPE_CHECKING, Any, Self
 
 from zarr.abc.store import ByteRangeRequest, Store
-from zarr.core.buffer.core import default_buffer_prototype
 from zarr.storage.common import _dereference_path
 
 if TYPE_CHECKING:
@@ -218,12 +217,10 @@ def __eq__(self, other: object) -> bool:
     async def get(
         self,
         key: str,
-        prototype: BufferPrototype | None = None,
+        prototype: BufferPrototype,
         byte_range: ByteRangeRequest | None = None,
     ) -> Buffer | None:
         # docstring inherited
-        if prototype is None:
-            prototype = default_buffer_prototype()
         if not self._is_open:
             await self._open()
         path = _dereference_path(self.path, key)

src/zarr/storage/remote.py

@@ -9,7 +9,6 @@
 
 from zarr.abc.store import ByteRangeRequest, Store
 from zarr.core.buffer import Buffer, BufferPrototype
-from zarr.core.buffer.core import default_buffer_prototype
 
 if TYPE_CHECKING:
     from collections.abc import AsyncGenerator, Iterable
@@ -167,13 +166,11 @@ def _get(
     async def get(
         self,
         key: str,
-        prototype: BufferPrototype | None = None,
+        prototype: BufferPrototype,
         byte_range: ByteRangeRequest | None = None,
     ) -> Buffer | None:
         # docstring inherited
         assert isinstance(key, str)
-        if prototype is None:
-            prototype = default_buffer_prototype()
 
         with self._lock:
             return self._get(key, prototype=prototype, byte_range=byte_range)

src/zarr/storage/zip.py

@@ -121,15 +121,6 @@ async def test_get(
         expected = data_buf[start : start + length]
         assert_bytes_equal(observed, expected)
 
-    async def test_get_default_prototype(self, store: S) -> None:
-        key = "c/0"
-        data = b"\x01\x02\x03\x04"
-        data_buf = self.buffer_cls.from_bytes(data)
-        await self.set(store, key, data_buf)
-        observed = await store.get(key)
-        expected = data_buf[:]
-        assert_bytes_equal(observed, expected)
-
     async def test_get_many(self, store: S) -> None:
         """
         Ensure that multiple keys can be retrieved at once with the _get_many method.

src/zarr/testing/store.py

@@ -5,8 +5,8 @@
 
 from zarr import AsyncArray
 from zarr.abc.store import Store
-from zarr.buffer import default_buffer_prototype
 from zarr.codecs import BloscCodec, BytesCodec, ShardingCodec
+from zarr.core.buffer import default_buffer_prototype
 from zarr.storage.common import StorePath
 
 

tests/test_codecs/test_blosc.py

@@ -8,13 +8,13 @@
 import pytest
 
 from zarr import Array, AsyncArray, config
-from zarr.buffer import default_buffer_prototype
 from zarr.codecs import (
     BytesCodec,
     GzipCodec,
     ShardingCodec,
     TransposeCodec,
 )
+from zarr.core.buffer import default_buffer_prototype
 from zarr.core.indexing import Selection, morton_order_iter
 from zarr.storage import StorePath