Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes runtime error seen after the GUI is closed when jobs have been terminated. #626

Merged
merged 1 commit into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions MDANSE_GUI/Src/MDANSE_GUI/Tabs/Models/JobHolder.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,25 @@ def run(self):
self._job_comm.status_update(status_update)


class JobEntry(Handler, QObject):
class JobLogHandler(Handler):

def __init__(self):
super().__init__()
self.records = []

def msgs_and_levels(self):
msgs = []
levels = []
for record in self.records:
msgs.append(self.format(record))
levels.append(record.levelname)
return msgs, levels

def emit(self, record):
self.records.append(record)


class JobEntry(QObject):
"""This coordinates all the objects that make up one line on the list
of current jobs. It is used for reporting the task progress to the GUI."""

Expand All @@ -104,8 +122,7 @@ def __init__(
pause_event=None,
load_afterwards=False,
):
super().__init__()
QObject.__init__(self)
super().__init__(*args)
self._command = command
self._finished = False
self._parameters = {}
Expand All @@ -132,7 +149,7 @@ def __init__(
self._prog_item.setData("progress", role=Qt.ItemDataRole.DisplayRole)
self._prog_item.setData(0, role=ProgressDelegate.progress_role)
self._prog_item.setData(100, role=ProgressDelegate.progress_role + 1)
self.records = []
self.handler = JobLogHandler()

def text_summary(self) -> str:
result = ""
Expand Down Expand Up @@ -232,17 +249,6 @@ def kill_job(self):
self._current_state.kill()
self.update_fields()

def msgs_and_levels(self):
msgs = []
levels = []
for record in self.records:
msgs.append(self.format(record))
levels.append(record.levelname)
return msgs, levels

def emit(self, record):
self.records.append(record)


class JobHolder(QStandardItemModel):
"""All the job INSTANCES that are started by the GUI
Expand Down Expand Up @@ -288,8 +294,8 @@ def startProcess(self, job_vars: list, load_afterwards=False):
pause_event=pause_event,
load_afterwards=load_afterwards,
)
item_th.setFormatter(FMT)
item_th.setLevel("INFO")
item_th.handler.setFormatter(FMT)
item_th.handler.setLevel("INFO")

try:
subprocess_ref = Subprocess(
Expand All @@ -307,7 +313,7 @@ def startProcess(self, job_vars: list, load_afterwards=False):
)
return

handlers = [item_th] + LOG.handlers
handlers = [item_th.handler] + LOG.handlers
listener = QueueListener(log_queue, *handlers, respect_handler_level=True)
listener.start()

Expand Down
2 changes: 1 addition & 1 deletion MDANSE_GUI/Src/MDANSE_GUI/Tabs/Views/RunTable.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def item_picked(self, index: QModelIndex):
node_number = model.index(item_row, 0).data(role=Qt.ItemDataRole.UserRole)
job_entry = model.existing_jobs[node_number]
self.item_details.emit(job_entry.text_summary())
self.jobs_logs.emit(job_entry.msgs_and_levels())
self.jobs_logs.emit(job_entry.handler.msgs_and_levels())

def connect_to_visualiser(self, visualiser: TextInfo) -> None:
"""Connect to a visualiser.
Expand Down
Loading