[code] graph : Better management of statuses after task/job actions

Author: Alxiice

meshroom/core/node.py

@@ -145,7 +145,6 @@ def setNodeType(self, node):
         self.mrNodeType = node.getMrNodeType()
 
     def toDict(self):
-        import traceback
         keys = list(self.__slots__) or []
         d = {key:getattr(self, key) for key in keys}
         for _k, _v in d.items():
@@ -155,7 +154,6 @@ def toDict(self):
         if self.chunks:
             chunks = list(self.chunks)
         d["chunks"] = chunks
-        traceback.print_stack()
         return d
 
     def fromDict(self, d):

meshroom/core/taskManager.py

@@ -526,7 +526,6 @@ def submit(self, graph, submitter=None, toNodes=None, submitLabel="{projectName}
             node.destroyed.connect(lambda obj=None, name=node.name: self.onNodeDestroyed(obj, name))
             node.initStatusOnSubmit()
 
-        print("[TaskManager] (submit) graph.updateMonitoredFiles")
         graph.updateMonitoredFiles()
 
         flowEdges = graph.flowEdges(startNodes=toNodes)

meshroom/ui/graph.py

@@ -435,7 +435,6 @@ def updateChunks(self):
             if node._chunksCreated:
                 nodechunks = node.getChunks()
                 chunks.extend(nodechunks)
-            else:
         if self._sortedDFSChunks.objectList() == chunks:
             # Nothing has changed, return
             return
@@ -624,6 +623,7 @@ def stopTask(self, chunk: NodeChunk):
             else:
                 chunk.updateStatusFromCache()
                 chunk.upgradeStatusTo(Status.STOPPED)
+                # TODO : Stop depending nodes ?
                 self.parent().showMessage(f"Stopped chunk {chunkIteration} of {node.label}")
         else:
             chunk.stopProcess()
@@ -649,6 +649,7 @@ def stopNode(self, node: Node):
             else:
                 node.updateNodeStatusFromCache()
                 node.upgradeStatusTo(Status.STOPPED)
+                # TODO : Stop depending nodes ?
                 self.parent().showMessage(f"Stopped node {node.label}")
         else:
             self.cancelNodeComputation(node)
@@ -686,7 +687,6 @@ def skipTask(self, chunk: NodeChunk):
         In local mode, the chunk status will be set to success
         """
         chunk.updateStatusFromCache()
-        chunk.upgradeStatusTo(Status.NONE)
         node = chunk.node
         chunkIteration = chunk.range.iteration
         job = jobManager.getNodeJob(node)
@@ -697,6 +697,7 @@ def skipTask(self, chunk: NodeChunk):
                 self.parent().showMessage(f"Failed to skip chunk {chunkIteration} of {node.label}", "error")
                 logging.warning(f"Error on skipTask :\n{e}")
             else:
+                chunk.upgradeStatusTo(Status.SUCCESS)
                 self.parent().showMessage(f"Skipped chunk {chunkIteration} of {node.label}")
         else:
             chunk.stopProcess()
@@ -765,7 +766,8 @@ def interruptJob(self, node: Node):
                 for chunk in self._sortedDFSChunks:
                     if jobManager.getNodeJob(chunk.node) == job:
                         chunk.updateStatusFromCache()
-                        chunk.upgradeStatusTo(Status.SUBMITTED)
+                        chunk.upgradeStatusTo(Status.STOPPED)
+                # TODO : Also nodes without chunks ?
                 self.parent().showMessage(f"Interrupted the job for node {node}")
         else:
             self._taskManager.clear()
@@ -782,7 +784,15 @@ def restartJobErrorTasks(self, node: Node):
         job = jobManager.getNodeJob(node)
         if job:
             try:
+                # Fist update status of each chunk to submitted
+                for chunk in self._sortedDFSChunks:
+                    if chunk._status.status not in (Status.ERROR, Status.STOPPED, Status.KILLED):
+                        continue
+                    if jobManager.getNodeJob(chunk.node) == job:
+                        chunk.upgradeStatusTo(Status.SUBMITTED)
+                # TODO : Also nodes without chunks ?
                 job.restartErrorTasks()
+                job.resumeJob()
             except Exception as e:
                 self.parent().showMessage(f"Failed to restart error tasks for node {node.label} on farm", "error")
                 logging.warning(f"Error on restartJobErrorTasks :\n{e}")

meshroom/ui/qml/GraphEditor/TaskManager.qml

@@ -160,7 +160,7 @@ Item {
                     MaterialToolButton {
                         ToolTip.text: "Pause job"
                         Layout.alignment: Qt.AlignHCenter
-                        enabled: selectedChunk !== null
+                        enabled: root.uigraph.selectedNode !== null
                         text: MaterialIcons.pause_circle_filled
                         font.pointSize: 15
                         onClicked: {
@@ -171,7 +171,7 @@ Item {
                     MaterialToolButton {
                         ToolTip.text: "Resume job"
                         Layout.alignment: Qt.AlignHCenter
-                        enabled: selectedChunk !== null
+                        enabled: root.uigraph.selectedNode !== null
                         text: MaterialIcons.play_circle_filled
                         font.pointSize: 15
                         onClicked: {
@@ -182,7 +182,7 @@ Item {
                     MaterialToolButton {
                         ToolTip.text: "Interrupt job"
                         Layout.alignment: Qt.AlignHCenter
-                        enabled: selectedChunk !== null
+                        enabled: root.uigraph.selectedNode !== null
                         text: MaterialIcons.stop_circle
                         font.pointSize: 15
                         onClicked: {
@@ -193,7 +193,7 @@ Item {
                     MaterialToolButton {
                         ToolTip.text: "Restart all error tasks"
                         Layout.alignment: Qt.AlignHCenter
-                        enabled: selectedChunk !== null
+                        enabled: root.uigraph.selectedNode !== null
                         text: MaterialIcons.replay_circle_filled  // MaterialIcons.restart_alt
                         font.pointSize: 15
                         onClicked: {