wip

2026-04-13 20:20:55 +02:00 · 2026-03-15 14:31:39 +01:00 · 2026-03-15 13:59:43 +01:00 · 2026-03-15 13:53:37 +01:00 · 2026-03-15 13:36:13 +01:00 · 2026-03-15 13:31:45 +01:00
45 changed files with 1044 additions and 664 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,19 +1,19 @@
 name: Full CI
-on: 
+on:
  push:
  pull_request:
  workflow_dispatch:
    inputs:
      BEC_WIDGETS_BRANCH:
-        description: 'Branch of BEC Widgets to install'
+        description: "Branch of BEC Widgets to install"
        required: false
        type: string
      BEC_CORE_BRANCH:
-        description: 'Branch of BEC Core to install'
+        description: "Branch of BEC Core to install"
        required: false
        type: string
      OPHYD_DEVICES_BRANCH:
-        description: 'Branch of Ophyd Devices to install'
+        description: "Branch of Ophyd Devices to install"
        required: false
        type: string

@@ -25,60 +25,58 @@ permissions:
  pull-requests: write

 jobs:
-  check_pr_status:
-    uses: ./.github/workflows/check_pr.yml
+  # check_pr_status:
+  #   uses: ./.github/workflows/check_pr.yml

-  formatter:
-    needs: check_pr_status
-    if: needs.check_pr_status.outputs.branch-pr == ''
-    uses: ./.github/workflows/formatter.yml
+  # formatter:
+  #   needs: check_pr_status
+  #   if: needs.check_pr_status.outputs.branch-pr == ''
+  #   uses: ./.github/workflows/formatter.yml

-  unit-test:
-    needs: [check_pr_status, formatter]
-    if: needs.check_pr_status.outputs.branch-pr == ''
-    uses: ./.github/workflows/pytest.yml
-    with:
-      BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref }}
-      BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
-      OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main' }}
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  # unit-test:
+  #   needs: [check_pr_status, formatter]
+  #   if: needs.check_pr_status.outputs.branch-pr == ''
+  #   uses: ./.github/workflows/pytest.yml
+  #   with:
+  #     BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref }}
+  #     BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
+  #     OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main' }}
+  #   secrets:
+  #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

-  unit-test-matrix:
-    needs: [check_pr_status, formatter]
-    if: needs.check_pr_status.outputs.branch-pr == ''
-    uses: ./.github/workflows/pytest-matrix.yml
-    with:
-      BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha}}
-      BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
-      OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main' }}
+  # unit-test-matrix:
+  #   needs: [check_pr_status, formatter]
+  #   if: needs.check_pr_status.outputs.branch-pr == ''
+  #   uses: ./.github/workflows/pytest-matrix.yml
+  #   with:
+  #     BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha}}
+  #     BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
+  #     OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main' }}

-  generate-cli-test:
-    needs: [check_pr_status, formatter]
-    if: needs.check_pr_status.outputs.branch-pr == ''
-    uses: ./.github/workflows/generate-cli-check.yml
+  # generate-cli-test:
+  #   needs: [check_pr_status, formatter]
+  #   if: needs.check_pr_status.outputs.branch-pr == ''
+  #   uses: ./.github/workflows/generate-cli-check.yml

  end2end-test:
-    needs: [check_pr_status, formatter]
-    if: needs.check_pr_status.outputs.branch-pr == ''
    uses: ./.github/workflows/end2end-conda.yml

-  child-repos:
-    needs: [check_pr_status, formatter]
-    if: needs.check_pr_status.outputs.branch-pr == ''
-    uses: ./.github/workflows/child_repos.yml
-    with:
-      BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
-      OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main'}} 
-      BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha }}
-  
-  plugin_repos:
-    needs: [check_pr_status, formatter]
-    if: needs.check_pr_status.outputs.branch-pr == ''
-    uses: bec-project/bec/.github/workflows/plugin_repos.yml@main
-    with:
-      BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
-      BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha }}
+  # child-repos:
+  #   needs: [check_pr_status, formatter]
+  #   if: needs.check_pr_status.outputs.branch-pr == ''
+  #   uses: ./.github/workflows/child_repos.yml
+  #   with:
+  #     BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
+  #     OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main'}}
+  #     BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha }}

-    secrets:
-      GH_READ_TOKEN: ${{ secrets.GH_READ_TOKEN }}
+  # plugin_repos:
+  #   needs: [check_pr_status, formatter]
+  #   if: needs.check_pr_status.outputs.branch-pr == ''
+  #   uses: bec-project/bec/.github/workflows/plugin_repos.yml@main
+  #   with:
+  #     BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
+  #     BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha }}
+
+  #   secrets:
+  #     GH_READ_TOKEN: ${{ secrets.GH_READ_TOKEN }}
--- a/.github/workflows/end2end-conda.yml
+++ b/.github/workflows/end2end-conda.yml
@@ -48,12 +48,14 @@ jobs:
          source ./bin/install_bec_dev.sh -t
          cd ../
          pip install -e ./ophyd_devices -e .[dev,pyside6] -e ./bec_testing_plugin
-          pytest -v --files-path ./ --start-servers --random-order  ./tests/end-2-end
+          pip install pytest-repeat
+
+          pytest -v --files-path ./ --start-servers --random-order  ./tests/end-2-end/user_interaction/test_user_interaction_e2e.py

      - name: Upload logs if job fails
        if: failure()
        uses: actions/upload-artifact@v4
        with:
          name: pytest-logs
