fix(waveform): async data duplication if multiple signals from same device fixed

Automatically generated by python-semantic-release

.gitlab-ci.yml

@@ -13,7 +13,7 @@ variables:
     value: main
   CHILD_PIPELINE_BRANCH: $CI_DEFAULT_BRANCH
   CHECK_PKG_VERSIONS:
-    description: Whether to run additional tests against min/max/random selection of dependencies. Set to 1 for running. 
+    description: Whether to run additional tests against min/max/random selection of dependencies. Set to 1 for running.
     value: 0
 
 workflow:
@@ -77,7 +77,7 @@ formatter:
   stage: Formatter
   needs: []
   script:
-    - pip install bec_lib[dev]
+    - pip install -e ./[dev]
     - isort --check --diff --line-length=100 --profile=black --multi-line=3 --trailing-comma ./
     - black --check --diff --color --line-length=100 --skip-magic-trailing-comma ./
   rules:
@@ -162,6 +162,20 @@ tests:
       - tests/reference_failures/
     when: always
 
+generate-client-check:
+  stage: test
+  needs: []
+  variables:
+    QT_QPA_PLATFORM: "offscreen"
+  script:
+    - *clone-repos
+    - *install-os-packages
+    - *install-repos
+    - pip install -e .[dev,pyside6]
+    - bw-generate-cli --target bec_widgets
+    # if there are changes in the generated files, fail the job
+    - git diff --exit-code
+
 test-matrix:
   parallel:
     matrix:
@@ -189,7 +203,7 @@ test-matrix:
 end-2-end-conda:
   stage: End2End
   needs: []
-  image: continuumio/miniconda3
+  image: continuumio/miniconda3:25.1.1-2
   allow_failure: false
   variables:
     QT_QPA_PLATFORM: "offscreen"
@@ -216,7 +230,7 @@ end-2-end-conda:
     - pip install -e ./ophyd_devices
 
     - pip install -e .[dev,pyside6]
-    - pytest -v --files-path ./ --start-servers --flush-redis --random-order  ./tests/end-2-end
+    - pytest -v --files-path ./ --start-servers --random-order  ./tests/end-2-end
 
   artifacts:
     when: on_failure
@@ -231,7 +245,7 @@ end-2-end-conda:
     - if: '$CI_PIPELINE_SOURCE == "parent_pipeline"'
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^pre_release.*$/'
+    - if: "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^pre_release.*$/"
 
 semver:
   stage: Deploy

CHANGELOG.md

@@ -1,6 +1,106 @@
 # CHANGELOG
 
 
