mac + windows standalone craching fixes
This commit is contained in:
@@ -21,6 +21,7 @@ from enum import Enum, auto
|
||||
from pathlib import Path, PurePosixPath
|
||||
from datetime import datetime
|
||||
from multiprocessing import Process, current_process, freeze_support, Manager, Queue
|
||||
from queue import Empty
|
||||
|
||||
# External library imports
|
||||
import numpy as np
|
||||
@@ -5784,95 +5785,91 @@ class MainApplication(QMainWindow):
|
||||
|
||||
|
||||
def check_for_pipeline_results(self):
|
||||
while not self.result_queue.empty():
|
||||
msg = self.result_queue.get()
|
||||
try:
|
||||
while True:
|
||||
try:
|
||||
msg = self.result_queue.get_nowait()
|
||||
except Empty:
|
||||
break
|
||||
|
||||
if isinstance(msg, dict):
|
||||
if msg.get("success"):
|
||||
|
||||
results = msg["result"] # from flares.py
|
||||
|
||||
for file_path, result_tuple in results.items():
|
||||
self.files_done.add(file_path)
|
||||
self.files_results[file_path] = result_tuple
|
||||
if isinstance(msg, dict) and msg.get("type") == "file_done":
|
||||
file_path = msg["file"]
|
||||
self.files_done.add(file_path)
|
||||
|
||||
# Initialize storage
|
||||
# TODO: Is this check needed? Edit: yes very much so
|
||||
if getattr(self, 'raw_haemo_dict', None) is None:
|
||||
self.raw_haemo_dict = {}
|
||||
self.config_dict = {}
|
||||
self.epochs_dict = {}
|
||||
self.fig_bytes_dict = {}
|
||||
self.cha_dict = {}
|
||||
self.contrast_results_dict = {}
|
||||
self.df_ind_dict = {}
|
||||
self.design_matrix_dict = {}
|
||||
self.valid_dict = {}
|
||||
# print(f"[DEBUG] File Done: {os.path.basename(file_path)}")
|
||||
# print(f"[DEBUG] Progress: {len(self.files_done)} / {self.files_total}")
|
||||
|
||||
if msg.get("success"):
|
||||
# Unpack the massive tuple
|
||||
raw_haemo, config, epochs, fig_bytes, cha, contrast, df_ind, design, valid = msg["result"]
|
||||
|
||||
# Initialize dictionaries once if needed
|
||||
if not hasattr(self, 'raw_haemo_dict') or self.raw_haemo_dict is None:
|
||||
attrs = ['raw_haemo_dict', 'config_dict', 'epochs_dict', 'fig_bytes_dict',
|
||||
'cha_dict', 'contrast_results_dict', 'df_ind_dict',
|
||||
'design_matrix_dict', 'valid_dict']
|
||||
for attr in attrs:
|
||||
setattr(self, attr, {})
|
||||
|
||||
# Combine all results into the dicts
|
||||
for file_path, (raw_haemo, config, epochs, fig_bytes, cha, contrast_results, df_ind, design_matrix, valid) in results.items():
|
||||
self.files_results[file_path] = msg["result"]
|
||||
self.raw_haemo_dict[file_path] = raw_haemo
|
||||
self.config_dict[file_path] = config
|
||||
self.epochs_dict[file_path] = epochs
|
||||
self.fig_bytes_dict[file_path] = fig_bytes
|
||||
self.cha_dict[file_path] = cha
|
||||
self.contrast_results_dict[file_path] = contrast_results
|
||||
self.contrast_results_dict[file_path] = contrast
|
||||
self.df_ind_dict[file_path] = df_ind
|
||||
self.design_matrix_dict[file_path] = design_matrix
|
||||
self.design_matrix_dict[file_path] = design
|
||||
self.valid_dict[file_path] = valid
|
||||
|
||||
# self.statusbar.showMessage(f"Processing complete! Time elapsed: {elapsed_time:.2f} seconds")
|
||||
# self.statusbar.showMessage(f"Processing complete!")
|
||||
self.statusbar.showMessage(f"Processed: {os.path.basename(file_path)}")
|
||||
|
||||
self.button3.setVisible(True)
|
||||
|
||||
else:
|
||||
self.files_failed.add(file_path)
|
||||
error_msg = msg.get("error", "Unknown worker error")
|
||||
print(f"[DEBUG] File Failed: {os.path.basename(file_path)} - {error_msg}")
|
||||
self.show_error_popup(f"Error: {file_path}", error_msg, msg.get("traceback", ""))
|
||||
self.statusbar.showMessage(f"Failed: {os.path.basename(file_path)}")
|
||||
|
||||
elif msg.get("success") is False:
|
||||
elif isinstance(msg, dict) and msg.get("success") is True:
|
||||
self.statusbar.showMessage("All files processed successfully!")
|
||||
|
||||
elif isinstance(msg, dict) and (msg.get("success") is False or msg.get("type") == "error"):
|
||||
file_path = msg.get("file", "Process")
|
||||
error_msg = msg.get("error", "Unknown error")
|
||||
traceback_str = msg.get("traceback", "")
|
||||
self.show_error_popup("Processing failed!", error_msg, traceback_str)
|
||||
self.files_done = set(self.files_results.keys())
|
||||
self.statusbar.showMessage(f"Processing failed!")
|
||||
self.result_timer.stop()
|
||||
self.cleanup_after_process()
|
||||
return
|
||||
|
||||
elif msg.get("type") == "error":
|
||||
# Error forwarded from a single file (e.g. from a worker)
|
||||
file_path = msg.get("file", "Unknown file")
|
||||
error_msg = msg.get("error", "Unknown error")
|
||||
traceback_str = msg.get("traceback", "")
|
||||
|
||||
self.show_error_popup(f"Error: {file_path}", error_msg, msg.get("traceback", ""))
|
||||
self.files_done.add(file_path)
|
||||
self.files_failed.add(file_path)
|
||||
if msg.get("success") is False: # Fatal crash
|
||||
self.result_timer.stop()
|
||||
self.cleanup_after_process()
|
||||
return
|
||||
|
||||
self.show_error_popup(f"{file_path}", error_msg, traceback_str)
|
||||
self.statusbar.showMessage(f"Error processing {file_path}")
|
||||
if file_path in self.bubble_widgets:
|
||||
self.bubble_widgets[file_path].mark_cancelled()
|
||||
|
||||
elif isinstance(msg, tuple) and msg[0] == 'progress':
|
||||
_, file_path, step_index = msg
|
||||
self.progress_update_signal.emit(file_path, step_index)
|
||||
|
||||
elif isinstance(msg, tuple) and msg[0] == 'progress':
|
||||
_, file_path, step_index = msg
|
||||
self.progress_update_signal.emit(file_path, step_index)
|
||||
|
||||
|
||||
if len(self.files_done) == self.files_total:
|
||||
self.result_timer.stop()
|
||||
self.cleanup_after_process()
|
||||
|
||||
success_count = len(self.files_results)
|
||||
fail_count = len(self.files_failed)
|
||||
|
||||
summary_msg = f"Processing complete: {success_count} succeeded, {fail_count} failed."
|
||||
self.statusbar.showMessage(summary_msg)
|
||||
|
||||
if success_count > 0:
|
||||
self.button3.setVisible(True)
|
||||
if len(self.files_done) >= self.files_total:
|
||||
self.result_timer.stop()
|
||||
self.cleanup_after_process()
|
||||
|
||||
self.button1.clicked.disconnect(self.cancel_task)
|
||||
self.button1.setText("Process")
|
||||
self.button1.clicked.connect(self.on_run_task)
|
||||
success_count = len(self.files_results)
|
||||
fail_count = self.files_total - success_count
|
||||
self.statusbar.showMessage(f"Complete: {success_count} succeeded, {fail_count} failed.")
|
||||
|
||||
if success_count > 0:
|
||||
self.button3.setVisible(True)
|
||||
|
||||
try:
|
||||
self.button1.clicked.disconnect()
|
||||
except: pass
|
||||
self.button1.setText("Process")
|
||||
self.button1.clicked.connect(self.on_run_task)
|
||||
|
||||
except Exception as e:
|
||||
print(f"Error in timer loop: {e}")
|
||||
if not self.result_process.is_alive() and len(self.files_done) < self.files_total:
|
||||
self.statusbar.showMessage("Background process died.")
|
||||
self.result_timer.stop()
|
||||
|
||||
|
||||
def show_error_popup(self, title, error_message, traceback_str=""):
|
||||
@@ -6061,7 +6058,7 @@ def run_gui_entry_wrapper(config, gui_queue, progress_queue):
|
||||
import flares
|
||||
flares.gui_entry(config, gui_queue, progress_queue)
|
||||
gui_queue.close()
|
||||
gui_queue.join_thread()
|
||||
#gui_queue.join_thread()
|
||||
sys.exit(0)
|
||||
|
||||
except Exception as e:
|
||||
@@ -6070,6 +6067,7 @@ def run_gui_entry_wrapper(config, gui_queue, progress_queue):
|
||||
"success": False,
|
||||
"error": f"Child process crashed: {str(e)}\nTraceback:\n{tb_str}"
|
||||
})
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def resource_path(relative_path):
|
||||
|
||||
Reference in New Issue
Block a user