-          path: ./logs/*.log
+          path: ./bec/logs/*.log
          retention-days: 7
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,77 @@
 # CHANGELOG


+## v3.2.0 (2026-03-11)
+
+### Features
+
+- **curve, waveform**: Add dap_parameters for lmfit customization in DAP requests
+  ([`14d51b8`](https://github.com/bec-project/bec_widgets/commit/14d51b80169f5a060dd24287f3a6db9a4b41275a))
+
+- **waveform**: Composite DAP with multiple models
+  ([`b4f6f5a`](https://github.com/bec-project/bec_widgets/commit/b4f6f5aa8bcd0f6091610e8f839ea265c87575e0))
+
+
+## v3.1.4 (2026-03-11)
+
+### Bug Fixes
+
+- **profile_utils**: Renamed to fetch widgets settings
+  ([`53e5ec4`](https://github.com/bec-project/bec_widgets/commit/53e5ec42b8b33397af777f418fbd8601628226a6))
+
+### Build System
+
+- Increased minimal version of bec and bec qthemes
+  ([`7e0e391`](https://github.com/bec-project/bec_widgets/commit/7e0e391888f2ee4e8528ccb3938e36da4c32f146))
+
+
+## v3.1.3 (2026-03-09)
+
+### Bug Fixes
+
+- **monaco_dock**: Optimization, removal of QTimer, eventFilter replaced by signal/slot
+  ([`278d8de`](https://github.com/bec-project/bec_widgets/commit/278d8de058c2f5c6c9aa7317e1026651d7a4acd3))
+
+
+## v3.1.2 (2026-03-06)
+
+### Bug Fixes
+
+- **dock_area**: Remove old AdvancedDockArea references
+  ([`4382d5c`](https://github.com/bec-project/bec_widgets/commit/4382d5c9b1fdac4048692eec53dd43127d67467b))
+
+### Build System
+
+- **deps**: Update isort requirement
+  ([`8463b32`](https://github.com/bec-project/bec_widgets/commit/8463b327923f853cfa1462bc22be1e83d4fd9a75))
+
+
+## v3.1.1 (2026-03-06)
+
+### Bug Fixes
+
+- **positioner box**: Include username in scan queue request
+  ([`419c01b`](https://github.com/bec-project/bec_widgets/commit/419c01bdd4e80d927761634b03723319b0a58694))
+
+### Build System
+
+- Update min bec dependency to 3.106
+  ([`e2daf2e`](https://github.com/bec-project/bec_widgets/commit/e2daf2e89cd25d4dcedd4895299dbbdc6b7e354f))
+
+- **deps**: Upgrade to black 26
+  ([`e157f0d`](https://github.com/bec-project/bec_widgets/commit/e157f0d7c9bb5b4d93f63ebe6f9a715a314aa1f4))
+
+### Refactoring
+
+- **black**: Black 26 applied
+  ([`d4e037f`](https://github.com/bec-project/bec_widgets/commit/d4e037f3384765e7bb8fb020cecbf3db24fc7494))
+
+### Testing
+
+- Fix import of bec_lib json extended
+  ([`ef12331`](https://github.com/bec-project/bec_widgets/commit/ef1233163cb7c3229630543fe88dbceaccd09297))
+
+
 ## v3.1.0 (2026-03-06)

 ### Bug Fixes
--- a/bec_widgets/applications/launch_window.py
+++ b/bec_widgets/applications/launch_window.py
@@ -147,8 +147,7 @@ class LaunchTile(RoundedFrame):

        # Action button
        self.action_button = QPushButton("Open")
-        self.action_button.setStyleSheet(
-            """
+        self.action_button.setStyleSheet("""
        QPushButton {
            background-color: #007AFF;
            border: none;
@@ -160,8 +159,7 @@ class LaunchTile(RoundedFrame):
        QPushButton:hover {
            background-color: #005BB5;
        }
-        """
-        )
+        """)
        self.layout.addWidget(self.action_button, alignment=Qt.AlignmentFlag.AlignCenter)

    def _fit_label_to_width(self, label: QLabel, max_width: int, min_pt: int = 10):
--- a/bec_widgets/applications/navigation_centre/side_bar_components.py
+++ b/bec_widgets/applications/navigation_centre/side_bar_components.py
@@ -127,12 +127,10 @@ class NavigationItem(QWidget):
        self._icon_size_expanded = QtCore.QSize(26, 26)
        self.icon_btn.setIconSize(self._icon_size_collapsed)
        # Remove QToolButton hover/pressed background/outline
-        self.icon_btn.setStyleSheet(
-            """
+        self.icon_btn.setStyleSheet("""
            QToolButton:hover { background: transparent; border: none; }
            QToolButton:pressed { background: transparent; border: none; }
-            """
-        )
+            """)

        # Mini label below icon
        self.mini_lbl = QLabel(self._mini_text, self)
--- a/bec_widgets/applications/views/device_manager_view/device_manager_dialogs/device_form_dialog.py
+++ b/bec_widgets/applications/views/device_manager_view/device_manager_dialogs/device_form_dialog.py
@@ -31,7 +31,7 @@ logger = bec_logger.logger
 class DeviceManagerOphydValidationDialog(QtWidgets.QDialog):
    """Popup dialog to test Ophyd device configurations interactively."""

-    def __init__(self, parent=None, config: dict | None = None):  # type:ignore
+    def __init__(self, parent=None, config: dict | None = None):  # type: ignore
        super().__init__(parent)
        self.setWindowTitle("Device Manager Ophyd Test")
        self._config_status = ConfigStatus.UNKNOWN.value
@@ -133,7 +133,7 @@ class DeviceFormDialog(QtWidgets.QDialog):
    # validated: config_status, connection_status
    accepted_data = QtCore.Signal(dict, int, int, str, str)

-    def __init__(self, parent=None, add_btn_text: str = "Add Device"):  # type:ignore
+    def __init__(self, parent=None, add_btn_text: str = "Add Device"):  # type: ignore
        super().__init__(parent)
        # Track old device name if config is edited
        self._old_device_name: str = ""
--- a/bec_widgets/applications/views/device_manager_view/device_manager_display_widget.py
+++ b/bec_widgets/applications/views/device_manager_view/device_manager_display_widget.py
@@ -103,16 +103,14 @@ class CustomBusyWidget(QWidget):
        button_width = int(button_height * aspect_ratio)
        self.cancel_button.setFixedSize(button_width, button_height)
        color = get_accent_colors()
-        self.cancel_button.setStyleSheet(
-            f"""
+        self.cancel_button.setStyleSheet(f"""
            QPushButton {{
                background-color: {color.emergency.name()};
                color: white;
                font-weight: 600;
                border-radius: 6px;
            }}
-            """
-        )
+            """)

        # Layout
        content_layout = QVBoxLayout(self)
@@ -128,12 +126,10 @@ class CustomBusyWidget(QWidget):
            bg_color = color._colors.get("BG", None)
        if bg_color is None:  # Fallback if missing
            bg_color = QColor(50, 50, 50, 255)
-        self.setStyleSheet(
-            f"""
+        self.setStyleSheet(f"""
            background-color: {bg_color.name()};
            border-radius: 12px;
-            """
-        )
+            """)

    def _ui_scale(self) -> int:
        parent = self.parent()
--- a/bec_widgets/cli/client.py
+++ b/bec_widgets/cli/client.py
@@ -187,7 +187,7 @@ class BECDockArea(RPCBase):
                or a sequence of button names to hide.
            show_settings_action(bool | None): Control whether a dock settings/property action should
                be installed. Defaults to ``False`` for the basic dock area; subclasses
-                such as `AdvancedDockArea` override the default to ``True``.
+                such as `BECDockArea` override the default to ``True``.
            promote_central(bool): When True, promote the created dock to be the dock manager's
                central widget (useful for editor stacks or other root content).
            object_name(str | None): Optional object name to assign to the created widget.
@@ -1141,7 +1141,7 @@ class DockAreaView(RPCBase):
                or a sequence of button names to hide.
            show_settings_action(bool | None): Control whether a dock settings/property action should
                be installed. Defaults to ``False`` for the basic dock area; subclasses
-                such as `AdvancedDockArea` override the default to ``True``.
+                such as `BECDockArea` override the default to ``True``.
            promote_central(bool): When True, promote the created dock to be the dock manager's
                central widget (useful for editor stacks or other root content).
            object_name(str | None): Optional object name to assign to the created widget.
@@ -1386,7 +1386,7 @@ class DockAreaWidget(RPCBase):
                or a sequence of button names to hide.
            show_settings_action(bool | None): Control whether a dock settings/property action should
                be installed. Defaults to ``False`` for the basic dock area; subclasses
-                such as `AdvancedDockArea` override the default to ``True``.
+                such as `BECDockArea` override the default to ``True``.
            promote_central(bool): When True, promote the created dock to be the dock manager's
                central widget (useful for editor stacks or other root content).
            dock_icon(QIcon | None): Optional icon applied to the dock via ``CDockWidget.setIcon``.
@@ -3192,7 +3192,7 @@ class MonacoDock(RPCBase):
                or a sequence of button names to hide.
            show_settings_action(bool | None): Control whether a dock settings/property action should
                be installed. Defaults to ``False`` for the basic dock area; subclasses
-                such as `AdvancedDockArea` override the default to ``True``.
+                such as `BECDockArea` override the default to ``True``.
            promote_central(bool): When True, promote the created dock to be the dock manager's
                central widget (useful for editor stacks or other root content).
            dock_icon(QIcon | None): Optional icon applied to the dock via ``CDockWidget.setIcon``.
@@ -6249,7 +6249,8 @@ class Waveform(RPCBase):
        signal_y: "str | None" = None,
        color: "str | None" = None,
        label: "str | None" = None,
-        dap: "str | None" = None,
+        dap: "str | list[str] | None" = None,
+        dap_parameters: "dict | list | lmfit.Parameters | None | object" = None,
        scan_id: "str | None" = None,
        scan_number: "int | None" = None,
        **kwargs,
@@ -6271,9 +6272,14 @@ class Waveform(RPCBase):
            signal_y(str): The name of the entry for the y-axis.
            color(str): The color of the curve.
            label(str): The label of the curve.
-            dap(str): The dap model to use for the curve. When provided, a DAP curve is
+            dap(str | list[str]): The dap model to use for the curve. When provided, a DAP curve is
                attached automatically for device, history, or custom data sources. Use
-                the same string as the LMFit model name.
+                the same string as the LMFit model name, or a list of model names to build a composite.
+            dap_parameters(dict | list | lmfit.Parameters | None): Optional lmfit parameter overrides sent to
+                the DAP server. For a single model: values can be numeric (interpreted as fixed parameters)
+                or dicts like `{"value": 1.0, "vary": False}`. For composite models (dap is list), use either
+                a list aligned to the model list (each item is a param dict), or a dict of
+                `{ "ModelName": { "param": {...} } }` when model names are unique.
            scan_id(str):  Optional scan ID. When provided, the curve is treated as a **history** curve and
                the y‑data (and optional x‑data) are fetched from that historical scan. Such curves are
                never cleared by live‑scan resets.
@@ -6287,9 +6293,10 @@ class Waveform(RPCBase):
    def add_dap_curve(
        self,
        device_label: "str",
-        dap_name: "str",
+        dap_name: "str | list[str]",
        color: "str | None" = None,
        dap_oversample: "int" = 1,
+        dap_parameters: "dict | list | lmfit.Parameters | None" = None,
        **kwargs,
    ) -> "Curve":
        """
@@ -6299,9 +6306,11 @@ class Waveform(RPCBase):

        Args:
            device_label(str): The label of the source curve to add DAP to.
-            dap_name(str): The name of the DAP model to use.
+            dap_name(str | list[str]): The name of the DAP model to use, or a list of model
+                names to build a composite model.
            color(str): The color of the curve.
            dap_oversample(int): The oversampling factor for the DAP curve.
+            dap_parameters(dict | list | lmfit.Parameters | None): Optional lmfit parameter overrides sent to the DAP server.
            **kwargs

        Returns:
--- a/bec_widgets/utils/bec_login.py
+++ b/bec_widgets/utils/bec_login.py
@@ -20,15 +20,13 @@ class BECLogin(QWidget):

        title = QLabel("Sign in", parent=self)
        title.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        title.setStyleSheet(
-            """
+        title.setStyleSheet("""
            #QLabel
                {
                    font-size: 18px;
                    font-weight: 600;
                }
-            """
-        )
+            """)

        self.username = QLineEdit(parent=self)
        self.username.setPlaceholderText("Username")
@@ -57,13 +55,11 @@ class BECLogin(QWidget):

        self.username.setFocus()

-        self.setStyleSheet(
-            """
+        self.setStyleSheet("""
            QLineEdit {
                padding: 8px;
            }
-            """
-        )
+            """)

    def _clear_password(self):
        """Clear the password field."""
--- a/bec_widgets/utils/guided_tour.py
+++ b/bec_widgets/utils/guided_tour.py
@@ -67,15 +67,13 @@ class TutorialOverlay(QWidget):
        box = QFrame(self)
        app = QApplication.instance()
        bg_color = app.palette().window().color()
-        box.setStyleSheet(
-            f"""
+        box.setStyleSheet(f"""
            QFrame {{
                background-color: {bg_color.name()};
                border-radius: 8px;
                padding: 8px;
            }}
-        """
-        )
+        """)
        layout = QVBoxLayout(box)

        # Top layout with close button (left) and step indicator (right)
--- a/bec_widgets/utils/round_frame.py
+++ b/bec_widgets/utils/round_frame.py
@@ -69,13 +69,11 @@ class RoundedFrame(QFrame):
        """
        Update the style of the frame based on the background color.
        """
-        self.setStyleSheet(
-            f"""
+        self.setStyleSheet(f"""
                QFrame#roundedFrame {{
                    border-radius: {self._radius}px;
                }}
-            """
-        )
+            """)
        self.apply_plot_widget_style()

    def apply_plot_widget_style(self, border: str = "none"):
--- a/bec_widgets/utils/rpc_server.py
+++ b/bec_widgets/utils/rpc_server.py
@@ -118,6 +118,9 @@ class RPCServer:
        logger.debug(f"Received RPC instruction: {msg}, metadata: {metadata}")
        with rpc_exception_hook(functools.partial(self.send_response, request_id, False)):
            try:
+                logger.info(
+                    f"Processing RPC instruction: {msg['action']} with request_id: {request_id}. Parameters: {msg.get('parameter')}"
+                )
                method = msg["action"]
                args = msg["parameter"].get("args", [])
                kwargs = msg["parameter"].get("kwargs", {})
@@ -257,6 +260,10 @@ class RPCServer:
            else:
                name = WidgetContainerUtils.generate_unique_name("dock_area", existing_dock_areas)

+            logger.info(
+                f"Launching new dock area with name: {name} and startup_profile: {startup_profile}"
+            )
+
            result_widget = bw_launch.dock_area(object_name=name, startup_profile=startup_profile)
            result_widget.window().setWindowTitle(f"BEC - {name}")

@@ -296,6 +303,9 @@ class RPCServer:
            else:
                res = self.serialize_object(res)
        except RegistryNotReadyError:
+            logger.info(
+                f"Object not registered yet for RPC request {request_id}, retrying serialization after {retry_delay} ms"
+            )
            try:
                self._rpc_singleshot_repeats[request_id] += retry_delay
                QTimer.singleShot(
--- a/bec_widgets/utils/toolbars/actions.py
+++ b/bec_widgets/utils/toolbars/actions.py
@@ -599,16 +599,14 @@ class ExpandableMenuAction(ToolBarAction):
            button.setIcon(QIcon(self.icon_path))
        button.setText(self.tooltip)
        button.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
-        button.setStyleSheet(
-            """
+        button.setStyleSheet("""
                   QToolButton {
                       font-size: 14px;
                   }
                   QMenu {
                       font-size: 14px;
                   }
-               """
-        )
+               """)
        menu = QMenu(button)
        for action_container in self.actions.values():
            action: QAction = action_container.action
--- a/bec_widgets/utils/toolbars/splitter.py
+++ b/bec_widgets/utils/toolbars/splitter.py
@@ -106,8 +106,7 @@ class ResizableSpacer(QWidget):

        self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)

-        self.setStyleSheet(
-            """
+        self.setStyleSheet("""
            ResizableSpacer {
                background-color: transparent;
                margin: 0px;
@@ -117,8 +116,7 @@ class ResizableSpacer(QWidget):
            ResizableSpacer:hover {
                background-color: rgba(100, 100, 200, 80);
            }
-        """
-        )
+        """)

        self.setContentsMargins(0, 0, 0, 0)

--- a/bec_widgets/utils/toolbars/toolbar.py
+++ b/bec_widgets/utils/toolbars/toolbar.py
@@ -291,8 +291,7 @@ class ModularToolBar(QToolBar):
        menu = QMenu(self)
        theme = get_theme_name()
        if theme == "dark":
-            menu.setStyleSheet(
-                """
+            menu.setStyleSheet("""
                QMenu {
                    background-color: rgba(50, 50, 50, 0.9);
                    border: 1px solid rgba(255, 255, 255, 0.2);
@@ -300,12 +299,10 @@ class ModularToolBar(QToolBar):
                QMenu::item:selected {
                    background-color: rgba(0, 0, 255, 0.2);
                }
-            """
-            )
+            """)
        else:
            # Light theme styling
-            menu.setStyleSheet(
-                """
+            menu.setStyleSheet("""
                QMenu {
                    background-color: rgba(255, 255, 255, 0.9);
                    border: 1px solid rgba(0, 0, 0, 0.2);
@@ -313,8 +310,7 @@ class ModularToolBar(QToolBar):
                QMenu::item:selected {
                    background-color: rgba(0, 0, 255, 0.2);
                }
-            """
-            )
+            """)
        for ii, bundle in enumerate(self.shown_bundles):
            self.handle_bundle_context_menu(menu, bundle)
            if ii < len(self.shown_bundles) - 1:
--- a/bec_widgets/widgets/containers/auto_update/auto_updates.py
+++ b/bec_widgets/widgets/containers/auto_update/auto_updates.py
@@ -46,7 +46,7 @@ class AutoUpdates(BECMainWindow):
        self.setCentralWidget(self.dock_area)
        self._auto_update_selected_device: str | None = None

-        self._default_dock = None  # type:ignore
+        self._default_dock = None  # type: ignore
        self.current_widget: BECWidget | None = None
        self.dock_name = None
        self._enabled = True
@@ -63,7 +63,7 @@ class AutoUpdates(BECMainWindow):
        Disconnect all connections for the auto updates.
        """
        self.bec_dispatcher.disconnect_slot(
-            self._on_scan_status, MessageEndpoints.scan_status()  # type:ignore
+            self._on_scan_status, MessageEndpoints.scan_status()  # type: ignore
        )

    @property
@@ -244,10 +244,10 @@ class AutoUpdates(BECMainWindow):
        wf = self.set_dock_to_widget("Waveform")

        # Get the scan report devices reported by the scan
-        dev_x = info.scan_report_devices[0]  # type:ignore
+        dev_x = info.scan_report_devices[0]  # type: ignore

        # For the y axis, get the selected device
-        dev_y = self.get_selected_device(info.readout_priority["monitored"])  # type:ignore
+        dev_y = self.get_selected_device(info.readout_priority["monitored"])  # type: ignore
        if not dev_y:
            return

@@ -279,8 +279,8 @@ class AutoUpdates(BECMainWindow):
        scatter = self.set_dock_to_widget("ScatterWaveform")

        # Get the scan report devices reported by the scan
-        dev_x, dev_y = info.scan_report_devices[0], info.scan_report_devices[1]  # type:ignore
-        dev_z = self.get_selected_device(info.readout_priority["monitored"])  # type:ignore
+        dev_x, dev_y = info.scan_report_devices[0], info.scan_report_devices[1]  # type: ignore
+        dev_z = self.get_selected_device(info.readout_priority["monitored"])  # type: ignore

        if None in (dev_x, dev_y, dev_z):
            return
@@ -309,8 +309,8 @@ class AutoUpdates(BECMainWindow):
        # If the scan report devices are empty, there is nothing we can do
        if not info.scan_report_devices:
            return
-        dev_x = info.scan_report_devices[0]  # type:ignore
-        dev_y = self.get_selected_device(info.readout_priority["monitored"])  # type:ignore
+        dev_x = info.scan_report_devices[0]  # type: ignore
+        dev_y = self.get_selected_device(info.readout_priority["monitored"])  # type: ignore
        if not dev_y:
            return

--- a/bec_widgets/widgets/containers/dock_area/basic_dock_area.py
+++ b/bec_widgets/widgets/containers/dock_area/basic_dock_area.py
@@ -1315,7 +1315,7 @@ class DockAreaWidget(BECWidget, QWidget):
                or a sequence of button names to hide.
            show_settings_action(bool | None): Control whether a dock settings/property action should
                be installed. Defaults to ``False`` for the basic dock area; subclasses
-                such as `AdvancedDockArea` override the default to ``True``.
+                such as `BECDockArea` override the default to ``True``.
            promote_central(bool): When True, promote the created dock to be the dock manager's
                central widget (useful for editor stacks or other root content).
            dock_icon(QIcon | None): Optional icon applied to the dock via ``CDockWidget.setIcon``.
--- a/bec_widgets/widgets/containers/dock_area/dock_area.py
+++ b/bec_widgets/widgets/containers/dock_area/dock_area.py
@@ -136,10 +136,7 @@ class BECDockArea(DockAreaWidget):
        self._profile_management_enabled = enable_profile_management
        self._startup_profile = self._normalize_startup_profile(startup_profile)
        super().__init__(
-            parent,
-            default_add_direction=default_add_direction,
-            title="Advanced Dock Area",
-            **kwargs,
+            parent, default_add_direction=default_add_direction, title="BEC Dock Area", **kwargs
        )

        # Initialize mode property first (before toolbar setup)
@@ -168,7 +165,7 @@ class BECDockArea(DockAreaWidget):

        # State manager
        self.state_manager = WidgetStateManager(
-            self, serialize_from_root=True, root_id="AdvancedDockArea"
+            self, serialize_from_root=True, root_id="BECDockArea"
        )

        # Developer mode state
@@ -304,7 +301,7 @@ class BECDockArea(DockAreaWidget):
                or a sequence of button names to hide.
            show_settings_action(bool | None): Control whether a dock settings/property action should
                be installed. Defaults to ``False`` for the basic dock area; subclasses
-                such as `AdvancedDockArea` override the default to ``True``.
+                such as `BECDockArea` override the default to ``True``.
            promote_central(bool): When True, promote the created dock to be the dock manager's
                central widget (useful for editor stacks or other root content).
            object_name(str | None): Optional object name to assign to the created widget.
--- a/bec_widgets/widgets/containers/dock_area/profile_utils.py
+++ b/bec_widgets/widgets/containers/dock_area/profile_utils.py
@@ -1,5 +1,5 @@
 """
-Utilities for managing AdvancedDockArea profiles stored in INI files.
+Utilities for managing BECDockArea profiles stored in INI files.

 Policy:
 - All created/modified profiles are stored under the BEC settings root: <base_path>/profiles/{default,user}
@@ -36,12 +36,12 @@ ProfileOrigin = Literal["module", "plugin", "settings", "unknown"]

 def module_profiles_dir() -> str:
    """
-    Return the built-in AdvancedDockArea profiles directory bundled with the module.
+    Return the built-in BECDockArea profiles directory bundled with the module.

    Returns:
        str: Absolute path of the read-only module profiles directory.
    """
-    return os.path.join(MODULE_PATH, "containers", "advanced_dock_area", "profiles")
+    return os.path.join(MODULE_PATH, "containers", "dock_area", "profiles")


@lru_cache(maxsize=1)
@@ -115,12 +115,12 @@ def _settings_profiles_root() -> str:
        str: Absolute path to the profiles root. The directory is created if missing.
    """
    client = BECClient()
-    bec_widgets_settings = client._service_config.config.get("bec_widgets_settings")
+    bec_widgets_settings = client._service_config.config.get("widgets_settings")
    bec_widgets_setting_path = (
        bec_widgets_settings.get("base_path") if bec_widgets_settings else None
    )
    default_path = os.path.join(bec_widgets_setting_path, "profiles")
-    root = os.environ.get("BECWIDGETS_PROFILE_DIR", default_path)
+    root = os.path.expanduser(os.environ.get("BECWIDGETS_PROFILE_DIR", default_path))
    os.makedirs(root, exist_ok=True)
    return root

@@ -138,7 +138,7 @@ def _profiles_dir(segment: str, namespace: str | None) -> str:
    """
    base = os.path.join(_settings_profiles_root(), segment)
    ns = slugify.slugify(namespace, separator="_") if namespace else None
-    path = os.path.join(base, ns) if ns else base
+    path = os.path.expanduser(os.path.join(base, ns) if ns else base)
    os.makedirs(path, exist_ok=True)
    return path

--- a/bec_widgets/widgets/containers/dock_area/settings/workspace_manager.py
+++ b/bec_widgets/widgets/containers/dock_area/settings/workspace_manager.py
@@ -330,7 +330,7 @@ class WorkSpaceManager(BECWidget, QWidget):
            return

        self.target_widget.save_profile_dialog()
-        # AdvancedDockArea will emit profile_changed which will trigger table refresh,
+        # BECDockArea will emit profile_changed which will trigger table refresh,
        # but ensure the UI stays in sync even if the signal is delayed.
        self.render_table()
        current = getattr(self.target_widget, "_current_profile_name", None)
--- a/bec_widgets/widgets/containers/dock_area/toolbar_components/workspace_actions.py
+++ b/bec_widgets/widgets/containers/dock_area/toolbar_components/workspace_actions.py
@@ -118,7 +118,7 @@ class ProfileComboBox(QComboBox):

 def workspace_bundle(components: ToolbarComponents, enable_tools: bool = True) -> ToolbarBundle:
    """
-    Creates a workspace toolbar bundle for AdvancedDockArea.
+    Creates a workspace toolbar bundle for BECDockArea.

    Args:
        components (ToolbarComponents): The components to be added to the bundle.
@@ -171,7 +171,7 @@ def workspace_bundle(components: ToolbarComponents, enable_tools: bool = True) -

 class WorkspaceConnection(BundleConnection):
    """
-    Connection class for workspace actions in AdvancedDockArea.
+    Connection class for workspace actions in BECDockArea.
    """

    def __init__(self, components: ToolbarComponents, target_widget=None):
--- a/bec_widgets/widgets/containers/explorer/explorer.py
+++ b/bec_widgets/widgets/containers/explorer/explorer.py
@@ -101,14 +101,12 @@ class Explorer(BECWidget, QWidget):
        palette = get_theme_palette()
        separator_color = palette.mid().color()

-        self.splitter.setStyleSheet(
-            f"""
+        self.splitter.setStyleSheet(f"""
            QSplitter::handle {{
                height: 0.1px;
                background-color: rgba({separator_color.red()}, {separator_color.green()}, {separator_color.blue()}, 60);
            }}
-        """
-        )
+        """)

    def _update_spacer(self) -> None:
        """Update the spacer size based on section states"""
--- a/bec_widgets/widgets/containers/main_window/addons/notification_center/notification_banner.py
+++ b/bec_widgets/widgets/containers/main_window/addons/notification_center/notification_banner.py
@@ -134,15 +134,13 @@ class NotificationToast(QFrame):
        bg.setAlphaF(0.30)
        icon_bg = bg.name(QtGui.QColor.HexArgb)
        icon_btn.setFixedSize(40, 40)
-        icon_btn.setStyleSheet(
-            f"""
+        icon_btn.setStyleSheet(f"""
            QToolButton {{
                background: {icon_bg};
                border: none;
                border-radius: 20px;   /* perfect circle */
            }}
