tomwer 1.2.0a1__py3-none-any.whl → 1.2.0a3__py3-none-any.whl

tomwer/gui/cluster/supervisor.py

@@ -88,11 +88,6 @@ class FutureTomwerScanObserverWidget(qt.QWidget):
 
         # set up
         self._convertWhenFinished.setChecked(True)
-        h_header = self.observationTable.horizontalHeader()
-        for column_index in (0, 2, 3, 4):
-            h_header.setSectionResizeMode(column_index, qt.QHeaderView.Interactive)
-        for column_index in (1,):
-            h_header.setSectionResizeMode(column_index, qt.QHeaderView.Stretch)
 
         # connect signal / slot
         self.filterWidget.sigChanged.connect(self._filterUpdated)
@@ -249,12 +244,12 @@ class _DatasetProcessModel(qt.QAbstractTableModel):
         )
         if trigger_update:
             self._tomoObjStatus[future_tomo_obj] = status
+            obj_index = list(self._tomoObjStatus.keys()).index(future_tomo_obj)
             try:
                 self.sigStatusUpdated.emit(future_tomo_obj, status)
             except Exception:
                 pass
             else:
-                obj_index = list(self._tomoObjStatus.keys()).index(future_tomo_obj)
                 self.dataChanged.emit(
                     self.createIndex(obj_index, 0),
                     self.createIndex(obj_index, len(self._headers) - 1),
@@ -353,11 +348,21 @@ class _DatasetProcessModel(qt.QAbstractTableModel):
 
 
 class ObservationTable(qt.QTableView):
-    def __init__(self, parent):
-        qt.QTableView.__init__(self, parent)
-
-        # QMenu
-        self.menu = qt.QMenu(self)
+    def sizeHintForColumn(self, column):
+        # warning: to be called we need to call resizeColumnsToContents upper
+        if column == 1:  # dataset column
+            return 400
+        elif column in (
+            0,
+            2,
+            3,
+            4,
+        ):  # start-time, status, requester, slurm-job
+            return 55
+        elif column == 5:
+            return 200
+        else:
+            return super().sizeHintForColumn(column)
 
 
 class FilterWidget(qt.QGroupBox):

tomwer/gui/cluster/test/test_cluster.py

@@ -32,8 +32,13 @@ from silx.gui import qt
 from silx.gui.utils.testutils import TestCaseQt
 
 from tomwer.core.settings import SlurmSettings
-from tomwer.gui.cluster.slurm import SlurmSettingsWidget
+from tomwer.gui.cluster.slurm import (
+    SlurmSettingsMode,
+    SlurmSettingsWidget,
+    SlurmSettingsWindow,
+)
 from tomwer.tests.utils import skip_gui_test
+from tomwer.tests.conftest import qtapp  # noqa F401
 
 
 @pytest.mark.skipif(skip_gui_test(), reason="skip gui test")
@@ -78,3 +83,13 @@ class TestSlurmWidget(TestCaseQt):
         assert self.slurmWidget.getMemory() == 156
         assert self.slurmWidget.getQueue() == "test-queue"
         assert self.slurmWidget.getNGPU() == 5
+
+
+def test_SlurmSettingsWindow(qtapp):  # noqa F811
+    """
+    test that slurm SettingsWindow can load all the different slurm settings modes
+    """
+    widget = SlurmSettingsWindow()
+    for mode in SlurmSettingsMode:
+        widget.setCurrentSettingsMode(mode)
+        widget.getConfiguration()

tomwer/gui/conditions/filter.py

@@ -34,7 +34,7 @@ __date__ = "19/07/2018"
 
 from silx.gui import qt
 
-from tomwer.core.process.conditions.filters import FileNameFilter
+from tomwer.core.process.conditions.filters import FileNameFilterTask
 from tomwer.gui import icons
 from tomwer.gui.utils.sandboxes import (
     RegularExpressionSandBox,
@@ -66,7 +66,7 @@ class FileNameFilterWidget(qt.QWidget):
 
         self.layout().addWidget(qt.QLabel("filter type:", self), 1, 0)
         self._filterTypeCB = qt.QComboBox(parent=self)
-        for filter_type in FileNameFilter.FILTER_TYPES:
+        for filter_type in FileNameFilterTask.FILTER_TYPES:
             self._filterTypeCB.addItem(filter_type)
         self.layout().addWidget(self._filterTypeCB, 1, 1, 1, 2)
 
@@ -84,7 +84,7 @@ class FileNameFilterWidget(qt.QWidget):
 
         # set up
         self._sandBoxPB.setVisible(False)
-        self._filterTypeCB.setCurrentText(FileNameFilter._DEFAULT_FILTER_TYPE)
+        self._filterTypeCB.setCurrentText(FileNameFilterTask._DEFAULT_FILTER_TYPE)
 
         self.sandboxDialog = None
 

tomwer/gui/control/datalist.py

@@ -509,7 +509,9 @@ class GenericScanListDialog(_DataListDialog):
         files_or_folders = dialog.files_selected()
         added_scans = []
         for file_or_folder in files_or_folders:
-            added_scans.extend(self.add(file_or_folder))
+            new_scans = self.add(file_or_folder)
+            if new_scans is not None:
+                added_scans.extend(new_scans)
         super()._callbackAddPath()
         self.datalist.setMySelection(added_scans)
 
@@ -530,7 +532,9 @@ class VolumeListDialog(_DataListDialog):
         files_or_folders = dialog.files_selected()
         added_volumes = []
         for file_or_folder in files_or_folders:
-            added_volumes.extend(self.add(file_or_folder))
+            new_volumes = self.add(file_or_folder)
+            if new_volumes is not None:
+                added_volumes.extend(new_volumes)
         super()._callbackAddPath()
         self.datalist.setMySelection(added_volumes)
 
@@ -765,18 +769,27 @@ class _TomwerObjectList(qt.QTableWidget):
 
     def _copyRequested(self):
         clipboard = qt.QGuiApplication.clipboard()
-        if isinstance(self._copy_target, TomwerObject):
-            clipboard.setText(self._copy_target.get_identifier().to_str())
-        else:
-            clipboard.setText(str(self._copy_target))
+
+        def get_info(item):
+            user_data = item.data(qt.Qt.UserRole)
+            if isinstance(user_data, TomwerObject):
+                return user_data.get_identifier().to_str()
+            else:
+                return str(user_data)
+
+        selection = [get_info(item) for item in self.selectedItems()]
+        clipboard.setText("\n".join(selection))
 
     def _pasteRequested(self):
         clipboard = qt.QGuiApplication.clipboard()
-        identifier = clipboard.text()
-        try:
-            self.add(identifier)
-        except Exception as e:
-            logger.error(f"Failed to add {identifier}. Error is {e}")
+        identifiers = clipboard.text()
+        # handle paste of several lines...
+        identifiers.replace(";", "\n")
+        for identifier in identifiers.split("\n"):
+            try:
+                self.add(identifier)
+            except Exception as e:
+                logger.error(f"Failed to add {identifier}. Error is {e}")
 
 
 class GenericScanList(_TomwerObjectList):

tomwer/gui/control/email.py

@@ -0,0 +1,183 @@
+from typing import Optional
+from silx.gui import qt
+from tomwer.gui import icons as tomwericons
+from tomwer.core.utils import concatenate_dict
+
+
+class EmailComposition(qt.QWidget):
+    """
+    Widget used to compose an email
+
+    Please see https://confluence.esrf.fr/display/SCKB/Rules+about+email for email rules at esrf
+    """
+
+    sigChanged = qt.Signal()
+    """emit when the composition changed"""
+
+    def __init__(self, parent: Optional[qt.QWidget]) -> None:
+        super().__init__(parent)
+        self.setLayout(qt.QFormLayout())
+        # from
+        self._fromAddressesQLE = qt.QLineEdit(self)
+        singleEmailValidator = qt.QRegularExpressionValidator(
+            qt.QRegularExpression(
+                r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)"
+            ),
+            self._fromAddressesQLE,
+        )
+        self._fromAddressesQLE.setValidator(singleEmailValidator)
+        self.layout().addRow("from", self._fromAddressesQLE)
+        # to
+        self._toAdressesQLE = qt.QLineEdit(self)
+        severalEmailValidator = qt.QRegularExpressionValidator(
+            qt.QRegularExpression(
+                r"(([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)(\s*;\s*|\s*$))*"
+            ),
+            self,
+        )
+        self._toAdressesQLE.setValidator(severalEmailValidator)
+        self.layout().addRow("to", self._toAdressesQLE)
+        # subject
+        self._subjectQLE = qt.QLineEdit("tomwer: {tomo_obj_short_id} received", self)
+        tooltip = """
+        this section can contain some predefine `keywords` and will be formatting before sending the email.\n
+        Reserve keywords are: \n
+        - {tomo_obj_short_id}: tomo_obj short identifier
+        - {tomo_obj_id}: tomo_obj id
+        - {ls_tomo_obj}: ls of the scan folder
+        - {timestamp}: current time
+        - {footnote}: some footnote defined by tomwer
+        - {dataset_processing_states}: list dataset state regarding met processes
+        """
+        self._subjectQLE.setToolTip(tooltip)
+        self.layout().addRow("subject", self._subjectQLE)
+        # text
+        self._textQLE = qt.QPlainTextEdit(
+            "{tomo_obj_id} received at {timestamp} \n\nprocesses:\n{dataset_processing_states}\n\nfile listening:\n{ls_tomo_obj}\n\nInfo: {footnote}"
+        )
+        self._textQLE.setToolTip(tooltip)
+        self.layout().addRow(self._textQLE)
+
+        # connect signal / slot
+        self._fromAddressesQLE.editingFinished.connect(self._changed)
+        self._toAdressesQLE.editingFinished.connect(self._changed)
+        self._subjectQLE.editingFinished.connect(self._changed)
+        self._textQLE.textChanged.connect(self._changed)
+
+    def _changed(self):
+        self.sigChanged.emit()
+
+    def getToAddrs(self) -> tuple:
+        adresses = self._toAdressesQLE.text().replace(" ", "")
+        adresses.replace(",", ";")
+        return tuple(set(adresses.split(";")))
+
+    def getConfiguration(self) -> dict:
+        return {
+            "subject": self._subjectQLE.text(),
+            "from_addr": self._fromAddressesQLE.text(),
+            "to_addrs": self.getToAddrs(),
+            "text": self._textQLE.toPlainText(),
+        }
+
+    def setConfiguration(self, config: dict):
+        assert isinstance(config, dict)
+        subject = config.get("subject", None)
+        if subject is not None:
+            self._subjectQLE.setText(str(subject))
+        from_addr = config.get("from_addr", None)
+        if from_addr is not None:
+            self._fromAddressesQLE.setText(str(from_addr))
+        to_addrs = config.get("to_addrs", None)
+        if to_addrs is not None:
+            if not isinstance(to_addrs, str):
+                to_addrs = ";".join(to_addrs)
+            self._toAdressesQLE.setText(str(to_addrs))
+        text = config.get("text", None)
+        if text is not None:
+            self._textQLE.setPlainText(str(text))
+
+
+class EmailSettings(qt.QWidget):
+    """
+    Widget to set up mail server
+    """
+
+    sigChanged = qt.Signal()
+    """emit when the settings changed"""
+
+    def __init__(self, parent: Optional[qt.QWidget]) -> None:
+        super().__init__(parent)
+        self.setLayout(qt.QFormLayout(self))
+        # server
+        self._hostQLE = qt.QLineEdit("smtps.esrf.fr", self)
+        self.layout().addRow("host", self._hostQLE)
+        # port
+        self._portQLE = qt.QLineEdit("0", self)
+        self._portQLE.setValidator(qt.QIntValidator(self._portQLE))
+        self.layout().addRow("port", self._portQLE)
+
+        # connect signal / slot
+        self._hostQLE.editingFinished.connect(self._changed)
+        self._portQLE.editingFinished.connect(self._changed)
+
+    def _changed(self):
+        self.sigChanged.emit()
+
+    def getConfiguration(self) -> dict:
+        return {"host": self._hostQLE.text(), "port": int(self._portQLE.text())}
+
+    def setConfiguration(self, config: dict):
+        server = config.get("host", None)
+        if server is not None:
+            self._hostQLE.setText(str(server))
+        port = config.get("port", None)
+        if port is not None:
+            self._portQLE.setText(str(port))
+
+
+class Emailwidget(qt.QTabWidget):
+    """
+    Main widget to send email
+    """
+
+    sigChanged = qt.Signal()
+    """emit when the email settings or composition changed"""
+
+    def __init__(self, parent: Optional[qt.QWidget] = None) -> None:
+        super().__init__(parent)
+
+        self.setTabPosition(qt.QTabWidget.East)
+
+        self._compositionWidget = EmailComposition(self)
+        composeIcon = tomwericons.getQIcon("compose")
+        self.addTab(
+            self._compositionWidget,
+            composeIcon,
+            "",
+        )
+
+        self._serverSettingsWidget = EmailSettings(self)
+        settingsIcon = tomwericons.getQIcon("parameters")
+        self.addTab(
+            self._serverSettingsWidget,
+            settingsIcon,
+            "",
+        )
+
+        # connect signal / slot
+        self._compositionWidget.sigChanged.connect(self._changed)
+        self._serverSettingsWidget.sigChanged.connect(self._changed)
+
+    def _changed(self):
+        self.sigChanged.emit()
+
+    def getConfiguration(self) -> dict:
+        return concatenate_dict(
+            self._serverSettingsWidget.getConfiguration(),
+            self._compositionWidget.getConfiguration(),
+        )
+
+    def setConfiguration(self, config: dict):
+        self._serverSettingsWidget.setConfiguration(config)
+        self._compositionWidget.setConfiguration(config)