Skip to content

Commit e4ce79f

Browse files
committed
only allow Codec not a simple str as compressor during array initialization
1 parent 7142974 commit e4ce79f

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

‎zarr/meta.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ def encode_array_metadata(cls, meta: MappingType[str, Any]) -> bytes:
512512
object_codec = numcodecs.get_codec(meta["attributes"]["filters"][0])
513513
else:
514514
object_codec = None
515+
515516
compressor = cls._encode_codec_metadata(meta.get("compressor", None))
516517
extensions = meta.get("extensions", [])
517518
meta = dict(

‎zarr/storage.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import uuid
3636
import time
3737

38+
from numcodecs.abc import Codec
3839
from numcodecs.compat import (
3940
ensure_bytes,
4041
ensure_text,
@@ -565,11 +566,17 @@ def _init_array_metadata(
565566

566567
# obtain compressor config
567568
compressor_config = None
568-
if store_version == 2 and compressor:
569-
try:
570-
compressor_config = compressor.get_config()
571-
except AttributeError as e:
572-
raise BadCompressorError(compressor) from e
569+
if compressor:
570+
if store_version == 2:
571+
try:
572+
compressor_config = compressor.get_config()
573+
except AttributeError as e:
574+
raise BadCompressorError(compressor) from e
575+
elif not isinstance(compressor, Codec):
576+
raise ValueError("expected a numcodecs Codec for compressor")
577+
# TODO: alternatively, could autoconvert str to a Codec
578+
# e.g. 'zlib' -> numcodec.Zlib object
579+
# compressor = numcodecs.get_codec({'id': compressor})
573580

574581
# obtain filters config
575582
if filters:

0 commit comments

Comments
 (0)