-            """
-        )
+            """)

        title_lbl = QtWidgets.QLabel(self._title)

@@ -327,15 +325,13 @@ class NotificationToast(QFrame):
        bg = QtGui.QColor(SEVERITY[value.value]["color"])
        bg.setAlphaF(0.30)
        icon_bg = bg.name(QtGui.QColor.HexArgb)
-        self._icon_btn.setStyleSheet(
-            f"""
+        self._icon_btn.setStyleSheet(f"""
            QToolButton {{
                background: {icon_bg};
                border: none;
                border-radius: 20px;
            }}
-            """
-        )
+            """)
        self.apply_theme(self._theme)
        # keep injected gradient in sync
        if getattr(self, "_hg_enabled", False):
@@ -391,8 +387,7 @@ class NotificationToast(QFrame):
            card_bg.setAlphaF(0.88)
            btn_hover = self._accent_color.name()

-        self.setStyleSheet(
-            f"""
+        self.setStyleSheet(f"""
            #NotificationToast {{
                background: {card_bg.name(QtGui.QColor.HexArgb)};
                border-radius: 12px;
@@ -406,18 +401,15 @@ class NotificationToast(QFrame):
                font-size: 14px;
            }}
            #NotificationToast QPushButton:hover {{ color: {btn_hover}; }}
-            """
-        )
+            """)
        # traceback panel colours
        trace_bg = "#1e1e1e" if theme == "dark" else "#f0f0f0"
-        self.trace_view.setStyleSheet(
-            f"""
+        self.trace_view.setStyleSheet(f"""
            background:{trace_bg};
            color:{palette['body']};
            border:none;
            border-radius:8px;
-            """
-        )
+            """)

        # icon glyph vs badge background: darker badge, lighter icon in light mode
        icon_fg = "#ffffff" if theme == "light" else self._accent_color.name()
@@ -438,15 +430,13 @@ class NotificationToast(QFrame):
        else:
            badge_bg.setAlphaF(0.30)
        icon_bg = badge_bg.name(QtGui.QColor.HexArgb)
-        self._icon_btn.setStyleSheet(
-            f"""
+        self._icon_btn.setStyleSheet(f"""
            QToolButton {{
                background: {icon_bg};
                border: none;
                border-radius: 20px;
            }}
-            """
-        )
+            """)

        # stronger accent wash in light mode, slightly stronger in dark too
        self._accent_alpha = 110 if theme == "light" else 60
@@ -593,8 +583,7 @@ class NotificationCentre(QScrollArea):
        self.setWidgetResizable(True)
        # transparent background so only the toast cards are visible
        self.setAttribute(QtCore.Qt.WA_TranslucentBackground, True)
-        self.setStyleSheet(
-            """
+        self.setStyleSheet("""
            #NotificationCentre { background: transparent; }
            #NotificationCentre QScrollBar:vertical {
                background: transparent;
@@ -610,8 +599,7 @@ class NotificationCentre(QScrollArea):
            #NotificationCentre QScrollBar::sub-line:vertical { height: 0; }
            #NotificationCentre QScrollBar::add-page:vertical,
            #NotificationCentre QScrollBar::sub-page:vertical { background: transparent; }
-            """
-        )
+            """)
        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
        self.setFrameShape(QtWidgets.QFrame.NoFrame)
        self.setFixedWidth(fixed_width)
@@ -958,8 +946,7 @@ class NotificationIndicator(QWidget):
        self._group.buttonToggled.connect(self._button_toggled)

        # minimalistic look: no frames or backgrounds on the buttons
-        self.setStyleSheet(
-            """
+        self.setStyleSheet("""
            QToolButton {
                border: none;
                background: transparent;
@@ -970,8 +957,7 @@ class NotificationIndicator(QWidget):
                background: rgba(255, 255, 255, 40);
                font-weight: 600;
            }
-            """
-        )
+            """)

        # initial state: none checked (auto‑dismiss behaviour)
        for k in kinds:
--- a/bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py
+++ b/bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py
@@ -123,7 +123,7 @@ class PositionerBoxBase(BECWidget, CompactPopupWidget):
            queue="emergency",
            metadata={"RID": request_id, "response": False},
        )
-        self.client.connector.send(MessageEndpoints.scan_queue_request(), msg)
+        self.client.connector.send(MessageEndpoints.scan_queue_request(self.client.username), msg)

    # pylint: disable=unused-argument
    def _on_device_readback(
--- a/bec_widgets/widgets/control/device_manager/components/_util.py
+++ b/bec_widgets/widgets/control/device_manager/components/_util.py
@@ -1,7 +1,7 @@
 import json
 from typing import Any, Callable, Generator, Iterable, TypeVar

-from bec_lib.utils.json import ExtendedEncoder
+from bec_lib.utils.json_extended import ExtendedEncoder
 from qtpy.QtCore import QByteArray, QMimeData, QObject, Signal  # type: ignore
 from qtpy.QtWidgets import QListWidgetItem

--- a/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_group.py
+++ b/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_group.py
@@ -51,8 +51,7 @@ class _DeviceEntryWidget(QFrame):
        self.setToolTip(self._rich_text())

    def _rich_text(self):
-        return dedent(
-            f"""
+        return dedent(f"""
        <b><u><h2> {self._device_spec.name}: </h2></u></b>
        <table>
        <tr><td> description: </td><td><i> {self._device_spec.description}  </i></td></tr>
@@ -60,8 +59,7 @@ class _DeviceEntryWidget(QFrame):
        <tr><td> enabled:     </td><td><i> {self._device_spec.enabled}      </i></td></tr>
        <tr><td> read only:   </td><td><i> {self._device_spec.readOnly}     </i></td></tr>
        </table>
-        """
-        )
+        """)

    def setup_title_layout(self, device_spec: HashableDevice):
        self._title_layout = QHBoxLayout()
--- a/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py
+++ b/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py
@@ -275,12 +275,10 @@ class LMFitDialog(BECWidget, QWidget):
                    button.setEnabled(True)
                else:
                    button.setEnabled(False)
-                button.setStyleSheet(
-                    f"""
+                button.setStyleSheet(f"""
                    QPushButton:enabled {{ background-color: {self._accent_colors.success.name()};color: white; }} 
                    QPushButton:disabled {{ background-color: grey;color: white; }}
-                    """
-                )
+                    """)
                self.action_buttons[param_name] = button
                layout = QVBoxLayout()
                layout.addWidget(self.action_buttons[param_name])
--- a/bec_widgets/widgets/editors/jupyter_console/jupyter_console.py
+++ b/bec_widgets/widgets/editors/jupyter_console/jupyter_console.py
@@ -47,15 +47,13 @@ class BECJupyterConsole(RichJupyterWidget):  # pragma: no cover:
        )

    def _init_bec_kernel(self):
