tomwer 1.3.26__py3-none-any.whl → 1.4.0__py3-none-any.whl

orangecontrib/tomwer/widgets/debugtools/ObjectInspectorOW.py

@@ -1,33 +1,5 @@
 # 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__ = "30/09/2020"
+from __future__ import annotations
 
 from orangewidget import gui, widget
 from orangewidget.widget import Input

orangecontrib/tomwer/widgets/edit/DarkFlatPatchOW.py

@@ -1,56 +1,23 @@
-# 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"
-
+from __future__ import annotations
 
 import logging
-from typing import Optional
 
 from orangewidget import gui
 from orangewidget.settings import Setting
-from orangewidget.widget import Input, Output
 from silx.io.url import DataUrl
 
 import tomwer.core.process.edit.darkflatpatch
-from tomwer.core.scan.nxtomoscan import NXtomoScan
-from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui.edit.dkrfpatch import DarkRefPatchWidget
-from tomwer.synctools.stacks.edit.darkflatpatch import DarkFlatPatchProcessStack
-from tomwer.utils import docstring
 
-from ...orange.managedprocess import SuperviseOW
-from ..utils import WidgetLongProcessing
+from ...orange.managedprocess import TomwerWithStackStack
 
 _logger = logging.getLogger(__name__)
 
 
-class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
+class DarkFlatPatchOW(
+    TomwerWithStackStack,
+    ewokstaskclass=tomwer.core.process.edit.darkflatpatch.DarkFlatPatchTask,
+):
     """
     Widget to define on the fly the image_key of a NXtomoScan
     """
@@ -78,23 +45,11 @@ class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
     resizing_enabled = True
 
     _urlsSetting = Setting(dict())
-
-    ewokstaskclass = tomwer.core.process.edit.darkflatpatch.DarkFlatPatchTask
-
-    class Inputs:
-        data = Input(name="data", type=TomwerScanBase)
-        config_in = Input(name="configuration", type=dict)
-
-    class Outputs:
-        data = Output(name="data", type=TomwerScanBase)
+    _ewoks_inputs_to_hide_from_orange = ("configuration", "serialize_output_data")
 
     def __init__(self, parent=None):
-        SuperviseOW.__init__(self, parent=parent)
-        WidgetLongProcessing.__init__(self)
+        super().__init__(parent=parent)
         layout = gui.vBox(self.mainArea, self.name).layout()
-        self._processingStack = DarkFlatPatchProcessStack(
-            self, process_id=self.process_id
-        )
 
         self.widget = DarkRefPatchWidget(parent=self)
         layout.addWidget(self.widget)
@@ -102,25 +57,34 @@ class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
         self.setConfiguration(self._urlsSetting)
 
         # connect signal / slot
-        self._processingStack.sigComputationStarted.connect(self._startProcessing)
-        self._processingStack.sigComputationEnded.connect(self._endProcessing)
+        self.task_executor_queue.sigComputationStarted.connect(self._startProcessing)
+        self.task_executor_queue.sigComputationEnded.connect(self._endProcessing)
         self.widget.sigConfigurationChanged.connect(self._updateSettings)
-
-    @Inputs.data
-    def process(self, scan):
-        if scan is None:
-            return
-        elif not isinstance(scan, NXtomoScan):
-            _logger.error("We can only patch dark and flat for NXtomoScan")
+        if isinstance(self.task_output_changed_callbacks, set):
+            self.task_output_changed_callbacks.add(self._notify_state)
+        elif isinstance(self.task_output_changed_callbacks, list):
+            self.task_output_changed_callbacks.append(self._notify_state)
         else:
-            self._processingStack.add(scan, self.getConfiguration())
+            raise NotImplementedError
 
-    @docstring(SuperviseOW)
     def reprocess(self, dataset):
-        self.process(dataset)
+        self.set_default_input(
+            "data",
+            dataset,
+        )
+
+    def get_task_inputs(self) -> dict:
+        task_inputs = super().get_task_inputs()
+        task_inputs.update(
+            {
+                "configuration": self.getConfiguration(),
+                "serialize_output_data": False,  # avoid serializing when using orange
+            }
+        )
+        return task_inputs
 
     def getConfiguration(self):
