Fix support for zarr>=3.3.0

src/mdio/builder/schemas/compressors.py

@@ -11,12 +11,29 @@
 
 from pydantic import Field
 from pydantic import model_validator
-from zarr.codecs import BloscCname
-from zarr.codecs import BloscShuffle
 
 from mdio.builder.schemas.core import CamelCaseStrictModel
 
 
+class BloscCname(StrEnum):
+    """Supported Blosc compression algorithms."""
+
+    lz4 = "lz4"
+    lz4hc = "lz4hc"
+    blosclz = "blosclz"
+    snappy = "snappy"
+    zlib = "zlib"
+    zstd = "zstd"
+
+
+class BloscShuffle(StrEnum):
+    """Supported Blosc shuffle modes."""
+
+    noshuffle = "noshuffle"
+    shuffle = "shuffle"
+    bitshuffle = "bitshuffle"
+
+
 class Blosc(CamelCaseStrictModel):
     """Data Model for Blosc options."""
 

src/mdio/core/grid.py

@@ -7,8 +7,8 @@
 
 import numpy as np
 import zarr
-from numcodecs.zarr3 import Blosc
 from zarr.codecs import BloscCodec
+from zarr.codecs.numcodecs import Blosc
 
 from mdio.constants import UINT32_MAX
 from mdio.constants import ZarrFormat

tests/unit/test_optimize_access_pattern.py

@@ -116,7 +116,7 @@ def test_optimize_access_patterns_custom_compressor(self, mdio_dataset_path: str
         assert "fast_crossline" in ds.variables
         assert ds["fast_crossline"].encoding["chunks"] == (32, 8, 32)
         assert isinstance(actual_compressor, zarr_BloscCodec)
-        assert actual_compressor.cname == BloscCname.blosclz
+        assert getattr(actual_compressor.cname, "value", actual_compressor.cname) == BloscCname.blosclz
         assert actual_compressor.clevel == 1
 
     def test_user_provided_client(self, mdio_dataset_path: str) -> None:

tests/unit/v1/test_dataset_builder_add_coordinate.py

@@ -1,11 +1,11 @@
 """Tests the schema v1 dataset_builder.add_coordinate() public API."""
 
 import pytest
-from zarr.codecs import BloscCname
 
 from mdio.builder.dataset_builder import MDIODatasetBuilder
 from mdio.builder.dataset_builder import _BuilderState
 from mdio.builder.schemas.compressors import Blosc
+from mdio.builder.schemas.compressors import BloscCname
 from mdio.builder.schemas.dtype import ScalarType
 from mdio.builder.schemas.v1.units import LengthUnitEnum
 from mdio.builder.schemas.v1.units import LengthUnitModel

tests/unit/v1/test_dataset_serializer.py

@@ -237,9 +237,9 @@ def test_compressor_encoding_blosc(self) -> None:
         result = _compressor_to_encoding(mdio_compressor)
 
         assert isinstance(result["compressors"], BloscCodec)
-        assert result["compressors"].cname == BloscCname.lz4
+        assert getattr(result["compressors"].cname, "value", result["compressors"].cname) == BloscCname.lz4
         assert result["compressors"].clevel == 5
-        assert result["compressors"].shuffle == BloscShuffle.bitshuffle
+        assert getattr(result["compressors"].shuffle, "value", result["compressors"].shuffle) == BloscShuffle.bitshuffle
         assert result["compressors"].blocksize == 1024
 
     def test_compressor_encoding_zfp(self) -> None: