z-stack tests pass

model_server/extensions/chaeo/tests/test_zstack.py

@@ -42,7 +42,7 @@ class TestZStackDerivedDataProducts(unittest.TestCase):
         zmask, meta, df, interm = build_zmask_from_object_mask(
             self.seg_mask,
             self.stack_ch_pa,
-            params=RoiSetMetaParams(mask_type=mask_type, **kwargs),
+            params=RoiSetMetaParams(mask_type=mask_type, filters=kwargs.get('filters')),
         )
         zmask_acc = InMemoryDataAccessor(zmask)
         self.assertTrue(zmask_acc.is_mask())
@@ -84,14 +84,14 @@ class TestZStackDerivedDataProducts(unittest.TestCase):
         return self.test_zmask_makes_correct_boxes(mask_type='contours')
 
     def test_zmask_makes_correct_boxes_with_filters(self):
-        return self.test_zmask_makes_correct_boxes(filters={'area': (1e3, 1e4)})
+        return self.test_zmask_makes_correct_boxes(filters={'area': {'min': 1e3, 'max': 1e4}})
 
     def test_zmask_makes_correct_expanded_boxes(self):
         return self.test_zmask_makes_correct_boxes(expand_box_by=(64, 2))
 
     def test_make_2d_patches_from_zmask(self):
         zmask, meta = self.test_zmask_makes_correct_boxes(
-            filters={'area': (1e3, 1e4)},
+            filters={'area': {'min': 1e3, 'max': 1e4}},
             expand_box_by=(64, 2)
         )
         files = export_patches_from_zstack(
@@ -104,7 +104,7 @@ class TestZStackDerivedDataProducts(unittest.TestCase):
 
     def test_make_3d_patches_from_zmask(self):
         zmask, meta = self.test_zmask_makes_correct_boxes(
-            filters={'area': (1e3, 1e4)},
+            filters={'area': {'min': 1e3, 'max': 1e4}},
             expand_box_by=(64, 2),
         )
         files = export_patches_from_zstack(
@@ -142,7 +142,7 @@ class TestZStackDerivedDataProducts(unittest.TestCase):
 
     def test_make_multichannel_2d_patches_from_zmask(self):
         zmask, meta = self.test_zmask_makes_correct_boxes(
-            filters={'area': (1e3, 1e4)},
+            filters={'area': {'min': 1e3, 'max': 1e4}},
             expand_box_by=(128, 2)
         )
         files = export_multichannel_patches_from_zstack(
@@ -157,7 +157,7 @@ class TestZStackDerivedDataProducts(unittest.TestCase):
 
     def test_make_multichannel_2d_patches_with_mask_overlay(self):
         zmask, meta = self.test_zmask_makes_correct_boxes(
-            filters={'area': (1e3, 1e4)},
+            filters={'area': {'min': 1e3, 'max': 1e4}},
             expand_box_by=(128, 2)
         )
         files = export_multichannel_patches_from_zstack(
@@ -174,7 +174,7 @@ class TestZStackDerivedDataProducts(unittest.TestCase):
 
     def test_make_multichannel_2d_patches_with_contour_overlay(self):
         zmask, meta = self.test_zmask_makes_correct_boxes(
-            filters={'area': (1e3, 1e4)},
+            filters={'area': {'min': 1e3, 'max': 1e4}},
             expand_box_by=(128, 2)
         )
         files = export_multichannel_patches_from_zstack(
@@ -191,7 +191,7 @@ class TestZStackDerivedDataProducts(unittest.TestCase):
 
     def test_make_binary_masks_from_zmask(self):
         zmask, meta = self.test_zmask_makes_correct_boxes(
-            filters={'area': (1e3, 1e4)},
+            filters={'area': {'min': 1e3, 'max': 1e4}},
             expand_box_by=(128, 2)
         )
         files = export_patch_masks_from_zstack(