-        def cast_url_to_str(url: Optional[DataUrl]):
+        def cast_url_to_str(url: DataUrl | None):
             if url is None:
                 return None
             elif not isinstance(url, DataUrl):
@@ -137,7 +101,6 @@ class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
             "flats_end": cast_url_to_str(self.widget.getEndFlatUrl()),
         }
 
-    @Inputs.config_in
     def setConfiguration(self, config):
         if config is None:
             return
@@ -159,17 +122,17 @@ class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
             if url_key in config:
                 index = config.get(url_idx_key, 0)
                 url = config[url_key]
+                if isinstance(url, str):
+                    url = DataUrl(path=url)
                 if url not in (None, ""):
+                    assert isinstance(
+                        url, DataUrl
+                    ), "url is expected to be an url. Either as a str or as an instance of DataUrl"
                     try:
-                        setter(url=url, serie_index=index)
+                        setter(url=url, series_index=index)
                     except Exception as e:
                         _logger.error(e)
 
-    def _endProcessing(self, scan, future_tomo_obj):
-        WidgetLongProcessing._endProcessing(self, scan)
-        if scan is not None:
-            self.Outputs.data.send(scan)
-
     def _updateSettings(self):
         self._urlsSetting = self.getConfiguration()
         self._urlsSetting.update(
@@ -180,3 +143,15 @@ class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
                 "flats_end_index": self.widget.getEndFlatIndex(),
             }
         )
+
+    def _notify_state(self):
+        try:
+            task_executor = self.sender()
+            task_suceeded = task_executor.succeeded
+            scan = task_executor.current_task.inputs.data
+            if task_suceeded:
+                self.notify_succeed(scan=scan)
+            else:
+                self.notify_failed(scan=scan)
+        except Exception as e:
+            _logger.error(f"failed to handle task finished callback. Reason is {e}")

orangecontrib/tomwer/widgets/edit/ImageKeyEditorOW.py

@@ -1,53 +1,19 @@
-# 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__ = "28/10/2020"
-
-
 import logging
-
 from orangewidget import gui
-from orangewidget.widget import Input, Output
 
 import tomwer.core.process.edit.imagekeyeditor
-from tomwer.core.scan.nxtomoscan import NXtomoScan
-from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui.edit.imagekeyeditor import ImageKeyDialog
-from tomwer.synctools.stacks.edit.imagekeyeditor import ImageKeyEditorProcessStack
-from tomwer.utils import docstring
+from ewokscore.missing_data import MissingData
 
-from ...orange.managedprocess import SuperviseOW
-from ..utils import WidgetLongProcessing
+from ...orange.managedprocess import TomwerWithStackStack
 
 _logger = logging.getLogger(__name__)
 
 
-class ImageKeyEditorOW(SuperviseOW, WidgetLongProcessing):
+class ImageKeyEditorOW(
+    TomwerWithStackStack,
+    ewokstaskclass=tomwer.core.process.edit.imagekeyeditor.ImageKeyEditorTask,
+):
     """
     Widget to define on the fly the image_key of a NXtomoScan
     """
@@ -74,21 +40,11 @@ class ImageKeyEditorOW(SuperviseOW, WidgetLongProcessing):
     want_main_area = True
     resizing_enabled = True
 
-    ewokstaskclass = tomwer.core.process.edit.imagekeyeditor.ImageKeyEditorTask
-
-    class Inputs:
-        data = Input(name="data", type=TomwerScanBase)
-
-    class Outputs:
-        data = Output(name="data", type=TomwerScanBase)
+    _ewoks_inputs_to_hide_from_orange = ("configuration", "serialize_output_data")
 
     def __init__(self, parent=None):
-        SuperviseOW.__init__(self, parent=parent)
-        WidgetLongProcessing.__init__(self)
+        super().__init__(parent=parent)
         self._scan = None
-        self._processingStack = ImageKeyEditorProcessStack(
-            self, process_id=self.process_id
-        )
         layout = gui.vBox(self.mainArea, self.name).layout()
 
         self.widget = ImageKeyDialog(parent=self)