+## v2.1.2 (2025-05-06)
+
+### Bug Fixes
+
+- **waveform**: Ignore callbacks for on_async_readback from QtSender objects that are already
+  destroyed; closes #497
+  ([`64a4824`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/64a48240546846fdf4541c2adf3a0a5a0829f948))
+
+### Build System
+
+- Remove flush-redis from ci job
+  ([`a6c479e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a6c479e42ea2a47c45e5a323bb3072bab503ecf1))
+
+### Refactoring
+
+- **bec-progressbar**: Add private method for bec_progressbar, udate client file
+  ([`37f0024`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/37f002427ad5da01164ae3b0f4983695fe61c243))
+
+- **bec-status-box**: Add get_server_state user_access method to BECStatusBox
+  ([`1619446`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1619446ec9839cfa1c666a3790a0c2abc449c4a8))
+
+
+## v2.1.1 (2025-05-06)
+
+### Bug Fixes
+
+- Import add operator in client
+  ([`55f7efc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/55f7efc4f586128dfb66fc6a8eb5d3a9f32bf61e))
+
+### Refactoring
+
+- Supply bec designer filename to function
+  ([`be72c9f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/be72c9f2708c93dab24d4383f5622e38cf1dc8a2))
+
+
+## v2.1.0 (2025-05-05)
+
+### Bug Fixes
+
+- Ensure rpc object do not collide with protected names
+  ([`94463af`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/94463afdba11fe2da5958a371ef49572889b8622))
+
+### Chores
+
+- **formatter**: Upgrade to black v25
+  ([`452124b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/452124b528c41db14d1e34ab98db95f6f7230ad6))
+
+### Continuous Integration
+
+- Install dev dependencies for formatter
+  ([`fff4af2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fff4af2489bdea0cf4f6f8db68db59fba411c25e))
+
+### Features
+
+- **SafeSlot**: Slot parameters can be overridden with kwarg; add option to raise
+  ([`9387275`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/93872758517177503b1f868376a6095670131844))
+
+### Refactoring
+
+- **colormap_widget**: Widget is rounded
+  ([`02563b1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/02563b10f3c90bddc069446dfe4137aa5a9727cb))
+
+### Testing
+
+- **Dock**: Add validation for new dock creation with invalid name
+  ([`c16b9dc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c16b9dce9ce629b794d731cd7f3282a59f8b8c59))
+
+
+## v2.0.3 (2025-05-02)
+
+### Bug Fixes
+
+- **generate_cli**: Apply isort config
+  ([`770dbd4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/770dbd4b63baba588871a4d4ffa77d44872d085b))
+
+- **image_item**: Wrong user access name for rotation
+  ([`58a0bc7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/58a0bc79742e7e7578988711a9840ed6041d9a69))
+
+### Continuous Integration
+
+- Add job to test that the generated client is up to date
+  ([`d22035f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d22035f8974ac51ae1b6efc0e2b3749ca0a674ff))
+
+
+## v2.0.2 (2025-05-01)
+
+### Bug Fixes
+
+- **plot_base**: No content margin for plot_widget window
+  ([`1b78840`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1b78840fd87ea0f156c73beeb57c6c06f685f7b1))
+
+
+## v2.0.1 (2025-04-30)
+
+### Bug Fixes
+
+- **dock_area**: Restore state safeguard to not pass none to pyqtgraph restoreState
+  ([`9079ddd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9079ddd7278ede7a9a12d7b39797154e83659c20))
+
+
 ## v2.0.0 (2025-04-29)
 
 ### Bug Fixes

bec_widgets/applications/launch_window.py

@@ -235,10 +235,8 @@ class LaunchWindow(BECMainWindow):
                     raise ValueError(
                         f"Name {name} must be unique for dock areas, but already exists: {existing_dock_areas}."
                     )
-                if not WidgetContainerUtils.has_name_valid_chars(name):
-                    raise ValueError(
-                        f"Name {name} contains invalid characters. Only alphanumeric characters, underscores, and dashes are allowed."
-                    )
+                WidgetContainerUtils.raise_for_invalid_name(name)
+
             else:
                 name = "dock_area"
                 name = WidgetContainerUtils.generate_unique_name(name, existing_dock_areas)
@@ -284,6 +282,8 @@ class LaunchWindow(BECMainWindow):
             raise ValueError("UI file must be provided for custom UI file launch.")
         filename = os.path.basename(ui_file).split(".")[0]
 
+        WidgetContainerUtils.raise_for_invalid_name(filename)
+
         tree = ET.parse(ui_file)
         root = tree.getroot()
         # Check if the top-level widget is a QMainWindow

bec_widgets/cli/client.py

@@ -7,6 +7,7 @@ import enum
 import inspect
 import traceback
 from functools import reduce
+from operator import add
 from typing import Literal, Optional
 
 from bec_lib.logger import bec_logger
@@ -469,6 +470,12 @@ class BECProgressBar(RPCBase):
         >>> progressbar.label_template = "$value / $percentage %"
         """
 
+    @rpc_call
+    def _get_label(self) -> str:
+        """
+        Return the label text. mostly used for testing rpc.
+        """
+
 
 class BECQueue(RPCBase):
     """Widget to display the BEC queue."""
@@ -483,6 +490,12 @@ class BECQueue(RPCBase):
 class BECStatusBox(RPCBase):
     """An autonomous widget to display the status of BEC services."""
 
+    @rpc_call
+    def get_server_state(self) -> "str":
+        """
+        Get the state ("RUNNING", "BUSY", "IDLE", "ERROR") of the BEC server
+        """
+
     @rpc_call
     def remove(self):
         """
@@ -1317,14 +1330,14 @@ class ImageItem(RPCBase):
 
     @property
     @rpc_call
-    def rotation(self) -> "Optional[int]":
+    def num_rotation_90(self) -> "Optional[int]":
         """
         Get or set the number of 90° rotations to apply.
         """
 
-    @rotation.setter
+    @num_rotation_90.setter
     @rpc_call
-    def rotation(self) -> "Optional[int]":
+    def num_rotation_90(self) -> "Optional[int]":
         """
         Get or set the number of 90° rotations to apply.
         """

bec_widgets/cli/generate_cli.py

@@ -41,6 +41,7 @@ class ClientGenerator:
 import inspect
 import traceback
 from functools import reduce
+from operator import add
 from typing import Literal, Optional
 """
             if self._base
@@ -222,18 +223,18 @@ class {class_name}(RPCBase):"""
         # Combine header and content, then format with black
         full_content = self.header + "\n" + self.content
         try:
-            formatted_content = black.format_str(full_content, mode=black.FileMode(line_length=100))
+            formatted_content = black.format_str(full_content, mode=black.Mode(line_length=100))
         except black.NothingChanged:
             formatted_content = full_content
 
-        isort.Config(
+        config = isort.Config(
             profile="black",
             line_length=100,
             multi_line_output=3,
-            include_trailing_comma=True,
+            include_trailing_comma=False,
             known_first_party=["bec_widgets"],
         )
-        formatted_content = isort.code(formatted_content)
+        formatted_content = isort.code(formatted_content, config=config)
 
         with open(file_name, "w", encoding="utf-8") as file:
             file.write(formatted_content)
@@ -318,5 +319,5 @@ def main():
 if __name__ == "__main__":  # pragma: no cover
     import sys
 
-    sys.argv = ["bw-generate-cli", "--target", "csaxs_bec"]
+    sys.argv = ["bw-generate-cli", "--target", "bec_widgets"]
     main()

bec_widgets/utils/bec_designer.py

@@ -16,9 +16,9 @@ if PYSIDE6:
     from PySide6.scripts.pyside_tool import (
         _extend_path_var,
         init_virtual_env,
-        qt_tool_wrapper,
         is_pyenv_python,
         is_virtual_env,
+        qt_tool_wrapper,
         ui_tool_binary,
     )
 
@@ -78,7 +78,7 @@ def list_editable_packages() -> set[str]:
     return editable_packages
 
 
-def patch_designer():  # pragma: no cover
+def patch_designer(cmd_args: list[str] = []):  # pragma: no cover
     if not PYSIDE6:
         print("PYSIDE6 is not available in the environment. Cannot patch designer.")
         return
@@ -119,7 +119,7 @@ def patch_designer():  # pragma: no cover
             editable_packages = list_editable_packages()
             for pckg in editable_packages:
                 _extend_path_var("PYTHONPATH", pckg, True)
-    qt_tool_wrapper(ui_tool_binary("designer"), sys.argv[1:])
+    qt_tool_wrapper(ui_tool_binary("designer"), cmd_args)
 
 
 def find_plugin_paths(base_path: Path):
@@ -147,7 +147,7 @@ def set_plugin_environment_variable(plugin_paths):
 
 
 # Patch the designer function
-def main():  # pragma: no cover
+def open_designer(cmd_args: list[str] = []):  # pragma: no cover
     if not PYSIDE6:
         print("PYSIDE6 is not available in the environment. Exiting...")
         return
@@ -160,7 +160,11 @@ def main():  # pragma: no cover
 
     set_plugin_environment_variable(plugin_paths)
 
-    patch_designer()
+    patch_designer(cmd_args)
+
+
+def main():
+    open_designer(sys.argv[1:])
 
 
 if __name__ == "__main__":  # pragma: no cover

bec_widgets/utils/bec_dispatcher.py

@@ -25,10 +25,20 @@ if TYPE_CHECKING:  # pragma: no cover
 
 
 class QtThreadSafeCallback(QObject):
+    """QtThreadSafeCallback is a wrapper around a callback function to make it thread-safe for Qt."""
+
     cb_signal = pyqtSignal(dict, dict)
 
-    def __init__(self, cb):
+    def __init__(self, cb: Callable, cb_info: dict | None = None):
+        """
+        Initialize the QtThreadSafeCallback.
+
+        Args:
+            cb (Callable): The callback function to be wrapped.
+            cb_info (dict, optional): Additional information about the callback. Defaults to None.
+        """
         super().__init__()
+        self.cb_info = cb_info
 
         self.cb = cb
         self.cb_signal.connect(self.cb)
@@ -37,7 +47,7 @@ class QtThreadSafeCallback(QObject):
         # make 2 differents QtThreadSafeCallback to look
         # identical when used as dictionary keys, if the
         # callback is the same
-        return id(self.cb)
+        return f"{id(self.cb)}{self.cb_info}".__hash__()
 
     def __call__(self, msg_content, metadata):
         self.cb_signal.emit(msg_content, metadata)
@@ -141,6 +151,7 @@ class BECDispatcher:
         self,
         slot: Callable,
         topics: Union[EndpointInfo, str, list[Union[EndpointInfo, str]]],
+        cb_info: dict | None = None,
         **kwargs,
     ) -> None:
         """Connect widget's qt slot, so that it is called on new pub/sub topic message.
@@ -149,8 +160,9 @@ class BECDispatcher:
             slot (Callable): A slot method/function that accepts two inputs: content and metadata of
                 the corresponding pub/sub message
             topics (EndpointInfo | str | list): A topic or list of topics that can typically be acquired via bec_lib.MessageEndpoints
+            cb_info (dict | None): A dictionary containing information about the callback. Defaults to None.
         """
-        slot = QtThreadSafeCallback(slot)
+        slot = QtThreadSafeCallback(cb=slot, cb_info=cb_info)
         self.client.connector.register(topics, cb=slot, **kwargs)
         topics_str, _ = self.client.connector._convert_endpointinfo(topics)
         self._slots[slot].update(set(topics_str))

bec_widgets/utils/bec_plugin_helper.py

@@ -21,7 +21,7 @@ def _submodule_specs(module: ModuleType) -> tuple[ModuleSpec | None, ...]:
 
 
 def _loaded_submodules_from_specs(
-    submodule_specs: tuple[ModuleSpec | None, ...]
+    submodule_specs: tuple[ModuleSpec | None, ...],
 ) -> Generator[ModuleType, None, None]:
     """Load all submodules from the given specs."""
     for submodule in (

bec_widgets/utils/bec_signal_proxy.py

@@ -1,6 +1,6 @@
-""" This custom class is a thin wrapper around the SignalProxy class to allow signal calls to be blocked.
+"""This custom class is a thin wrapper around the SignalProxy class to allow signal calls to be blocked.
 Unblocking the proxy needs to be done through the slot unblock_proxy. The most likely use case for this class is
-when the callback function is potentially initiating a slower progress, i.e. requesting a data analysis routine to 
+when the callback function is potentially initiating a slower progress, i.e. requesting a data analysis routine to
 analyse data. Requesting a new fit may lead to request piling up and an overall slow done of performance. This proxy
 will allow you to decide by yourself when to unblock and execute the callback again."""
 

bec_widgets/utils/container_utils.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-import itertools
-from typing import Literal, Type
+from typing import Any, Type
 
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.cli.rpc.rpc_register import RPCRegister
+from bec_widgets.cli.client_utils import BECGuiClient
 
 
 class WidgetContainerUtils:
@@ -73,3 +72,36 @@ class WidgetContainerUtils:
             return None
         else:
             raise ValueError(f"No widget of class {widget_class} found.")
+
+    @staticmethod
+    def name_is_protected(name: str, container: Any = None) -> bool:
+        """
+        Check if the name is not protected.
+
+        Args:
+            name(str): The name to be checked.
+
+        Returns:
+            bool: True if the name is not protected, False otherwise.
+        """
+        if container is None:
+            container = BECGuiClient
+        gui_client_methods = set(filter(lambda x: not x.startswith("_"), dir(container)))
+        return name in gui_client_methods
+
+    @staticmethod
+    def raise_for_invalid_name(name: str, container: Any = None) -> None:
+        """
+        Check if the name is valid. If not, raise a ValueError.
+
+        Args:
+            name(str): The name to be checked.
+        Raises:
+            ValueError: If the name is not valid.
+        """
+        if not WidgetContainerUtils.has_name_valid_chars(name):
+            raise ValueError(
+                f"Name '{name}' contains invalid characters. Only alphanumeric characters, underscores, and dashes are allowed."
+            )
+        if WidgetContainerUtils.name_is_protected(name, container):
+            raise ValueError(f"Name '{name}' is protected. Please choose another name.")

bec_widgets/utils/error_popups.py

@@ -99,16 +99,30 @@ def SafeSlot(*slot_args, **slot_kwargs):  # pylint: disable=invalid-name
     'verify_sender' keyword argument can be passed with boolean value if the sender should be verified
     before executing the slot. If True, the slot will only execute if the sender is a QObject. This is
     useful to prevent function calls from already deleted objects.
+    'raise_error' keyword argument can be passed with boolean value if the error should be raised
+    after the error is displayed. This is useful to propagate the error to the caller but should be used
+    with great care to avoid segfaults.
+
+    The keywords above are stored in a container which can be overridden by passing
+    '_override_slot_params' keyword argument with a dictionary containing the keywords to override.
+    This is useful to override the default behavior of the decorator for a specific function call.
+
     """
-    popup_error = bool(slot_kwargs.pop("popup_error", False))
-    verify_sender = bool(slot_kwargs.pop("verify_sender", False))
+    _slot_params = {
+        "popup_error": bool(slot_kwargs.pop("popup_error", False)),
+        "verify_sender": bool(slot_kwargs.pop("verify_sender", False)),
+        "raise_error": bool(slot_kwargs.pop("raise_error", False)),
+    }
 
     def error_managed(method):
         @Slot(*slot_args, **slot_kwargs)
         @functools.wraps(method)
         def wrapper(*args, **kwargs):
+
+            _override_slot_params = kwargs.pop("_override_slot_params", {})
+            _slot_params.update(_override_slot_params)
             try:
-                if not verify_sender or len(args) == 0:
+                if not _slot_params["verify_sender"] or len(args) == 0:
                     return method(*args, **kwargs)
 
                 _instance = args[0]
@@ -126,11 +140,11 @@ def SafeSlot(*slot_args, **slot_kwargs):  # pylint: disable=invalid-name
             except Exception:
                 slot_name = f"{method.__module__}.{method.__qualname__}"
                 error_msg = traceback.format_exc()
-                if popup_error:
-                    ErrorPopupUtility().custom_exception_hook(
-                        *sys.exc_info(), popup_error=popup_error
-                    )
+                if _slot_params["popup_error"]:
+                    ErrorPopupUtility().custom_exception_hook(*sys.exc_info(), popup_error=True)
                 logger.error(f"SafeSlot error in slot '{slot_name}':\n{error_msg}")
+                if _slot_params["raise_error"]:
+                    raise
 
         return wrapper
 

bec_widgets/utils/linear_region_selector.py

@@ -1,5 +1,5 @@
-""" Module for a thin wrapper (LinearRegionWrapper) around the LinearRegionItem in pyqtgraph.
-The class is mainly designed for usage with the BECWaveform and 1D plots. """
+"""Module for a thin wrapper (LinearRegionWrapper) around the LinearRegionItem in pyqtgraph.
+The class is mainly designed for usage with the BECWaveform and 1D plots."""
 
 from __future__ import annotations
 

bec_widgets/widgets/containers/dock/dock.py

@@ -303,11 +303,7 @@ class BECDock(BECWidget, Dock):
             shift(Literal["down", "up", "left", "right"]): The direction to shift the widgets if the position is occupied.
         """
         if name is not None:
-            if not WidgetContainerUtils.has_name_valid_chars(name):
-                raise ValueError(
-                    f"Name {name} contains invalid characters. "
-                    f"Only alphanumeric characters and underscores are allowed."
-                )
+            WidgetContainerUtils.raise_for_invalid_name(name, container=self)
 
         if row is None:
             row = self.layout.rowCount()

bec_widgets/widgets/containers/dock/dock_area.py

@@ -308,6 +308,8 @@ class BECDockArea(BECWidget, QWidget):
         """
         if state is None:
             state = self.config.docks_state
+        if state is None:
+            return
         self.dock_area.restoreState(state, missing=missing, extra=extra)
 
     @SafeSlot()
@@ -364,11 +366,8 @@ class BECDockArea(BECWidget, QWidget):
                     f"Name {name} must be unique for docks, but already exists in DockArea "
                     f"with name: {self.object_name} and id {self.gui_id}."
                 )
-            if not WidgetContainerUtils.has_name_valid_chars(name):
-                raise ValueError(
-                    f"Name {name} contains invalid characters. "
-                    f"Only alphanumeric characters and underscores are allowed."
-                )
+            WidgetContainerUtils.raise_for_invalid_name(name, container=self)
+
         else:  # Name is not provided
             name = WidgetContainerUtils.generate_unique_name(name="dock", list_of_names=dock_names)
 

bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py

@@ -1,4 +1,4 @@
-""" Module for a PositionerGroup widget to control a positioner device."""
+"""Module for a PositionerGroup widget to control a positioner device."""
 
 from __future__ import annotations
 

bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.py

@@ -1,4 +1,4 @@
-""" Module for DapComboBox widget class to select a DAP model from a combobox. """
+"""Module for DapComboBox widget class to select a DAP model from a combobox."""
 
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Property, Signal, Slot

bec_widgets/widgets/editors/console/console.py

@@ -1,5 +1,5 @@
 """
-BECConsole is a Qt widget that runs a Bash shell. 
+BECConsole is a Qt widget that runs a Bash shell.
 
 BECConsole VT100 emulation is powered by Pyte,
 (https://github.com/selectel/pyte).
@@ -56,12 +56,12 @@ control_keys_mapping = {
     QtCore.Qt.Key_G: b"\x07",  # Ctrl-G (Bell)
     QtCore.Qt.Key_H: b"\x08",  # Ctrl-H (Backspace)
     QtCore.Qt.Key_I: b"\x09",  # Ctrl-I (Tab)
-    QtCore.Qt.Key_J: b"\x0A",  # Ctrl-J (Line Feed)
-    QtCore.Qt.Key_K: b"\x0B",  # Ctrl-K (Vertical Tab)
-    QtCore.Qt.Key_L: b"\x0C",  # Ctrl-L (Form Feed)
-    QtCore.Qt.Key_M: b"\x0D",  # Ctrl-M (Carriage Return)
-    QtCore.Qt.Key_N: b"\x0E",  # Ctrl-N
-    QtCore.Qt.Key_O: b"\x0F",  # Ctrl-O
+    QtCore.Qt.Key_J: b"\x0a",  # Ctrl-J (Line Feed)
+    QtCore.Qt.Key_K: b"\x0b",  # Ctrl-K (Vertical Tab)
+    QtCore.Qt.Key_L: b"\x0c",  # Ctrl-L (Form Feed)
+    QtCore.Qt.Key_M: b"\x0d",  # Ctrl-M (Carriage Return)
+    QtCore.Qt.Key_N: b"\x0e",  # Ctrl-N
+    QtCore.Qt.Key_O: b"\x0f",  # Ctrl-O
     QtCore.Qt.Key_P: b"\x10",  # Ctrl-P
     QtCore.Qt.Key_Q: b"\x11",  # Ctrl-Q
     QtCore.Qt.Key_R: b"\x12",  # Ctrl-R
@@ -72,10 +72,10 @@ control_keys_mapping = {
     QtCore.Qt.Key_W: b"\x17",  # Ctrl-W
     QtCore.Qt.Key_X: b"\x18",  # Ctrl-X
     QtCore.Qt.Key_Y: b"\x19",  # Ctrl-Y
-    QtCore.Qt.Key_Z: b"\x1A",  # Ctrl-Z
-    QtCore.Qt.Key_Escape: b"\x1B",  # Ctrl-Escape
-    QtCore.Qt.Key_Backslash: b"\x1C",  # Ctrl-\
-    QtCore.Qt.Key_Underscore: b"\x1F",  # Ctrl-_
+    QtCore.Qt.Key_Z: b"\x1a",  # Ctrl-Z
+    QtCore.Qt.Key_Escape: b"\x1b",  # Ctrl-Escape
+    QtCore.Qt.Key_Backslash: b"\x1c",  # Ctrl-\
+    QtCore.Qt.Key_Underscore: b"\x1f",  # Ctrl-_
 }
 
 normal_keys_mapping = {
@@ -89,7 +89,7 @@ normal_keys_mapping = {
     QtCore.Qt.Key_Left: b"\x02",
     QtCore.Qt.Key_Up: b"\x10",
     QtCore.Qt.Key_Right: b"\x06",
-    QtCore.Qt.Key_Down: b"\x0E",
+    QtCore.Qt.Key_Down: b"\x0e",
     QtCore.Qt.Key_PageUp: b"\x49",
     QtCore.Qt.Key_PageDown: b"\x51",
     QtCore.Qt.Key_F1: b"\x1b\x31",

bec_widgets/widgets/plots/image/image_item.py

@@ -61,8 +61,8 @@ class ImageItem(BECConnector, pg.ImageItem):
         "fft.setter",
         "log",
         "log.setter",
-        "rotation",
-        "rotation.setter",
+        "num_rotation_90",
+        "num_rotation_90.setter",
         "transpose",
         "transpose.setter",
         "get_data",

bec_widgets/widgets/plots/plot_base.py

@@ -98,6 +98,7 @@ class PlotBase(BECWidget, QWidget):
         self._ui_mode = UIMode.POPUP if popups else UIMode.SIDE
         self.axis_settings_dialog = None
         self.plot_widget = pg.GraphicsLayoutWidget(parent=self)
+        self.plot_widget.ci.setContentsMargins(0, 0, 0, 0)
         self.plot_item = pg.PlotItem(viewBox=BECViewBox(enableMenu=True))
         self.plot_widget.addItem(self.plot_item)
         self.side_panel = SidePanel(self, orientation="left", panel_max_width=280)
@@ -795,6 +796,7 @@ class PlotBase(BECWidget, QWidget):
         """
         self.plot_item.showAxis("top", value)
         self.plot_item.showAxis("right", value)
+
         self.property_changed.emit("outer_axes", value)
 
     @SafeProperty(bool, doc="Show inner axes of the plot widget.")
@@ -814,6 +816,7 @@ class PlotBase(BECWidget, QWidget):
         """
         self.plot_item.showAxis("bottom", value)
         self.plot_item.showAxis("left", value)
+
         self._apply_x_label()
         self._apply_y_label()
         self.property_changed.emit("inner_axes", value)

bec_widgets/widgets/plots/waveform/waveform.py

@@ -137,6 +137,7 @@ class Waveform(PlotBase):
         # Curve data
         self._sync_curves = []
         self._async_curves = []
+        self._async_connected_devices: set[str] = set()
         self._slice_index = None
         self._dap_curves = []
         self._mode: Literal["none", "sync", "async", "mixed"] = "none"
@@ -544,6 +545,7 @@ class Waveform(PlotBase):
                     continue
                 config = CurveConfig(**cfg_dict)
                 self._add_curve(config=config)
+            self.update_with_scan_history(-1)
         except json.JSONDecodeError as e:
             logger.error(f"Failed to decode JSON: {e}")
 
@@ -1012,6 +1014,7 @@ class Waveform(PlotBase):
             return
 
         if current_scan_id != self.scan_id:
+            self._async_connected_devices.clear()
             self.reset()
             self.new_scan.emit()
             self.new_scan_id.emit(current_scan_id)
@@ -1178,17 +1181,22 @@ class Waveform(PlotBase):
         except KeyError:
             logger.warning(f"Curve {name} not found in plot item.")
             pass
-        self.bec_dispatcher.connect_slot(
-            self.on_async_readback,
-            MessageEndpoints.device_async_readback(self.scan_id, name),
-            from_start=True,
-        )
-        logger.info(f"Setup async curve {name}")
 
-    @SafeSlot(dict, dict)
+        # Connect only once per device signal
+        if name not in self._async_connected_devices:
+            self.bec_dispatcher.connect_slot(
+                self.on_async_readback,
+                MessageEndpoints.device_async_readback(self.scan_id, name),
+                from_start=True,
+                cb_info={"scan_id": self.scan_id},
+            )
+            self._async_connected_devices.add(name)
+            logger.info(f"Async read-back connected for {name}")
+
+    @SafeSlot(dict, dict, verify_sender=True)
     def on_async_readback(self, msg, metadata):
         """
-        Get async data readback. This code needs to be fast, therefor we try
+        Get async data readback. This code needs to be fast; therefore, we try
         to reduce the number of copies in between cycles. Be careful when refactoring
         this part as it will affect the performance of the async readback.
 
@@ -1204,6 +1212,14 @@ class Waveform(PlotBase):
             msg(dict): Message with the async data.
             metadata(dict): Metadata of the message.
         """
+        sender = self.sender()
+        if not hasattr(sender, "cb_info"):
+            logger.info(f"Sender {sender} has no cb_info.")
+            return
+        scan_id = sender.cb_info.get("scan_id", None)
+        if scan_id != self.scan_id:
+            logger.info("Scan ID mismatch, ignoring async readback.")
+
         instruction = metadata.get("async_update", {}).get("type")
         if instruction not in ["add", "add_slice", "replace"]:
             logger.warning(f"Invalid async update instruction: {instruction}")
@@ -1212,6 +1228,7 @@ class Waveform(PlotBase):
         plot_mode = self.x_axis_mode["name"]
         for curve in self._async_curves:
             x_data = None  # Reset x_data
+            y_data = None  # Reset y_data
             # Get the curve data
             async_data = msg["signals"].get(curve.config.signal.entry, None)
             if async_data is None:

bec_widgets/widgets/progress/bec_progressbar/bec_progressbar.py

@@ -21,6 +21,7 @@ class BECProgressBar(BECWidget, QWidget):
         "set_minimum",
         "label_template",
         "label_template.setter",
+        "_get_label",
     ]
     ICON_NAME = "page_control"
 
@@ -235,6 +236,10 @@ class BECProgressBar(BECWidget, QWidget):
             (value - self._user_minimum) / (self._user_maximum - self._user_minimum) * self._maximum
         )
 
+    def _get_label(self) -> str:
+        """Return the label text. mostly used for testing rpc."""
+        return self.center_label.text()
+
 
 if __name__ == "__main__":  # pragma: no cover
     app = QApplication(sys.argv)

bec_widgets/widgets/services/bec_status_box/bec_status_box.py

@@ -76,6 +76,7 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
 
     PLUGIN = True
     CORE_SERVICES = ["DeviceServer", "ScanServer", "SciHub", "ScanBundler", "FileWriterManager"]
+    USER_ACCESS = ["get_server_state", "remove"]
 
     service_update = Signal(BECServiceInfoContainer)
     bec_core_state = Signal(str)
@@ -134,6 +135,10 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
             "QTreeWidget::item:selected {}"
         )
 
+    def get_server_state(self) -> str:
+        """Get the state ("RUNNING", "BUSY", "IDLE", "ERROR") of the BEC server"""
+        return self.status_container[self.box_name]["info"].status
+
     def _create_status_widget(
         self, service_name: str, status=BECStatus, info: dict = None, metrics: dict = None
     ) -> StatusItem:

bec_widgets/widgets/services/bec_status_box/status_item.py

@@ -1,4 +1,4 @@
-""" Module for a StatusItem widget to display status and metrics for a BEC service.
+"""Module for a StatusItem widget to display status and metrics for a BEC service.
 The widget is bound to be used with the BECStatusBox widget."""
 
 import enum

bec_widgets/widgets/utility/logpanel/_util.py

@@ -1,4 +1,4 @@
-""" Utilities for filtering and formatting in the LogPanel"""
+"""Utilities for filtering and formatting in the LogPanel"""
 
 from __future__ import annotations
 

bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py

@@ -1,4 +1,5 @@
 from pyqtgraph.widgets.ColorMapButton import ColorMapButton
+from qtpy import QtCore, QtGui
 from qtpy.QtCore import Property, Signal, Slot
 from qtpy.QtWidgets import QSizePolicy, QVBoxLayout, QWidget
 
@@ -6,6 +7,23 @@ from bec_widgets.utils import Colors
 from bec_widgets.utils.bec_widget import BECWidget
 
 
+class RoundedColorMapButton(ColorMapButton):
+    """Thin wrapper around pyqtgraph ColorMapButton to add rounded clipping."""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+    def paintEvent(self, evt):
+        painter = QtGui.QPainter(self)
+        painter.setRenderHint(QtGui.QPainter.Antialiasing)
+        path = QtGui.QPainterPath()
+        path.addRoundedRect(self.rect(), 8, 8)
+        painter.setClipPath(path)
+        self.paintColorMap(painter, self.contentsRect())
+        painter.end()
+
+
 class BECColorMapWidget(BECWidget, QWidget):
     colormap_changed_signal = Signal(str)
     ICON_NAME = "palette"
@@ -15,7 +33,7 @@ class BECColorMapWidget(BECWidget, QWidget):
     def __init__(self, parent=None, cmap: str = "plasma", **kwargs):
         super().__init__(parent=parent, **kwargs)
         # Create the ColorMapButton
-        self.button = ColorMapButton()
+        self.button = RoundedColorMapButton()
 
         # Set the size policy and minimum width
         size_policy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "2.0.0"
+version = "2.1.2"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [
@@ -16,7 +16,7 @@ dependencies = [
     "bec_ipython_client>=2.21.4, <=4.0", # needed for jupyter console
     "bec_lib>=3.29, <=4.0",
     "bec_qthemes~=0.7, >=0.7",
-    "black~=24.0",                       # needed for bw-generate-cli
+    "black~=25.0",                       # needed for bw-generate-cli
     "isort~=5.13, >=5.13.2",             # needed for bw-generate-cli
     "pydantic~=2.0",
     "pyqtgraph~=0.13",
@@ -31,6 +31,7 @@ dependencies = [
 dev = [
     "coverage~=7.0",
     "fakeredis~=2.23, >=2.23.2",
+    "isort~=5.13, >=5.13.2",
     "pytest-bec-e2e>=2.21.4, <=4.0",
     "pytest-qt~=4.4",
     "pytest-random-order~=1.1",

tests/end-2-end/conftest.py

@@ -4,8 +4,7 @@ import random
 
 import pytest
 
-from bec_widgets.cli.client_utils import BECGuiClient, _start_plot_process
-from bec_widgets.utils import BECDispatcher
+from bec_widgets.cli.client_utils import BECGuiClient
 
 # pylint: disable=unused-argument
 # pylint: disable=redefined-outer-name
@@ -28,7 +27,7 @@ def gui_id():
     return f"figure_{random.randint(0,100)}"  # make a new gui id each time, to ensure no 'gui is alive' zombie key can perturbate
 
 
-@pytest.fixture
+@pytest.fixture(scope="function")
 def connected_client_gui_obj(qtbot, gui_id, bec_client_lib):
     """
     Fixture to create a new BECGuiClient object and start a server in the background.
@@ -42,22 +41,3 @@ def connected_client_gui_obj(qtbot, gui_id, bec_client_lib):
         yield gui
     finally:
         gui.kill_server()
-
-
-@pytest.fixture(scope="session")
-def connected_gui_with_scope_session(qtbot, gui_id, bec_client_lib):
-    """
-    Fixture to create a new BECGuiClient object and start a server in the background.
-
-    This fixture is scoped to the session, meaning it remains alive for all tests in the session.
-    We can use this fixture to create a gui object that is used across multiple tests, and
-    simulate a real-world scenario where the gui is not restarted for each test.
-    """
-    gui = BECGuiClient(gui_id=gui_id)
-    try:
-        gui.start(wait=True)
-        # After the server started, we need to wait until the bec exists in the namespace
-        qtbot.waitUntil(lambda: hasattr(gui, "bec"), timeout=5000)
-        yield gui
-    finally:
-        gui.kill_server()

tests/end-2-end/test_bec_gui_ipython.py

@@ -1,5 +1,5 @@
 """
-Test module for the gui object within the BEC IPython client. 
+Test module for the gui object within the BEC IPython client.
 """
 
 from unittest import mock

tests/end-2-end/test_plotting_framework_e2e.py

@@ -136,7 +136,7 @@ def test_async_plotting(qtbot, bec_client_lib, connected_client_gui_obj):
     dev.waveform.sim.select_model("GaussianModel")
     dev.waveform.sim.params = {"amplitude": 1000, "center": 4000, "sigma": 300}
     dev.waveform.async_update.set("add").wait()
-    dev.waveform.waveform_shape.set(1000).wait()
+    dev.waveform.waveform_shape.set(10000).wait()
     wf = dock.new("wf_dock").new("Waveform")
     curve = wf.plot(y_name="waveform")
 

tests/end-2-end/test_rpc_register_e2e.py

@@ -9,7 +9,7 @@ from bec_widgets.cli.rpc.rpc_base import RPCReference
 
 def test_rpc_reference_objects(connected_client_gui_obj):
     gui = connected_client_gui_obj
-    dock = gui.window_list[0].new("dock")
+    dock = gui.window_list[0].new()
     plt = dock.new(name="fig", widget="Waveform")
 
     plt.plot(x_name="samx", y_name="bpm4i")

tests/end-2-end/user_interaction/conftest.py

@@ -0,0 +1,82 @@
+"""
+End-2-End test fixtures for module scoped testing. The fixtures overwrite the default versions used
+for the function scoped tests. The fixtures will only be created once for this entire module, meaning
+that any test can be used to test user interaction and potential leakage of threads or other resources across
+different widgets.
+"""
+
+import random
+
+import pytest
+from bec_ipython_client import BECIPythonClient
+from bec_lib.redis_connector import RedisConnector
+from bec_lib.service_config import ServiceConfig
+from bec_lib.tests.utils import wait_for_empty_queue
+from pytestqt.plugin import QtBot
+
+from bec_widgets.cli.client_utils import BECGuiClient
+
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+
+
+@pytest.fixture(scope="module")
+def gui_id():
+    """New gui id each time, to ensure no 'gui is alive' zombie key can perturbate"""
+    return f"figure_{random.randint(0,100)}"
+
+
+@pytest.fixture(scope="module")
+def bec_ipython_client_with_demo_config(
+    bec_redis_fixture, bec_services_config_file_path, bec_servers
+):
+    """Fixture to create a BECIPythonClient with a demo config."""
+    config = ServiceConfig(bec_services_config_file_path)
+    bec = BECIPythonClient(config, RedisConnector, forced=True)
+    bec.start()
+    bec.config.load_demo_config()
+    try:
+        yield bec
+    finally:
+        bec.shutdown()
+        bec._client._reset_singleton()
+
+
+@pytest.fixture(scope="module")
+def bec_client_lib(bec_ipython_client_with_demo_config):
+    """Fixture to create a BECIPythonClient with a demo config."""
+    bec = bec_ipython_client_with_demo_config
+    bec.queue.request_queue_reset()
+    bec.queue.request_scan_continuation()
+    wait_for_empty_queue(bec)
+    yield bec
+
+
+@pytest.fixture(scope="module")
+def qtbot_scope_module(qapp, request):
+    """
+    Fixture used to create a QtBot instance for using during testing.
+
+    Make sure to call addWidget for each top-level widget you create to ensure
+    that they are properly closed after the test ends.
+    """
+    result = QtBot(request)
+    return result
+
+
+@pytest.fixture(scope="module")
+def connected_client_gui_obj(qtbot_scope_module, gui_id, bec_client_lib):
+    """
+    Fixture to create a new BECGuiClient object and start a server in the background.
+
+    This fixture is scoped to the session, meaning it remains alive for all tests in the session.
+    We can use this fixture to create a gui object that is used across multiple tests, and
+    simulate a real-world scenario where the gui is not restarted for each test.
+    """
+    gui = BECGuiClient(gui_id=gui_id)
+    try:
+        gui.start(wait=True)
+        qtbot_scope_module.waitUntil(lambda: hasattr(gui, "bec"), timeout=5000)
+        yield gui
+    finally:
+        gui.kill_server()

tests/end-2-end/user_interaction/test_user_interaction_e2e.py

@@ -0,0 +1,667 @@
+"""
+End-to-end tests single gui instance across the full session.
+
+Each test will use the same gui instance, simulating a real-world scenario where the gui is not
+restarted for each test. The interaction is tested through the rpc calls.
+
+Note: wait_for_namespace_created is a utility method that helps to wait for the namespace to be
+created in the gui. This is necessary because the rpc calls are asynchronous and the namespace
+may not be created immediately after the rpc call is made.
+"""
+
+from __future__ import annotations
+
+import random
+from typing import TYPE_CHECKING, Any
+
+import numpy as np
+import pytest
+
+from bec_widgets.cli.client import BECDockArea
+from bec_widgets.cli.rpc.rpc_base import RPCBase, RPCReference
+
+PYTEST_TIMEOUT = 50
+
+if TYPE_CHECKING:  # pragma: no cover
+    from bec_widgets.cli import client
+    from bec_widgets.cli.client_utils import BECGuiClient
+
+# pylint: disable=redefined-outer-name
+# pylint: disable=too-many-arguments
+# pylint: disable=protected-access
+# pylint: disable=unused-variable
+
+
+def wait_for_namespace_change(
+    qtbot,
+    gui: BECGuiClient,
+    parent_widget: RPCBase | RPCReference,
+    object_name: str,
+    widget_gui_id: str,
+    timeout: float = 10000,
+    exists: bool = True,
+):
+    """
+    Utility method to wait for the namespace to be created in the widget.
+
+    Args:
+        qtbot: The qtbot fixture.
+        gui: The client_utils.BECGuiClient 'gui' object from the CLI.
+        parent_widget: The widget that creates a new widget.
+        object_name: The name of the widget that was created. Must appear as attribute in namespace of parent.
+        widget_gui_id: The gui_id of the created widget.
+        timeout: The timeout in milliseconds for the qtbot to wait for changes to appear.
+        exists: If True, wait for the object to be created. If False, wait for the object to be removed.
+    """
+    # GUI object is not registered in the registry (yet)
+    if parent_widget is gui:
+
+        def check_reference_registered():
+            # Check server registry
+            obj = gui._server_registry.get(widget_gui_id, None)
+            if obj is None:
+                if not exists:
+                    return True
+                return False
+            # CHeck Ipython registry
+            obj = gui._ipython_registry.get(widget_gui_id, None)
+            if obj is None:
+                if not exists:
+                    return True
+                return False
+
+    else:
+
+        def check_reference_registered():
+            # Check server registry
+            obj = gui._server_registry.get(widget_gui_id, None)
+            if obj is None:
+                if not exists:
+                    return True
+                return False
+            # CHeck Ipython registry
+            obj = gui._ipython_registry.get(widget_gui_id, None)
+            if obj is None:
+                if not exists:
+                    return True
+                return False
+            # Check reference registry
+            ref = parent_widget._rpc_references.get(widget_gui_id, None)
+            if exists:
+                return ref is not None
+            return ref is None
+
+    try:
+        qtbot.waitUntil(check_reference_registered, timeout=timeout)
+    except Exception as e:
+        raise RuntimeError(
+            f"Timeout waiting for {parent_widget.object_name}.{object_name} to be created."
+        ) from e
+
+
+def create_widget(
+    qtbot, gui: BECGuiClient, widget_cls_name: str
+) -> tuple[RPCReference, RPCReference]:
+    """Utility method to create a widget and wait for the namespaces to be created."""
+    if hasattr(gui, "dock_area"):
+        dock_area: client.BECDockArea = gui.dock_area
+    else:
+        dock_area: client.BECDockArea = gui.new(name="dock_area")
+    wait_for_namespace_change(qtbot, gui, gui, dock_area.object_name, dock_area._gui_id)
+    dock: client.BECDock = dock_area.new()
+    wait_for_namespace_change(qtbot, gui, dock_area, dock.object_name, dock._gui_id)
+    widget = dock.new(widget=widget_cls_name)
+    wait_for_namespace_change(qtbot, gui, dock, widget.object_name, widget._gui_id)
+    return dock, widget
+
+
+@pytest.fixture(scope="module")
+def random_generator_from_seed(request):
+    """Fixture to get a random seed for the following tests."""
+    seed = request.config.getoption("--random-order-seed").split(":")[-1]
+    try:
+        seed = int(seed)
+    except ValueError:  # Should not be required...
+        seed = 42
+    rng = random.Random(seed)
+    yield rng
+
+
+def maybe_remove_dock_area(qtbot, gui: BECGuiClient, random_int_gen: random.Random):
+    """Utility method to remove all dock_ares from gui object, likelihood 50%."""
+    random_int = random_int_gen.randint(0, 100)
+    if random_int >= 50:
+        # Needed, reference gets deleted in the gui
+        name = gui.dock_area.object_name
+        gui_id = gui.dock_area._gui_id
+        gui.delete("dock_area")
+        wait_for_namespace_change(
+            qtbot, gui=gui, parent_widget=gui, object_name=name, widget_gui_id=gui_id, exists=False
+        )
+
+
+@pytest.mark.timeout(PYTEST_TIMEOUT)
+def test_widgets_e2e_abort_button(qtbot, connected_client_gui_obj, random_generator_from_seed):
+    """Test the AbortButton widget."""
+    gui: BECGuiClient = connected_client_gui_obj
+    bec = gui._client
+    # Create dock_area, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.AbortButton)
+    dock: client.BECDock
+    widget: client.AbortButton
+
+    # No rpc calls to check so far
+
+    # Try detaching the dock
+    dock.detach()
+
+    # 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_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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.BECProgressBar)
+    dock: client.BECDock
+    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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.BECQueue)
+    dock: client.BECDock
+    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, dock, widget
+    dock, 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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.DapComboBox)
+    dock: client.BECDock
+    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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.DeviceBrowser)
+    dock: client.BECDock
+    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_device_combo_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
+    """Test the DeviceComboBox widget."""
+    gui = connected_client_gui_obj
+    bec = gui._client
+    # Create dock_area, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.DeviceComboBox)
+    dock: client.BECDock
+    widget: client.DeviceComboBox
+
+    # No rpc calls to check so far, maybe set_device should be exposed
+
+    # 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_line_edit(qtbot, connected_client_gui_obj, random_generator_from_seed):
+    """Test the DeviceLineEdit widget."""
+    gui = connected_client_gui_obj
+    bec = gui._client
+    # Create dock_area, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.DeviceLineEdit)
+    dock: client.BECDock
+    widget: client.DeviceLineEdit
+
+    # No rpc calls to check so far
+    # Should probably have a set_device method
+
+    # No rpc calls to check so far, maybe set_device should be exposed
+
+    # 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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.Image)
+    dock: client.BECDock
+    widget: client.Image
+
+    scans = bec.scans
+    dev = bec.device_manager.devices
+    # Test rpc calls
+    img = widget.image(dev.eiger)
+    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.device_monitor.get_data(
+        dev.eiger, count=1
+    )  # Get last image from Redis monitor 2D endpoint
+    assert np.allclose(img.get_data(), last_img)
+
+    # 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, dock, widget
+#     dock, widget = create_widget(qtbot, gui, gui.available_widgets.LogPanel)
+#     dock: client.BECDock
+#     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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.Minesweeper)
+    dock: client.BECDock
+    widget: client.MineSweeper
+
+    # 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_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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.MotorMap)
+    dock: client.BECDock
+    widget: client.MotorMap
+
+    # 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)
+
+
+@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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.MultiWaveform)
+    dock: client.BECDock
+    widget: client.MultiWaveform
+
+    # 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
+
+    # 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_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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.PositionIndicator)
+    dock: client.BECDock
+    widget: client.PositionIndicator
+
+    # TODO check what these rpc calls are supposed to do! Issue created #461
+    widget.set_value(5)
+
+    # 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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.PositionerBox)
+    dock: client.BECDock
+    widget: client.PositionerBox
+
+    # 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)
+
+    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_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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.PositionerBox2D)
+    dock: client.BECDock
+    widget: client.PositionerBox2D
+
+    # 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)
+
+    # 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)
+
+
+@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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.PositionerControlLine)
+    dock: client.BECDock
+    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)
+
+
+@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"""
+    gui = connected_client_gui_obj
+    bec = gui._client
+    # Create dock_area, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.RingProgressBar)
+    dock: client.BECDock
+    widget: client.RingProgressBar
+
+    # Test rpc calls
+    dev = bec.device_manager.devices
+    scans = bec.scans
+    # Do a scan
+    scans.line_scan(dev.samx, -3, 3, steps=50, 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)
+
+
+@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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.ScanControl)
+    dock: client.BECDock
+    widget: client.ScanControl
+
+    # 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_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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.ScatterWaveform)
+    dock: client.BECDock
+    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 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_stop_button(qtbot, connected_client_gui_obj, random_generator_from_seed):
+    """Test the StopButton widget"""
+    gui = connected_client_gui_obj
+    bec = gui._client
+    # Create dock_area, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.StopButton)
+    dock: client.BECDock
+    widget: client.StopButton
+
+    # 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_resume_button(qtbot, connected_client_gui_obj, random_generator_from_seed):
+    """Test the StopButton widget"""
+    gui = connected_client_gui_obj
+    bec = gui._client
+    # Create dock_area, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.ResumeButton)
+    dock: client.BECDock
+    widget: client.ResumeButton
+
+    # 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_reset_button(qtbot, connected_client_gui_obj, random_generator_from_seed):
+    """Test the StopButton widget"""
+    gui = connected_client_gui_obj
+    bec = gui._client
+    # Create dock_area, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.ResetButton)
+    dock: client.BECDock
+    widget: client.ResetButton
+    # 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_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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.TextBox)
+    dock: client.BECDock
+    widget: client.TextBox
+
+    # 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)
+
+
+@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, dock, widget
+    dock, widget = create_widget(qtbot, gui, gui.available_widgets.Waveform)
+    dock: client.BECDock
+    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()
+
+    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)
+
+    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)

tests/unit_tests/test_bec_dock.py

@@ -89,6 +89,13 @@ def test_undock_and_dock_docks(bec_dock_area, qtbot):
     assert len(bec_dock_area.dock_area.tempAreas) == 0
 
 
+def test_new_dock_raises_for_invalid_name(bec_dock_area):
+    with pytest.raises(ValueError):
+        bec_dock_area.new(
+            name="new", _override_slot_params={"popup_error": False, "raise_error": True}
+        )
+
+
 ###################################
 # Toolbar Actions
 ###################################

tests/unit_tests/test_generate_cli_client.py

@@ -74,6 +74,7 @@ def test_client_generator_with_black_formatting():
         import inspect
         import traceback
         from functools import reduce
+        from operator import add
         from typing import Literal, Optional
 
         from bec_lib.logger import bec_logger

tests/unit_tests/test_scan_metadata.py

@@ -116,7 +116,7 @@ def fill_commponents(components: dict[str, DynamicFormItem]):
 
 
 def test_griditems_are_correct_class(
-    metadata_widget: tuple[ScanMetadata, dict[str, DynamicFormItem]]
+    metadata_widget: tuple[ScanMetadata, dict[str, DynamicFormItem]],
 ):
     _, components = metadata_widget
     assert isinstance(components["sample_name"], StrMetadataField)
@@ -162,7 +162,7 @@ def test_validation(metadata_widget: tuple[ScanMetadata, dict[str, DynamicFormIt
 
 
 def test_numbers_clipped_to_limits(
-    metadata_widget: tuple[ScanMetadata, dict[str, DynamicFormItem]]
+    metadata_widget: tuple[ScanMetadata, dict[str, DynamicFormItem]],
 ):
     widget, components = metadata_widget = metadata_widget
     fill_commponents(components)

tests/unit_tests/test_waveform_next_gen.py

@@ -1,4 +1,6 @@
 import json
+from types import SimpleNamespace
+from unittest import mock
 from unittest.mock import MagicMock
 
 import numpy as np
@@ -19,6 +21,8 @@ from tests.unit_tests.client_mocks import (
 
 from .conftest import create_widget
 
+# pylint: disable=unexpected-keyword-arg
+
 ##################################################
 # Waveform widget base functionality tests
 ##################################################
@@ -541,7 +545,14 @@ def test_on_async_readback_add_update(qtbot, mocked_client):
 
     msg = {"signals": {"async_device": {"value": [100, 200], "timestamp": [1001, 1002]}}}
     metadata = {"async_update": {"max_shape": [None], "type": "add"}}
-    wf.on_async_readback(msg, metadata)
+
+    cb_info_ret = {"scan_id": wf.scan_id}
+
+    def ret_sender():
+        return SimpleNamespace(cb_info={"scan_id": wf.scan_id})
+
+    with mock.patch.object(wf, "sender", side_effect=ret_sender):
+        wf.on_async_readback(msg, metadata, _override_slot_params={"verify_sender": False})
 
     x_data, y_data = c.get_data()
     assert len(x_data) == 5
@@ -553,7 +564,8 @@ def test_on_async_readback_add_update(qtbot, mocked_client):
     # instruction='replace'
     msg2 = {"signals": {"async_device": {"value": [999], "timestamp": [555]}}}
     metadata2 = {"async_update": {"max_shape": [None], "type": "replace"}}
-    wf.on_async_readback(msg2, metadata2)
+    with mock.patch.object(wf, "sender", side_effect=ret_sender):
+        wf.on_async_readback(msg2, metadata2, _override_slot_params={"verify_sender": False})
     x_data2, y_data2 = c.get_data()
     np.testing.assert_array_equal(x_data2, [0])
 
@@ -568,7 +580,8 @@ def test_on_async_readback_add_update(qtbot, mocked_client):
         metadata = {
             "async_update": {"max_shape": [None, waveform_shape], "index": 0, "type": "add_slice"}
         }
-        wf.on_async_readback(msg, metadata)
+        with mock.patch.object(wf, "sender", side_effect=ret_sender):
+            wf.on_async_readback(msg, metadata, _override_slot_params={"verify_sender": False})
 
     # Old data should be deleted since the slice_index did not match
     x_data, y_data = c.get_data()
@@ -595,7 +608,8 @@ def test_on_async_readback_add_update(qtbot, mocked_client):
         metadata = {
             "async_update": {"max_shape": [None, waveform_shape], "index": 0, "type": "add_slice"}
         }
-        wf.on_async_readback(msg, metadata)
+        with mock.patch.object(wf, "sender", side_effect=ret_sender):
+            wf.on_async_readback(msg, metadata, _override_slot_params={"verify_sender": False})
     x_data, y_data = c.get_data()
     assert len(y_data) == waveform_shape
     assert len(x_data) == waveform_shape
@@ -616,7 +630,8 @@ def test_on_async_readback_add_update(qtbot, mocked_client):
             }
         }
         metadata = {"async_update": {"type": "replace"}}
-        wf.on_async_readback(msg, metadata)
+        with mock.patch.object(wf, "sender", side_effect=ret_sender):
+            wf.on_async_readback(msg, metadata, _override_slot_params={"verify_sender": False})
 
     x_data, y_data = c.get_data()
     assert np.array_equal(y_data, np.array(range(waveform_shape)))