STYLE: Refactor _update_previous_dim_factors into re-usable function

Author: thewtex

ngff_zarr/methods/_itk.py

@@ -8,6 +8,7 @@
     _align_chunks,
     _compute_sigma,
     _dim_scale_factors,
+    _update_previous_dim_factors,
     _get_block,
     _spatial_dims,
 )
@@ -136,10 +137,9 @@ def _downsample_itk_bin_shrink(
     spatial_dims = _image_dims[: len(spatial_dims)]
     for scale_factor in scale_factors:
         dim_factors = _dim_scale_factors(dims, scale_factor, previous_dim_factors)
-        if isinstance(scale_factor, int):
-            previous_dim_factors = { d : scale_factor for d in spatial_dims }
-        else:
-            previous_dim_factors = scale_factor
+        previous_dim_factors = _update_previous_dim_factors(
+            scale_factor, spatial_dims, previous_dim_factors
+        )
         previous_image = _align_chunks(previous_image, default_chunks, dim_factors)
 
         shrink_factors = [dim_factors[sd] for sd in spatial_dims]
@@ -225,10 +225,9 @@ def _downsample_itk_gaussian(
     spatial_dims = _image_dims[: len(spatial_dims)]
     for scale_factor in scale_factors:
         dim_factors = _dim_scale_factors(dims, scale_factor, previous_dim_factors)
-        if isinstance(scale_factor, int):
-            previous_dim_factors = { d : scale_factor for d in spatial_dims }
-        else:
-            previous_dim_factors = scale_factor
+        previous_dim_factors = _update_previous_dim_factors(
+            scale_factor, spatial_dims, previous_dim_factors
+        )
         previous_image = _align_chunks(previous_image, default_chunks, dim_factors)
 
         shrink_factors = [dim_factors[sd] for sd in spatial_dims]

ngff_zarr/methods/_itkwasm.py

@@ -10,6 +10,7 @@
     _align_chunks,
     _compute_sigma,
     _dim_scale_factors,
+    _update_previous_dim_factors,
     _get_block,
     _spatial_dims,
     _spatial_dims_last_zyx,
@@ -93,10 +94,9 @@ def _downsample_itkwasm(
     transposed_dims = False
     for scale_factor in scale_factors:
         dim_factors = _dim_scale_factors(dims, scale_factor, previous_dim_factors)
-        if isinstance(scale_factor, int):
-            previous_dim_factors = { d : scale_factor for d in spatial_dims }
-        else:
-            previous_dim_factors = scale_factor
+        previous_dim_factors = _update_previous_dim_factors(
+            scale_factor, spatial_dims, previous_dim_factors
+        )
         previous_image = _align_chunks(previous_image, default_chunks, dim_factors)
         # Operate on a contiguous spatial block
         previous_image = _spatial_dims_last_zyx(previous_image)

ngff_zarr/methods/_support.py

@@ -113,6 +113,12 @@ def _dim_scale_factors(dims, scale_factor, previous_dim_factors):
         }
     return result_scale_factors
 
+def _update_previous_dim_factors(scale_factor, spatial_dims, previous_dim_factors):
+    if isinstance(scale_factor, int):
+        previous_dim_factors = { d : scale_factor for d in spatial_dims }
+    else:
+        previous_dim_factors = scale_factor
+    return previous_dim_factors
 
 def _align_chunks(previous_image, default_chunks, dim_factors):
     block_0_shape = [c[0] for c in previous_image.data.chunks]