@@ -96,25 +52,34 @@ class ImageKeyEditorOW(SuperviseOW, WidgetLongProcessing):
 
         # connect signal / slot
         self.widget.sigValidated.connect(self._validateCallback)
-        self._processingStack.sigComputationStarted.connect(self._startProcessing)
-        self._processingStack.sigComputationEnded.connect(self._endProcessing)
-
-    @Inputs.data
-    def process(self, scan):
-        if scan is None:
-            return
-        elif not isinstance(scan, NXtomoScan):
-            _logger.error("You can only edit image keys for the HDF5 scans")
+        self.task_executor_queue.sigComputationStarted.connect(self._startProcessing)
+        self.task_executor_queue.sigComputationEnded.connect(self._endProcessing)
+        if isinstance(self.task_output_changed_callbacks, set):
+            self.task_output_changed_callbacks.add(self._notify_state)
+        elif isinstance(self.task_output_changed_callbacks, list):
+            self.task_output_changed_callbacks.append(self._notify_state)
         else:
-            self._scan = scan
-            self.widget.setScan(scan)
+            raise NotImplementedError
+
+    def handleNewSignals(self) -> None:
+        scan = self.get_task_input_value("data", MissingData)
+        if scan not in (None, MissingData):
+            if scan is not self._scan:
+                self._scan = scan
+                self.widget.setScan(scan)
+                self.notify_pending(scan=scan)
             self.activateWindow()
             self.raise_()
             self.show()
 
-    @docstring
-    def reprocess(self, dataset):
-        self.process(dataset)
+        # warning: avoid calling "handleNewSignals" else this will trigger the processing.
+        # here we want for the user to explicitly click on 'validate' to modify the image keys
+
+    def reprocess(self, scan):
+        self.set_default_input(
+            "data",
+            scan,
+        )
 
     def getConfiguration(self):
         return {
@@ -122,12 +87,20 @@ class ImageKeyEditorOW(SuperviseOW, WidgetLongProcessing):
         }
 
     def _validateCallback(self):
-        if self._scan is None:
-            return
-        self._processingStack.add(self._scan, configuration=self.getConfiguration())
-        self.accept()
-
-    def _endProcessing(self, scan, future_tomo_obj):
-        WidgetLongProcessing._endProcessing(self, scan)
-        if scan is not None:
-            self.Outputs.data.send(scan)
+        self.update_default_inputs(configuration=self.getConfiguration())
+        self.update_default_inputs(
+            serialize_output_data=False
+        )  # avoid serializing when using orange
+        self.execute_ewoks_task()
+
+    def _notify_state(self):
+        try:
+            task_executor = self.sender()
+            task_suceeded = task_executor.succeeded
+            scan = task_executor.current_task.inputs.data
+            if task_suceeded:
+                self.notify_succeed(scan=scan)
+            else:
+                self.notify_failed(scan=scan)
+        except Exception as e:
+            _logger.error(f"failed to handle task finished callback. Reason is {e}")

orangecontrib/tomwer/widgets/edit/ImageKeyUpgraderOW.py

@@ -1,32 +1,5 @@
 # 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__ = "28/10/2020"
+from __future__ import annotations
 
 
 import logging
