processview 0.1.2b1__tar.gz → 0.2.0__tar.gz

{home/payno/.local/share/virtualenvs/tomwer_venv → users/payno/.local/share/virtualenvs/tomwer_venc}/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
@@ -74,6 +75,8 @@ class ProcessManager:
         """check if a dataset has already met a dataset"""
         if isinstance(dataset, DatasetIdentifier):
             dataset_id = dataset
+        elif dataset is None:
+            return False
         else:
             dataset_id = dataset.get_dataset_identifier()
         if process.process_id in self._dataset_process_states:

{home/payno/.local/share/virtualenvs/tomwer_venv → users/payno/.local/share/virtualenvs/tomwer_venc}/lib/python3.7/site-packages/processview/core/manager/test/test_manager.py

@@ -33,6 +33,7 @@ from processview.core.superviseprocess import SuperviseProcess
 from processview.core.manager import ProcessManager
 from processview.core.manager import DatasetState
 from processview.core.dataset import Dataset
+from processview.core.dataset import DatasetIdentifier
 import gc
 
 
@@ -99,7 +100,10 @@ class TestProcessManager(unittest.TestCase):
         # test 'getProcessHistory'
         self.assertEqual(
             manager.get_process_history(process=p1),
-            ((str(scan_1), DatasetState.PENDING), (str(scan_2), DatasetState.SUCCEED)),
+            (
+                (scan_1.get_dataset_identifier(), DatasetState.PENDING),
+                (scan_2.get_dataset_identifier(), DatasetState.SUCCEED),
+            ),
         )
 
 
@@ -111,9 +115,24 @@ class _DummyScan(Dataset):
     def __str__(self) -> str:
         return self.name
 
-    def short_str(self):
+    def get_dataset_identifier(self) -> DatasetIdentifier:
+        return _DummyIdentifier(self)
+
+
+class _DummyIdentifier(DatasetIdentifier):
+    def __init__(self, dataset):
+        super().__init__(dataset)
+        self.name = dataset.name
+
+    def __str__(self):
         return self.name
 
+    def __eq__(self, other):
+        return self.name == other.name
+
+    def __hash__(self):
+        return hash(self.name)
+
 
 def suite():
     test_suite = unittest.TestSuite()

users/payno/.local/share/virtualenvs/tomwer_venc/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 → users/payno/.local/share/virtualenvs/tomwer_venc}/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
 }
 
 
@@ -66,10 +68,16 @@ class ProcessManagerWindow(qt.QMainWindow):
 class ObservationTable(qt.QTableView):
     def __init__(self, parent):
         qt.QTableView.__init__(self, parent)
+
+        # QMenu
         self.menu = qt.QMenu()
-        self.action = qt.QAction("reprocess")
-        self.action.triggered.connect(self._requestReprocessing)
-        self.menu.addAction(self.action)
+        self._reprocessAction = qt.QAction("reprocess")
+        self._reprocessAction.triggered.connect(self._requestReprocessing)
+        self.menu.addAction(self._reprocessAction)
+        self._infoAction = qt.QAction("info")
+        self._infoAction.triggered.connect(self._requestInfo)
+        self.menu.addAction(self._infoAction)
+
         self._target = (None, None)
         # register target of the last menu (process, DatasetIdentifier)
 
@@ -103,6 +111,22 @@ class ObservationTable(qt.QTableView):
             assert isinstance(dataset, DatasetIdentifier)
             process.reprocess(dataset.recreate_dataset())
 
+    def _requestInfo(self, *args, **kwargs):
+        process, dataset = self._target
+        if process is not None and dataset is not None:
+            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.setWindowModality(qt.Qt.NonModal)
+            msg.show()
+
 
 class ProcessManagerWidget(qt.QWidget):
     def __init__(self, parent):
@@ -119,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())
         )
@@ -473,8 +496,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]:

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/processview/gui/test/__init__.py

@@ -0,0 +1,38 @@
+# coding: utf-8
+# /*##########################################################################
+#
+# Copyright (c) 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__ = "01/02/2021"
+
+import unittest
+
+from .test_process_manager import suite as test_process_manager_suite
+
+
+def suite():
+    test_suite = unittest.TestSuite()
+    test_suite.addTest(test_process_manager_suite())
+    return test_suite

