celldetective 1.5.0b6__tar.gz → 1.5.0b7__tar.gz

{celldetective-1.5.0b6 → celldetective-1.5.0b7}/PKG-INFO

@@ -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.0b7/celldetective/_version.py

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

{celldetective-1.5.0b6 → celldetective-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-1.5.0b6 → celldetective-1.5.0b7}/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-1.5.0b6 → celldetective-1.5.0b7}/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 → celldetective-1.5.0b7}/celldetective.egg-info/PKG-INFO

@@ -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 → celldetective-1.5.0b7}/celldetective.egg-info/requires.txt

@@ -43,11 +43,6 @@ cellpose<3
 stardist
 tensorflow~=2.15.0
 
-[process]
-cellpose<3
-stardist
-tensorflow~=2.15.0
-
 [tensorflow]
 tensorflow~=2.15.0
 stardist

{celldetective-1.5.0b6 → celldetective-1.5.0b7}/setup.py

@@ -72,7 +72,7 @@ setup(
     install_requires=requirements,
     extras_require={
         "tensorflow": ["tensorflow~=2.15.0", "stardist"],
-        "process": ["cellpose<3", "stardist", "tensorflow~=2.15.0"],
+        #"process": ["cellpose<3", "stardist", "tensorflow~=2.15.0"],
         "all": ["cellpose<3", "stardist", "tensorflow~=2.15.0"],
     },
     # dependency_links = links

celldetective-1.5.0b6/celldetective/_version.py

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