cellprofiler-library-nightly 5.0.0.dev728__tar.gz → 5.0.0.dev737__tar.gz

{cellprofiler_library_nightly-5.0.0.dev728/cellprofiler_library_nightly.egg-info → cellprofiler_library_nightly-5.0.0.dev737}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellprofiler-library-nightly
-Version: 5.0.0.dev728
+Version: 5.0.0.dev737
 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.dev737/cellprofiler_library/__init__.py

@@ -0,0 +1 @@
+from .measurements.measurement_model import LibraryMeasurements

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/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.dev728'
-__version_tuple__ = version_tuple = (5, 0, 0, 'dev728')
+__version__ = version = '5.0.0.dev737'
+__version_tuple__ = version_tuple = (5, 0, 0, 'dev737')
 
-__commit_id__ = commit_id = 'gf66c883bd'
+__commit_id__ = commit_id = 'gcb2ef7a2c'

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/functions/measurement.py

@@ -41,20 +41,10 @@ from cellprofiler_library.opts.measureobjectoverlap import DecimationMethod as O
 from cellprofiler_library.opts.measureobjectskeleton import VF_I, VF_J, VF_LABELS, VF_KIND, EF_V1, EF_V2, EF_LENGTH, EF_TOTAL_INTENSITY
 from cellprofiler_library.opts.measureobjectneighbors import DistanceMethod as NeighborsDistanceMethod
 from cellprofiler_library.opts.measureobjectneighbors import MeasurementScale as NeighborsMeasurementScale
-from cellprofiler_core.constants.measurement import (
-    FF_COUNT,
-    FF_PARENT,
-)
 from cellprofiler_library.opts.relateobjects import TemplateMeasurementFormat
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.functions.segmentation import center_of_labels_mass
-from cellprofiler_library.opts.measurement import (
-    M_LOCATION_CENTER_X,
-    M_LOCATION_CENTER_Y,
-    M_LOCATION_CENTER_Z,
-    C_LOCATION,
-    M_NUMBER_OBJECT_NUMBER,
-)
+from cellprofiler_library.opts.measurement import FF_PARENT
 
 ###############################################################################
 # MeasureImageOverlap
@@ -4429,62 +4419,3 @@ def find_parents_of(
         )
 
     return parents_of
-
-def get_object_location_measurements(object_name, labels, object_count=None):
-    measurements = LibraryMeasurements()
-    if object_count is None:
-        object_count = numpy.max(labels)
-    #
-    # Get the centers of each object - center_of_mass <- list of two-tuples.
-    #
-    if object_count:
-        centers = scipy.ndimage.center_of_mass(
-            numpy.ones(labels.shape), labels, list(range(1, object_count + 1))
-        )
-        centers = numpy.array(centers)
-        centers = centers.reshape((object_count, len(labels.shape)))
-        if centers.shape[1] != 3:
-            location_center_z = None
-            location_center_y = centers[:, 0]
-            location_center_x = centers[:, 1]
-        else:
-            location_center_z = centers[:, 0]
-            location_center_y = centers[:, 1]
-            location_center_x = centers[:, 2]
-        number = numpy.arange(1, object_count + 1)
-    else:
-        location_center_z = numpy.zeros((0,), dtype=float)
-        location_center_y = numpy.zeros((0,), dtype=float)
-        location_center_x = numpy.zeros((0,), dtype=float)
-        number = numpy.zeros((0,), dtype=int)
-    measurements.add_measurement(
-        object_name, M_LOCATION_CENTER_X, location_center_x,
-    )
-    measurements.add_measurement(
-        object_name, M_LOCATION_CENTER_Y, location_center_y,
-    )
-    if len(labels.shape) > 2:
-        measurements.add_measurement(
-            object_name, M_LOCATION_CENTER_Z, location_center_z,
-        )
-
-    measurements.add_measurement(
-        object_name, M_NUMBER_OBJECT_NUMBER, number,
-    )
-    return measurements
-
-def get_object_count_measurements(object_name, object_count):
-    """Add the # of objects to the measurements"""
-    lib_measurements = LibraryMeasurements()
-    lib_measurements.add_image_measurement(FF_COUNT % object_name, object_count)
-    return lib_measurements
-
-def get_object_processing_measurements(*args, **kwargs):
-    # TODO: #5117 implement add_measurements from src/subpackages/core/cellprofiler_core/module/image_segmentation/_object_processing.py
-    pass
-
-def get_image_segmentation_measurements(*args, **kwargs):
-    # TODO: #5117 implement add_measurements from src/subpackages/core/cellprofiler_core/module/image_segmentation/_image_segmentation.py
-    pass
-
-

