celldetective 1.5.0b6__py3-none-any.whl → 1.5.0b7__py3-none-any.whl

celldetective/_version.py

@@ -1 +1 @@
-__version__ = "1.5.0b6"
+__version__ = "1.5.0b7"

celldetective/processes/unified_process.py

@@ -122,15 +122,29 @@ class UnifiedBatchProcess(Process):
         signal_model = None
 
         if self.run_signals:
-            from celldetective.utils.event_detection import _prep_event_detection_model
-
             try:
+                from celldetective.utils.event_detection import (
+                    _prep_event_detection_model,
+                )
+
                 logger.info("Loading the event detection model...")
                 self.queue.put({"status": "Loading event detection model..."})
                 model_name = self.signal_args["model_name"]
                 signal_model = _prep_event_detection_model(
                     model_name, use_gpu=self.signal_args.get("gpu", True)
                 )
+            except (ImportError, ModuleNotFoundError) as e:
+                if "tensorflow" in str(e):
+                    logger.warning(
+                        "Tensorflow not found/installed. Signal analysis will be skipped."
+                    )
+                    self.run_signals = False
+                else:
+                    logger.error(
+                        f"Failed to initialize event detection model: {e}",
+                        exc_info=True,
+                    )
+                    self.run_signals = False
             except Exception as e:
                 logger.error(
                     f"Failed to initialize event detection model: {e}", exc_info=True

celldetective/utils/cellpose_utils/__init__.py

@@ -109,7 +109,7 @@ def _prep_cellpose_model(
     except ImportError as e:
         raise RuntimeError(
             "Torch is not installed. Please install it to use this feature.\n"
-            "You can install the full package with: pip install celldetective[process]\n"
+            "You can install the full package with: pip install celldetective[all]\n"
         ) from e
 
     if not use_gpu:
@@ -122,7 +122,7 @@ def _prep_cellpose_model(
     except ImportError as e:
         raise RuntimeError(
             "Cellpose is not installed. Please install it to use this feature.\n"
-            "You can install the full package with: pip install celldetective[process]\n"
+            "You can install the full package with: pip install celldetective[all]\n"
             "Or specifically: pip install celldetective[cellpose]"
         ) from e
 

celldetective/utils/stardist_utils/__init__.py

@@ -48,8 +48,7 @@ def _prep_stardist_model(
     except ImportError as e:
         raise RuntimeError(
             "StarDist is not installed. Please install it to use this feature.\n"
-            "You can install the full package with: pip install celldetective[process]\n"
-            "Or specifically: pip install celldetective[stardist]"
+            "You can install the full package with: pip install celldetective[all]"
         ) from e
 
     model = StarDist2D(None, name=model_name, basedir=path)

{celldetective-1.5.0b6.dist-info → celldetective-1.5.0b7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: celldetective
-Version: 1.5.0b6
+Version: 1.5.0b7
 Summary: description
 Home-page: http://github.com/remyeltorro/celldetective
 Author: Rémy Torro
@@ -50,10 +50,6 @@ Requires-Dist: natsort
 Provides-Extra: tensorflow
 Requires-Dist: tensorflow~=2.15.0; extra == "tensorflow"
 Requires-Dist: stardist; extra == "tensorflow"
-Provides-Extra: process
-Requires-Dist: cellpose<3; extra == "process"
-Requires-Dist: stardist; extra == "process"
-Requires-Dist: tensorflow~=2.15.0; extra == "process"
 Provides-Extra: all
 Requires-Dist: cellpose<3; extra == "all"
 Requires-Dist: stardist; extra == "all"

{celldetective-1.5.0b6.dist-info → celldetective-1.5.0b7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 celldetective/__init__.py,sha256=LfnOyfUnYPGDc8xcsF_PfYEL7-CqAb7BMBPBIWGv84o,666
 celldetective/__main__.py,sha256=Rzzu9ArxZSgfBVjV-lyn-3oanQB2MumQR6itK5ZaRpA,2597
-celldetective/_version.py,sha256=2t7jfGYhecNEZFNHUmz-D7GUPyvfrkDim4ynpi-TYII,24
+celldetective/_version.py,sha256=PxAZ8DovjTTFvob973OaT7yXi4GAYpuAcRntt0ZchLM,24
 celldetective/events.py,sha256=n15R53c7QZ2wT8gjb0oeNikQbuRBrVVbyNsRCqXjzXA,8166
 celldetective/exceptions.py,sha256=f3VmIYOthWTiqMEV5xQCox2rw5c5e7yog88h-CcV4oI,356
 celldetective/extra_properties.py,sha256=s_2R4_El2p-gQNZ_EpgDxgrN3UnRitN7KDKHhyLuoHc,21681
@@ -126,7 +126,7 @@ celldetective/processes/segment_cells.py,sha256=klGl5y3tHbLbQFNAQz0PV1FspmiPC-GH
 celldetective/processes/track_cells.py,sha256=ndKZpVXonnooOVnHK5AVED5i_i2bZ4FefTt1_dEZS48,15188
 celldetective/processes/train_segmentation_model.py,sha256=j1aPgR4CzF2OR-9njriNmUStVViiWaiicQA9YWRWOTo,25411
 celldetective/processes/train_signal_model.py,sha256=HInUHCXNePhfQs8-DQOreJ19LtLkQopvYSyX8tj0mOo,9498
-celldetective/processes/unified_process.py,sha256=vHAS_LbtwmlOjKho_FpwDy7WHVgyY38s3X2BtHxep7A,11671
+celldetective/processes/unified_process.py,sha256=xvNrYtZaRgpjEWzrPSYoY6dmqJbC81udDojkHuT4iTc,12251
 celldetective/regionprops/__init__.py,sha256=ohe9vC7j4lnpKnGXidVo1PVfoQfC8TqCuHTNo8rXmdg,44
 celldetective/regionprops/_regionprops.py,sha256=spq_Mb43HjHiKqot7yjLJl_jrMTNfIP8NLrPnCEm8Nc,13306
 celldetective/regionprops/props.json,sha256=sCwACmbh0n-JAw9eve9yV85REukoMBJLsRjxCwTRMm8,2424
@@ -161,12 +161,12 @@ celldetective/utils/parsing.py,sha256=1zpIH9tyULCRmO5Kwzy6yA01fqm5uE_mZKYtondy-V
 celldetective/utils/resources.py,sha256=3Fz_W0NYWl_Ixc2AjEmkOv5f7ejXerCLJ2z1iWhGWUI,1153
 celldetective/utils/stats.py,sha256=4TVHRqi38Y0sed-izaMI51sMP0fd5tC5M68EYyfJjkE,3636
 celldetective/utils/types.py,sha256=lRfWSMVzTkxgoctGGp0NqD551akuxu0ygna7zVGonTg,397
-celldetective/utils/cellpose_utils/__init__.py,sha256=XUG6T9RFwJ2H2jrz9eO58gYHjI6vxMe93ZeDD35DChg,5999
+celldetective/utils/cellpose_utils/__init__.py,sha256=g41EiR6p29bHkXQN-SFHymoeaoTEfuozEFSGMuTd30Q,5991
 celldetective/utils/event_detection/__init__.py,sha256=KX20PwPTevdbZ-25otDy_QTmealcDx5xNCfH2SOVIZM,323
 celldetective/utils/plots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 celldetective/utils/plots/regression.py,sha256=oUCn29-hp7PxMqC-R0yoL60KMw5ZWpZAIoCDh2ErlcY,1764
-celldetective/utils/stardist_utils/__init__.py,sha256=eQiZz7UQbwkFS6zXOJFofoNm2wE7ylt-7hdCOd9uOWc,4304
-celldetective-1.5.0b6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+celldetective/utils/stardist_utils/__init__.py,sha256=SY2kxFNXSRjXN4ncs3heDdXT3UNk8M3dELJQySysAf4,4231
+celldetective-1.5.0b7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_cellpose_fallback.py,sha256=BJZTDFF8sFR1x7rDbvZQ2RQOB1OP6wuFBRfc8zbl5zw,3513
 tests/test_events.py,sha256=eLFwwEEJfQAdwhews3-fn1HSvzozcNNFN_Qn0gOvQkE,685
@@ -186,8 +186,8 @@ tests/gui/test_enhancements.py,sha256=3x9au_rkQtMZ94DRj3OaEHKPr511RrWqBAUAcNQn1y
 tests/gui/test_measure_annotator_bugfix.py,sha256=tPfgWNKC0UkvrVssSrUcVDC1qgpzx6l2yCqvKtKYkM4,4544
 tests/gui/test_new_project.py,sha256=wRjW2vEaZb0LWT-f8G8-Ptk8CW9z8-FDPLpV5uqj6ck,8778
 tests/gui/test_project.py,sha256=KzAnodIc0Ovta0ARL5Kr5PkOR5euA6qczT_GhEZpyE4,4710
-celldetective-1.5.0b6.dist-info/METADATA,sha256=7e7KJTEzTLZx7T0o4ITML6CI6PM8EwXU4ENpB0uymNc,11691
-celldetective-1.5.0b6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-celldetective-1.5.0b6.dist-info/entry_points.txt,sha256=2NU6_EOByvPxqBbCvjwxlVlvnQreqZ3BKRCVIKEv3dg,62
-celldetective-1.5.0b6.dist-info/top_level.txt,sha256=6rsIKKfGMKgud7HPuATcpq6EhdXwcg_yknBVWn9x4C4,20
-celldetective-1.5.0b6.dist-info/RECORD,,
+celldetective-1.5.0b7.dist-info/METADATA,sha256=qOwqT_qSpFnGY0CXpVIFdSUV4atTi3FV4M4Kn57tNAg,11523
+celldetective-1.5.0b7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+celldetective-1.5.0b7.dist-info/entry_points.txt,sha256=2NU6_EOByvPxqBbCvjwxlVlvnQreqZ3BKRCVIKEv3dg,62
+celldetective-1.5.0b7.dist-info/top_level.txt,sha256=6rsIKKfGMKgud7HPuATcpq6EhdXwcg_yknBVWn9x4C4,20
+celldetective-1.5.0b7.dist-info/RECORD,,