@@ -118,7 +91,9 @@ class ImageKeyUpgraderOW(
         scan = task_arguments.get("inputs", {}).get("data", None)
         if scan is not None:
             self.notify_pending(scan=scan)
-        super()._execute_ewoks_task(propagate=propagate)
+        super()._execute_ewoks_task(  # pylint: disable=E1123
+            propagate=propagate, log_missing_inputs=False
+        )
 
     def _notify_state(self):
         try:
@@ -130,4 +105,4 @@ class ImageKeyUpgraderOW(
             else:
                 self.notify_failed(scan=scan)
         except Exception as e:
-            _logger.error(f"failed to handle task finished callback. Raiseon is {e}")
+            _logger.error(f"failed to handle task finished callback. Reason is {e}")

orangecontrib/tomwer/widgets/edit/NXtomoEditorOW.py

@@ -1,50 +1,36 @@
+from __future__ import annotations
+
 import logging
 
 from orangewidget import gui
 from orangewidget.settings import Setting
-from orangewidget.widget import Input, Output
 from silx.gui import qt
+from ewokscore.missing_data import MISSING_DATA
+
+from ...orange.managedprocess import TomwerWithStackStack
 
 from tomwer.core.scan.nxtomoscan import NXtomoScan
-from tomwer.core.scan.scanbase import TomwerScanBase
+import tomwer.core.process.edit.nxtomoeditor
 from tomwer.gui.edit.nxtomoeditor import NXtomoEditorDialog as _NXtomoEditorDialog
 
-from ...orange.managedprocess import SuperviseOW
+from ...orange.managedprocess import _SuperviseMixIn
 
 _logger = logging.getLogger(__name__)
 
 
 class NXtomoEditorDialog(_NXtomoEditorDialog):
+
     def __init__(self, parent, *args, **kwargs) -> None:
-        assert isinstance(parent, SuperviseOW)
-        self._ow = parent
-        # we need to save it become looks like orange is doing some stuff with parenting
+        assert isinstance(parent, _SuperviseMixIn)
         super().__init__(parent, *args, **kwargs)
 
-        # connect signal / slot
-        self._buttons.button(qt.QDialogButtonBox.Ok).released.connect(
-            self._overwriteNXtomo
-        )
 
-    def _overwriteNXtomo(self, *args, **kwargs):
-        scan = self.mainWidget.getScan()
-        if scan is not None:
-            assert isinstance(self._ow, SuperviseOW)
-            try:
-                self.overwriteNXtomo()
-            except Exception as e:
-                _logger.error(
-                    f"Fail to overwrite NXtomo ({scan.get_identifier().to_str()}). Error is {e}"
-                )
-                self._ow.notify_failed(scan=scan)
-            else:
-                self._ow.notify_succeed(scan=scan)
-            self._ow._validateScan(scan)
-
-
-class NXtomoEditorOW(SuperviseOW):
+class NXtomoEditorOW(
+    TomwerWithStackStack,
+    ewokstaskclass=tomwer.core.process.edit.nxtomoeditor.NXtomoEditorTask,
+):
     """
-    Widget to edit manually an NXtomo
+    Widget to edit manually a NXtomo
     """
 
     name = "nxtomo-editor"
@@ -64,18 +50,14 @@ class NXtomoEditorOW(SuperviseOW):
         "distance",
         "pixel size",
     ]
-
-    class Inputs:
-        data = Input(name="data", type=TomwerScanBase)
-
-    class Outputs:
-        data = Output(name="data", type=TomwerScanBase)
+    _ewoks_inputs_to_hide_from_orange = ("configuration",)
 
     want_main_area = True
+    want_control_area = False
     resizing_enabled = True
 
     sigScanReady = qt.Signal(str)
-    # used for test only for now
+    """emit when scan ready. Used for test only"""
 
     settings = Setting(dict())
 
@@ -86,36 +68,53 @@ class NXtomoEditorOW(SuperviseOW):
         self.widget = NXtomoEditorDialog(parent=self, hide_lockers=False)
         _layout.addWidget(self.widget)
         self.widget.mainWidget.sigEditingFinished.connect(self._updateSettings)
+
         # load settings
         self.widget.setConfiguration(self.settings)
 
+        # connect signal / slot
+        self.widget._buttons.button(qt.QDialogButtonBox.Ok).released.connect(
+            self.execute_ewoks_task
+        )
+
     def _updateSettings(self):
         self.settings = self.getConfiguration()
 
-    def _validateScan(self, scan):
-        self.Outputs.data.send(scan)
-        self.sigScanReady.emit(str(scan))
-        super().hide()
+    def handleNewSignals(self) -> None:
+        scan = self.get_task_input_value("data", MISSING_DATA)
+        if scan not in (MISSING_DATA, None):
+            self._setScan(scan=scan)
+        # return super().handleNewSignals() do not call to make sure the processing is not triggered
 
-    @Inputs.data
-    def setScan(self, scan):
+    def setScan(self, scan: NXtomoScan | None):
+        self.set_dynamic_input("data", scan)
         self._setScan(scan=scan)
 
-    def _setScan(self, scan):
-        if scan is None:
-            pass
-        elif not isinstance(scan, NXtomoScan):
+    def _setScan(self, scan: NXtomoScan | None):
+        if not isinstance(scan, NXtomoScan):
             raise TypeError(
                 f"expect to have an instance of {NXtomoScan}. {type(scan)} provided."
             )
+
+        self.widget.setScan(scan)
+        if self.widget.hasLockField():
+            super().execute_ewoks_task()
         else:
-            self.widget.setScan(scan)
-            if self.widget.hasLockField():
-                self.widget._overwriteNXtomo()
-                # note: _overwriteNXtomo will trigger the scan validation
-            else:
-                self.show()
-                self.raise_()
+            self.show()
+            self.raise_()
+
+    def task_output_changed(self) -> None:
+        self.sigScanReady.emit(str(self.get_task_output_value("data")))
+        super().task_output_changed()
+
+    def get_task_inputs(self):
+        task_inputs = super().get_task_inputs()
+        task_inputs.update(
+            {
+                "configuration": self.widget.getConfigurationForTask(),
+            }
+        )
+        return task_inputs
 
     def sizeHint(self):
         return qt.QSize(400, 500)

orangecontrib/tomwer/widgets/other/PythonScriptOW.py

@@ -15,7 +15,7 @@ from orangewidget.settings import Setting, SettingsHandler
 from orangewidget.utils import itemmodels
 from orangewidget.widget import Input, Output, OWBaseWidget
 from silx.gui import qt
-from tomoscan.serie import Serie
+from tomoscan.series import Series
 
 import tomwer.core.process.script.python
 from tomwer.core.cluster.cluster import SlurmClusterConfiguration
@@ -366,6 +366,18 @@ class PrepareSavingSettingsHandler(SettingsHandler):
     """Calls storeSpecificSettings, which is currently not called from non-context handlers."""
 
     def pack_data(self, widget):
+        """
+        Pack the settings for the given widget. This method is used when
+        saving schema, so that when the schema is reloaded the widget is
+        initialized with its proper data and not the class-based defaults.
+        See :obj:`SettingsHandler.initialize` for detailed explanation of its
+        use.
+
+        Inherited classes add other data, in particular widget-specific
+        local contexts.
+
+        :param OWBaseWidget widget:
+        """
         widget.storeSpecificSettings()
         return super().pack_data(widget)
 
@@ -431,10 +443,10 @@ class OWPythonScript(widget.OWBaseWidget, openclass=True):
             default=True,
             multiple=True,
         )
