Skip to content

Commit e6120bf

Browse files
committed
Provide more informative error message
1 parent e7d29c5 commit e6120bf

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

src/zarr/storage/_fsspec.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ async def get(
232232
await self.fs._cat_file(path, start=-byte_range.suffix, end=None)
233233
)
234234
else:
235-
raise ValueError("Invalid format for ByteRequest")
235+
raise ValueError(f"Unexpected byte_range, got {byte_range}.")
236236
except self.allowed_exceptions:
237237
return None
238238
except OSError as e:
@@ -303,7 +303,7 @@ async def get_partial_values(
303303
starts.append(-byte_range.suffix)
304304
stops.append(None)
305305
else:
306-
raise ValueError("Invalid format for ByteRequest")
306+
raise ValueError(f"Unexpected byte_range, got {byte_range}.")
307307
else:
308308
return []
309309
# TODO: expectations for exceptions or missing keys?

src/zarr/storage/_local.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def _get(path: Path, prototype: BufferPrototype, byte_range: ByteRequest | None)
3737
elif isinstance(byte_range, SuffixByteRequest):
3838
f.seek(max(0, size - byte_range.suffix))
3939
else:
40-
raise TypeError("Invalid format for ByteRequest")
40+
raise TypeError(f"Unexpected byte_range, got {byte_range}.")
4141
return prototype.buffer.from_bytes(f.read())
4242

4343

src/zarr/storage/_utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,6 @@ def _normalize_byte_range_index(data: Buffer, byte_range: ByteRequest | None) ->
6363
elif isinstance(byte_range, SuffixByteRequest):
6464
start = len(data) - byte_range.suffix
6565
stop = len(data) + 1
66+
else:
67+
raise ValueError(f"Unexpected byte_range, got {byte_range}.")
6668
return (start, stop)

src/zarr/storage/_zip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def _get(
160160
elif isinstance(byte_range, SuffixByteRequest):
161161
f.seek(max(0, size - byte_range.suffix))
162162
else:
163-
raise TypeError("Invalid format for ByteRequest")
163+
raise TypeError(f"Unexpected byte_range, got {byte_range}.")
164164
return prototype.buffer.from_bytes(f.read())
165165
except KeyError:
166166
return None

0 commit comments

Comments
 (0)