-        self.execute(
-            """
+        self.execute("""
            from bec_ipython_client.main import BECIPythonClient
            bec = BECIPythonClient()
            bec.start()
            dev = bec.device_manager.devices if bec else None
            scans = bec.scans if bec else None
-            """
-        )
+            """)

    def _cleanup_bec(self):
        if getattr(self, "ipyclient", None) is not None and self.inprocess is True:
--- a/bec_widgets/widgets/editors/monaco/monaco_dock.py
+++ b/bec_widgets/widgets/editors/monaco/monaco_dock.py
@@ -6,7 +6,7 @@ from typing import Any, cast

 from bec_lib.logger import bec_logger
 from bec_lib.macro_update_handler import has_executable_code
-from qtpy.QtCore import QEvent, QTimer, Signal
+from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QFileDialog, QMessageBox, QToolButton, QWidget

 from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
@@ -36,12 +36,12 @@ class MonacoDock(DockAreaWidget):
            **kwargs,
        )
        self.dock_manager.focusedDockWidgetChanged.connect(self._on_focus_event)
-        self.dock_manager.installEventFilter(self)
        self._last_focused_editor: CDockWidget | None = None
        self.focused_editor.connect(self._on_last_focused_editor_changed)
        initial_editor = self.add_editor()
        if isinstance(initial_editor, CDockWidget):
            self.last_focused_editor = initial_editor
+        self._install_manager_scan_and_fix_guards()

    def _create_editor_widget(self) -> MonacoWidget:
        """Create a configured Monaco editor widget."""
@@ -73,7 +73,8 @@ class MonacoDock(DockAreaWidget):
            logger.info(f"Editor '{widget.current_file}' has unsaved changes: {widget.get_text()}")
        self.save_enabled.emit(widget.modified)

-    def _update_tab_title_for_modification(self, dock: CDockWidget, modified: bool):
+    @staticmethod
+    def _update_tab_title_for_modification(dock: CDockWidget, modified: bool):
        """Update the tab title to show modification status with a dot indicator."""
        current_title = dock.windowTitle()

@@ -98,14 +99,12 @@ class MonacoDock(DockAreaWidget):
            return

        active_sig = signatures[signature.get("activeSignature", 0)]
-        active_param = signature.get("activeParameter", 0)  # TODO: Add highlight for active_param
-
        # Get signature label and documentation
        label = active_sig.get("label", "")
        doc_obj = active_sig.get("documentation", {})
        documentation = doc_obj.get("value", "") if isinstance(doc_obj, dict) else str(doc_obj)

-        # Format the markdown output
+        # Format the Markdown output
        markdown = f"```python\n{label}\n```\n\n{documentation}"
        self.signature_help.emit(markdown)

@@ -156,9 +155,10 @@ class MonacoDock(DockAreaWidget):
        if self.last_focused_editor is dock:
            self.last_focused_editor = None
        # After topology changes, make sure single-tab areas get a plus button
-        QTimer.singleShot(0, self._scan_and_fix_areas)
+        self._scan_and_fix_areas()

-    def reset_widget(self, widget: MonacoWidget):
+    @staticmethod
+    def reset_widget(widget: MonacoWidget):
        """
        Reset the given Monaco editor widget to its initial state.

@@ -193,23 +193,23 @@ class MonacoDock(DockAreaWidget):
            # pylint: disable=protected-access
            area._monaco_plus_btn = plus_btn

-    def _scan_and_fix_areas(self):
+    def _install_manager_scan_and_fix_guards(self) -> None:
+        """
+        Track ADS structural changes to trigger scan and fix of dock areas for plus button injection.
+        """
+        self.dock_manager.dockAreaCreated.connect(self._scan_and_fix_areas)
+        self.dock_manager.dockWidgetAdded.connect(self._scan_and_fix_areas)
+        self.dock_manager.stateRestored.connect(self._scan_and_fix_areas)
+        self.dock_manager.restoringState.connect(self._scan_and_fix_areas)
+        self.dock_manager.focusedDockWidgetChanged.connect(self._scan_and_fix_areas)
+        self._scan_and_fix_areas()
+
+    def _scan_and_fix_areas(self, *_arg):
        # Find all dock areas under this manager and ensure each single-tab area has a plus button
        areas = self.dock_manager.findChildren(CDockAreaWidget)
        for a in areas:
            self._ensure_area_plus(a)

-    def eventFilter(self, obj, event):
-        # Track dock manager events
-        if obj is self.dock_manager and event.type() in (
-            QEvent.Type.ChildAdded,
-            QEvent.Type.ChildRemoved,
-            QEvent.Type.LayoutRequest,
-        ):
-            QTimer.singleShot(0, self._scan_and_fix_areas)
-
-        return super().eventFilter(obj, event)
-
    def add_editor(
        self, area: Any | None = None, title: str | None = None, tooltip: str | None = None
    ) -> CDockWidget:
@@ -258,7 +258,7 @@ class MonacoDock(DockAreaWidget):
        if area_widget is not None:
            self._ensure_area_plus(area_widget)

-        QTimer.singleShot(0, self._scan_and_fix_areas)
+        self._scan_and_fix_areas()
        self.last_focused_editor = dock
        return dock

--- a/bec_widgets/widgets/editors/monaco/monaco_widget.py
+++ b/bec_widgets/widgets/editors/monaco/monaco_widget.py
@@ -362,8 +362,7 @@ if __name__ == "__main__":  # pragma: no cover
    widget.set_language("python")
    widget.set_theme("vs-dark")
    widget.editor.set_minimap_enabled(False)
-    widget.set_text(
-        """
+    widget.set_text("""
 import numpy as np
 from typing import TYPE_CHECKING

@@ -380,8 +379,7 @@ if TYPE_CHECKING:
 # This is a comment
 def hello_world():
    print("Hello, world!")
-            """
-    )
+            """)
    widget.set_highlighted_lines(1, 3)
    widget.show()
    qapp.exec_()
--- a/bec_widgets/widgets/plots/waveform/curve.py
+++ b/bec_widgets/widgets/plots/waveform/curve.py
@@ -22,8 +22,9 @@ class DeviceSignal(BaseModel):

    device: str
    signal: str
-    dap: str | None = None
+    dap: str | list[str] | None = None
    dap_oversample: int = 1
+    dap_parameters: dict | list | None = None

    model_config: dict = {"validate_assignment": True}

--- a/bec_widgets/widgets/plots/waveform/waveform.py
+++ b/bec_widgets/widgets/plots/waveform/waveform.py
@@ -1,13 +1,13 @@
 from __future__ import annotations

 import json
-from typing import Literal
+from typing import TYPE_CHECKING, Literal

-import lmfit
 import numpy as np
 import pyqtgraph as pg
 from bec_lib import bec_logger, messages
 from bec_lib.endpoints import MessageEndpoints
+from bec_lib.lmfit_serializer import serialize_lmfit_params, serialize_param_object
 from bec_lib.scan_data_container import ScanDataContainer
 from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Qt, QTimer, Signal
@@ -41,6 +41,18 @@ from bec_widgets.widgets.services.scan_history_browser.scan_history_browser impo
 )

 logger = bec_logger.logger
+_DAP_PARAM = object()
+
+if TYPE_CHECKING:  # pragma: no cover
+    import lmfit  # type: ignore
+else:
+    try:
+        import lmfit  # type: ignore
+    except Exception as e:  # pragma: no cover
+        logger.warning(
+            f"lmfit could not be imported: {e}. Custom DAP functionality will be unavailable."
+        )
+        lmfit = None


 # noinspection PyDataclass
@@ -696,7 +708,8 @@ class Waveform(PlotBase):
        signal_y: str | None = None,
        color: str | None = None,
        label: str | None = None,
-        dap: str | None = None,
+        dap: str | list[str] | None = None,
+        dap_parameters: dict | list | lmfit.Parameters | None | object = None,
        scan_id: str | None = None,
        scan_number: int | None = None,
        **kwargs,
@@ -718,9 +731,14 @@ class Waveform(PlotBase):
            signal_y(str): The name of the entry for the y-axis.
            color(str): The color of the curve.
            label(str): The label of the curve.
-            dap(str): The dap model to use for the curve. When provided, a DAP curve is
+            dap(str | list[str]): The dap model to use for the curve. When provided, a DAP curve is
                attached automatically for device, history, or custom data sources. Use
-                the same string as the LMFit model name.
+                the same string as the LMFit model name, or a list of model names to build a composite.
+            dap_parameters(dict | list | lmfit.Parameters | None): Optional lmfit parameter overrides sent to
+                the DAP server. For a single model: values can be numeric (interpreted as fixed parameters)
+                or dicts like `{"value": 1.0, "vary": False}`. For composite models (dap is list), use either
+                a list aligned to the model list (each item is a param dict), or a dict of
+                `{ "ModelName": { "param": {...} } }` when model names are unique.
            scan_id(str):  Optional scan ID. When provided, the curve is treated as a **history** curve and
                the y‑data (and optional x‑data) are fetched from that historical scan. Such curves are
                never cleared by live‑scan resets.
@@ -733,6 +751,8 @@ class Waveform(PlotBase):
        source = "custom"
        x_data = None
        y_data = None
+        if dap_parameters is _DAP_PARAM:
+            dap_parameters = kwargs.pop("dap_parameters", None) or kwargs.pop("parameters", None)

        # 1. Custom curve logic
        if x is not None and y is not None:
@@ -810,7 +830,9 @@ class Waveform(PlotBase):
        curve = self._add_curve(config=config, x_data=x_data, y_data=y_data)

        if dap is not None and curve.config.source in ("device", "history", "custom"):
-            self.add_dap_curve(device_label=curve.name(), dap_name=dap, **kwargs)
+            self.add_dap_curve(
+                device_label=curve.name(), dap_name=dap, dap_parameters=dap_parameters, **kwargs
+            )

        return curve

@@ -820,9 +842,10 @@ class Waveform(PlotBase):
    def add_dap_curve(
        self,
        device_label: str,
-        dap_name: str,
+        dap_name: str | list[str],
        color: str | None = None,
        dap_oversample: int = 1,
+        dap_parameters: dict | list | lmfit.Parameters | None = None,
        **kwargs,
    ) -> Curve:
        """
@@ -832,9 +855,11 @@ class Waveform(PlotBase):

        Args:
            device_label(str): The label of the source curve to add DAP to.
-            dap_name(str): The name of the DAP model to use.
+            dap_name(str | list[str]): The name of the DAP model to use, or a list of model
+                names to build a composite model.
            color(str): The color of the curve.
            dap_oversample(int): The oversampling factor for the DAP curve.
+            dap_parameters(dict | list | lmfit.Parameters | None): Optional lmfit parameter overrides sent to the DAP server.
            **kwargs

        Returns:
@@ -859,7 +884,7 @@ class Waveform(PlotBase):
            dev_entry = "custom"

        # 2) Build a label for the new DAP curve
-        dap_label = f"{device_label}-{dap_name}"
+        dap_label = f"{device_label}-{self._format_dap_label(dap_name)}"

        # 3) Possibly raise if the DAP curve already exists
        if self._check_curve_id(dap_label):
@@ -882,7 +907,11 @@ class Waveform(PlotBase):

        # Attach device signal with DAP
        config.signal = DeviceSignal(
-            device=dev_name, signal=dev_entry, dap=dap_name, dap_oversample=dap_oversample
+            device=dev_name,
+            signal=dev_entry,
+            dap=dap_name,
+            dap_oversample=dap_oversample,
+            dap_parameters=self._normalize_dap_parameters(dap_parameters, dap_name=dap_name),
        )

        # 4) Create the DAP curve config using `_add_curve(...)`
@@ -1754,7 +1783,9 @@ class Waveform(PlotBase):

            x_data, y_data = parent_curve.get_data()
            model_name = dap_curve.config.signal.dap
