Fix production

.github/workflows/build-windows-executable-app.yaml

@@ -14,7 +14,7 @@ env:
   OPENMS_VERSION: 3.2.0 
   PYTHON_VERSION: 3.11.0
   # Name of the installer
-  APP_NAME: FLASHApp-0.8.0
+  APP_NAME: FLASHApp-0.8.2
   APP_UpgradeCode: "69ae44ad-d554-4e3c-8715-7c4daf60f8bb"
 
 jobs:

settings.json

@@ -1,7 +1,7 @@
 {
     "app-name": "FLASHApp",
     "github-user": "OpenMS",
-    "version": "0.8.0",
+    "version": "0.8.2",
     "repository-name": "FLASHApp",
     "analytics": {
         "google-analytics": {

src/Workflow.py

@@ -80,12 +80,12 @@ def execution(self) -> None:
         try:      
             in_mzmls = self.file_manager.get_files(self.params["mzML-files"])
         except ValueError:
-            st.error('Please select at least one mzML file.')  
+            self.logger.log('Please select at least one mzML file.')  
             return
         try: 
             database = self.file_manager.get_files(self.params["fasta-file"])
         except ValueError:
-            st.error('Please select a database.')  
+            self.logger.log('Please select a database.')  
             return
 
         # Make sure output directory exists
@@ -298,10 +298,10 @@ def configure(self) -> None:
 
     def execution(self) -> None:
         # Get input files
-        try:      
+        try:
             in_mzmls = self.file_manager.get_files(self.params["mzML-files"])
         except ValueError:
-            st.error('Please select at least one mzML file.')  
+            self.logger.log('Please select at least one mzML file.')  
             return
 
         # Define output directory

src/workflow/StreamlitUI.py

@@ -1032,7 +1032,45 @@ def execution_section(self, start_workflow_function) -> None:
         with st.expander("**Summary**"):
             st.markdown(self.export_parameters_markdown())
 
-        self.show_log(start_workflow_function)
+        if OS_PLATFORM == 'win32':
+            self.show_log(start_workflow_function)
+            return
+
+        c1, c2 = st.columns(2)
+        # Select log level, this can be changed at run time or later without re-running the workflow
+        log_level = c1.selectbox(
+            "log details", ["minimal", "commands and run times", "all"], key="log_level"
+        )
+        if self.executor.pid_dir.exists():
+            if c1.button("Stop Workflow", type="primary", use_container_width=True):
+                self.executor.stop()
+                st.rerun()
+        elif c1.button("Start Workflow", type="primary", use_container_width=True):
+            start_workflow_function()
+            time.sleep(3)
+            st.rerun()
+        log_path = Path(self.workflow_dir, "logs", log_level.replace(" ", "-") + ".log")
+        if log_path.exists():
+            if self.executor.pid_dir.exists():
+                with st.spinner("**Workflow running...**"):
+                    with open(log_path, "r", encoding="utf-8") as f:
+                        st.code(
+                            "".join(f.readlines()[-30:]),
+                            language="neon",
+                            line_numbers=False,
+                        )
+                    time.sleep(2)
+                st.rerun()
+            else:
+                st.markdown(
+                    f"**Workflow log file: {datetime.fromtimestamp(log_path.stat().st_ctime).strftime('%Y-%m-%d %H:%M')} CET**"
+                )
+                with open(log_path, "r", encoding="utf-8") as f:
+                    content = f.read()
+                    # Check if workflow finished successfully
+                    if not "WORKFLOW FINISHED" in content:
+                        st.error("**Errors occurred, check log file.**")
+                    st.code(content, language="neon", line_numbers=False)
 
     def results_section(self, custom_results_function) -> None:
         custom_results_function()