processview 0.1.3__tar.gz → 0.2.1__tar.gz

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/core/manager/manager.py

@@ -50,6 +50,7 @@ class DatasetState(_Enum):
     FAILED = "failed"
     PENDING = "pending"
     SKIPPED = "skipped"
+    WAIT_USER_VALIDATION = "waiting user validation"
 
 
 @singleton
@@ -68,6 +69,8 @@ class ProcessManager:
         """list of callback to trigger when an update is generated"""
         self._newProcessCallback = set()
         """list of callback to trigger when a process is added"""
+        self._processRemovedCallback = set()
+        """list of callback to trigger when a process is removed"""
         self.lock = threading.Lock()
 
     def met(self, process, dataset) -> bool:
@@ -131,6 +134,9 @@ class ProcessManager:
         if process.process_id in self._processes and process.is_master_process:
             del self._processes[process.process_id]
 
+        for callback in self._processRemovedCallback:
+            callback()
+
     def get_processes(self) -> tuple:
         """
 
@@ -312,6 +318,13 @@ class ProcessManager:
         if callback in self._newProcessCallback:
             self._newProcessCallback.remove(callback)
 
+    def add_process_removed_callback(self, callback):
+        self._processRemovedCallback.add(callback)
+
+    def remove_process_removed_callback(self, callback):
+        if callback in self._processRemovedCallback:
+            self._processRemovedCallback.remove(callback)
+
     def clear(self):
         """
         clear registered processes and dataset states

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/gui/messagebox.py

@@ -0,0 +1,59 @@
+# coding: utf-8
+# /*##########################################################################
+#
+# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ###########################################################################*/
+
+
+__authors__ = ["H. Payno"]
+__license__ = "MIT"
+__date__ = "29/03/2021"
+
+
+from silx.gui import qt
+
+
+class MessageBox(qt.QDialog):
+    def __init__(self, parent=None):
+        qt.QDialog.__init__(self, parent)
+        self.setLayout(qt.QVBoxLayout())
+        self._scrollArea = qt.QScrollArea(self)
+        self._scrollArea.setWidgetResizable(True)
+        self.content = qt.QTextEdit(self._scrollArea)
+        self.content.setReadOnly(True)
+        self._scrollArea.setWidget(self.content)
+        self.layout().addWidget(self._scrollArea)
+
+        # buttons
+        types = qt.QDialogButtonBox.Ok
+        self._buttons = qt.QDialogButtonBox(parent=self)
+        self._buttons.setStandardButtons(types)
+        self.layout().addWidget(self._buttons)
+
+        # connect signal / slots
+        self._buttons.button(qt.QDialogButtonBox.Ok).clicked.connect(self.accept)
+
+    def setInfos(self, infos):
+        self.content.setText(infos)
+
+    def sizeHint(self):
+        return qt.QSize(400, 400)

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/gui/processmanager.py

@@ -37,6 +37,7 @@ from processview.core.manager import ProcessManager as _ProcessManager
 from processview.core.superviseprocess import SuperviseProcess
 from processview.core.dataset import DatasetIdentifier
 from processview.gui import icons as icons
+from processview.gui.messagebox import MessageBox
 from processview.utils import docstring
 import fnmatch
 
@@ -47,6 +48,7 @@ _DATASET_STATE_BACKGROUND = {
     DatasetState.FAILED: qt.QColor("#f52718"),  # red
     DatasetState.PENDING: qt.QColor("#609ab3"),  # blue gray
     DatasetState.SKIPPED: qt.QColor("#f08e0e"),  # light orange
+    DatasetState.WAIT_USER_VALIDATION: qt.QColor("#cb34c1"),  # pink
 }
 
 
@@ -112,17 +114,16 @@ class ObservationTable(qt.QTableView):
     def _requestInfo(self, *args, **kwargs):
         process, dataset = self._target
         if process is not None and dataset is not None:
-            msg = qt.QMessageBox(self)
-            msg.setIcon(qt.QMessageBox.Information)
-
             infos = ProcessManager().get_dataset_details(
                 dataset=dataset, process=process
             )
             if infos in (None, ""):
                 infos = "No extra information provided"