-            model = getattr(self.dap, model_name)
+            model = None
+            if not isinstance(model_name, (list, tuple)):
+                model = getattr(self.dap, model_name)
            try:
                x_min, x_max = self.roi_region
                x_data, y_data = self._crop_data(x_data, y_data, x_min, x_max)
@@ -1762,20 +1793,132 @@ class Waveform(PlotBase):
                x_min = None
                x_max = None

+            dap_parameters = getattr(dap_curve.config.signal, "dap_parameters", None)
+            dap_kwargs = {
+                "data_x": x_data,
+                "data_y": y_data,
+                "oversample": dap_curve.dap_oversample,
+            }
+            if dap_parameters:
+                dap_kwargs["parameters"] = dap_parameters
+
+            if model is not None:
+                class_args = model._plugin_info["class_args"]
+                class_kwargs = model._plugin_info["class_kwargs"]
+            else:
+                class_args = []
+                class_kwargs = {"model": model_name}
+
            msg = messages.DAPRequestMessage(
                dap_cls="LmfitService1D",
                dap_type="on_demand",
                config={
                    "args": [],
-                    "kwargs": {"data_x": x_data, "data_y": y_data},
-                    "class_args": model._plugin_info["class_args"],
-                    "class_kwargs": model._plugin_info["class_kwargs"],
+                    "kwargs": dap_kwargs,
+                    "class_args": class_args,
+                    "class_kwargs": class_kwargs,
                    "curve_label": dap_curve.name(),
                },
                metadata={"RID": f"{self.scan_id}-{self.gui_id}"},
            )
            self.client.connector.set_and_publish(MessageEndpoints.dap_request(), msg)

+    @staticmethod
+    def _normalize_dap_parameters(
+        parameters: dict | list | lmfit.Parameters | None, dap_name: str | list[str] | None = None
+    ) -> dict | list | None:
+        """
+        Normalize user-provided lmfit parameters into a JSON-serializable dict suitable for the DAP server.
+
+        Supports:
+        - `lmfit.Parameters` (single-model only)
+        - `dict[name -> number]` (treated as fixed parameter with `vary=False`)
+        - `dict[name -> dict]` (lmfit.Parameter fields; defaults to `vary=False` if unspecified)
+        - `dict[name -> lmfit.Parameter]`
+        - composite: `list[dict[param_name -> spec]]` aligned to model list
+        - composite: `dict[model_name -> dict[param_name -> spec]]` (unique model names only)
+        """
+        if parameters is None:
+            return None
+        if isinstance(dap_name, (list, tuple)):
+            if lmfit is not None and isinstance(parameters, lmfit.Parameters):
+                raise TypeError("dap_parameters must be a dict when using composite dap models.")
+            if isinstance(parameters, (list, tuple)):
+                normalized_list: list[dict | None] = []
+                for idx, item in enumerate(parameters):
+                    if item is None:
+                        normalized_list.append(None)
+                        continue
+                    if not isinstance(item, dict):
+                        raise TypeError(
+                            f"dap_parameters list item {idx} must be a dict of parameter overrides."
+                        )
+                    normalized_list.append(Waveform._normalize_param_overrides(item))
+                return normalized_list or None
+            if not isinstance(parameters, dict):
+                raise TypeError(
+                    "dap_parameters must be a dict of model->params when using composite dap models."
+                )
+            model_names = set(dap_name)
+            invalid_models = set(parameters.keys()) - model_names
+            if invalid_models:
+                raise TypeError(
+                    f"Invalid dap_parameters keys for composite model: {sorted(invalid_models)}"
+                )
+            normalized_composite: dict[str, dict] = {}
+            for model_name in dap_name:
+                model_params = parameters.get(model_name)
+                if model_params is None:
+                    continue
+                if not isinstance(model_params, dict):
+                    raise TypeError(
+                        f"dap_parameters for '{model_name}' must be a dict of parameter overrides."
+                    )
+                normalized = Waveform._normalize_param_overrides(model_params)
+                if normalized:
+                    normalized_composite[model_name] = normalized
+            return normalized_composite or None
+
+        if lmfit is not None and isinstance(parameters, lmfit.Parameters):
+            return serialize_lmfit_params(parameters)
+        if not isinstance(parameters, dict):
+            if lmfit is None:
+                raise TypeError(
+                    "dap_parameters must be a dict when lmfit is not installed on the client."
+                )
+            raise TypeError("dap_parameters must be a dict or lmfit.Parameters (or omitted).")
+
+        return Waveform._normalize_param_overrides(parameters)
+
+    @staticmethod
+    def _normalize_param_overrides(parameters: dict) -> dict | None:
+        normalized: dict[str, dict] = {}
+        for name, spec in parameters.items():
+            if spec is None:
+                continue
+            if isinstance(spec, (int, float, np.number)):
+                normalized[name] = {"name": name, "value": float(spec), "vary": False}
+                continue
+            if lmfit is not None and isinstance(spec, lmfit.Parameter):
+                normalized[name] = serialize_param_object(spec)
+                continue
+            if isinstance(spec, dict):
+                normalized[name] = {"name": name, **spec}
+                if "vary" not in normalized[name]:
+                    normalized[name]["vary"] = False
+                continue
+            raise TypeError(
+                f"Invalid dap_parameters entry for '{name}': expected number, dict, or lmfit.Parameter."
+            )
+
+        return normalized or None
+
+    @staticmethod
+    def _format_dap_label(dap_name: str | list[str]) -> str:
+        if isinstance(dap_name, (list, tuple)):
+            return "+".join(dap_name)
+        return dap_name
+
    @SafeSlot(dict, dict)
    def update_dap_curves(self, msg, metadata):
        """
@@ -1793,14 +1936,6 @@ class Waveform(PlotBase):
        if not curve:
            return

-        # Get data from the parent (device) curve
-        parent_curve = self._find_curve_by_label(curve.config.parent_label)
-        if parent_curve is None:
-            return
-        x_parent, _ = parent_curve.get_data()
-        if x_parent is None or len(x_parent) == 0:
-            return
-
        # Retrieve and store the fit parameters and summary from the DAP server response
        try:
            curve.dap_params = msg["data"][1]["fit_parameters"]
@@ -1809,19 +1944,13 @@ class Waveform(PlotBase):
            logger.warning(f"Failed to retrieve DAP data for curve '{curve.name()}'")
            return

-        # Render model according to the DAP model name and parameters
-        model_name = curve.config.signal.dap
-        model_function = getattr(lmfit.models, model_name)()
-
-        x_min, x_max = x_parent.min(), x_parent.max()
-        oversample = curve.dap_oversample
-        new_x = np.linspace(x_min, x_max, int(len(x_parent) * oversample))
-
-        # Evaluate the model with the provided parameters to generate the y values
-        new_y = model_function.eval(**curve.dap_params, x=new_x)
-
-        # Update the curve with the new data
-        curve.setData(new_x, new_y)
+        # Plot the fitted curve using the server-provided output to avoid requiring lmfit on the client.
+        try:
+            fit_data = msg["data"][0]
+            curve.setData(np.asarray(fit_data["x"]), np.asarray(fit_data["y"]))
+        except Exception as e:
+            logger.exception(f"Failed to plot DAP result for curve '{curve.name()}', error: {e}")
+            return

        metadata.update({"curve_id": curve_id})
        self.dap_params_update.emit(curve.dap_params, metadata)
@@ -2341,24 +2470,20 @@ class DemoApp(QMainWindow):  # pragma: no cover
    def __init__(self):
        super().__init__()
        self.setWindowTitle("Waveform Demo")
-        self.resize(1200, 600)
+        self.resize(1600, 600)
        self.main_widget = QWidget(self)
        self.layout = QHBoxLayout(self.main_widget)
        self.setCentralWidget(self.main_widget)

-        self.waveform_popup = Waveform(popups=True)
-        self.waveform_popup.plot(device_y="waveform")
-
-        self.waveform_side = Waveform(popups=False)
-        self.waveform_side.plot(device_y="bpm4i", signal_y="bpm4i", dap="GaussianModel")
-        self.waveform_side.plot(device_y="bpm3a", signal_y="bpm3a")
-
        self.custom_waveform = Waveform(popups=True)
        self._populate_custom_curve_demo()

-        self.layout.addWidget(self.waveform_side)
-        self.layout.addWidget(self.waveform_popup)
+        self.sine_waveform = Waveform(popups=True)
+        self.sine_waveform.dap_params_update.connect(self._log_sine_dap_params)
+        self._populate_sine_curve_demo()
+
        self.layout.addWidget(self.custom_waveform)
+        self.layout.addWidget(self.sine_waveform)

    def _populate_custom_curve_demo(self):
        """
@@ -2377,8 +2502,141 @@ class DemoApp(QMainWindow):  # pragma: no cover
        sigma = 0.8
        y = amplitude * np.exp(-((x - center) ** 2) / (2 * sigma**2)) + noise

+        # 1) No explicit parameters: server will use lmfit defaults/guesses.
        self.custom_waveform.plot(x=x, y=y, label="custom-gaussian", dap="GaussianModel")

+        # 2) Easy dict: numbers mean "fix this parameter to value" (vary=False).
+        self.custom_waveform.plot(
+            x=x,
+            y=y,
+            label="custom-gaussian-fixed-easy",
+            dap="GaussianModel",
+            dap_parameters={"amplitude": 1.0},
+            dap_oversample=5,
+        )
+
+        # 3) Partial parameter override: this should still trigger guessing on the server
+        #    because not all Gaussian parameters are explicitly specified.
+        self.custom_waveform.plot(
+            x=x,
+            y=y,
+            label="custom-gaussian-partial-guess",
+            dap="GaussianModel",
+            dap_parameters={
+                "center": {"value": 1.2, "vary": True},
+                "sigma": {"value": sigma, "vary": False, "min": 0.0},
+            },
+        )
+
+        # 4) Complete parameter override: this should skip guessing on the server.
+        if lmfit is not None:
+            params_gauss = lmfit.models.GaussianModel().make_params()
+            params_gauss["amplitude"].set(value=amplitude, vary=False)
+            params_gauss["center"].set(value=center, vary=False)
+            params_gauss["sigma"].set(value=sigma, vary=False, min=0.0)
+            self.custom_waveform.plot(
+                x=x,
+                y=y,
+                label="custom-gaussian-complete-no-guess",
+                dap="GaussianModel",
+                dap_parameters=params_gauss,
+            )
+        else:
+            logger.info("Skipping lmfit.Parameters demo (lmfit not installed on client).")
+
+        # Composite example: spectrum with three Gaussians (DAP-only)
+        x_spec = np.linspace(-5, 5, 800)
+        rng_spec = np.random.default_rng(123)
+        centers = [-2.0, 0.6, 2.4]
+        amplitudes = [2.5, 3.2, 1.8]
+        sigmas = [0.35, 0.5, 0.3]
+        y_spec = (
+            amplitudes[0] * np.exp(-((x_spec - centers[0]) ** 2) / (2 * sigmas[0] ** 2))
+            + amplitudes[1] * np.exp(-((x_spec - centers[1]) ** 2) / (2 * sigmas[1] ** 2))
+            + amplitudes[2] * np.exp(-((x_spec - centers[2]) ** 2) / (2 * sigmas[2] ** 2))
+            + rng_spec.normal(loc=0, scale=0.06, size=x_spec.size)
+        )
+
+        # 5) Composite model with partial overrides only: this should still trigger guessing.
+        self.custom_waveform.plot(
+            x=x_spec,
+            y=y_spec,
+            label="custom-gaussian-spectrum-partial-guess",
+            dap=["GaussianModel", "GaussianModel", "GaussianModel"],
+            dap_parameters=[
+                {"center": {"value": centers[0], "vary": False}},
+                {"center": {"value": centers[1], "vary": False}},
+                {"center": {"value": centers[2], "vary": False}},
+            ],
+        )
+
+        # 6) Composite model with all component parameters specified: this should skip guessing.
+        self.custom_waveform.plot(
+            x=x_spec,
+            y=y_spec,
+            label="custom-gaussian-spectrum-complete-no-guess",
+            dap=["GaussianModel", "GaussianModel", "GaussianModel"],
+            dap_parameters=[
+                {
+                    "amplitude": {"value": amplitudes[0], "vary": False},
+                    "center": {"value": centers[0], "vary": False},
+                    "sigma": {"value": sigmas[0], "vary": False, "min": 0.0},
+                },
+                {
+                    "amplitude": {"value": amplitudes[1], "vary": False},
+                    "center": {"value": centers[1], "vary": False},
+                    "sigma": {"value": sigmas[1], "vary": False, "min": 0.0},
+                },
+                {
+                    "amplitude": {"value": amplitudes[2], "vary": False},
+                    "center": {"value": centers[2], "vary": False},
+                    "sigma": {"value": sigmas[2], "vary": False, "min": 0.0},
+                },
+            ],
+        )
+
+    def _populate_sine_curve_demo(self):
+        """
+        Showcase how lmfit's base SineModel can struggle with a drifting baseline.
+        """
+        x = np.linspace(0, 6 * np.pi, 600)
+        rng = np.random.default_rng(7)
+        amplitude = 1.6
+        frequency = 0.75
+        phase = 0.4
+        offset = 0.8
+        slope = 0.08
+        noise = rng.normal(loc=0, scale=0.12, size=x.size)
+        y = offset + slope * x + amplitude * np.sin(2 * np.pi * frequency * x + phase) + noise
+
+        # Base SineModel (no offset support) to show the mismatch
+        self.sine_waveform.plot(x=x, y=y, label="custom-sine-data", dap="SineModel")
+
+        # Composite model: Sine + Linear baseline (offset + slope)
+        self.sine_waveform.plot(
+            x=x,
+            y=y,
+            label="custom-sine-composite",
+            dap=["SineModel", "LinearModel"],
+            dap_oversample=4,
+        )
+
+        if lmfit is None:
+            logger.info("Skipping sine lmfit demo (lmfit not installed on client).")
+            return
+
+        return
+
+    @staticmethod
+    def _log_sine_dap_params(params: dict, metadata: dict):
+        curve_id = metadata.get("curve_id")
+        if curve_id not in {
+            "custom-sine-data-SineModel",
+            "custom-sine-composite-SineModel+LinearModel",
+        }:
+            return
+        logger.info(f"SineModel DAP fit params ({curve_id}): {params}")
+

 if __name__ == "__main__":  # pragma: no cover
    import sys
