fix ci

Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com>

Author: KumoLiu

monai/inferers/merger.py

@@ -310,17 +310,56 @@ def __init__(
         self.chunks = chunks
 
         # Handle compressor/codecs based on zarr version
-        self.codecs = codecs
-        self.value_codecs = value_codecs
-        self.count_codecs = count_codecs
-
-        # For backward compatibility
-        if compressor is not None and codecs is None:
-            self.codecs = compressor if isinstance(compressor, (list, tuple)) else [compressor]
-        if value_compressor is not None and value_codecs is None:
-            self.value_codecs = value_compressor if isinstance(value_compressor, (list, tuple)) else [value_compressor]
-        if count_compressor is not None and count_codecs is None:
-            self.count_codecs = count_compressor if isinstance(count_compressor, (list, tuple)) else [count_compressor]
+        is_zarr_v3 = version_geq(get_package_version("zarr"), "3.0.0")
+
+        if is_zarr_v3:
+            # For zarr v3, use codecs or convert compressor to codecs
+            if codecs is not None:
+                self.codecs = codecs
+            elif compressor is not None:
+                # Convert compressor to codec format
+                if isinstance(compressor, (list, tuple)):
+                    self.codecs = compressor
+            else:
+                self.codecs = None
+
+            if value_codecs is not None:
+                self.value_codecs = value_codecs
+            elif value_compressor is not None:
+                if isinstance(value_compressor, (list, tuple)):
+                    self.value_codecs = value_compressor
+            else:
+                self.value_codecs = None
+
+            if count_codecs is not None:
+                self.count_codecs = count_codecs
+            elif count_compressor is not None:
+                if isinstance(count_compressor, (list, tuple)):
+                    self.count_codecs = count_compressor
+                else:
+                    self.count_codecs = [
+                        {"name": "bytes", "configuration": {}},
+                        {"name": count_compressor.lower(), "configuration": {}},
+                    ]
+            else:
+                self.count_codecs = None
+        else:
+            # For zarr v2, use compressors
+            if codecs is not None:
+                # If codecs are specified in v2, use the first codec as compressor
+                self.codecs = codecs[0] if isinstance(codecs, (list, tuple)) else codecs
+            else:
+                self.codecs = compressor
+
+            if value_codecs is not None:
+                self.value_codecs = value_codecs[0] if isinstance(value_codecs, (list, tuple)) else value_codecs
+            else:
+                self.value_codecs = value_compressor
+
+            if count_codecs is not None:
+                self.count_codecs = count_codecs[0] if isinstance(count_codecs, (list, tuple)) else count_codecs
+            else:
+                self.count_codecs = count_compressor
 
         # Create zarr arrays with appropriate parameters based on version
         if is_zarr_v3:

tests/inferers/test_zarr_avg_merger.py

@@ -13,6 +13,7 @@
 
 import unittest
 import warnings
+from typing import Any
 
 import numpy as np
 import torch
@@ -428,38 +429,24 @@ def test_zarr_avg_merge_none_merged_shape_error(self):
         with self.assertRaises(ValueError):
             ZarrAvgMerger(merged_shape=None)
 
-    def test_deprecated_compressor_warning(self):
+    def _check_deprecation_warning(self, param_name: str, value: Any):
+        """Helper function to check deprecation warnings for compressor parameters."""
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter("always")
-            ZarrAvgMerger(merged_shape=TENSOR_4x4.shape, compressor="LZ4")
+            kwargs = {"merged_shape": TENSOR_4x4.shape, param_name: value}
+            ZarrAvgMerger(**kwargs)
             self.assertTrue(len(w) == 1)
-            self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
-            expected_message_part = (
-                "The `compressor` argument is deprecated since 1.5.0 and will be removed in 1.7.0. "
-                "Please use 'codecs' instead."
+            self.assertTrue(issubclass(w[-1].category, FutureWarning))
+            expected_message = (
+                f"Argument `{param_name}` has been deprecated since version 1.5.0. It will be removed in version 1.7.0."
             )
-            self.assertTrue(expected_message_part in str(w[-1].message))
+            self.assertIn(expected_message, str(w[-1].message))
+
+    def test_deprecated_compressor_warning(self):
+        self._check_deprecation_warning("compressor", numcodecs.VLenBytes())
 
     def test_deprecated_value_compressor_warning(self):
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            ZarrAvgMerger(merged_shape=TENSOR_4x4.shape, value_compressor="LZ4")
-            self.assertTrue(len(w) == 1)
-            self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
-            expected_message_part = (
-                "The `value_compressor` argument is deprecated since 1.5.0 and will be removed in 1.7.0. "
-                "Please use 'value_codecs' instead."
-            )
-            self.assertTrue(expected_message_part in str(w[-1].message))
+        self._check_deprecation_warning("value_compressor", numcodecs.VLenBytes())
 
     def test_deprecated_count_compressor_warning(self):
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            ZarrAvgMerger(merged_shape=TENSOR_4x4.shape, count_compressor="LZ4")
-            self.assertTrue(len(w) == 1)
-            self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
-            expected_message_part = (
-                "The `count_compressor` argument is deprecated since 1.5.0 and will be removed in 1.7.0. "
-                "Please use 'count_codecs' instead."
-            )
-            self.assertTrue(expected_message_part in str(w[-1].message))
+        self._check_deprecation_warning("count_compressor", numcodecs.VLenBytes())