Merge remote-tracking branch 'origin/develop' into docs/training

Author: SBlokhuizen

pyproject.toml

@@ -12,6 +12,7 @@ authors = [
 classifiers = [
 ]
 license = {file = "LICENSE.txt"}
+requires-python = ">=3.10"
 dependencies = [
     "numpy",
     "pandas",

waveform_editor/base_waveform.py

@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-from typing import Optional
 
 import imas
 import numpy as np
@@ -21,7 +20,7 @@ def __init__(self, yaml_str, name, dd_version):
 
     @abstractmethod
     def get_value(
-        self, time: Optional[np.ndarray] = None
+        self, time: np.ndarray | None = None
     ) -> tuple[np.ndarray, np.ndarray]:
         raise NotImplementedError
 

waveform_editor/derived_waveform.py

@@ -1,5 +1,4 @@
 import ast
-from typing import Optional
 
 import numpy as np
 from asteval import Interpreter
@@ -127,7 +126,7 @@ def _build_eval_context(self, time: np.ndarray) -> dict:
         return eval_context
 
     def get_value(
-        self, time: Optional[np.ndarray] = None
+        self, time: np.ndarray | None = None
     ) -> tuple[np.ndarray, np.ndarray]:
         """Evaluate the derived waveform expression at specified times.
 

waveform_editor/exporter.py

@@ -193,7 +193,9 @@ def _fill_waveforms(self, ids, waveforms):
         # Here, phase/angle should be filled for all 4 beams.
         # However, certain niche cases involving multiple slices for different waveforms
         # might still not be handled correctly.
-        for waveform, (path, values) in zip(waveforms, values_per_waveform):
+        for waveform, (path, values) in zip(
+            waveforms, values_per_waveform, strict=True
+        ):
             logger.debug(f"Filling {waveform.name}...")
             self._fill_nodes_recursively(ids, path, values)
             self._increment_progress()
@@ -228,7 +230,7 @@ def _fill_nodes_recursively(self, node, path, values, path_index=0, fill=True):
             if node.metadata.type.is_dynamic and part != path.parts[-1]:
                 if len(node) != len(values):
                     node.resize(len(values), keep=True)
-                for item, value in zip(node, values):
+                for item, value in zip(node, values, strict=True):
                     self._fill_nodes_recursively(item, path, value, next_index)
             else:
                 self._fill_nodes_recursively(node, path, values, next_index)

waveform_editor/gui/editor.py

@@ -1,5 +1,4 @@
 import textwrap
-from typing import Optional
 
 import panel as pn
 import param
@@ -53,7 +52,7 @@ def __init__(self, config):
         # Initialize empty
         self.set_waveform(None)
 
-    def set_waveform(self, waveform: Optional[str]) -> None:
+    def set_waveform(self, waveform: str | None) -> None:
         """Start editing a waveform.
 
         Args:

waveform_editor/gui/io/filebrowser.py

@@ -147,7 +147,7 @@ def _update_files(
             paths.insert(0, "..")
             abbreviated.insert(0, "⬆ ..")
 
-        options = dict(zip(abbreviated, paths))
+        options = dict(zip(abbreviated, paths, strict=True))
         self._selector.options = options
         self._selector.value = [s for s in selected if s in paths]
 

waveform_editor/gui/selector/selection_group.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING
 
 import panel as pn
 import param
@@ -20,7 +20,7 @@ class SelectionGroup(Viewer):
     def __init__(
         self,
         selector: "WaveformSelector",
-        group: Union[WaveformConfiguration, WaveformGroup],
+        group: WaveformConfiguration | WaveformGroup,
         path: list[str],
     ) -> None:
         name = getattr(group, "name", "")

waveform_editor/pcssp_exporter.py

@@ -79,5 +79,5 @@ def _add_trajectories(self, segment):
             ET.SubElement(trajectory, "EXIT_RULE", {"is": "Last"})
             reference = ET.SubElement(trajectory, "REFERENCE")
             values = waveform.get_value(self.times)[1]
-            for t, v in zip(self.times, values):
+            for t, v in zip(self.times, values, strict=True):
                 ET.SubElement(reference, "POINT", {"time": str(t), "value": str(v)})

waveform_editor/tendencies/base.py

@@ -1,5 +1,4 @@
 from abc import abstractmethod
-from typing import Optional
 
 import numpy as np
 import param
@@ -228,7 +227,7 @@ def _get_value_and_derivative(self, time):
 
     @abstractmethod
     def get_value(
-        self, time: Optional[np.ndarray] = None
+        self, time: np.ndarray | None = None
     ) -> tuple[np.ndarray, np.ndarray]:
         """Get the tendency values at the provided time array."""
         raise NotImplementedError()

waveform_editor/tendencies/constant.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import numpy as np
 import param
 from param import depends
@@ -22,7 +20,7 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
     def get_value(
-        self, time: Optional[np.ndarray] = None
+        self, time: np.ndarray | None = None
     ) -> tuple[np.ndarray, np.ndarray]:
         """Get the tendency values at the provided time array. If no time array is
         provided, a constant line containing the start and end points will be generated.