Merge remote-tracking branch 'origin/main' into 366-feature-add-generic-elementholder-collection-access

Author: gupichon-soleil

.github/workflows/dt4acc-integration.yml

@@ -60,8 +60,8 @@ jobs:
           python -m pip install -e ".[test]"
           python -m pip install "ophyd-async[tango, ca, pva]"
           python -m pip install --no-deps \
-            "tango-pyaml @ git+https://github.com/python-accelerator-middle-layer/tango-pyaml.git" \
-            "pyaml-cs-oa @ git+https://github.com/python-accelerator-middle-layer/pyaml-cs-oa.git"
+            "tango-pyaml @ git+https://github.com/python-accelerator-middle-layer/tango-pyaml.git@1f010735bd675ad2f918958abd0396cb6766f14e" \
+            "pyaml-cs-oa @ git+https://github.com/python-accelerator-middle-layer/pyaml-cs-oa.git@0.2.0"
           python -c "import tango; import tango.pyaml; import pyaml_cs_oa"
 
       - name: Log in to GitLab registry
@@ -85,9 +85,12 @@ jobs:
           LOG_FILE="${RUNNER_TEMP}/dt4acc-twin.log"
           PID_FILE="${RUNNER_TEMP}/dt4acc-twin.pid"
 
+          ACCEL_SETUP_FILE=$(python -c "from pyaml_test_lattice import configurations; print(configurations['dt4acc/fodo_1gev_6d_dt4acc_tango.json'])")
+          LATTICE_FILE=$(python -c "from pyaml_test_lattice import lattices; print(lattices['fodo_1gev_6d.json'])")
+
           bash tests/integration/start_dt4acc_twin.sh \
-            --accelerator-setup-file "${GITHUB_WORKSPACE}/tests/integration/data/fodo_1gev_6d/fodo_1gev_6d_dt4acc.json" \
-            --lattice-file "${GITHUB_WORKSPACE}/tests/integration/data/fodo_1gev_6d/fodo_1gev_6d.json" \
+            --accelerator-setup-file "${ACCEL_SETUP_FILE}" \
+            --lattice-file "${LATTICE_FILE}" \
             --tango-host "${TANGO_HOST%:*}" \
             --tango-port "${TANGO_HOST##*:}" \
             --sif "${RUNNER_TEMP}/apptainer/dt4acc-soleil-twin.sif" \

pyaml/bpm/bpm.py

@@ -1,13 +1,16 @@
 """Beam-position monitor elements and their runtime interfaces."""
 
 import copy
-from typing import Self
+from typing import TYPE_CHECKING, Self
 
 from ..common.abstract import ReadFloatArray, ReadWriteFloatArray, ReadWriteFloatScalar
 from ..common.element import Element, __pyaml_repr__
 from ..common.exception import PyAMLException
 from ..validation import DynamicValidation, register_schema
 
+if TYPE_CHECKING:
+    from ..common.holders.element_holder import ElementHolder
+
 PYAMLCLASS = "BPM"
 
 
@@ -176,7 +179,7 @@ def attach(
         obj._peer = peer
         return obj
 
-    def _fill_device(self, holder) -> None:
+    def _fill_device(self, holder: "ElementHolder") -> None:
         holder._fill_bpm(self)
 
     def get_pos_devices(self) -> list[str | None]:

pyaml/common/element.py

@@ -268,6 +268,12 @@ def attached_to(self) -> str:
         """
         return "None" if self._peer is None else f"{self._peer.__class__.__name__}:{self._peer.name()}"
 
+    def _fill_device(self, holder: "ElementHolder"):
+        """
+        Add this element to a holder (Simultor or ControlSystem)
+        """
+        raise PyAMLException(f"__fill_device() is not implemented for {self.__class__.__name__}")
+
     def post_init(self):
         """
         Perform post-construction initialization after attachment.

pyaml/configuration/unbound_element.py

@@ -6,11 +6,16 @@
 known and the concrete element can be instantiated.
 """
 
+from typing import TYPE_CHECKING
+
 from pydantic import BaseModel
 
 from ..common.element import Element
 from ..common.exception import PyAMLConfigException
 
+if TYPE_CHECKING:
+    from ..common.holders.element_holder import ElementHolder
+
 
 class UnboundElement(Element):
     """
@@ -54,7 +59,7 @@ def __repr__(self):
             self._module_name,
         )
 
-    def _fill_device(self, holder) -> None:
+    def _fill_device(self, holder: "ElementHolder") -> None:
         holder._fill_unbound_element(self)
 
     def instantiate(self, holder) -> Element:

