Merge pull request #5 from maxrjones/object-store

Catch some allowed exceptions

Author: kylebarron

pyproject.toml

@@ -57,7 +57,7 @@ keywords = ["Python", "compressed", "ndimensional-arrays", "zarr"]
 # User extras
 remote = [
     "fsspec>=2023.10.0",
-    "obstore==0.3.0b10",
+    "obstore==0.3.0",
 
 ]
 gpu = [
@@ -77,7 +77,7 @@ test = [
     "mypy",
     "hypothesis",
     "universal-pathlib",
-    "obstore==0.3.0b10",
+    "obstore==0.3.0",
 ]
 optional = ["rich", "universal-pathlib"]
 docs = [

src/zarr/storage/object_store.py

@@ -28,6 +28,12 @@
     from zarr.core.buffer import Buffer, BufferPrototype
     from zarr.core.common import BytesLike
 
+ALLOWED_EXCEPTIONS: tuple[type[Exception], ...] = (
+    FileNotFoundError,
+    IsADirectoryError,
+    NotADirectoryError,
+)
+
 
 class ObjectStore(Store):
     """A Zarr store that uses obstore for fast read/write from AWS, GCP, and Azure.
@@ -77,27 +83,30 @@ def __setstate__(self) -> None:
 
     async def get(
         self, key: str, prototype: BufferPrototype, byte_range: ByteRequest | None = None
-    ) -> Buffer:
-        if byte_range is None:
-            resp = await obs.get_async(self.store, key)
-            return prototype.buffer.from_bytes(await resp.bytes_async())
-        elif isinstance(byte_range, RangeByteRequest):
-            resp = await obs.get_range_async(
-                self.store, key, start=byte_range.start, end=byte_range.end
-            )
-            return prototype.buffer.from_bytes(memoryview(resp))
-        elif isinstance(byte_range, OffsetByteRequest):
-            resp = await obs.get_async(
-                self.store, key, options={"range": {"offset": byte_range.offset}}
-            )
-            return prototype.buffer.from_bytes(await resp.bytes_async())
-        elif isinstance(byte_range, SuffixByteRequest):
-            resp = await obs.get_async(
-                self.store, key, options={"range": {"suffix": byte_range.suffix}}
-            )
-            return prototype.buffer.from_bytes(await resp.bytes_async())
-        else:
-            raise ValueError(f"Unexpected input to `get`: {byte_range}")
+    ) -> Buffer | None:
+        try:
+            if byte_range is None:
+                resp = await obs.get_async(self.store, key)
+                return prototype.buffer.from_bytes(await resp.bytes_async())
+            elif isinstance(byte_range, RangeByteRequest):
+                resp = await obs.get_range_async(
+                    self.store, key, start=byte_range.start, end=byte_range.end
+                )
+                return prototype.buffer.from_bytes(memoryview(resp))
+            elif isinstance(byte_range, OffsetByteRequest):
+                resp = await obs.get_async(
+                    self.store, key, options={"range": {"offset": byte_range.offset}}
+                )
+                return prototype.buffer.from_bytes(await resp.bytes_async())
+            elif isinstance(byte_range, SuffixByteRequest):
+                resp = await obs.get_async(
+                    self.store, key, options={"range": {"suffix": byte_range.suffix}}
+                )
+                return prototype.buffer.from_bytes(await resp.bytes_async())
+            else:
+                raise ValueError(f"Unexpected input to `get`: {byte_range}")
+        except ALLOWED_EXCEPTIONS:
+            return None
 
     async def get_partial_values(
         self,