cellprofiler-library-nightly 5.0.0.dev706__tar.gz → 5.0.0.dev707__tar.gz

{cellprofiler_library_nightly-5.0.0.dev706/cellprofiler_library_nightly.egg-info → cellprofiler_library_nightly-5.0.0.dev707}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellprofiler-library-nightly
-Version: 5.0.0.dev706
+Version: 5.0.0.dev707
 Summary: cellprofiler-library implements CellProfiler's image processing and mathematical code, and is usable as a standalone library
 Author: Anne Carpenter, Thouis (Ray) Jones, Lee Kamentsky, Vebjorn Ljosa, David Logan, Mark Bray, Madison Swain-Bowden, Allen Goodman, Claire McQuinn, Alice Lucas, Callum Tromans-Coia
 Author-email: Beth Cimini <bcimini@broadinstitute.org>, David Stirling <dstirling@glencoesoftware.com>, Nodar Gogoberidze <ngogober@broadinstitute.org>

{cellprofiler_library_nightly-5.0.0.dev706 → cellprofiler_library_nightly-5.0.0.dev707}/cellprofiler_library/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '5.0.0.dev706'
-__version_tuple__ = version_tuple = (5, 0, 0, 'dev706')
+__version__ = version = '5.0.0.dev707'
+__version_tuple__ = version_tuple = (5, 0, 0, 'dev707')
 
-__commit_id__ = commit_id = 'gc01fa20f6'
+__commit_id__ = commit_id = 'g2b3417b86'

{cellprofiler_library_nightly-5.0.0.dev706 → cellprofiler_library_nightly-5.0.0.dev707}/cellprofiler_library/modules/_correctilluminationcalculate.py

@@ -5,7 +5,7 @@ import centrosome.cpmorphology
 import scipy.ndimage
 import numpy
 from numpy.typing import NDArray
-from typing import Optional, Tuple, Annotated
+from typing import Optional, Tuple, Annotated, cast
 from typing_extensions import TypeAlias
 from pydantic import Field, validate_call, ConfigDict, BaseModel
 from cellprofiler_library.types import Image2D, Image2DMask
@@ -107,7 +107,7 @@ def correctilluminationcalculate(
         An IlluminationAccumulator wrapping the initial accumulation.
     """
     preprocessed = _preprocess_image_for_averaging(image, mask, intensity_choice, smoothing_method, block_size)
-    image_sum = numpy.zeros(preprocessed.shape, preprocessed.dtype)
+    image_sum = cast(Image2D, numpy.zeros(preprocessed.shape, preprocessed.dtype))
     mask_count = numpy.zeros(preprocessed.shape[:2], numpy.int32)
     _mut_accumulate(preprocessed, mask, image_sum, mask_count)
 
@@ -368,7 +368,7 @@ def _calculate_average_image(
         Tuple of (average pixel data, boolean mask where at least one
         image contributed).
     """
-    pixel_data = numpy.zeros(image_sum.shape, image_sum.dtype)
+    pixel_data = cast(Image2D, numpy.zeros(image_sum.shape, image_sum.dtype))
     mask = mask_count > 0
     if pixel_data.ndim == 2:
         pixel_data[mask] = image_sum[mask] / mask_count[mask]
@@ -398,7 +398,7 @@ def _apply_scaling(
     if rescale_option == RescaleIlluminationFunction.NO.value:
         return image_pixel_data
 
-    def scaling_fn_2d(pixel_data):
+    def scaling_fn_2d(pixel_data: Image2D) -> Image2D:
         if image_mask is not None:
             sorted_pixel_data = pixel_data[(pixel_data > 0) & image_mask]
         else:
@@ -423,9 +423,9 @@ def _apply_scaling(
     if image_pixel_data.ndim == 2:
         output_pixels = scaling_fn_2d(image_pixel_data)
     else:
-        output_pixels = numpy.dstack(
+        output_pixels = cast(Image2D, numpy.dstack(
             [scaling_fn_2d(x) for x in image_pixel_data.transpose(2, 0, 1)]
-        )
+        ))
     return output_pixels
 
 @validate_call(config=ConfigDict(arbitrary_types_allowed=True))
@@ -475,7 +475,7 @@ def _apply_smoothing(
     """
     pixel_data = image_pixel_data
     if pixel_data.ndim == 3:
-        output_pixels = numpy.zeros(pixel_data.shape, pixel_data.dtype)
+        output_pixels = cast(Image2D, numpy.zeros(pixel_data.shape, pixel_data.dtype))
         for i in range(pixel_data.shape[2]):
             output_pixels[:, :, i] = smooth_plane(
                 pixel_data = pixel_data[:, :, i], 
@@ -534,7 +534,7 @@ def _apply_dilation(
         object_dilation_radius, object_dilation_radius * 3
     )
 
-    def fn(image):
+    def fn(image: Image2D):
         return scipy.ndimage.convolve(image, kernel, mode="constant", cval=0)
 
     if pixel_data.ndim == 2:
@@ -554,7 +554,7 @@ def _apply_dilation(
     # downstream smoothing methods (e.g. Splines) are sensitive to the
     # resulting sub-epsilon floating point noise, so match the input's
     # precision rather than silently widening it.
-    return dilated_pixels.astype(pixel_data.dtype)
+    return cast(Image2D, dilated_pixels.astype(pixel_data.dtype))
 
 # NOTE: _mut prefix means the function mutates input numpy arrays, rather than returning new arrays
 def _mut_accumulate(

{cellprofiler_library_nightly-5.0.0.dev706 → cellprofiler_library_nightly-5.0.0.dev707/cellprofiler_library_nightly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellprofiler-library-nightly
-Version: 5.0.0.dev706
+Version: 5.0.0.dev707
 Summary: cellprofiler-library implements CellProfiler's image processing and mathematical code, and is usable as a standalone library
 Author: Anne Carpenter, Thouis (Ray) Jones, Lee Kamentsky, Vebjorn Ljosa, David Logan, Mark Bray, Madison Swain-Bowden, Allen Goodman, Claire McQuinn, Alice Lucas, Callum Tromans-Coia
 Author-email: Beth Cimini <bcimini@broadinstitute.org>, David Stirling <dstirling@glencoesoftware.com>, Nodar Gogoberidze <ngogober@broadinstitute.org>

{cellprofiler_library_nightly-5.0.0.dev706 → cellprofiler_library_nightly-5.0.0.dev707}/cellprofiler_library_nightly.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
   "tag": "5.0.0.dev0",
-  "distance": 706,
-  "node": "gc01fa20f67db50b70b93af139d7fce9cd38ee476",
+  "distance": 707,
+  "node": "g2b3417b862db5d8adeef5cf561f721d981b9c880",
   "dirty": true,
   "branch": "main",
   "node_date": "2026-09-10"