patches for remote store

src/zarr/store/core.py

@@ -79,27 +79,3 @@ def make_store_path(store_like: StoreLike | None, *, mode: OpenMode | None = Non
         assert mode is not None
         return StorePath(LocalStore(Path(store_like), mode=mode))
     raise TypeError
-
-
-def _normalize_interval_index(
-    data: Buffer, interval: None | tuple[int | None, int | None]
-) -> tuple[int, int]:
-    """
-    Convert an implicit interval into an explicit start and length
-    """
-    if interval is None:
-        start = 0
-        length = len(data)
-    else:
-        maybe_start, maybe_len = interval
-        if maybe_start is None:
-            start = 0
-        else:
-            start = maybe_start
-
-        if maybe_len is None:
-            length = len(data) - start
-        else:
-            length = maybe_len
-
-    return (start, length)

src/zarr/store/memory.py

@@ -5,7 +5,7 @@
 from zarr.abc.store import Store
 from zarr.buffer import Buffer
 from zarr.common import OpenMode, concurrent_map
-from zarr.store.core import _normalize_interval_index
+from zarr.store.util import _normalize_interval_index
 
 
 # TODO: this store could easily be extended to wrap any MutableMapping store from v2

src/zarr/store/remote.py

@@ -29,6 +29,7 @@ class RemoteStore(Store):
     def __init__(
         self,
         url: UPath | str,
+        *,
         mode: OpenMode = "r",
         allowed_exceptions: tuple[type[Exception], ...] = (
             FileNotFoundError,
@@ -81,10 +82,12 @@ async def get(
         path = _dereference_path(self.path, key)
 
         try:
-            return await (
-                self._fs._cat_file(path, start=byte_range[0], end=byte_range[1])
-                if byte_range
-                else self._fs._cat_file(path)
+            return Buffer.from_bytes(
+                await (
+                    self._fs._cat_file(path, start=byte_range[0], end=byte_range[1])
+                    if byte_range
+                    else self._fs._cat_file(path)
+                )
             )
         # dear mypy: this is indeed defined as a tuple of exceptions
         except self.exceptions:  # type: ignore
@@ -100,7 +103,7 @@ async def set(
         # write data
         if byte_range:
             raise NotImplementedError
-        await self._fs._pipe_file(path, value)
+        await self._fs._pipe_file(path, value.to_bytes())
 
     async def delete(self, key: str) -> None:
         path = _dereference_path(self.path, key)

src/zarr/store/util.py

@@ -0,0 +1,25 @@
+from zarr.buffer import Buffer
+
+
+def _normalize_interval_index(
+    data: Buffer, interval: None | tuple[int | None, int | None]
+) -> tuple[int, int]:
+    """
+    Convert an implicit interval into an explicit start and length
+    """
+    if interval is None:
+        start = 0
+        length = len(data)
+    else:
+        maybe_start, maybe_len = interval
+        if maybe_start is None:
+            start = 0
+        else:
+            start = maybe_start
+
+        if maybe_len is None:
+            length = len(data) - start
+        else:
+            length = maybe_len
+
+    return (start, length)