{cellprofiler_library_nightly-5.0.0.dev728/cellprofiler_library → cellprofiler_library_nightly-5.0.0.dev737/cellprofiler_library/measurements}/measurement_model.py

@@ -6,11 +6,12 @@ import numpy
 from typing import Any, Dict, List
 from numpy.typing import NDArray
 
-# Constants for relationship measurements
-IMAGE_NUMBER = "ImageNumber"
-OBJECT_NUMBER = "ObjectNumber"
-R_FIRST_OBJECT_NUMBER = f"{OBJECT_NUMBER}_First"
-R_SECOND_OBJECT_NUMBER = f"{OBJECT_NUMBER}_Second"
+from cellprofiler_library.opts.measurement import (
+    IMAGE_NUMBER,
+    OBJECT_NUMBER,
+    R_FIRST_OBJECT_NUMBER,
+    R_SECOND_OBJECT_NUMBER,
+)
 
 class RelationshipBase:
     """Key for identifying relationship groups."""

cellprofiler_library_nightly-5.0.0.dev737/cellprofiler_library/measurements/wrappers.py

@@ -0,0 +1,180 @@
+import numpy
+import scipy.ndimage
+from typing import Annotated, Optional
+from pydantic import Field, validate_call, ConfigDict
+
+from cellprofiler_library.types import ObjectSegmentation, ObjectSegmentationIJV
+from cellprofiler_library.functions.segmentation import center_of_labels_mass, relate_children
+from cellprofiler_library.opts.measurement import (
+    M_LOCATION_CENTER_X,
+    M_LOCATION_CENTER_Y,
+    M_LOCATION_CENTER_Z,
+    M_NUMBER_OBJECT_NUMBER,
+    FF_COUNT,
+    FF_PARENT,
+    FF_CHILDREN_COUNT,
+)
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
+
+
+@validate_call(config=ConfigDict(arbitrary_types_allowed=True))
+def wrap_object_location_measurements(
+    object_name: Annotated[str, Field(description="Name of the objects being measured")],
+    labels: Annotated[ObjectSegmentation, Field(description="Dense label matrix of the objects")],
+    object_count: Annotated[
+        Optional[int],
+        Field(description="Number of objects in labels, if known. Otherwise taken as the max label value."),
+    ] = None,
+) -> LibraryMeasurements:
+    """Return the X/Y(/Z) centers of mass and object numbers for the given objects"""
+    measurements = LibraryMeasurements()
+    if object_count is None:
+        object_count = numpy.max(labels)
+    #
+    # Get the centers of each object - center_of_mass <- list of two-tuples.
+    #
+    if object_count:
+        centers = scipy.ndimage.center_of_mass(
+            numpy.ones(labels.shape), labels, list(range(1, object_count + 1))
+        )
+        centers = numpy.array(centers)
+        centers = centers.reshape((object_count, len(labels.shape)))
+        if centers.shape[1] != 3:
+            location_center_y = centers[:, 0]
+            location_center_x = centers[:, 1]
+        else:
+            location_center_z = centers[:, 0]
+            location_center_y = centers[:, 1]
+            location_center_x = centers[:, 2]
+        number = numpy.arange(1, object_count + 1)
+    else:
+        location_center_z = numpy.zeros((0,), dtype=float)
+        location_center_y = numpy.zeros((0,), dtype=float)
+        location_center_x = numpy.zeros((0,), dtype=float)
+        number = numpy.zeros((0,), dtype=int)
+    measurements.add_measurement(
+        object_name, M_LOCATION_CENTER_X, location_center_x,
+    )
+    measurements.add_measurement(
+        object_name, M_LOCATION_CENTER_Y, location_center_y,
+    )
+    if len(labels.shape) > 2:
+        measurements.add_measurement(
+            object_name, M_LOCATION_CENTER_Z, location_center_z,
+        )
+
+    measurements.add_measurement(
+        object_name, M_NUMBER_OBJECT_NUMBER, number,
+    )
+    return measurements
+
+
+@validate_call(config=ConfigDict(arbitrary_types_allowed=True))
+def wrap_object_count_measurements(
+    object_name: Annotated[str, Field(description="Name of the objects being counted")],
+    object_count: Annotated[int, Field(description="Number of objects")],
+) -> LibraryMeasurements:
+    """Return the image-level object count measurement"""
+    lib_measurements = LibraryMeasurements()
+    lib_measurements.add_image_measurement(
+        FF_COUNT % object_name, numpy.array([object_count], dtype=float),
+    )
+    return lib_measurements
+
+
+@validate_call(config=ConfigDict(arbitrary_types_allowed=True))
+def wrap_relate_object_measurements(
+    object_labels: Annotated[ObjectSegmentation, Field(description="Dense label matrix of the child objects")],
+    object_volumetric: Annotated[bool, Field(description="Whether the objects are volumetric (3D)")],
+    object_name: Annotated[str, Field(description="Name of the child objects")],
+    object_ijv: Annotated[ObjectSegmentationIJV, Field(description="Child object segmentation in IJV format")],
+    parent_object_name: Annotated[str, Field(description="Name of the parent objects")],
+    parent_object_labels: Annotated[ObjectSegmentation, Field(description="Dense label matrix of the parent objects")],
+    parent_object_ijv: Annotated[ObjectSegmentationIJV, Field(description="Parent object segmentation in IJV format")],
+) -> LibraryMeasurements:
+    """Return parent/child relate measurements: children-per-parent count and parent-of-child"""
+    lib_measurements = LibraryMeasurements()
+    children_per_parent, parents_of_children = relate_children(
+        parent_object_labels,
+        object_labels,
+        parent_object_ijv,
+        object_ijv,
+        volumetric=object_volumetric,
+    )
+    lib_measurements.add_measurement(
+        parent_object_name,
+        FF_CHILDREN_COUNT % object_name,
+        children_per_parent,
+    )
+
+    lib_measurements.add_measurement(
+        object_name, FF_PARENT % parent_object_name, parents_of_children,
+    )
+    return lib_measurements
+
+
+@validate_call(config=ConfigDict(arbitrary_types_allowed=True))
+def wrap_image_segmentation_measurements(
+    object_labels: Annotated[ObjectSegmentation, Field(description="Dense label matrix of the objects")],
+    object_volumetric: Annotated[bool, Field(description="Whether the objects are volumetric (3D)")],
+    object_count: Annotated[int, Field(description="Number of objects")],
+    object_name: Annotated[str, Field(description="Name of the objects being measured")],
+) -> LibraryMeasurements:
+    """Return the location and count measurements produced by ImageSegmentation.add_measurements"""
+    lib_measurements = LibraryMeasurements()
+    centers = center_of_labels_mass(object_labels, validate=False)
+
+    if len(centers) == 0:
+        center_z, center_y, center_x = [], [], []
+    else:
+        if object_volumetric:
+            center_z, center_y, center_x = centers.transpose()
+        else:
+            center_z = [0] * len(centers)
+
+            center_y, center_x = centers.transpose()
+
+    lib_measurements.add_measurement(
+        object_name, M_LOCATION_CENTER_X, center_x,
+    )
+
+    lib_measurements.add_measurement(
+        object_name, M_LOCATION_CENTER_Y, center_y,
+    )
+
+    lib_measurements.add_measurement(
+        object_name, M_LOCATION_CENTER_Z, center_z,
+    )
+
+    lib_measurements.add_measurement(
+        object_name, M_NUMBER_OBJECT_NUMBER, numpy.arange(1, object_count + 1),
+    )
+
+    lib_measurements = lib_measurements.merge(
+        wrap_object_count_measurements(object_name, object_count)
+    )
+    return lib_measurements
+
+
+@validate_call(config=ConfigDict(arbitrary_types_allowed=True))
+def wrap_object_processing_measurements(
+    object_labels: Annotated[ObjectSegmentation, Field(description="Dense label matrix of the output objects")],
+    object_volumetric: Annotated[bool, Field(description="Whether the output objects are volumetric (3D)")],
+    object_count: Annotated[int, Field(description="Number of output objects")],
+    object_name: Annotated[str, Field(description="Name of the output objects")],
+    object_ijv: Annotated[ObjectSegmentationIJV, Field(description="Output object segmentation in IJV format")],
+    parent_object_name: Annotated[str, Field(description="Name of the input (parent) objects")],
+    parent_object_labels: Annotated[ObjectSegmentation, Field(description="Dense label matrix of the input objects")],
+    parent_object_ijv: Annotated[ObjectSegmentationIJV, Field(description="Input object segmentation in IJV format")],
+) -> LibraryMeasurements:
+    """Return the measurements produced by ObjectProcessing.add_measurements"""
+    lib_measurements = wrap_image_segmentation_measurements(
+        object_labels, object_volumetric, object_count, object_name
+    )
+    lib_measurements_relate = wrap_relate_object_measurements(
+        object_labels, object_volumetric, object_name, object_ijv,
+        parent_object_name, parent_object_labels, parent_object_ijv,
+    )
+    lib_measurements = lib_measurements.merge(lib_measurements_relate)
+
+    return lib_measurements

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_align.py