--- a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py
+++ b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py
@@ -44,14 +44,12 @@ class RingCardWidget(QFrame):
        self.setObjectName("RingCardWidget")

        bg = self._get_theme_color("BORDER")
-        self.setStyleSheet(
-            f"""
+        self.setStyleSheet(f"""
            #RingCardWidget {{
                border: 1px solid {bg.name() if bg else '#CCCCCC'};
                border-radius: 4px;
            }}
-            """
-        )
+            """)

        layout = QVBoxLayout(self)
        layout.setContentsMargins(8, 8, 8, 8)
--- a/bec_widgets/widgets/services/bec_queue/bec_queue.py
+++ b/bec_widgets/widgets/services/bec_queue/bec_queue.py
@@ -289,14 +289,12 @@ class BECQueue(BECWidget, CompactPopupWidget):
        abort_button.button.setIcon(
            material_icon("cancel", color="#cc181e", filled=True, convert_to_pixmap=False)
        )
-        abort_button.setStyleSheet(
-            """
+        abort_button.setStyleSheet("""
            QPushButton {
                background-color: transparent;
                border: none;
            }
-            """
-        )
+            """)

        return abort_button

--- a/bec_widgets/widgets/utility/ide_explorer/ide_explorer.py
+++ b/bec_widgets/widgets/utility/ide_explorer/ide_explorer.py
@@ -227,13 +227,11 @@ class IDEExplorer(BECWidget, QWidget):
        try:
            # Create the file with a basic template
            with open(file_path, "w", encoding="utf-8") as f:
-                f.write(
-                    f"""
+                f.write(f"""
 \"\"\"
 {filename} - Created at {datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}
 \"\"\"
-"""
-                )
+""")

        except Exception as e:
            # Show error if file creation failed
@@ -281,8 +279,7 @@ class IDEExplorer(BECWidget, QWidget):
        try:
            # Create the file with a macro function template
            with open(file_path, "w", encoding="utf-8") as f:
-                f.write(
-                    f'''"""
+                f.write(f'''"""
 {function_name} macro - Created at {datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}
 """

@@ -296,8 +293,7 @@ def {function_name}():
    print("Executing macro: {function_name}")
    # TODO: Add your macro code here
    pass
-'''
-                )
+''')

            # Refresh the macro tree to show the new function
            macro_dir_section.content_widget.refresh()
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"

 [project]
 name = "bec_widgets"
-version = "3.1.0"
+version = "3.2.0"
 description = "BEC Widgets"
 requires-python = ">=3.11"
 classifiers = [
@@ -13,11 +13,11 @@ classifiers = [
    "Topic :: Scientific/Engineering",
 ]
 dependencies = [
-    "bec_ipython_client~=3.70",      # needed for jupyter console
-    "bec_lib~=3.70",
-    "bec_qthemes~=1.0, >=1.3.3",
-    "black~=25.0",                   # needed for bw-generate-cli
-    "isort~=5.13, >=5.13.2",         # needed for bw-generate-cli
+    "bec_ipython_client~=3.107,>=3.107.2",     # needed for jupyter console
+    "bec_lib~=3.107,>=3.107.2",
+    "bec_qthemes~=1.0, >=1.3.4",
+    "black>=26,<27",                 # needed for bw-generate-cli
+    "isort>=5.13, <9.0",             # needed for bw-generate-cli
    "ophyd_devices~=1.29, >=1.29.1",
    "pydantic~=2.0",
    "pyqtgraph==0.13.7",
--- a/tests/end-2-end/test_bec_dock_rpc_e2e.py
+++ b/tests/end-2-end/test_bec_dock_rpc_e2e.py
@@ -150,7 +150,9 @@ def test_rpc_gui_obj(connected_client_gui_obj, qtbot):
    # communication should work, main dock area should have same id and be visible

    yw = gui.new("Y")
+    qtbot.waitUntil(lambda: len(gui.windows) == 2, timeout=3000)
    yw.delete_all()
    assert len(gui.windows) == 2
    yw.remove()
-    assert len(gui.windows) == 1  # only bec is left
+    qtbot.waitUntil(lambda: len(gui.windows) == 1, timeout=3000)
+    assert len(gui.windows) == 1
--- a/tests/end-2-end/test_plotting_framework_e2e.py
+++ b/tests/end-2-end/test_plotting_framework_e2e.py
@@ -72,6 +72,7 @@ def test_rpc_plotting_shortcuts_init_configs(qtbot, connected_client_gui_obj):
        "dap": None,
        "device": "bpm4i",
        "signal": "bpm4i",
+        "dap_parameters": None,
        "dap_oversample": 1,
    }
    assert c1._config_dict["source"] == "device"
--- a/tests/end-2-end/user_interaction/test_user_interaction_e2e.py
+++ b/tests/end-2-end/user_interaction/test_user_interaction_e2e.py
@@ -135,144 +135,160 @@ def maybe_remove_dock_area(qtbot, gui: BECGuiClient, random_int_gen: random.Rand
        wait_for_namespace_change(
            qtbot, gui=gui, parent_widget=gui, object_name=name, widget_gui_id=gui_id, exists=False
        )
+        qtbot.waitUntil(lambda: hasattr(gui, "dock_area") is False, timeout=5000)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_bec_progress_bar(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the BECProgressBar widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.BECProgressBar)
-    widget: client.BECProgressBar
-
-    # Check rpc calls
-    assert widget.label_template == "$value / $maximum - $percentage %"
-    widget.set_maximum(100)
-    widget.set_minimum(50)
-    widget.set_value(75)
-
-    assert widget._get_label() == "75 / 100 - 50 %"
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_bec_queue(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the BECQueue widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.BECQueue)
-    widget: client.BECQueue
-
-    # No rpc calls to test so far
-    #  maybe we can add an rpc call to check the queue length
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_bec_status_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the BECStatusBox widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.BECStatusBox)
-
-    # Check rpc calls
-    assert widget.get_server_state() in ["RUNNING", "IDLE", "BUSY", "ERROR"]
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_dap_combo_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the DAPComboBox widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.DapComboBox)
-    widget: client.DAPComboBox
-
-    # Check rpc calls
-    widget.select_fit_model("PseudoVoigtModel")
-    widget.select_x_axis("samx")
-    widget.select_y_axis("bpm4i")
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_device_browser(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the DeviceBrowser widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.DeviceBrowser)
-    widget: client.DeviceBrowser
-
-    # No rpc calls yet to check
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_image(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the Image widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.Image)
-    widget: client.Image
-
-    scans = bec.scans
-    dev = bec.device_manager.devices
-    # Test rpc calls
-    img = widget.image(device=dev.eiger.name, signal="preview")
-    assert img.get_data() is None
-    # Run a scan and plot the image
-    s = scans.line_scan(dev.samx, -3, 3, steps=50, exp_time=0.01, relative=False)
-    s.wait()
-
-    def _wait_for_scan_in_history():
-        # Get scan item from history
-        scan_item = bec.history.get_by_scan_id(s.scan.scan_id)
-        return scan_item is not None
-
-    qtbot.waitUntil(_wait_for_scan_in_history, timeout=7000)
-
-    # Check that last image is equivalent to data in Redis
-    last_img = bec.connector.get_last(MessageEndpoints.device_preview("eiger", "preview"))[
-        "data"
-    ].data
-    assert np.allclose(img.get_data(), last_img)
-
-    # Now add a device with a preview signal
-    img = widget.image(device="eiger", signal="preview")
-    s = scans.line_scan(dev.samx, -3, 3, steps=50, exp_time=0.01, relative=False)
-    s.wait()
-
-    qtbot.waitUntil(_wait_for_scan_in_history, timeout=7000)
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
-# TODO re-enable when issue is resolved #560
 # @pytest.mark.timeout(PYTEST_TIMEOUT)
-# def test_widgets_e2e_log_panel(qtbot, connected_client_gui_obj, random_generator_from_seed):
-#     """Test the LogPanel widget."""
+# def test_widgets_e2e_bec_progress_bar(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the BECProgressBar widget."""
 #     gui = connected_client_gui_obj
 #     bec = gui._client
 #     # Create dock_area and widget
-#     widget = create_widget(qtbot, gui, gui.available_widgets.LogPanel)
-#     widget: client.LogPanel
+#     widget = create_widget(qtbot, gui, gui.available_widgets.BECProgressBar)
+#     widget: client.BECProgressBar
+
+#     # Check rpc calls
+#     assert widget.label_template == "$value / $maximum - $percentage %"
+#     widget.set_maximum(100)
+#     widget.set_minimum(50)
+#     widget.set_value(75)
+
+#     assert widget._get_label() == "75 / 100 - 50 %"
+
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+
+
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_bec_queue(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the BECQueue widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.BECQueue)
+#     widget: client.BECQueue
+
+#     # No rpc calls to test so far
+#     #  maybe we can add an rpc call to check the queue length
+
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+
+
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_bec_status_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the BECStatusBox widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.BECStatusBox)
+
+#     # Check rpc calls
+#     assert widget.get_server_state() in ["RUNNING", "IDLE", "BUSY", "ERROR"]
+
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+
+
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_dap_combo_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the DAPComboBox widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.DapComboBox)
+#     widget: client.DAPComboBox
+
+#     # Check rpc calls
+#     widget.select_fit_model("PseudoVoigtModel")
+#     widget.select_x_axis("samx")
+#     widget.select_y_axis("bpm4i")
+
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+
+
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_device_browser(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the DeviceBrowser widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.DeviceBrowser)
+#     widget: client.DeviceBrowser
+
+#     # No rpc calls yet to check
+
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+
+
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_image(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the Image widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.Image)
+#     widget: client.Image
+
+#     scans = bec.scans
+#     dev = bec.device_manager.devices
+#     # Test rpc calls
+#     img = widget.image(device=dev.eiger.name, signal="preview")
+#     assert img.get_data() is None
+#     # Run a scan and plot the image
+#     s = scans.line_scan(dev.samx, -3, 3, steps=50, exp_time=0.01, relative=False)
+#     s.wait()
+
+#     def _wait_for_scan_in_history():
+#         # Get scan item from history
+#         scan_item = bec.history.get_by_scan_id(s.scan.scan_id)
+#         return scan_item is not None
+
+#     qtbot.waitUntil(_wait_for_scan_in_history, timeout=7000)
+
+#     # Check that last image is equivalent to data in Redis
+#     last_img = bec.connector.get_last(MessageEndpoints.device_preview("eiger", "preview"))[
+#         "data"
+#     ].data
+#     assert np.allclose(img.get_data(), last_img)
+
+#     # Now add a device with a preview signal
+#     img = widget.image(device="eiger", signal="preview")
+#     s = scans.line_scan(dev.samx, -3, 3, steps=50, exp_time=0.01, relative=False)
+#     s.wait()
+
+#     qtbot.waitUntil(_wait_for_scan_in_history, timeout=7000)
+
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+
+
+# # TODO re-enable when issue is resolved #560
+# # @pytest.mark.timeout(PYTEST_TIMEOUT)
+# # def test_widgets_e2e_log_panel(qtbot, connected_client_gui_obj, random_generator_from_seed):
+# #     """Test the LogPanel widget."""
+# #     gui = connected_client_gui_obj
+# #     bec = gui._client
+# #     # Create dock_area and widget
+# #     widget = create_widget(qtbot, gui, gui.available_widgets.LogPanel)
+# #     widget: client.LogPanel
+
+# #     # No rpc calls to check so far
+
+# #     # Test removing the widget, or leaving it open for the next test
+# #     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+
+
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_minesweeper(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the MineSweeper widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.Minesweeper)
+#     widget: client.MineSweeper

 #     # No rpc calls to check so far

