mosamatic2 2.0.14__tar.gz → 2.0.15__tar.gz

{mosamatic2-2.0.14 → mosamatic2-2.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mosamatic2
-Version: 2.0.14
+Version: 2.0.15
 Summary: 
 Author: Ralph Brecheisen
 Author-email: r.brecheisen@maastrichtuniversity.nl

{mosamatic2-2.0.14 → mosamatic2-2.0.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mosamatic2"
-version = "2.0.14"
+version = "2.0.15"
 description = ""
 authors = [
     {name = "Ralph Brecheisen", email = "r.brecheisen@maastrichtuniversity.nl"}

{mosamatic2-2.0.14 → mosamatic2-2.0.15}/src/mosamatic2/core/utils.py

@@ -363,5 +363,9 @@ def is_docker_running():
         return False
     
 
+def is_path_docker_compatible(path):
+    return not ' ' in path
+
+
 def to_unix_path(path):
     return path.replace("\\", "/").replace(" ", "\\ ")

mosamatic2-2.0.15/src/mosamatic2/ui/resources/VERSION

@@ -0,0 +1 @@
+2.0.15 

{mosamatic2-2.0.14 → mosamatic2-2.0.15}/src/mosamatic2/ui/widgets/panels/pipelines/boadockerpipelinepanel.py

@@ -16,6 +16,7 @@ from PySide6.QtCore import (
 )
 
 from mosamatic2.core.managers.logmanager import LogManager
+from mosamatic2.core.utils import is_docker_running, is_path_docker_compatible
 from mosamatic2.ui.widgets.panels.pipelines.pipelinepanel import PipelinePanel
 from mosamatic2.ui.settings import Settings
 from mosamatic2.ui.utils import is_macos
@@ -127,6 +128,15 @@ class BoaDockerPipelinePanel(PipelinePanel):
             self.settings().set('last_directory', directory)
 
     def handle_run_pipeline_button(self):
+        if not is_docker_running():
+            QMessageBox.information(self, 'Error', 'Docker is not running. Please start Docker Desktop first')
+            return
+        if not is_path_docker_compatible(self.scans_dir_line_edit().text()):
+            QMessageBox.information(self, 'Error', 'Path to scans directory contains spaces and is not Docker compatible')
+            return
+        if not is_path_docker_compatible(self.output_dir_line_edit().text()):
+            QMessageBox.information(self, 'Error', 'Path to output directory contains spaces and is not Docker compatible')
+            return
         errors = self.check_inputs_and_parameters()
         if len(errors) > 0:
             error_message = 'Following errors were encountered:\n'

{mosamatic2-2.0.14 → mosamatic2-2.0.15}/src/mosamatic2/ui/widgets/panels/pipelines/defaultdockerpipelinepanel.py

@@ -18,6 +18,7 @@ from PySide6.QtCore import (
 )
 
 from mosamatic2.core.managers.logmanager import LogManager
+from mosamatic2.core.utils import is_docker_running, is_path_docker_compatible
 from mosamatic2.ui.widgets.panels.pipelines.pipelinepanel import PipelinePanel
 from mosamatic2.ui.settings import Settings
 from mosamatic2.ui.utils import is_macos
@@ -223,6 +224,18 @@ class DefaultDockerPipelinePanel(PipelinePanel):
             self.model_type_combobox().setCurrentText('pytorch')
 
     def handle_run_pipeline_button(self):
+        if not is_docker_running():
+            QMessageBox.information(self, 'Error', 'Docker is not running. Please start Docker Desktop first')
+            return
+        if not is_path_docker_compatible(self.images_dir_line_edit().text()):
+            QMessageBox.information(self, 'Error', 'Path to images directory contains spaces and is not Docker compatible')
+            return
+        if not is_path_docker_compatible(self.model_files_dir_line_edit().text()):
+            QMessageBox.information(self, 'Error', 'Path to model files directory contains spaces and is not Docker compatible')
+            return
+        if not is_path_docker_compatible(self.output_dir_line_edit().text()):
+            QMessageBox.information(self, 'Error', 'Path to output directory contains spaces and is not Docker compatible')
+            return
         errors = self.check_inputs_and_parameters()
         if len(errors) > 0:
             error_message = 'Following errors were encountered:\n'

mosamatic2-2.0.14/src/mosamatic2/ui/resources/VERSION

@@ -1 +0,0 @@
-2.0.14