@@ -5,7 +5,7 @@ from pydantic import Field, validate_call, ConfigDict, BaseModel
 
 from cellprofiler_library.opts.align import CropMode, AlignmentMethod, AdditionalAlignmentChoice, MEASUREMENT_FORMAT
 from cellprofiler_library.types import Image2D, Image2DMask, ImageBinary
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.functions.image_processing import (
     align_cross_correlation,
     align_mutual_information,

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_identifydeadworms.py

@@ -6,7 +6,7 @@ from pydantic import Field, validate_call, ConfigDict, BaseModel
 
 from cellprofiler_library.types import Image2DBinary, Image2DBinaryMask, ObjectLabel
 from cellprofiler_library.functions.image_processing import get_3d_adjacent_after_erosion, process_all_connected_components, find_adjacent_by_distance
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 
 from cellprofiler_library.opts.identifydeadworms import M_LOCATION_CENTER_X, M_LOCATION_CENTER_Y, M_ANGLE, M_NUMBER_OBJECT_NUMBER, TemplateMeasurementFormat
 

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measurecolocalization.py

@@ -6,7 +6,7 @@ from cellprofiler_library.functions.measurement import measure_correlation_and_s
 from cellprofiler_library.opts.measurecolocalization import TemplateMeasurementFormat, MeasurementType
 from cellprofiler_library.types import ImageGrayscale, ImageGrayscaleMask, Pixel, ObjectLabel, ObjectSegmentation, ImageAny, ImageAnyMask
 from cellprofiler_library.opts.measurecolocalization import CostesMethod
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.functions.image_processing import crop_image_similarly
 from cellprofiler_library.functions.object_processing import size_similarly, object_crop_image_similarly
 

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measuregranularity.py

@@ -3,7 +3,7 @@ from typing import Annotated, List, Tuple, Union
 from enum import Enum
 import numpy as np
 
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.functions.measurement import get_granularity_measurements, ObjectRecord
 from cellprofiler_library.functions.image_processing import apply_grayscale_tophat_filter, downsample_image_and_mask
 from cellprofiler_library.types import ImageGrayscale, ImageGrayscaleMask

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureimageareaoccupied.py

@@ -4,7 +4,7 @@ from typing import Annotated, Optional, Tuple, List, Union
 from pydantic import Field, validate_call, ConfigDict, BaseModel
 from cellprofiler_library.types import ImageBinary, ObjectSegmentation, ImageAnyMask
 from cellprofiler_library.functions.measurement import measure_area_occupied, measure_total_area, measure_perimeter, measure_object_perimeter, measure_objects_area_occupied, measure_objects_total_area
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.opts.measureimageareaoccupied import TemplateMeasurementFormat
 
 ImageAreaOccupiedStatistics = List[List[str]]

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureimageintensity.py

@@ -4,7 +4,7 @@ from typing import List, Annotated, Optional, Tuple, Union
 from pydantic import Field, validate_call, ConfigDict, BaseModel
 from cellprofiler_library.functions.measurement import measure_image_intensities
 from cellprofiler_library.opts.measureimageintensity import TemplateMeasurementFormat, Feature, FORMATED_FEATURE_NAMES, FORMATED_PERCENTILE_TEMPLATE 
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 
 ImageIntensityStatistics = List[Union[List[str], Tuple[str,float]]]
 

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureimageoverlap.py

@@ -7,7 +7,7 @@ from cellprofiler_library.functions.measurement import (
     compute_earth_movers_distance,
 )
 from cellprofiler_library.types import ImageBinary, ImageBinaryMask
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 
 ImageOverlapStatistics = List[Tuple[str, Union[int, float, numpy.float_, numpy.int_]]]
 

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureimagequality.py

@@ -3,7 +3,7 @@ from numpy.typing import NDArray
 from typing import Optional, List, Sequence, Annotated, Union, Tuple, Any
 from pydantic import BaseModel, Field, validate_call, ConfigDict
 from cellprofiler_library.types import ImageGrayscale, ImageGrayscaleMask
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.opts.measureimagequality import (
      Feature, ScaledThresholdMethod, TemplateMeasurementFormat
 )

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureimageskeleton.py

@@ -6,7 +6,7 @@ from pydantic import Field, validate_call, ConfigDict, BaseModel
 from cellprofiler_library.types import ImageGrayscale
 from cellprofiler_library.opts.measureimageskeleton import TemplateMeasurementFormat
 from cellprofiler_library.functions.measurement import branches, endpoints
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 
 
 ImageSkeletonStatistics = List[Tuple[int, int]]

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureobjectintensity.py

@@ -6,7 +6,7 @@ from typing import Tuple, Annotated, Optional, List, Any, Union
 from pydantic import Field, validate_call, ConfigDict, BaseModel
 from cellprofiler_core.utilities.core.object import crop_labels_and_image
 from cellprofiler_library.types import ImageGrayscale, ImageGrayscaleMask, ObjectLabelSet, Pixel, ObjectLabel
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.functions.measurement import measure_object_area_occupied, measure_integrated_intensity, measure_mean_intensity, measure_std_intensity, measure_min_intensity, measure_max_intensity, measure_max_position, measure_center_of_mass_binary, measure_center_of_mass_intensity, measure_mass_displacement, measure_quartile_intensity, measure_mad_intensity
 from cellprofiler_library.opts.measureobjectintensity import TemplateMeasurementFormat, IntensityFeature
 

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureobjectintensitydistribution.py

@@ -12,7 +12,7 @@ from cellprofiler_library.functions.measurement import (
     compute_radial_indexes,
     prepare_object_zernike_polynomials, # passthrough import
 )
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.opts.measureobjectintensitydistribution import (
     C_RADIAL_DISTRIBUTION,
     CenterChoice,

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureobjectneighbors.py

@@ -4,7 +4,7 @@ from typing import Optional, Tuple, Annotated, Union, List
 from pydantic import Field, validate_call, ConfigDict, BaseModel
 
 from cellprofiler_library.types import ObjectSegmentation, ObjectLabelMask
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.opts.measureobjectneighbors import (
     DistanceMethod as NeighborsDistanceMethod,
     Measurement as NeighborsMeasurement,

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureobjectoverlap.py

@@ -5,7 +5,7 @@ from typing import Annotated, Tuple, Union, Optional, List, Any
 from cellprofiler_library.opts.measureobjectoverlap import DecimationMethod, Feature, C_IMAGE_OVERLAP
 from cellprofiler_library.types import ObjectLabelSet
 from cellprofiler_library.functions.measurement import calculate_overlap_measurements, compute_earth_movers_distance_objects
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 
 ObjectOverlapStatistics = List[Tuple[str, float]]
 

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureobjectsizeshape.py

@@ -4,7 +4,7 @@ import centrosome
 import centrosome.cpmorphology
 from pydantic import validate_call, ConfigDict, Field, BaseModel
 from cellprofiler_library.types import ObjectLabelsDense
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.functions.measurement import (
     measure_object_size_shape_2d,
     measure_object_size_shape_3d

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measureobjectskeleton.py

@@ -5,7 +5,7 @@ from cellprofiler_library.types import Image2DBinary, ObjectSegmentation, Image2
 from pydantic import Field, validate_call, ConfigDict, BaseModel
 from cellprofiler_library.functions.measurement import calculate_object_skeleton
 from cellprofiler_library.opts.measureobjectskeleton import SkeletonMeasurements, C_OBJSKELETON
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 
 
 ObjectSkeletonStatistics = List[None]

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_measuretexture.py

@@ -5,7 +5,7 @@ from cellprofiler_library.types import ImageGrayscale, ImageGrayscaleMask, Objec
 from pydantic import validate_call, Field, ConfigDict, BaseModel
 from cellprofiler_library.functions.measurement import measure_haralick_features_image, measure_haralick_features_objects
 from cellprofiler_library.opts.measuretexture import F_HARALICK, TEXTURE
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 
 
 MeasureTextureStatistics = List[Tuple[

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/modules/_relateobjects.py

@@ -6,7 +6,7 @@ import scipy.ndimage
 from cellprofiler_library.types import ObjectSegmentation, ObjectSegmentationIJV
 from cellprofiler_library.functions.segmentation import relate_children
 from cellprofiler_library.functions.object_processing import get_filtered_object
-from cellprofiler_library.measurement_model import LibraryMeasurements
+from cellprofiler_library.measurements.measurement_model import LibraryMeasurements
 from cellprofiler_library.opts.relateobjects import TemplateMeasurementFormat, Relationship, C_MEAN, C_PARENT, M_NUMBER_OBJECT_NUMBER
 from cellprofiler_library.functions.measurement import (
     calculate_centroid_distances,

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library/opts/measureobjectintensity.py

@@ -1,7 +1,8 @@
 from enum import Enum
 
+from cellprofiler_library.opts.measurement import C_LOCATION
+
 C_INTENSITY = "Intensity"
-C_LOCATION = "Location"
 
 class IntensityFeature(str, Enum):
     """Raw strings for intensity and location features."""

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737/cellprofiler_library_nightly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellprofiler-library-nightly
-Version: 5.0.0.dev728
+Version: 5.0.0.dev737
 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.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library_nightly.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ environment.yml
 pyproject.toml
 cellprofiler_library/__init__.py
 cellprofiler_library/_version.py
-cellprofiler_library/measurement_model.py
 cellprofiler_library/py.typed
 cellprofiler_library/types.py
 cellprofiler_library/functions/__init__.py
@@ -13,6 +12,9 @@ cellprofiler_library/functions/image_processing.py
 cellprofiler_library/functions/measurement.py
 cellprofiler_library/functions/object_processing.py
 cellprofiler_library/functions/segmentation.py
+cellprofiler_library/measurements/__init__.py
+cellprofiler_library/measurements/measurement_model.py
+cellprofiler_library/measurements/wrappers.py
 cellprofiler_library/modules/__init__.py
 cellprofiler_library/modules/_align.py
 cellprofiler_library/modules/_closing.py

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library_nightly.egg-info/scm_file_list.json

@@ -9,7 +9,9 @@
     "cellprofiler_library/functions/measurement.py",
     "cellprofiler_library/functions/object_processing.py",
     "cellprofiler_library/functions/segmentation.py",
-    "cellprofiler_library/measurement_model.py",
+    "cellprofiler_library/measurements/__init__.py",
+    "cellprofiler_library/measurements/measurement_model.py",
+    "cellprofiler_library/measurements/wrappers.py",
     "cellprofiler_library/modules/__init__.py",
     "cellprofiler_library/modules/_align.py",
     "cellprofiler_library/modules/_closing.py",

{cellprofiler_library_nightly-5.0.0.dev728 → cellprofiler_library_nightly-5.0.0.dev737}/cellprofiler_library_nightly.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
   "tag": "5.0.0.dev0",
-  "distance": 728,
-  "node": "gf66c883bd90c65d71095cd85bea58cc7c6b092e1",
+  "distance": 737,
+  "node": "gcb2ef7a2c2bff190d85bff9aaae1b000385e32fb",
   "dirty": true,
   "branch": "main",
   "node_date": "2026-09-28"

cellprofiler_library_nightly-5.0.0.dev728/cellprofiler_library/__init__.py

@@ -1 +0,0 @@
-from .measurement_model import LibraryMeasurements