@@ -280,175 +296,160 @@ def test_widgets_e2e_image(qtbot, connected_client_gui_obj, random_generator_fro
 #     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_minesweeper(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the MineSweeper widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.Minesweeper)
-    widget: client.MineSweeper
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_motor_map(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the MotorMap widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.MotorMap)
+#     widget: client.MotorMap

-    # No rpc calls to check so far
+#     # Test RPC calls
+#     dev = bec.device_manager.devices
+#     scans = bec.scans
+#     # Set motor map to names
+#     widget.map(dev.samx, dev.samy)
+#     # Move motor samx to pos
+#     pos = dev.samx.limits[1] - 1  # -1 from higher limit
+#     scans.mv(dev.samx, pos, relative=False).wait()
+#     # Check that data is up to date
+#     assert np.isclose(widget.get_data()["x"][-1], pos, dev.samx.precision)
+#     # Move motor samy to pos
+#     pos = dev.samy.limits[0] + 1  # +1 from lower limit
+#     scans.mv(dev.samy, pos, relative=False).wait()
+#     # Check that data is up to date
+#     assert np.isclose(widget.get_data()["y"][-1], pos, dev.samy.precision)

-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_motor_map(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the MotorMap widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.MotorMap)
-    widget: client.MotorMap
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_multi_waveform(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test MultiWaveform widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.MultiWaveform)
+#     widget: client.MultiWaveform

-    # Test RPC calls
-    dev = bec.device_manager.devices
-    scans = bec.scans
-    # Set motor map to names
-    widget.map(dev.samx, dev.samy)
-    # Move motor samx to pos
-    pos = dev.samx.limits[1] - 1  # -1 from higher limit
-    scans.mv(dev.samx, pos, relative=False).wait()
-    # Check that data is up to date
-    assert np.isclose(widget.get_data()["x"][-1], pos, dev.samx.precision)
-    # Move motor samy to pos
-    pos = dev.samy.limits[0] + 1  # +1 from lower limit
-    scans.mv(dev.samy, pos, relative=False).wait()
-    # Check that data is up to date
-    assert np.isclose(widget.get_data()["y"][-1], pos, dev.samy.precision)
+#     # Test RPC calls
+#     dev = bec.device_manager.devices
+#     scans = bec.scans
+#     # test plotting
+#     cm = "cividis"
+#     widget.plot(dev.waveform, color_palette=cm)
+#     assert widget.monitor == dev.waveform.name
+#     assert widget.color_palette == cm

-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     # Scan with BEC
+#     s = scans.line_scan(dev.samx, -3, 3, steps=5, exp_time=0.01, relative=False)
+#     s.wait()
+
+#     def _wait_for_scan_in_history():
+#         # Get scan item from history
+#         scan_item = bec.history.get_by_scan_id(s.scan.scan_id)
+#         return scan_item is not None
+
+#     qtbot.waitUntil(_wait_for_scan_in_history, timeout=7000)
+#     # Wait for data in history (should be plotted?)
+
+#     # TODO how can we check that the data was plotted, implement get_data()
+
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_multi_waveform(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test MultiWaveform widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.MultiWaveform)
-    widget: client.MultiWaveform
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_positioner_indicator(
+#     qtbot, connected_client_gui_obj, random_generator_from_seed
+# ):
+#     """Test the PositionIndicator widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.PositionIndicator)
+#     widget: client.PositionIndicator

-    # Test RPC calls
-    dev = bec.device_manager.devices
-    scans = bec.scans
-    # test plotting
-    cm = "cividis"
-    widget.plot(dev.waveform, color_palette=cm)
-    assert widget.monitor == dev.waveform.name
-    assert widget.color_palette == cm
+#     # TODO check what these rpc calls are supposed to do! Issue created #461
+#     widget.set_value(5)

-    # Scan with BEC
-    s = scans.line_scan(dev.samx, -3, 3, steps=5, exp_time=0.01, relative=False)
-    s.wait()
-
-    def _wait_for_scan_in_history():
-        # Get scan item from history
-        scan_item = bec.history.get_by_scan_id(s.scan.scan_id)
-        return scan_item is not None
-
-    qtbot.waitUntil(_wait_for_scan_in_history, timeout=7000)
-    # Wait for data in history (should be plotted?)
-
-    # TODO how can we check that the data was plotted, implement get_data()
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_positioner_indicator(
-    qtbot, connected_client_gui_obj, random_generator_from_seed
-):
-    """Test the PositionIndicator widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.PositionIndicator)
-    widget: client.PositionIndicator
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_positioner_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the PositionerBox widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.PositionerBox)
+#     widget: client.PositionerBox

-    # TODO check what these rpc calls are supposed to do! Issue created #461
-    widget.set_value(5)
+#     # Test rpc calls
+#     dev = bec.device_manager.devices
+#     scans = bec.scans
+#     # No rpc calls to check so far
+#     widget.set_positioner(dev.samx)
+#     widget.set_positioner(dev.samy.name)

-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     scans.mv(dev.samy, -3, relative=False).wait()
+
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_positioner_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the PositionerBox widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.PositionerBox)
-    widget: client.PositionerBox
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_positioner_box_2d(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the PositionerBox2D widget."""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.PositionerBox2D)
+#     widget: client.PositionerBox2D

-    # Test rpc calls
-    dev = bec.device_manager.devices
-    scans = bec.scans
-    # No rpc calls to check so far
-    widget.set_positioner(dev.samx)
-    widget.set_positioner(dev.samy.name)
+#     # Test rpc calls
+#     dev = bec.device_manager.devices
+#     scans = bec.scans
+#     # No rpc calls to check so far
+#     widget.set_positioner_hor(dev.samx)
+#     widget.set_positioner_ver(dev.samy)

-    scans.mv(dev.samy, -3, relative=False).wait()
+#     # Try moving the motors
+#     scans.mv(dev.samx, 3, relative=False).wait()
+#     scans.mv(dev.samy, -3, relative=False).wait()

-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_positioner_box_2d(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the PositionerBox2D widget."""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.PositionerBox2D)
-    widget: client.PositionerBox2D
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_positioner_control_line(
+#     qtbot, connected_client_gui_obj, random_generator_from_seed
+# ):
+#     """Test the positioner control line widget"""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.PositionerControlLine)
+#     widget: client.PositionerControlLine

-    # Test rpc calls
-    dev = bec.device_manager.devices
-    scans = bec.scans
-    # No rpc calls to check so far
-    widget.set_positioner_hor(dev.samx)
-    widget.set_positioner_ver(dev.samy)
+#     # Test rpc calls
+#     dev = bec.device_manager.devices
+#     scans = bec.scans
+#     # Set positioner
+#     widget.set_positioner(dev.samx)
+#     scans.mv(dev.samx, 3, relative=False).wait()
+#     widget.set_positioner(dev.samy.name)
+#     scans.mv(dev.samy, -3, relative=False).wait()

-    # Try moving the motors
-    scans.mv(dev.samx, 3, relative=False).wait()
-    scans.mv(dev.samy, -3, relative=False).wait()
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_positioner_control_line(
-    qtbot, connected_client_gui_obj, random_generator_from_seed
-):
-    """Test the positioner control line widget"""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.PositionerControlLine)
-    widget: client.PositionerControlLine
-
-    # Test rpc calls
-    dev = bec.device_manager.devices
-    scans = bec.scans
-    # Set positioner
-    widget.set_positioner(dev.samx)
-    scans.mv(dev.samx, 3, relative=False).wait()
-    widget.set_positioner(dev.samy.name)
-    scans.mv(dev.samy, -3, relative=False).wait()
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
-# TODO passes locally, fails on CI for some reason... -> issue #1003
+@pytest.mark.repeat(20)
@pytest.mark.timeout(PYTEST_TIMEOUT)
 def test_widgets_e2e_ring_progress_bar(qtbot, connected_client_gui_obj, random_generator_from_seed):
    """Test the RingProgressBar widget"""
@@ -477,86 +478,86 @@ def test_widgets_e2e_ring_progress_bar(qtbot, connected_client_gui_obj, random_g
    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_scan_control(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the ScanControl widget"""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.ScanControl)
-    widget: client.ScanControl
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_scan_control(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the ScanControl widget"""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.ScanControl)
+#     widget: client.ScanControl

-    # No rpc calls to check so far
+#     # No rpc calls to check so far

-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_scatter_waveform(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the ScatterWaveform widget"""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.ScatterWaveform)
-    widget: client.ScatterWaveform
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_scatter_waveform(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the ScatterWaveform widget"""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.ScatterWaveform)
+#     widget: client.ScatterWaveform

-    # Test rpc calls
-    dev = bec.device_manager.devices
-    scans = bec.scans
-    widget.plot(dev.samx, dev.samy, dev.bpm4i)
-    scans.grid_scan(dev.samx, -5, 5, 5, dev.samy, -5, 5, 5, exp_time=0.01, relative=False).wait()
+#     # Test rpc calls
+#     dev = bec.device_manager.devices
+#     scans = bec.scans
+#     widget.plot(dev.samx, dev.samy, dev.bpm4i)
+#     scans.grid_scan(dev.samx, -5, 5, 5, dev.samy, -5, 5, 5, exp_time=0.01, relative=False).wait()

-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_text_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the TextBox widget"""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.TextBox)
-    widget: client.TextBox
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_text_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the TextBox widget"""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.TextBox)
+#     widget: client.TextBox

-    # RPC calls
-    widget.set_plain_text("Hello World")
-    widget.set_html_text("<b> Hello World HTML </b>")
+#     # RPC calls
+#     widget.set_plain_text("Hello World")
+#     widget.set_html_text("<b> Hello World HTML </b>")

-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)


-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_waveform(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the Waveform widget"""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area and widget
-    widget = create_widget(qtbot, gui, gui.available_widgets.Waveform)
-    widget: client.Waveform
+# @pytest.mark.timeout(PYTEST_TIMEOUT)
+# def test_widgets_e2e_waveform(qtbot, connected_client_gui_obj, random_generator_from_seed):
+#     """Test the Waveform widget"""
+#     gui = connected_client_gui_obj
+#     bec = gui._client
+#     # Create dock_area and widget
+#     widget = create_widget(qtbot, gui, gui.available_widgets.Waveform)
+#     widget: client.Waveform

-    # Test rpc calls
-    dev = bec.device_manager.devices
-    scans = bec.scans
-    widget.plot(dev.bpm4i)
-    s = scans.line_scan(dev.samx, -3, 3, steps=50, exp_time=0.01, relative=False)
-    s.wait()
+#     # Test rpc calls
+#     dev = bec.device_manager.devices
+#     scans = bec.scans
+#     widget.plot(dev.bpm4i)
+#     s = scans.line_scan(dev.samx, -3, 3, steps=50, exp_time=0.01, relative=False)
+#     s.wait()

-    def _wait_for_scan_in_history():
-        # Get scan item from history
-        scan_item = bec.history.get_by_scan_id(s.scan.scan_id)
-        return scan_item is not None
+#     def _wait_for_scan_in_history():
+#         # Get scan item from history
+#         scan_item = bec.history.get_by_scan_id(s.scan.scan_id)
+#         return scan_item is not None

-    qtbot.waitUntil(_wait_for_scan_in_history, timeout=7000)
+#     qtbot.waitUntil(_wait_for_scan_in_history, timeout=7000)

-    scan_item = bec.history.get_by_scan_id(s.scan.scan_id)
-    samx_data = scan_item.devices.samx.samx.read()["value"]
-    bpm4i_data = scan_item.devices.bpm4i.bpm4i.read()["value"]
-    curve = widget.curves[0]
-    assert np.allclose(curve.get_data()[0], samx_data)
-    assert np.allclose(curve.get_data()[1], bpm4i_data)
+#     scan_item = bec.history.get_by_scan_id(s.scan.scan_id)
+#     samx_data = scan_item.devices.samx.samx.read()["value"]
+#     bpm4i_data = scan_item.devices.bpm4i.bpm4i.read()["value"]
+#     curve = widget.curves[0]
+#     assert np.allclose(curve.get_data()[0], samx_data)
+#     assert np.allclose(curve.get_data()[1], bpm4i_data)

-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
+#     # Test removing the widget, or leaving it open for the next test
+#     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
--- a/tests/unit_tests/test_developer_view.py
+++ b/tests/unit_tests/test_developer_view.py
@@ -38,8 +38,7 @@ def developer_view(qtbot, mocked_client):
 def temp_python_file():
    """Create a temporary Python file for testing."""
    with tempfile.NamedTemporaryFile(mode="w", suffix=".py", delete=False) as f:
-        f.write(
-            """# Test Python file
+        f.write("""# Test Python file
 import os
 import sys

@@ -48,8 +47,7 @@ def test_function():

 if __name__ == "__main__":
    print(test_function())
-"""
-        )
+""")
        temp_file_path = f.name

    yield temp_file_path
--- a/tests/unit_tests/test_generate_cli_client.py
+++ b/tests/unit_tests/test_generate_cli_client.py
@@ -88,8 +88,7 @@ def test_client_generator_with_black_formatting():
    generator.generate_client(container)

    # Format the expected output with black to ensure it matches the generator output
-    expected_output = dedent(
-        '''\
+    expected_output = dedent('''\
        # This file was automatically generated by generate_cli.py
        # type: ignore

@@ -174,8 +173,7 @@ def test_client_generator_with_black_formatting():
                """
                Set the amplitude of the waveform.
                """
-    '''
-    )
+    ''')

    expected_output_formatted = black.format_str(
        expected_output, mode=black.FileMode(line_length=100)
--- a/tests/unit_tests/test_ide_explorer.py
+++ b/tests/unit_tests/test_ide_explorer.py
@@ -68,21 +68,17 @@ def test_shared_macros_section_with_files(ide_explorer, tmpdir):
    """Test that shared macros section is created when plugin directory has files"""
    # Create dummy shared macro files
    shared_macros_dir = tmpdir.mkdir("shared_macros")
-    shared_macros_dir.join("shared_macro1.py").write(
-        """
+    shared_macros_dir.join("shared_macro1.py").write("""
 def shared_function1():
    return "shared1"

 def shared_function2():
    return "shared2"
-"""
-    )
-    shared_macros_dir.join("utilities.py").write(
-        """
+""")
+    shared_macros_dir.join("utilities.py").write("""
 def utility_function():
    return "utility"
-"""
-    )
+""")

    with mock.patch.object(ide_explorer, "_get_plugin_dir") as mock_get_plugin_dir:
        mock_get_plugin_dir.return_value = str(shared_macros_dir)
--- a/tests/unit_tests/test_macro_tree_widget.py
+++ b/tests/unit_tests/test_macro_tree_widget.py
@@ -20,8 +20,7 @@ def temp_macro_files(tmpdir):

    # Create a simple macro file with functions
    macro_file1 = macro_dir / "test_macros.py"
-    macro_file1.write_text(
-        '''
+    macro_file1.write_text('''
 def test_macro_function():
    """A test macro function."""
    return "test"
@@ -34,13 +33,11 @@ class TestClass:
    """This class should be ignored."""
    def method(self):
        pass
-'''
-    )
+''')

    # Create another macro file
    macro_file2 = macro_dir / "utils_macros.py"
-    macro_file2.write_text(
-        '''
+    macro_file2.write_text('''
 def utility_function():
    """A utility function."""
    pass
@@ -48,37 +45,30 @@ def utility_function():
 def deprecated_function():
    """Old function."""
    return None
-'''
-    )
+''')

    # Create a file with no functions (should be ignored)
    empty_file = macro_dir / "empty.py"
-    empty_file.write_text(
-        """
+    empty_file.write_text("""
 # Just a comment
 x = 1
 y = 2
-"""
-    )
+""")

    # Create a file starting with underscore (should be ignored)
    private_file = macro_dir / "_private.py"
-    private_file.write_text(
-        """
+    private_file.write_text("""
 def private_function():
    return "private"
-"""
-    )
+""")

    # Create a file with syntax errors
    error_file = macro_dir / "error_file.py"
-    error_file.write_text(
-        """
+    error_file.write_text("""
 def broken_function(
    # Missing closing parenthesis and colon
    pass
-"""
-    )
+""")

    return macro_dir

@@ -406,13 +396,11 @@ class TestMacroTreeRefresh:

        # Add a new macro file
        new_file = temp_macro_files / "new_macros.py"
-        new_file.write_text(
-            '''
+        new_file.write_text('''
 def new_function():
    """A new function."""
    return "new"
-'''
-        )
+''')

        # Refresh the tree
        macro_tree.refresh()
@@ -439,14 +427,12 @@ def new_function():

        # Modify the file to add a new function
        with open(test_file_path, "a") as f:
-            f.write(
-                '''
+            f.write('''

 def newly_added_function():
    """A newly added function."""
    return "added"
-'''
-            )
+''')

        # Refresh just this file
        macro_tree.refresh_file_item(test_file_path)
--- a/tests/unit_tests/test_positioner_box.py
+++ b/tests/unit_tests/test_positioner_box.py
@@ -98,7 +98,9 @@ def test_positioner_box_on_stop(positioner_box):
            queue="emergency",
            metadata={"RID": "fake_uuid", "response": False},
        )
-        mock_send.assert_called_once_with(MessageEndpoints.scan_queue_request(), msg)
+        mock_send.assert_called_once_with(
+            MessageEndpoints.scan_queue_request(positioner_box.client.username), msg
+        )


 def test_positioner_box_setpoint_change(positioner_box):
--- a/tests/unit_tests/test_waveform.py
+++ b/tests/unit_tests/test_waveform.py
@@ -516,6 +516,112 @@ def test_plot_custom_curve_with_inline_dap(qtbot, mocked_client_with_dap):
    assert dap_curve.config.signal.dap == "GaussianModel"


+def test_normalize_dap_parameters_number_dict():
+    normalized = Waveform._normalize_dap_parameters({"amplitude": 1.0, "center": 2})
+    assert normalized == {
+        "amplitude": {"name": "amplitude", "value": 1.0, "vary": False},
+        "center": {"name": "center", "value": 2.0, "vary": False},
+    }
+
+
+def test_normalize_dap_parameters_dict_spec_defaults_vary_false():
+    normalized = Waveform._normalize_dap_parameters({"sigma": {"value": 0.8, "min": 0.0}})
+    assert normalized["sigma"]["name"] == "sigma"
+    assert normalized["sigma"]["value"] == 0.8
+    assert normalized["sigma"]["min"] == 0.0
+    assert normalized["sigma"]["vary"] is False
+
+
+def test_normalize_dap_parameters_invalid_type_raises():
+    with pytest.raises(TypeError):
+        Waveform._normalize_dap_parameters(["amplitude", 1.0])  # type: ignore[arg-type]
+
+
+def test_normalize_dap_parameters_composite_list():
+    normalized = Waveform._normalize_dap_parameters(
+        [{"center": 1.0}, {"sigma": {"value": 0.5, "min": 0.0}}],
+        dap_name=["GaussianModel", "GaussianModel"],
+    )
+    assert normalized == [
+        {"center": {"name": "center", "value": 1.0, "vary": False}},
+        {"sigma": {"name": "sigma", "value": 0.5, "min": 0.0, "vary": False}},
+    ]
+
+
+def test_normalize_dap_parameters_composite_dict():
+    normalized = Waveform._normalize_dap_parameters(
+        {
+            "GaussianModel": {"center": {"value": 1.0, "vary": True}},
+            "LorentzModel": {"amplitude": 2.0},
+        },
+        dap_name=["GaussianModel", "LorentzModel"],
+    )
+    assert normalized["GaussianModel"]["center"]["value"] == 1.0
+    assert normalized["GaussianModel"]["center"]["vary"] is True
+    assert normalized["LorentzModel"]["amplitude"]["value"] == 2.0
+    assert normalized["LorentzModel"]["amplitude"]["vary"] is False
+
+
+def test_request_dap_includes_normalized_parameters(qtbot, mocked_client_with_dap, monkeypatch):
+    wf = create_widget(qtbot, Waveform, client=mocked_client_with_dap)
+    curve = wf.plot(
+        x=[0, 1, 2],
+        y=[1, 2, 3],
+        label="custom-inline-params",
+        dap="GaussianModel",
+        dap_parameters={"amplitude": 1.0},
+    )
+    dap_curve = wf.get_curve(f"{curve.name()}-GaussianModel")
+    assert dap_curve is not None
+    dap_curve.dap_oversample = 3
+
+    captured = {}
+
+    def capture(topic, msg, *args, **kwargs):  # noqa: ARG001
+        captured["topic"] = topic
+        captured["msg"] = msg
+
+    monkeypatch.setattr(wf.client.connector, "set_and_publish", capture)
+    wf.request_dap()
+
+    msg = captured["msg"]
+    dap_kwargs = msg.content["config"]["kwargs"]
+    assert dap_kwargs["oversample"] == 3
+    assert dap_kwargs["parameters"] == {
+        "amplitude": {"name": "amplitude", "value": 1.0, "vary": False}
+    }
+
+
+def test_request_dap_includes_composite_parameters_list(qtbot, mocked_client_with_dap, monkeypatch):
+    wf = create_widget(qtbot, Waveform, client=mocked_client_with_dap)
+    curve = wf.plot(
+        x=[0, 1, 2],
+        y=[1, 2, 3],
+        label="custom-composite",
+        dap=["GaussianModel", "GaussianModel"],
+        dap_parameters=[{"center": 0.0}, {"center": 1.0}],
+    )
+    dap_curve = wf.get_curve(f"{curve.name()}-GaussianModel+GaussianModel")
+    assert dap_curve is not None
+
+    captured = {}
+
+    def capture(topic, msg, *args, **kwargs):  # noqa: ARG001
+        captured["topic"] = topic
+        captured["msg"] = msg
+
+    monkeypatch.setattr(wf.client.connector, "set_and_publish", capture)
+    wf.request_dap()
+
+    msg = captured["msg"]
+    dap_kwargs = msg.content["config"]["kwargs"]
+    assert dap_kwargs["parameters"] == [
+        {"center": {"name": "center", "value": 0.0, "vary": False}},
+        {"center": {"name": "center", "value": 1.0, "vary": False}},
+    ]
+    assert msg.content["config"]["class_kwargs"]["model"] == ["GaussianModel", "GaussianModel"]
+
+
 def test_fetch_scan_data_and_access(qtbot, mocked_client, monkeypatch):
    """
    Test the _fetch_scan_data_and_access method returns live_data/val if in a live scan,
Author	SHA1	Message	Date
wakonig_k	a275c5a3b1	wip	2026-03-15 14:31:39 +01:00
wakonig_k	b12e6432d6	wip	2026-03-15 13:59:43 +01:00
wakonig_k	b802beec69	wip	2026-03-15 13:53:37 +01:00
wakonig_k	6c40df4380	wip	2026-03-15 13:36:13 +01:00
wakonig_k	dc8ae5a85d	wip	2026-03-15 13:31:45 +01:00
wakonig_k	2d41a158bc	wip	2026-03-15 13:25:42 +01:00
wakonig_k	c2a6964875	wip	2026-03-15 13:18:15 +01:00
wakonig_k	774ca08cb3	wip	2026-03-15 13:06:18 +01:00
wakonig_k	4606bbd570	wip	2026-03-15 13:01:44 +01:00
wakonig_k	b2ed9d42f7	wip	2026-03-15 12:57:19 +01:00
wakonig_k	d799691e12	wip	2026-03-15 12:47:58 +01:00
wakonig_k	6848a9e20b	test(e2e): avoid timing issues in rpc_gui_obj test	2026-03-15 12:30:40 +01:00
semantic-release	bd5aafc052	3.2.0 Automatically generated by python-semantic-release	2026-03-11 20:52:57 +00:00
wyzula-jan	b4f6f5aa8b	feat(waveform): composite DAP with multiple models	2026-03-11 21:52:10 +01:00
wyzula-jan	14d51b8016	feat(curve, waveform): add dap_parameters for lmfit customization in DAP requests	2026-03-11 21:52:10 +01:00
semantic-release	e94554b471	3.1.4 Automatically generated by python-semantic-release	2026-03-11 11:58:34 +00:00
wyzula-jan	7e0e391888	build: increased minimal version of bec and bec qthemes	2026-03-11 12:57:40 +01:00
wyzula-jan	53e5ec42b8	fix(profile_utils): renamed to fetch widgets settings	2026-03-11 12:57:40 +01:00
semantic-release	0e49828a23	3.1.3 Automatically generated by python-semantic-release	2026-03-09 08:46:29 +00:00
wyzula-jan	278d8de058	fix(monaco_dock): optimization, removal of QTimer, eventFilter replaced by signal/slot	2026-03-09 09:45:40 +01:00
semantic-release	cb4c2beed4	3.1.2 Automatically generated by python-semantic-release	2026-03-06 15:34:15 +00:00
wyzula-jan	4382d5c9b1	fix(dock_area): remove old AdvancedDockArea references	2026-03-06 16:33:23 +01:00
wakonig_k	8463b32792	build(deps): update isort requirement	2026-03-06 12:02:48 +01:00
semantic-release	5aff336446	3.1.1 Automatically generated by python-semantic-release	2026-03-06 10:47:17 +00:00
wakonig_k	e2daf2e89c	build: update min bec dependency to 3.106	2026-03-06 11:46:29 +01:00
wakonig_k	ef1233163c	test: fix import of bec_lib json extended	2026-03-06 11:46:29 +01:00
wakonig_k	419c01bdd4	fix(positioner box): include username in scan queue request	2026-03-06 11:46:29 +01:00
wyzula-jan	d4e037f338	refactor(black): black 26 applied	2026-03-06 11:25:37 +01:00
wyzula-jan	e157f0d7c9	build(deps): upgrade to black 26	2026-03-06 11:25:37 +01:00