+
+            msg = MessageBox(self)
+            msg.setInfos(infos=infos)
             extra_info = "{} processing {}".format(process.name, dataset)
             msg.setWindowTitle(extra_info)
-            msg.setText(infos)
             msg.setWindowModality(qt.Qt.NonModal)
             msg.show()
 
@@ -142,7 +143,6 @@ class ProcessManagerWidget(qt.QWidget):
 
         self.observationTable = ObservationTable(self)
         self.layout().addWidget(self.observationTable)
-        self.observationTable.setSelectionBehavior(qt.QAbstractItemView.SelectRows)
         self.observationTable.setModel(
             _DatasetProcessModel(parent=self.observationTable, header=tuple())
         )
@@ -159,6 +159,7 @@ class ProcessManagerWidget(qt.QWidget):
         self.filterWidget.filterWidget.sigProcessPatternEditingFinished.connect(
             self._filterUpdated
         )
+        self._manager.sigProcessUnregistered.connect(self._updateProcesses)
         # update to fit existing processes / datasets
         self._updateProcesses()
         self._updateDatasetStates()
@@ -472,6 +473,9 @@ class ProcessManager(qt.QObject):
     sigNewProcessRegistered = qt.Signal()
     """Signal emitted when a new process is registered"""
 
+    sigProcessUnregistered = qt.Signal()
+    """Signal emitted when a process is unregistered"""
+
     def __init__(self):
         qt.QObject.__init__(self)
         self.manager = _ProcessManager()
@@ -480,6 +484,7 @@ class ProcessManager(qt.QObject):
         # TODO: add / remove callback would be simpler
         self.manager.add_update_callback(self.updated)
         self.manager.add_new_process_callback(self.processAdded)
+        self.manager.add_process_removed_callback(self.processRemoved)
 
     def updated(self):
         self.sigUpdated.emit()
@@ -487,6 +492,9 @@ class ProcessManager(qt.QObject):
     def processAdded(self):
         self.sigNewProcessRegistered.emit()
 
+    def processRemoved(self):
+        self.sigProcessUnregistered.emit()
+
     def processNameChanged(self, process):
         self.sigProcessNameChanged.emit(process)
 
@@ -496,8 +504,10 @@ class ProcessManager(qt.QObject):
 
     # expose some of the original ProcessManager API
     @docstring(_ProcessManager)
-    def notify_dataset_state(self, dataset, process, state) -> None:
-        self.manager.notify_dataset_state(dataset=dataset, process=process, state=state)
+    def notify_dataset_state(self, dataset, process, state, details=None) -> None:
+        self.manager.notify_dataset_state(
+            dataset=dataset, process=process, state=state, details=details
+        )
 
     @docstring(_ProcessManager)
     def get_dataset_state(self, dataset, process) -> Union[None, DatasetState]:

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview/version.py

@@ -76,10 +76,10 @@ RELEASE_LEVEL_VALUE = {
 }
 
 MAJOR = 0
-MINOR = 1
-MICRO = 3
+MINOR = 2
+MICRO = 1
 RELEV = "final"  # <16
-SERIAL = 1  # <16
+SERIAL = 0  # <16
 
 date = __date__
 

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/{processview-0.1.3-py3.7.egg-info → processview-0.2.1-py3.7.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: processview
-Version: 0.1.3
+Version: 0.2.1
 Summary: Library workflow process supervision
 Home-page: https://gitlab.esrf.fr/workflow/processview
 Author: data analysis unit

home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/{processview-0.1.3-py3.7.egg-info → processview-0.2.1-py3.7.egg-info}/SOURCES.txt

@@ -20,6 +20,7 @@ processview/core/manager/test/test_manager.py
 processview/core/test/__init__.py
 processview/gui/__init__.py
 processview/gui/icons.py
+processview/gui/messagebox.py
 processview/gui/processmanager.py
 processview/gui/test/__init__.py
 processview/gui/test/test_process_manager.py