users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/processview/gui/test/test_process_manager.py

@@ -0,0 +1,108 @@
+# 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__ = "02/11/2020"
+
+
+import unittest
+from processview.core.superviseprocess import SuperviseProcess
+from processview.core.dataset import Dataset
+from processview.core.dataset import DatasetIdentifier
+from processview.gui.processmanager import ProcessManager
+from processview.core.manager import DatasetState
+from silx.gui.utils.testutils import SignalListener
+from silx.gui.utils.testutils import TestCaseQt
+import gc
+
+
+class TestProcessManager(TestCaseQt):
+    """
+    test ProcessManager
+    """
+
+    def setUp(self):
+        TestCaseQt.setUp(self)
+        self.signalListener = SignalListener()
+        self.manager = ProcessManager()
+        self.manager.sigUpdated.connect(self.signalListener)
+
+    def tearDown(self):
+        self.signalListener = None
+        self.processManager = None
+        gc.collect()
+        TestCaseQt.tearDown(self)
+
+    def testProcessStatesUpdate(self):
+        """insure providing states works well"""
+        p1 = SuperviseProcess()
+        p2 = SuperviseProcess()
+        scan_1 = _DummyScan("scan1")
+        scan_2 = _DummyScan("scan2")
+        self.manager.notify_dataset_state(
+            dataset=scan_1, state=DatasetState.PENDING, process=p1
+        )
+        self.manager.notify_dataset_state(
+            dataset=scan_2, state=DatasetState.SUCCEED, process=p1
+        )
+        self.manager.notify_dataset_state(
+            dataset=scan_2, state=DatasetState.FAILED, process=p2
+        )
+        self.assertEqual(self.signalListener.callCount(), 3)
+
+
+class _DummyScan(Dataset):
+    def __init__(self, name):
+        super().__init__()
+        self.name = name
+
+    def __str__(self) -> str:
+        return self.name
+
+    def get_dataset_identifier(self) -> DatasetIdentifier:
+        return _DummyIdentifier(self)
+
+
+class _DummyIdentifier(DatasetIdentifier):
+    def __init__(self, dataset):
+        super().__init__(dataset)
+        self.name = dataset.name
+
+    def __str__(self):
+        return self.name
+
+    def __eq__(self, other):
+        return self.name == other.name
+
+    def __hash__(self):
+        return hash(self.name)
+
+
+def suite():
+    test_suite = unittest.TestSuite()
+    for ui in (TestProcessManager,):
+        test_suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ui))
+    return test_suite

{home/payno/.local/share/virtualenvs/tomwer_venv → users/payno/.local/share/virtualenvs/tomwer_venc}/lib/python3.7/site-packages/processview/test/__init__.py

@@ -30,11 +30,13 @@ __date__ = "29/01/2021"
 
 import unittest
 from ..core import test as test_core
+from ..gui import test as test_gui
 
 
 def suite(loader=None):
     test_suite = unittest.TestSuite()
     test_suite.addTest(test_core.suite())
+    test_suite.addTest(test_gui.suite())
 
     return test_suite
 

{home/payno/.local/share/virtualenvs/tomwer_venv → users/payno/.local/share/virtualenvs/tomwer_venc}/lib/python3.7/site-packages/processview/version.py

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

{home/payno/.local/share/virtualenvs/tomwer_venv/lib/python3.7/site-packages/processview-0.1.2b1-py3.7.egg-info → users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/processview-0.2.0-py3.7.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: processview
-Version: 0.1.2b1
+Version: 0.2.0
 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.2b1-py3.7.egg-info → users/payno/.local/share/virtualenvs/tomwer_venc/lib/python3.7/site-packages/processview-0.2.0-py3.7.egg-info}/SOURCES.txt

@@ -20,7 +20,10 @@ 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
 processview/resources/__init__.py
 processview/resources/gui/icons/advancement.png
 processview/resources/gui/icons/advancement.svg