celldetective 1.5.0b3__tar.gz → 1.5.0b4__tar.gz

{celldetective-1.5.0b3 → celldetective-1.5.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: celldetective
-Version: 1.5.0b3
+Version: 1.5.0b4
 Summary: description
 Home-page: http://github.com/remyeltorro/celldetective
 Author: Rémy Torro

celldetective-1.5.0b4/celldetective/_version.py

@@ -0,0 +1 @@
+__version__ = "1.5.0b4"

{celldetective-1.5.0b3 → celldetective-1.5.0b4}/celldetective/gui/measure_annotator.py

@@ -950,9 +950,9 @@ class MeasureAnnotator(BaseAnnotator):
                 ].to_numpy()
             )
             self.colors.append(
-                self.df_tracks.loc[
-                    self.df_tracks["FRAME"] == t, ["group_color"]
-                ].to_numpy()
+                self.df_tracks.loc[self.df_tracks["FRAME"] == t, ["group_color"]]
+                .to_numpy()
+                .copy()
             )
             if "TRACK_ID" in self.df_tracks.columns:
                 self.tracks.append(

{celldetective-1.5.0b3 → celldetective-1.5.0b4}/celldetective/gui/settings/_settings_segmentation_model_training.py

@@ -84,6 +84,12 @@ class SettingsSegmentationModelTraining(CelldetectiveSettingsPanel):
         self.bg_loader = BackgroundLoader()
         self.bg_loader.start()
 
+    def closeEvent(self, event):
+        if self.bg_loader.isRunning():
+            logger.info("Waiting for background loader to finish...")
+            self.bg_loader.wait()
+        super().closeEvent(event)
+
     def _add_to_layout(self):
 
         self._layout.addWidget(self.model_frame)

{celldetective-1.5.0b3 → celldetective-1.5.0b4}/celldetective/gui/viewers/base_viewer.py

@@ -111,6 +111,11 @@ class StackLoader(QThread):
                 # If nothing to load, wait
                 self.mutex.lock()
                 self.condition.wait(self.mutex, 500)  # Wait 500ms or until new priority
+
+                if not self.running:
+                    self.mutex.unlock()
+                    break
+
                 self.mutex.unlock()
 
 

{celldetective-1.5.0b3 → celldetective-1.5.0b4}/celldetective/utils/cellpose_utils/__init__.py

@@ -113,13 +113,29 @@ def _prep_cellpose_model(
 
     from cellpose.models import CellposeModel
 
-    model = CellposeModel(
-        gpu=use_gpu,
-        device=device,
-        pretrained_model=path + model_name,
-        model_type=None,
-        nchan=n_channels,
-    )  # diam_mean=30.0,
+    try:
+        model = CellposeModel(
+            gpu=use_gpu,
+            device=device,
+            pretrained_model=path + model_name,
+            model_type=None,
+            nchan=n_channels,
+        )  # diam_mean=30.0,
+    except AssertionError as e:
+        if use_gpu:
+            print(
+                f"[WARNING] Could not load Cellpose model with GPU ({e}). Retrying with CPU..."
+            )
+            device = torch.device("cpu")
+            model = CellposeModel(
+                gpu=False,
+                device=device,
+                pretrained_model=path + model_name,
+                model_type=None,
+                nchan=n_channels,
+            )
+        else:
+            raise e
     if scale is None:
         scale_model = model.diam_mean / model.diam_labels
     else:

{celldetective-1.5.0b3 → celldetective-1.5.0b4}/celldetective.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: celldetective
-Version: 1.5.0b3
+Version: 1.5.0b4
 Summary: description
 Home-page: http://github.com/remyeltorro/celldetective
 Author: Rémy Torro

{celldetective-1.5.0b3 → celldetective-1.5.0b4}/celldetective.egg-info/SOURCES.txt

@@ -177,6 +177,7 @@ celldetective/utils/plots/__init__.py
 celldetective/utils/plots/regression.py
 celldetective/utils/stardist_utils/__init__.py
 tests/__init__.py
+tests/test_cellpose_fallback.py
 tests/test_events.py
 tests/test_filters.py
 tests/test_io.py
@@ -190,5 +191,6 @@ tests/test_tracking.py
 tests/test_utils.py
 tests/gui/__init__.py
 tests/gui/test_enhancements.py
+tests/gui/test_measure_annotator_bugfix.py
 tests/gui/test_new_project.py
 tests/gui/test_project.py

celldetective-1.5.0b4/tests/gui/test_measure_annotator_bugfix.py

@@ -0,0 +1,130 @@
+import pytest
+import os
+import pandas as pd
+import numpy as np
+import logging
+from PyQt5 import QtCore
+from celldetective.gui.InitWindow import AppInitWindow
+from celldetective.gui.measure_annotator import MeasureAnnotator
+from celldetective import get_software_location
+from unittest.mock import patch
+import shutil
+import tifffile
+
+software_location = get_software_location()
+
+
+@pytest.fixture(autouse=True)
+def disable_logging():
+    """Disable all logging to avoid Windows OSError with pytest capture."""
+    logger = logging.getLogger()
+    try:
+        logging.disable(logging.CRITICAL)
+        yield
+    finally:
+        logging.disable(logging.NOTSET)
+
+
+@pytest.fixture
+def app(qtbot):
+    test_app = AppInitWindow(software_location=software_location)
+    qtbot.addWidget(test_app)
+    return test_app
+
+
+def create_dummy_movie(exp_dir, well="W1", pos="100", prefix="sample", frames=5):
+    movie_dir = os.path.join(exp_dir, well, pos, "movie")
+    os.makedirs(movie_dir, exist_ok=True)
+    # Use a single multi-page TIF as expected by locate_stack
+    movie_path = os.path.join(movie_dir, f"{prefix}.tif")
+    img = np.zeros((frames, 100, 100), dtype=np.uint16)
+    tifffile.imwrite(movie_path, img)
+
+
+def test_measure_annotator_colors_writable(app, qtbot, tmp_path):
+    """
+    Test that self.colors in MeasureAnnotator contains writable arrays.
+    This verifies the fix for 'ValueError: assignment destination is read-only'.
+    """
+    exp_dir = str(tmp_path / "ExperimentColors")
+    os.makedirs(os.path.join(exp_dir, "W1", "100", "output", "tables"), exist_ok=True)
+    os.makedirs(os.path.join(exp_dir, "configs"), exist_ok=True)
+
+    with open(os.path.join(exp_dir, "config.ini"), "w") as f:
+        f.write(
+            "[MovieSettings]\nmovie_prefix = sample\nlen_movie = 10\nshape_x = 100\nshape_y = 100\npxtoum = 1.0\nframetomin = 1.0\n"
+        )
+        f.write(
+            "[Labels]\nconcentrations = 0\ncell_types = dummy\nantibodies = none\npharmaceutical_agents = none\n[Channels]\nChannel1 = 0\n"
+        )
+
+    create_dummy_movie(exp_dir, well="W1", pos="100", prefix="sample", frames=10)
+
+    # DataFrame with tracks
+    df = pd.DataFrame(
+        {
+            "TRACK_ID": [1, 1],
+            "FRAME": [0, 1],
+            "group_experimental": ["A", "A"],
+            "area": [100.0, 110.0],
+            "POSITION_X": [10, 12],
+            "POSITION_Y": [10, 12],
+            "status": [0, 0],  # Ensure status column exists
+        }
+    )
+    # The 'group_color' column is usually generated inside MeasureAnnotator,
+    # but let's see if we need to let it generate it.
+    # MeasureAnnotator calls 'color_from_state', then assigns 'group_color'.
+
+    traj_path = os.path.join(
+        exp_dir, "W1", "100", "output", "tables", "trajectories_effectors.csv"
+    )
+    df.to_csv(traj_path, index=False)
+
+    app.experiment_path_selection.setText(exp_dir)
+    qtbot.mouseClick(app.validate_button, QtCore.Qt.LeftButton)
+    qtbot.waitUntil(lambda: hasattr(app, "control_panel"), timeout=30000)
+
+    cp = app.control_panel
+    p0 = cp.ProcessPopulations[0]
+
+    qtbot.waitUntil(lambda: cp.well_list.count() > 0, timeout=30000)
+
+    with patch.object(cp.well_list, "getSelectedIndices", return_value=[0]):
+        with patch.object(cp.position_list, "getSelectedIndices", return_value=[0]):
+
+            cp.update_position_options()
+            qtbot.wait(500)
+
+            qtbot.mouseClick(p0.check_measurements_btn, QtCore.Qt.LeftButton)
+
+            try:
+                qtbot.waitUntil(lambda: hasattr(p0, "measure_annotator"), timeout=15000)
+            except Exception:
+                print("DEBUG: measure_annotator not found on p0.")
+                raise
+
+            annotator = p0.measure_annotator
+            qtbot.wait(1000)
+            assert annotator is not None
+
+            # Verify that self.colors arrays are writable
+            # extract_scatter_from_trajectories should have been called during init
+            assert hasattr(annotator, "colors")
+            assert len(annotator.colors) > 0
+
+            # Check the first frame's colors
+            colors_frame_0 = annotator.colors[0]
+
+            # Check flags
+            assert colors_frame_0.flags[
+                "WRITEABLE"
+            ], "self.colors arrays must be writable"
+
+            # Try to modify (should not raise ValueError)
+            try:
+                colors_frame_0[0] = "lime"
+            except ValueError as e:
+                pytest.fail(f"Could not modify colors array: {e}")
+
+            annotator.close()

celldetective-1.5.0b4/tests/test_cellpose_fallback.py

@@ -0,0 +1,101 @@
+import unittest
+from unittest.mock import MagicMock, patch
+import sys
+
+# Do not import torch here to avoid WinError 1114 if environment is broken.
+# We will mock it in setUp.
+
+
+class TestCellposeFallback(unittest.TestCase):
+
+    def setUp(self):
+        # Create a mock for torch
+        self.mock_torch = MagicMock()
+        self.mock_torch.device = MagicMock(return_value="cpu")
+        self.mock_torch.cuda = MagicMock()
+        self.mock_torch.cuda.is_available.return_value = (
+            False  # Default to CPU environment simulation
+        )
+
+        # Patch modules so that 'import torch' and 'import cellpose' work with our mocks
+        # We need to patch 'torch' in sys.modules BEFORE importing code that uses it.
+        self.modules_patcher = patch.dict(
+            sys.modules,
+            {
+                "torch": self.mock_torch,
+                "cellpose": MagicMock(),
+                "cellpose.models": MagicMock(),
+            },
+        )
+        self.modules_patcher.start()
+
+        # Define a mock CellposeModel that we can control
+        self.MockCellposeModel = MagicMock()
+        sys.modules["cellpose.models"].CellposeModel = self.MockCellposeModel
+
+    def tearDown(self):
+        self.modules_patcher.stop()
+
+    def test_gpu_fallback_on_assertion_error(self):
+        """
+        Test that _prep_cellpose_model falls back to CPU if GPU init fails with AssertionError.
+        """
+        # Lazy import inside the test method/patch context
+        from celldetective.utils.cellpose_utils import _prep_cellpose_model
+
+        # Side effect for CellposeModel constructor
+        def side_effect(gpu=False, **kwargs):
+            if gpu:
+                raise AssertionError("Torch not compiled with CUDA enabled")
+
+            # Return a mock model object
+            model = MagicMock()
+            model.diam_mean = 30.0
+            model.diam_labels = 30.0
+            return model
+
+        self.MockCellposeModel.side_effect = side_effect
+
+        # Call the function with use_gpu=True
+        # We expect it to try with gpu=True, fail, print warning, and retry with gpu=False
+        model, scale = _prep_cellpose_model(
+            model_name="fake_model", path="fake_path/", use_gpu=True, n_channels=2
+        )
+
+        # Check call history
+        self.assertEqual(self.MockCellposeModel.call_count, 2)
+
+        args1, kwargs1 = self.MockCellposeModel.call_args_list[0]
+        self.assertTrue(kwargs1.get("gpu"), "First call should try gpu=True")
+
+        args2, kwargs2 = self.MockCellposeModel.call_args_list[1]
+        self.assertFalse(kwargs2.get("gpu"), "Second call should retry with gpu=False")
+
+        self.assertIsNotNone(model)
+
+    def test_gpu_success(self):
+        """
+        Test that _prep_cellpose_model works normally if GPU init succeeds.
+        """
+        from celldetective.utils.cellpose_utils import _prep_cellpose_model
+
+        # Side effect for success
+        def side_effect(gpu=False, **kwargs):
+            model = MagicMock()
+            model.diam_mean = 30.0
+            model.diam_labels = 30.0
+            return model
+
+        self.MockCellposeModel.side_effect = side_effect
+
+        model, scale = _prep_cellpose_model(
+            model_name="fake_model", path="fake_path/", use_gpu=True, n_channels=2
+        )
+
+        self.assertEqual(self.MockCellposeModel.call_count, 1)
+        args, kwargs = self.MockCellposeModel.call_args
+        self.assertTrue(kwargs.get("gpu"))
+
+
+if __name__ == "__main__":
+    unittest.main()

celldetective-1.5.0b3/celldetective/_version.py

@@ -1 +0,0 @@
-__version__ = "1.5.0b3"