-        serie = Input(
-            "serie",
-            Serie,
-            replaces=["in_serie"],
+        series = Input(
+            "series",
+            Series,
+            replaces=["in_series"],
             default=True,
             multiple=True,
         )
@@ -452,7 +464,7 @@ class OWPythonScript(widget.OWBaseWidget, openclass=True):
         cluster_config = Output(
             "cluster_config", SlurmClusterConfiguration, replaces=["out_cluster_config"]
         )
-        serie = Output("serie", dict, replaces=["out_serie"])
+        series = Output("series", dict, replaces=["out_series"])
 
     signal_names = (
         "data",
@@ -461,7 +473,7 @@ class OWPythonScript(widget.OWBaseWidget, openclass=True):
         "object",
         "configuration",
         "cluster_config",
-        "serie",
+        "series",
         "tomo_obj",
         "tomo_objs",
     )
@@ -657,9 +669,9 @@ class OWPythonScript(widget.OWBaseWidget, openclass=True):
     def set_cluster_config(self, data, id):  # noqa F811 pylint: disable=E0102
         self.handle_input(data, id, "cluster_config")
 
-    @Inputs.serie  # noqa F811
-    def set_serie(self, data, id):
-        self.handle_input(data, id, "serie")
+    @Inputs.series  # noqa F811
+    def set_series(self, data, id):
+        self.handle_input(data, id, "series")
 
     @Inputs.tomo_obj  # noqa F811
     def set_tomo_obj(self, tomo_obj, id):