pyaml/diagnostics/tune_monitor.py

@@ -6,7 +6,7 @@
 """
 
 import copy
-from typing import Self
+from typing import TYPE_CHECKING, Self
 
 from numpy.typing import NDArray
 
@@ -15,6 +15,9 @@
 from ..validation import DynamicValidation, register_schema
 from .atune_monitor import ABetatronTuneMonitor
 
+if TYPE_CHECKING:
+    from ..common.holders.element_holder import ElementHolder
+
 PYAMLCLASS = "BetatronTuneMonitor"
 
 
@@ -90,7 +93,7 @@ def set_harmonic(self, h: int):
         """
         self._h = float(h)
 
-    def _fill_device(self, holder) -> None:
+    def _fill_device(self, holder: "ElementHolder") -> None:
         holder._fill_betatron_tune_monitor(self)
 
     @property

pyaml/magnet/cfm_magnet.py

@@ -5,6 +5,8 @@
 provide separate strength and hardware access for those components.
 """
 
+from typing import TYPE_CHECKING
+
 from scipy.constants import speed_of_light
 
 from ..common import abstract
@@ -24,6 +26,9 @@
 from .skewsext import SkewSext
 from .vcorrector import VCorrector
 
+if TYPE_CHECKING:
+    from ..common.holders.element_holder import ElementHolder
+
 _fmap: dict = {
     "B0": HCorrector,
     "A0": VCorrector,
@@ -131,7 +136,7 @@ def __init__(
             # Attach
             self._peer = peer
 
-    def _fill_device(self, holder) -> None:
+    def _fill_device(self, holder: "ElementHolder") -> None:
         holder._fill_combined_function_magnet(self)
 
     def get_model_name(self) -> str:

pyaml/magnet/magnet.py

@@ -6,7 +6,7 @@
 """
 
 import copy
-from typing import Self
+from typing import TYPE_CHECKING, Self
 
 import numpy as np
 from scipy.constants import speed_of_light
@@ -16,6 +16,9 @@
 from ..common.element import Element
 from .model import MagnetModel
 
+if TYPE_CHECKING:
+    from ..common.holders.element_holder import ElementHolder
+
 
 class Magnet(Element):
     """
@@ -131,7 +134,7 @@ def attach(
         obj._peer = peer
         return obj
 
-    def _fill_device(self, holder) -> None:
+    def _fill_device(self, holder: "ElementHolder") -> None:
         holder._fill_magnet(self)
 
     def set_energy(self, energy: float):

pyaml/magnet/serialized_magnet.py

@@ -4,6 +4,8 @@
 This module defines magnet elements composed of multiple serialized magnets.
 """
 
+from typing import TYPE_CHECKING
+
 import numpy as np
 from scipy.constants import speed_of_light
 
@@ -16,6 +18,9 @@
 from .magnet import Magnet
 from .model import MagnetModel
 
+if TYPE_CHECKING:
+    from ..common.holders.element_holder import ElementHolder
+
 # Define the main class name for this module
 PYAMLCLASS = "SerializedMagnets"
 
@@ -257,7 +262,7 @@ def __init__(
             # Attach
             self._peer = peer
 
-    def _fill_device(self, holder) -> None:
+    def _fill_device(self, holder: "ElementHolder") -> None:
         holder._fill_serialized_magnets(self)
 
     def __create_virtual_magnet(self, name: str) -> Magnet:

pyaml/rf/rf_plant.py

@@ -7,14 +7,17 @@
 """
 
 import copy
-from typing import Self
+from typing import TYPE_CHECKING, Self
 
 from .. import PyAMLException
 from ..common import abstract
 from ..common.element import Element, __pyaml_repr__
 from ..validation import DynamicValidation, register_schema
 from .rf_transmitter import RFTransmitter
 
+if TYPE_CHECKING:
+    from ..common.holders.element_holder import ElementHolder
+
 # Define the main class name for this module
 PYAMLCLASS = "RFPlant"
 
@@ -115,7 +118,7 @@ def attach(
         obj._peer = peer
         return obj
 
-    def _fill_device(self, holder) -> None:
+    def _fill_device(self, holder: "ElementHolder") -> None:
         holder._fill_rf_plant(self)
 
 

pyproject.toml

@@ -50,6 +50,7 @@ cs-oa-tango = [
 test = [
     "pytest>=7.4",
     "pytest-cov>=3.0",
+    "pyaml-test-lattice @ git+https://github.com/python-accelerator-middle-layer/pyaml-test-lattice.git@main",
 ]
 doc = [
     "sphinx ~= 8.1",