WIP adjustments to be compatible with latest bec widgets and bec

.gitlab-ci.yml

@@ -12,9 +12,6 @@ variables:
     description: ophyd_devices branch
     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. 
-    value: 0
 
 workflow:
   rules:
@@ -34,9 +31,8 @@ include:
     inputs:
       stage: test
       path: "."
-      pytest_args: "-v,--random-order,tests/unit_tests"
-      ignore_dep_group: "pyqt6"
-      pip_args: ".[dev,pyside6]"
+      pytest_args: "-v --random-order tests/"
+      exclude_packages: ""
 
 # different stages in the pipeline
 stages:
@@ -61,7 +57,6 @@ stages:
   - pip install -e ./ophyd_devices
   - pip install -e ./bec/bec_lib[dev]
   - pip install -e ./bec/bec_ipython_client
-  - pip install -e ./bec/pytest_bec_e2e
 
 .install-os-packages: &install-os-packages
   - apt-get update
@@ -78,9 +73,9 @@ formatter:
   stage: Formatter
   needs: []
   script:
-    - pip install bec_lib[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 ./
+    - pip install black isort
+    - isort --check --diff ./
+    - black --check --diff --color ./
   rules:
     - if: $CI_PROJECT_PATH == "bec/bec_widgets"
 
@@ -148,7 +143,7 @@ tests:
     - *clone-repos
     - *install-os-packages
     - *install-repos
-    - pip install -e .[dev,pyside6]
+    - pip install -e .[dev,pyqt6]
     - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --maxfail=2 --random-order --full-trace ./tests/unit_tests
     - coverage report
     - coverage xml
@@ -172,6 +167,7 @@ test-matrix:
           - "3.12"
         QT_PCKG:
           - "pyside6"
+          - "pyqt6"
 
   stage: AdditionalTests
   needs: []
@@ -197,13 +193,7 @@ end-2-end-conda:
   script:
     - *clone-repos
     - *install-os-packages
-    - conda config --show-sources
-    - conda config --add channels conda-forge
-    - conda config --system --remove channels https://repo.anaconda.com/pkgs/main
-    - conda config --system --remove channels https://repo.anaconda.com/pkgs/r
-    - conda config --remove channels https://repo.anaconda.com/pkgs/main
-    - conda config --remove channels https://repo.anaconda.com/pkgs/r
-    - conda config --show-sources
+    - conda config --prepend channels conda-forge
     - conda config --set channel_priority strict
     - conda config --set always_yes yes --set changeps1 no
     - conda create -q -n test-environment python=3.11
@@ -216,8 +206,9 @@ end-2-end-conda:
     - cd ../
     - pip install -e ./ophyd_devices
 
-    - pip install -e .[dev,pyside6]
-    - pytest -v --files-path ./ --start-servers --flush-redis --random-order  ./tests/end-2-end
+    - pip install -e .[dev,pyqt6]
+    - cd ./tests/end-2-end
+    - pytest -v --start-servers --flush-redis --random-order
 
   artifacts:
     when: on_failure
@@ -232,7 +223,6 @@ 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.*$/'
 
 semver:
   stage: Deploy

README.md

@@ -1,17 +1,12 @@
 # BEC Widgets
 
-**⚠️ Important Notice:**
-
-🚨 **PyQt6 is no longer supported** due to incompatibilities with Qt Designer. Please use **PySide6** instead. 🚨
-
 BEC Widgets is a GUI framework designed for interaction with [BEC (Beamline Experiment Control)](https://gitlab.psi.ch/bec/bec).
-
 ## Installation
 
 Use the package manager [pip](https://pip.pypa.io/en/stable/) to install BEC Widgets:
 
 ```bash
-pip install bec_widgets[pyside6]
+pip install bec_widgets PyQt6
 ```
 
 For development purposes, you can clone the repository and install the package locally in editable mode:
@@ -19,12 +14,22 @@ For development purposes, you can clone the repository and install the package l
 ```bash
 git clone https://gitlab.psi.ch/bec/bec-widgets
 cd bec_widgets
-pip install -e .[dev,pyside6]
+pip install -e .[dev,pyqt6]
 ```
 
-BEC Widgets now **only supports PySide6**. Users must manually install PySide6 as no default Qt distribution is
-specified.
+BEC Widgets currently supports both Pyside6 and PyQt6, however, no default distribution is specified. As a result, users must install one of the supported
+Python Qt distributions manually.
 
+To select a specific Python Qt distribution, install the package with an additional tag:
+
+```bash
+pip install bec_widgets[pyqt6]
+```
+or 
+
+```bash
+pip install bec_widgets[pyside6]
+```
 ## Documentation
 
 Documentation of BEC Widgets can be found [here](https://bec-widgets.readthedocs.io/en/latest/). The documentation of the BEC can be found [here](https://bec.readthedocs.io/en/latest/).
@@ -34,7 +39,7 @@ Documentation of BEC Widgets can be found [here](https://bec-widgets.readthedocs
 All commits should use the Angular commit scheme:
 
 > #### <a name="commit-header"></a>Angular Commit Message Header
->
+> 
 > ```
 > <type>(<scope>): <short summary>
 >   │       │             │
@@ -48,13 +53,13 @@ All commits should use the Angular commit scheme:
 >   │
 >   └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|test
 > ```
->
+> 
 > The `<type>` and `<summary>` fields are mandatory, the `(<scope>)` field is optional.
 
 > ##### Type
->
+> 
 > Must be one of the following:
->
+> 
 > * **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 > * **ci**: Changes to our CI configuration files and scripts (examples: CircleCi, SauceLabs)
 > * **docs**: Documentation only changes
@@ -66,5 +71,4 @@ All commits should use the Angular commit scheme:
 
 ## License
 
-[BSD-3-Clause](https://choosealicense.com/licenses/bsd-3-clause/)
-
+[BSD-3-Clause](https://choosealicense.com/licenses/bsd-3-clause/)

bec_widgets/__init__.py

@@ -1,4 +0,0 @@
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-
-__all__ = ["BECWidget", "SafeSlot", "SafeProperty"]

bec_widgets/applications/alignment/alignment_1d/alignment_1d.py

@@ -5,31 +5,41 @@ It is a preliminary version of the GUI, which will be added to the main branch a
 import os
 from typing import Optional
 
+from bec_lib.device import Positioner as BECPositioner
 from bec_lib.device import Signal as BECSignal
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
-from qtpy.QtCore import QSize
+from qtpy.QtCore import QSize, Signal
 from qtpy.QtGui import QIcon
-from qtpy.QtWidgets import QApplication
+from qtpy.QtWidgets import (
+    QApplication,
+    QCheckBox,
+    QDoubleSpinBox,
+    QMainWindow,
+    QPushButton,
+    QSpinBox,
+)
 
 import bec_widgets
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+from bec_widgets.qt_utils.toolbar import WidgetAction
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.utils.error_popups import SafeSlot as Slot
-from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
-from bec_widgets.widgets.control.device_control.positioner_group.positioner_group import (
-    PositionerGroup,
-)
-from bec_widgets.widgets.dap.lmfit_dialog.lmfit_dialog import LMFitDialog
-from bec_widgets.widgets.plots.waveform.waveform_widget import BECWaveformWidget
-from bec_widgets.widgets.progress.bec_progressbar.bec_progressbar import BECProgressBar
+from bec_widgets.widgets.bec_progressbar.bec_progressbar import BECProgressBar
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
+from bec_widgets.widgets.lmfit_dialog.lmfit_dialog import LMFitDialog
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
+from bec_widgets.widgets.positioner_group.positioner_group import PositionerGroup
+from bec_widgets.widgets.stop_button.stop_button import StopButton
+from bec_widgets.widgets.toggle.toggle import ToggleSwitch
+from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget
 
 MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 logger = bec_logger.logger
 
 
-# FIXME BECWaveFormWidget is gone, this app will not work until adapted to new Waveform
 class Alignment1D:
     """Alignment GUI to perform 1D scans"""
 

bec_widgets/cli/__init__.py

@@ -0,0 +1 @@
+from .client import *

bec_widgets/cli/auto_updates.py

@@ -1,169 +1,184 @@
-# TODO autoupdate disabled
-# from __future__ import annotations
-#
-# import threading
-# from queue import Queue
-# from typing import TYPE_CHECKING
-#
-# from pydantic import BaseModel
-#
-# if TYPE_CHECKING:
-#     from .client import BECDockArea, BECFigure
-#
-#
-# class ScanInfo(BaseModel):
-#     scan_id: str
-#     scan_number: int
-#     scan_name: str
-#     scan_report_devices: list
-#     monitored_devices: list
-#     status: str
-#     model_config: dict = {"validate_assignment": True}
-#
-#
-# class AutoUpdates:
-#     create_default_dock: bool = False
-#     enabled: bool = False
-#     dock_name: str = None
-#
-#     def __init__(self, gui: BECDockArea):
-#         self.gui = gui
-#         self._default_dock = None
-#         self._default_fig = None
-#
-#     def start_default_dock(self):
-#         """
-#         Create a default dock for the auto updates.
-#         """
-#         self.dock_name = "default_figure"
-#         self._default_dock = self.gui.new(self.dock_name)
-#         self._default_dock.new("BECFigure")
-#         self._default_fig = self._default_dock.elements_list[0]
-#
-#     @staticmethod
-#     def get_scan_info(msg) -> ScanInfo:
-#         """
-#         Update the script with the given data.
-#         """
-#         info = msg.info
-#         status = msg.status
-#         scan_id = msg.scan_id
-#         scan_number = info.get("scan_number", 0)
-#         scan_name = info.get("scan_name", "Unknown")
-#         scan_report_devices = info.get("scan_report_devices", [])
-#         monitored_devices = info.get("readout_priority", {}).get("monitored", [])
-#         monitored_devices = [dev for dev in monitored_devices if dev not in scan_report_devices]
-#         return ScanInfo(
-#             scan_id=scan_id,
-#             scan_number=scan_number,
-#             scan_name=scan_name,
-#             scan_report_devices=scan_report_devices,
-#             monitored_devices=monitored_devices,
-#             status=status,
-#         )
-#
-#     def get_default_figure(self) -> BECFigure | None:
-#         """
-#         Get the default figure from the GUI.
-#         """
-#         return self._default_fig
-#
-#     def do_update(self, msg):
-#         """
-#         Run the update function if enabled.
-#         """
-#         if not self.enabled:
-#             return
-#         if msg.status != "open":
-#             return
-#         info = self.get_scan_info(msg)
-#         return self.handler(info)
-#
-#     def get_selected_device(self, monitored_devices, selected_device):
-#         """
-#         Get the selected device for the plot. If no device is selected, the first
-#         device in the monitored devices list is selected.
-#         """
-#         if selected_device:
-#             return selected_device
-#         if len(monitored_devices) > 0:
-#             sel_device = monitored_devices[0]
-#             return sel_device
-#         return None
-#
-#     def handler(self, info: ScanInfo) -> None:
-#         """
-#         Default update function.
-#         """
-#         if info.scan_name == "line_scan" and info.scan_report_devices:
-#             return self.simple_line_scan(info)
-#         if info.scan_name == "grid_scan" and info.scan_report_devices:
-#             return self.simple_grid_scan(info)
-#         if info.scan_report_devices:
-#             return self.best_effort(info)
-#
-#     def simple_line_scan(self, info: ScanInfo) -> None:
-#         """
-#         Simple line scan.
-#         """
-#         fig = self.get_default_figure()
-#         if not fig:
-#             return
-#         dev_x = info.scan_report_devices[0]
-#         selected_device = yield self.gui.selected_device
-#         dev_y = self.get_selected_device(info.monitored_devices, selected_device)
-#         if not dev_y:
-#             return
-#         yield fig.clear_all()
-#         yield fig.plot(
-#             x_name=dev_x,
-#             y_name=dev_y,
-#             label=f"Scan {info.scan_number} - {dev_y}",
-#             title=f"Scan {info.scan_number}",
-#             x_label=dev_x,
-#             y_label=dev_y,
-#         )
-#
-#     def simple_grid_scan(self, info: ScanInfo) -> None:
-#         """
-#         Simple grid scan.
-#         """
-#         fig = self.get_default_figure()
-#         if not fig:
-#             return
-#         dev_x = info.scan_report_devices[0]
-#         dev_y = info.scan_report_devices[1]
-#         selected_device = yield self.gui.selected_device
-#         dev_z = self.get_selected_device(info.monitored_devices, selected_device)
-#         yield fig.clear_all()
-#         yield fig.plot(
-#             x_name=dev_x,
-#             y_name=dev_y,
-#             z_name=dev_z,
-#             label=f"Scan {info.scan_number} - {dev_z}",
-#             title=f"Scan {info.scan_number}",
-#             x_label=dev_x,
-#             y_label=dev_y,
-#         )
-#
-#     def best_effort(self, info: ScanInfo) -> None:
-#         """
-#         Best effort scan.
-#         """
-#         fig = self.get_default_figure()
-#         if not fig:
-#             return
-#         dev_x = info.scan_report_devices[0]
-#         selected_device = yield self.gui.selected_device
-#         dev_y = self.get_selected_device(info.monitored_devices, selected_device)
-#         if not dev_y:
-#             return
-#         yield fig.clear_all()
-#         yield fig.plot(
-#             x_name=dev_x,
-#             y_name=dev_y,
-#             label=f"Scan {info.scan_number} - {dev_y}",
-#             title=f"Scan {info.scan_number}",
-#             x_label=dev_x,
-#             y_label=dev_y,
-#         )
+from __future__ import annotations
+
+import threading
+from queue import Queue
+from typing import TYPE_CHECKING
+
+from pydantic import BaseModel
+
+if TYPE_CHECKING:
+    from .client import BECDockArea, BECFigure
+
+
+class ScanInfo(BaseModel):
+    scan_id: str
+    scan_number: int
+    scan_name: str
+    scan_report_devices: list
+    monitored_devices: list
+    status: str
+    model_config: dict = {"validate_assignment": True}
+
+
+class AutoUpdates:
+    create_default_dock: bool = False
+    enabled: bool = False
+    dock_name: str = None
+
+    def __init__(self, gui: BECDockArea):
+        self.gui = gui
+        self.msg_queue = Queue()
+        self.auto_update_thread = None
+        self._shutdown_sentinel = object()
+        self.start()
+
+    def start(self):
+        """
+        Start the auto update thread.
+        """
+        self.auto_update_thread = threading.Thread(target=self.process_queue)
+        self.auto_update_thread.start()
+
+    def start_default_dock(self):
+        """
+        Create a default dock for the auto updates.
+        """
+        dock = self.gui.add_dock("default_figure")
+        dock.add_widget("BECFigure")
+        self.dock_name = "default_figure"
+
+    @staticmethod
+    def get_scan_info(msg) -> ScanInfo:
+        """
+        Update the script with the given data.
+        """
+        info = msg.info
+        status = msg.status
+        scan_id = msg.scan_id
+        scan_number = info.get("scan_number", 0)
+        scan_name = info.get("scan_name", "Unknown")
+        scan_report_devices = info.get("scan_report_devices", [])
+        monitored_devices = info.get("readout_priority", {}).get("monitored", [])
+        monitored_devices = [dev for dev in monitored_devices if dev not in scan_report_devices]
+        return ScanInfo(
+            scan_id=scan_id,
+            scan_number=scan_number,
+            scan_name=scan_name,
+            scan_report_devices=scan_report_devices,
+            monitored_devices=monitored_devices,
+            status=status,
+        )
+
+    def get_default_figure(self) -> BECFigure | None:
+        """
+        Get the default figure from the GUI.
+        """
+        dock = self.gui.panels.get(self.dock_name, [])
+        if not dock:
+            return None
+        widgets = dock.widget_list
+        if not widgets:
+            return None
+        return widgets[0]
+
+    def run(self, msg):
+        """
+        Run the update function if enabled.
+        """
+        if not self.enabled:
+            return
+        if msg.status != "open":
+            return
+        info = self.get_scan_info(msg)
+        self.handler(info)
+
+    def process_queue(self):
+        """
+        Process the message queue.
+        """
+        while True:
+            msg = self.msg_queue.get()
+            if msg is self._shutdown_sentinel:
+                break
+            self.run(msg)
+
+    @staticmethod
+    def get_selected_device(monitored_devices, selected_device):
+        """
+        Get the selected device for the plot. If no device is selected, the first
+        device in the monitored devices list is selected.
+        """
+        if selected_device:
+            return selected_device
+        if len(monitored_devices) > 0:
+            sel_device = monitored_devices[0]
+            return sel_device
+        return None
+
+    def handler(self, info: ScanInfo) -> None:
+        """
+        Default update function.
+        """
+        if info.scan_name == "line_scan" and info.scan_report_devices:
+            self.simple_line_scan(info)
+            return
+        if info.scan_name == "grid_scan" and info.scan_report_devices:
+            self.simple_grid_scan(info)
+            return
+        if info.scan_report_devices:
+            self.best_effort(info)
+            return
+
+    def simple_line_scan(self, info: ScanInfo) -> None:
+        """
+        Simple line scan.
+        """
+        fig = self.get_default_figure()
+        if not fig:
+            return
+        dev_x = info.scan_report_devices[0]
+        dev_y = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
+        if not dev_y:
+            return
+        fig.clear_all()
+        plt = fig.plot(x_name=dev_x, y_name=dev_y, label=f"Scan {info.scan_number} - {dev_y}")
+        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
+
+    def simple_grid_scan(self, info: ScanInfo) -> None:
+        """
+        Simple grid scan.
+        """
+        fig = self.get_default_figure()
+        if not fig:
+            return
+        dev_x = info.scan_report_devices[0]
+        dev_y = info.scan_report_devices[1]
+        dev_z = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
+        fig.clear_all()
+        plt = fig.plot(
+            x_name=dev_x, y_name=dev_y, z_name=dev_z, label=f"Scan {info.scan_number} - {dev_z}"
+        )
+        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
+
+    def best_effort(self, info: ScanInfo) -> None:
+        """
+        Best effort scan.
+        """
+        fig = self.get_default_figure()
+        if not fig:
+            return
+        dev_x = info.scan_report_devices[0]
+        dev_y = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
+        if not dev_y:
+            return
+        fig.clear_all()
+        plt = fig.plot(x_name=dev_x, y_name=dev_y, label=f"Scan {info.scan_number} - {dev_y}")
+        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
+
+    def shutdown(self):
+        """
+        Shutdown the auto update thread.
+        """
+        self.msg_queue.put(self._shutdown_sentinel)
+        if self.auto_update_thread:
+            self.auto_update_thread.join()

bec_widgets/cli/client_utils.py

@@ -1,47 +1,65 @@
-"""Client utilities for the BEC GUI."""
-
 from __future__ import annotations
 
+import importlib
+import importlib.metadata as imd
 import json
 import os
 import select
 import subprocess
 import threading
 import time
-from contextlib import contextmanager
-from threading import Lock
-from typing import TYPE_CHECKING, Any
+import uuid
+from functools import wraps
+from typing import TYPE_CHECKING
 
+from bec_lib.client import BECClient
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
-from bec_lib.utils.import_utils import lazy_import, lazy_import_from
-from rich.console import Console
-from rich.table import Table
+from bec_lib.utils.import_utils import isinstance_based_on_class_name, lazy_import, lazy_import_from
 
 import bec_widgets.cli.client as client
-from bec_widgets.cli.rpc.rpc_base import RPCBase, RPCReference
+from bec_widgets.cli.auto_updates import AutoUpdates
 
-if TYPE_CHECKING:  # pragma: no cover
-    from bec_lib.redis_connector import StreamMessage
-else:
-    StreamMessage = lazy_import_from("bec_lib.redis_connector", ("StreamMessage",))
+if TYPE_CHECKING:
+    from bec_lib.device import DeviceBase
+
+messages = lazy_import("bec_lib.messages")
+# from bec_lib.connector import MessageObject
+MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))
+BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))
 
 logger = bec_logger.logger
 
-IGNORE_WIDGETS = ["BECDockArea", "BECDock"]
 
-# pylint: disable=redefined-outer-scope
-
-
-def _filter_output(output: str) -> str:
+def rpc_call(func):
     """
-    Filter out the output from the process.
+    A decorator for calling a function on the server.
+
+    Args:
+        func: The function to call.
+
+    Returns:
+        The result of the function call.
     """
-    if "IMKClient" in output:
-        # only relevant on macOS
-        # see https://discussions.apple.com/thread/255761734?sortBy=rank
-        return ""
-    return output
+
+    @wraps(func)
+    def wrapper(self, *args, **kwargs):
+        # we could rely on a strict type check here, but this is more flexible
+        # moreover, it would anyway crash for objects...
+        out = []
+        for arg in args:
+            if hasattr(arg, "name"):
+                arg = arg.name
+            out.append(arg)
+        args = tuple(out)
+        for key, val in kwargs.items():
+            if hasattr(val, "name"):
+                kwargs[key] = val.name
+        if not self.gui_is_alive():
+            raise RuntimeError("GUI is not alive")
+        return self._run_rpc(func.__name__, *args, **kwargs)
+
+    return wrapper
 
 
 def _get_output(process, logger) -> None:
@@ -57,7 +75,6 @@ def _get_output(process, logger) -> None:
                 if stream in readylist:
                     buf.append(stream.read(4096))
                 output, _, remaining = "".join(buf).rpartition("\n")
-                output = _filter_output(output)
                 if output:
                     log_func[stream](output)
                     buf.clear()
@@ -66,9 +83,7 @@ def _get_output(process, logger) -> None:
         logger.error(f"Error reading process output: {str(e)}")
 
 
-def _start_plot_process(
-    gui_id: str, gui_class: type, gui_class_id: str, config: dict | str, logger=None
-) -> tuple[subprocess.Popen[str], threading.Thread | None]:
+def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger=None) -> None:
     """
     Start the plot in a new process.
 
@@ -77,20 +92,11 @@ def _start_plot_process(
     process will not be captured.
     """
     # pylint: disable=subprocess-run-check
-    command = [
-        "bec-gui-server",
-        "--id",
-        gui_id,
-        "--gui_class",
-        gui_class.__name__,
-        "--gui_class_id",
-        gui_class_id,
-        "--hide",
-    ]
+    command = ["bec-gui-server", "--id", gui_id, "--gui_class", gui_class.__name__]
     if config:
         if isinstance(config, dict):
             config = json.dumps(config)
-        command.extend(["--config", str(config)])
+        command.extend(["--config", config])
 
     env_dict = os.environ.copy()
     env_dict["PYTHONUNBUFFERED"] = "1"
@@ -120,449 +126,215 @@ def _start_plot_process(
     return process, process_output_processing_thread
 
 
-class RepeatTimer(threading.Timer):
-    """RepeatTimer class."""
-
-    def run(self):
-        while not self.finished.wait(self.interval):
-            self.function(*self.args, **self.kwargs)
-
-
-# pylint: disable=protected-access
-@contextmanager
-def wait_for_server(client: BECGuiClient):
-    """Context manager to wait for the server to start."""
-    timeout = client._startup_timeout
-    if not timeout:
-        if client._gui_is_alive():
-            # there is hope, let's wait a bit
-            timeout = 1
-        else:
-            raise RuntimeError("GUI is not alive")
-    try:
-        if client._gui_started_event.wait(timeout=timeout):
-            client._gui_started_timer.cancel()
-            client._gui_started_timer.join()
-        else:
-            raise TimeoutError("Could not connect to GUI server")
-    finally:
-        # after initial waiting period, do not wait so much any more
-        # (only relevant if GUI didn't start)
-        client._startup_timeout = 0
-    yield
-
-
-class WidgetNameSpace:
-    def __repr__(self):
-        console = Console()
-        table = Table(title="Available widgets for BEC CLI usage")
-        table.add_column("Widget Name", justify="left", style="magenta")
-        table.add_column("Description", justify="left")
-        for attr, value in self.__dict__.items():
-            docs = value.__doc__
-            docs = docs if docs else "No description available"
-            table.add_row(attr, docs)
-        console.print(table)
-        return ""
-
-
-class AvailableWidgetsNamespace:
-    """Namespace for available widgets in the BEC GUI."""
-
-    def __init__(self):
-        for widget in client.Widgets:
-            name = widget.value
-            if name in IGNORE_WIDGETS:
-                continue
-            setattr(self, name, name)
-
-    def __repr__(self):
-        console = Console()
-        table = Table(title="Available widgets for BEC CLI usage")
-        table.add_column("Widget Name", justify="left", style="magenta")
-        table.add_column("Description", justify="left")
-        for attr_name, _ in self.__dict__.items():
-            docs = getattr(client, attr_name).__doc__
-            docs = docs if docs else "No description available"
-            table.add_row(attr_name, docs if len(docs.strip()) > 0 else "No description available")
-        console.print(table)
-        return ""
-
-
-class BECGuiClient(RPCBase):
-    """BEC GUI client class. Container for GUI applications within Python."""
-
+class BECGuiClientMixin:
     def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
-        self._lock = Lock()
-        self._default_dock_name = "bec"
-        self._auto_updates_enabled = True
-        self._auto_updates = None
-        self._killed = False
-        self._top_level: dict[str, client.BECDockArea] = {}
-        self._startup_timeout = 0
-        self._gui_started_timer = None
-        self._gui_started_event = threading.Event()
         self._process = None
         self._process_output_processing_thread = None
-        self._exposed_widgets = []
-        self._server_registry = {}
-        self._ipython_registry = {}
-        self.available_widgets = AvailableWidgetsNamespace()
+        self.auto_updates = self._get_update_script()
+        self._target_endpoint = MessageEndpoints.scan_status()
+        self._selected_device = None
 
-    ####################
-    #### Client API ####
-    ####################
+    def _get_update_script(self) -> AutoUpdates | None:
+        eps = imd.entry_points(group="bec.widgets.auto_updates")
+        for ep in eps:
+            if ep.name == "plugin_widgets_update":
+                try:
+                    spec = importlib.util.find_spec(ep.module)
+                    # if the module is not found, we skip it
+                    if spec is None:
+                        continue
+                    return ep.load()(gui=self)
+                except Exception as e:
+                    logger.error(f"Error loading auto update script from plugin: {str(e)}")
+        return None
 
-    def connect_to_gui_server(self, gui_id: str) -> None:
-        """Connect to a GUI server"""
-        # Unregister the old callback
-        self._client.connector.unregister(
-            MessageEndpoints.gui_registry_state(self._gui_id), cb=self._handle_registry_update
-        )
-        self._gui_id = gui_id
-        # Get the registry state
-        msgs = self._client.connector.xread(
-            MessageEndpoints.gui_registry_state(self._gui_id), count=1
-        )
-        if msgs:
-            self._handle_registry_update(msgs[0])
-        # Register the new callback
+    @property
+    def selected_device(self):
+        """
+        Selected device for the plot.
+        """
+        return self._selected_device
+
+    @selected_device.setter
+    def selected_device(self, device: str | DeviceBase):
+        if isinstance_based_on_class_name(device, "bec_lib.device.DeviceBase"):
+            self._selected_device = device.name
+        elif isinstance(device, str):
+            self._selected_device = device
+        else:
+            raise ValueError("Device must be a string or a device object")
+
+    def _start_update_script(self) -> None:
         self._client.connector.register(
-            MessageEndpoints.gui_registry_state(self._gui_id), cb=self._handle_registry_update
+            self._target_endpoint, cb=self._handle_msg_update, parent=self
         )
 
-    @property
-    def windows(self) -> dict:
-        """Dictionary with dock areas in the GUI."""
-        return self._top_level
+    @staticmethod
+    def _handle_msg_update(msg: MessageObject, parent: BECGuiClientMixin) -> None:
+        if parent.auto_updates is not None:
+            # pylint: disable=protected-access
+            parent._update_script_msg_parser(msg.value)
 
-    @property
-    def window_list(self) -> list:
-        """List with dock areas in the GUI."""
-        return list(self._top_level.values())
+    def _update_script_msg_parser(self, msg: messages.BECMessage) -> None:
+        if isinstance(msg, messages.ScanStatusMessage):
+            if not self.gui_is_alive():
+                return
+            self.auto_updates.msg_queue.put(msg)
 
-    def start(self, wait: bool = False) -> None:
-        """Start the GUI server."""
-        return self._start(wait=wait)
-
-    def show(self):
-        """Show the GUI window."""
-        if self._check_if_server_is_alive():
-            return self._show_all()
-        return self.start(wait=True)
-
-    def hide(self):
-        """Hide the GUI window."""
-        return self._hide_all()
-
-    def new(
-        self,
-        name: str | None = None,
-        wait: bool = True,
-        geometry: tuple[int, int, int, int] | None = None,
-    ) -> client.BECDockArea:
-        """Create a new top-level dock area.
-
-        Args:
-            name(str, optional): The name of the dock area. Defaults to None.
-            wait(bool, optional): Whether to wait for the server to start. Defaults to True.
-            geometry(tuple[int, int, int, int] | None): The geometry of the dock area (pos_x, pos_y, w, h)
-        Returns:
-            client.BECDockArea: The new dock area.
+    def show(self) -> None:
         """
-        if not self._check_if_server_is_alive():
-            self.start(wait=True)
-        if wait:
-            with wait_for_server(self):
-                rpc_client = RPCBase(gui_id=f"{self._gui_id}:window", parent=self)
-                widget = rpc_client._run_rpc(
-                    "new_dock_area", name, geometry
-                )  # pylint: disable=protected-access
-                return widget
-        rpc_client = RPCBase(gui_id=f"{self._gui_id}:window", parent=self)
-        widget = rpc_client._run_rpc(
-            "new_dock_area", name, geometry
-        )  # pylint: disable=protected-access
-        return widget
-
-    def delete(self, name: str) -> None:
-        """Delete a dock area.
-
-        Args:
-            name(str): The name of the dock area.
+        Show the figure.
         """
-        widget = self.windows.get(name)
-        if widget is None:
-            raise ValueError(f"Dock area {name} not found.")
-        widget._run_rpc("close")  # pylint: disable=protected-access
-
-    def delete_all(self) -> None:
-        """Delete all dock areas."""
-        for widget_name in self.windows:
-            self.delete(widget_name)
-
-    def kill_server(self) -> None:
-        """Kill the GUI server."""
-        # Unregister the registry state
-        self._killed = True
-
-        if self._gui_started_timer is not None:
-            self._gui_started_timer.cancel()
-            self._gui_started_timer.join()
+        if self._process is None or self._process.poll() is not None:
+            self._start_update_script()
+            self._process, self._process_output_processing_thread = _start_plot_process(
+                self._gui_id, self.__class__, self._client._service_config.config, logger=logger
+            )
+        while not self.gui_is_alive():
+            print("Waiting for GUI to start...")
+            time.sleep(1)
+        logger.success(f"GUI started with id: {self._gui_id}")
 
+    def close(self) -> None:
+        """
+        Close the gui window.
+        """
         if self._process is None:
             return
 
+        self._client.shutdown()
         if self._process:
-            logger.success("Stopping GUI...")
             self._process.terminate()
             if self._process_output_processing_thread:
                 self._process_output_processing_thread.join()
             self._process.wait()
             self._process = None
+        if self.auto_updates is not None:
+            self.auto_updates.shutdown()
 
-        # Unregister the registry state
-        self._client.connector.unregister(
-            MessageEndpoints.gui_registry_state(self._gui_id), cb=self._handle_registry_update
+
+class RPCResponseTimeoutError(Exception):
+    """Exception raised when an RPC response is not received within the expected time."""
+
+    def __init__(self, request_id, timeout):
+        super().__init__(
+            f"RPC response not received within {timeout} seconds for request ID {request_id}"
         )
-        # Remove all reference from top level
-        self._top_level.clear()
-        self._server_registry.clear()
 
-    def close(self):
-        """Deprecated. Use kill_server() instead."""
-        # FIXME, deprecated in favor of kill, will be removed in the future
-        self.kill_server()
 
-    #########################
-    #### Private methods ####
-    #########################
+class RPCBase:
+    def __init__(self, gui_id: str = None, config: dict = None, parent=None) -> None:
+        self._client = BECClient()  # BECClient is a singleton; here, we simply get the instance
+        self._config = config if config is not None else {}
+        self._gui_id = gui_id if gui_id is not None else str(uuid.uuid4())[:5]
+        self._parent = parent
+        self._msg_wait_event = threading.Event()
+        self._rpc_response = None
+        super().__init__()
+        # print(f"RPCBase: {self._gui_id}")
 
-    def _check_if_server_is_alive(self):
-        """Checks if the process is alive"""
-        if self._process is None:
-            return False
-        if self._process.poll() is not None:
-            return False
-        return True
+    def __repr__(self):
+        type_ = type(self)
+        qualname = type_.__qualname__
+        return f"<{qualname} object at {hex(id(self))}>"
 
-    def _gui_post_startup(self):
-        timeout = 60
-        # Wait for 'bec' gui to be registered, this may take some time
-        # After 60s timeout. Should this raise an exception on timeout?
-        while time.time() < time.time() + timeout:
-            if len(list(self._server_registry.keys())) == 0:
-                time.sleep(0.1)
-            else:
-                break
-        self._do_show_all()
-        self._gui_started_event.set()
-
-    def _start_server(self, wait: bool = False) -> None:
+    @property
+    def _root(self):
         """
-        Start the GUI server, and execute callback when it is launched
+        Get the root widget. This is the BECFigure widget that holds
+        the anchor gui_id.
         """
-        if self._process is None or self._process.poll() is not None:
-            logger.success("GUI starting...")
-            self._startup_timeout = 5
-            self._gui_started_event.clear()
-            self._process, self._process_output_processing_thread = _start_plot_process(
-                self._gui_id,
-                self.__class__,
-                gui_class_id=self._default_dock_name,
-                config=self._client._service_config.config,  # pylint: disable=protected-access
-                logger=logger,
-            )
+        parent = self
+        # pylint: disable=protected-access
+        while parent._parent is not None:
+            parent = parent._parent
+        return parent
 
-            def gui_started_callback(callback):
-                try:
-                    if callable(callback):
-                        callback()
-                finally:
-                    threading.current_thread().cancel()
-
-            self._gui_started_timer = RepeatTimer(
-                0.5, lambda: self._gui_is_alive() and gui_started_callback(self._gui_post_startup)
-            )
-            self._gui_started_timer.start()
-
-        if wait:
-            self._gui_started_event.wait()
-
-    def _dump(self):
-        rpc_client = RPCBase(gui_id=f"{self._gui_id}:window", parent=self)
-        return rpc_client._run_rpc("_dump")
-
-    def _start(self, wait: bool = False) -> None:
-        self._killed = False
-        self._client.connector.register(
-            MessageEndpoints.gui_registry_state(self._gui_id), cb=self._handle_registry_update
-        )
-        return self._start_server(wait=wait)
-
-    def _handle_registry_update(self, msg: StreamMessage) -> None:
-        # This was causing a deadlock during shutdown, not sure why.
-        # with self._lock:
-        self._server_registry = msg["data"].state
-        self._update_dynamic_namespace()
-
-    def _do_show_all(self):
-        rpc_client = RPCBase(gui_id=f"{self._gui_id}:window", parent=self)
-        rpc_client._run_rpc("show")  # pylint: disable=protected-access
-        for window in self._top_level.values():
-            window.show()
-
-    def _show_all(self):
-        with wait_for_server(self):
-            return self._do_show_all()
-
-    def _hide_all(self):
-        with wait_for_server(self):
-            rpc_client = RPCBase(gui_id=f"{self._gui_id}:window", parent=self)
-            rpc_client._run_rpc("hide")  # pylint: disable=protected-access
-            if not self._killed:
-                for window in self._top_level.values():
-                    window.hide()
-
-    def _update_dynamic_namespace(self):
-        """Update the dynamic name space"""
-        # Clear the top level
-        self._top_level.clear()
-        # First we update the name space based on the new registry state
-        self._add_registry_to_namespace()
-        # Then we clear the ipython registry from old objects
-        self._cleanup_ipython_registry()
-
-    def _cleanup_ipython_registry(self):
-        """Cleanup the ipython registry"""
-        names_in_registry = list(self._ipython_registry.keys())
-        names_in_server_state = list(self._server_registry.keys())
-        remove_ids = list(set(names_in_registry) - set(names_in_server_state))
-        for widget_id in remove_ids:
-            self._ipython_registry.pop(widget_id)
-        self._cleanup_rpc_references_on_rpc_base(remove_ids)
-        # Clear the exposed widgets
-        self._exposed_widgets.clear()  # No longer needed I think
-
-    def _cleanup_rpc_references_on_rpc_base(self, remove_ids: list[str]) -> None:
-        """Cleanup the rpc references on the RPCBase object"""
-        if not remove_ids:
-            return
-        for widget in self._ipython_registry.values():
-            to_delete = []
-            for attr_name, gui_id in widget._rpc_references.items():
-                if gui_id in remove_ids:
-                    to_delete.append(attr_name)
-            for attr_name in to_delete:
-                if hasattr(widget, attr_name):
-                    delattr(widget, attr_name)
-                if attr_name.startswith("elements."):
-                    delattr(widget.elements, attr_name.split(".")[1])
-                widget._rpc_references.pop(attr_name)
-
-    def _set_dynamic_attributes(self, obj: object, name: str, value: Any) -> None:
-        """Add an object to the namespace"""
-        setattr(obj, name, value)
-
-    def _update_rpc_references(self, widget: RPCBase, name: str, gui_id: str) -> None:
-        """Update the RPC references"""
-        widget._rpc_references[name] = gui_id
-
-    def _add_registry_to_namespace(self) -> None:
-        """Add registry to namespace"""
-        # Add dock areas
-        dock_area_states = [
-            state
-            for state in self._server_registry.values()
-            if state["widget_class"] == "BECDockArea"
-        ]
-        for state in dock_area_states:
-            dock_area_ref = self._add_widget(state, self)
-            dock_area = self._ipython_registry.get(dock_area_ref._gui_id)
-            if not hasattr(dock_area, "elements"):
-                self._set_dynamic_attributes(dock_area, "elements", WidgetNameSpace())
-            self._set_dynamic_attributes(self, dock_area.widget_name, dock_area_ref)
-            # Keep track of rpc references on RPCBase object
-            self._update_rpc_references(self, dock_area.widget_name, dock_area_ref._gui_id)
-            # Add dock_area to the top level
-            self._top_level[dock_area_ref.widget_name] = dock_area_ref
-            self._exposed_widgets.append(dock_area_ref._gui_id)
-
-            # Add docks
-            dock_states = [
-                state
-                for state in self._server_registry.values()
-                if state["config"].get("parent_id", "") == dock_area_ref._gui_id
-            ]
-            for state in dock_states:
-                dock_ref = self._add_widget(state, dock_area)
-                dock = self._ipython_registry.get(dock_ref._gui_id)
-                self._set_dynamic_attributes(dock_area, dock_ref.widget_name, dock_ref)
-                # Keep track of rpc references on RPCBase object
-                self._update_rpc_references(dock_area, dock_ref.widget_name, dock_ref._gui_id)
-                # Keep track of exposed docks
-                self._exposed_widgets.append(dock_ref._gui_id)
-
-                # Add widgets
-                widget_states = [
-                    state
-                    for state in self._server_registry.values()
-                    if state["config"].get("parent_id", "") == dock_ref._gui_id
-                ]
-                for state in widget_states:
-                    widget_ref = self._add_widget(state, dock)
-                    self._set_dynamic_attributes(dock, widget_ref.widget_name, widget_ref)
-                    self._set_dynamic_attributes(
-                        dock_area.elements, widget_ref.widget_name, widget_ref
-                    )
-                    # Keep track of rpc references on RPCBase object
-                    self._update_rpc_references(
-                        dock_area, f"elements.{widget_ref.widget_name}", widget_ref._gui_id
-                    )
-                    self._update_rpc_references(dock, widget_ref.widget_name, widget_ref._gui_id)
-                    # Keep track of exposed widgets
-                    self._exposed_widgets.append(widget_ref._gui_id)
-
-    def _add_widget(self, state: dict, parent: object) -> RPCReference:
-        """Add a widget to the namespace
+    def _run_rpc(self, method, *args, wait_for_rpc_response=True, timeout=3, **kwargs):
+        """
+        Run the RPC call.
 
         Args:
-            state (dict): The state of the widget from the _server_registry.
-            parent (object): The parent object.
+            method: The method to call.
+            args: The arguments to pass to the method.
+            wait_for_rpc_response: Whether to wait for the RPC response.
+            kwargs: The keyword arguments to pass to the method.
+
+        Returns:
+            The result of the RPC call.
         """
-        name = state["name"]
-        gui_id = state["gui_id"]
-        try:
-            widget_class = getattr(client, state["widget_class"])
-        except AttributeError as e:
-            raise AttributeError(
-                f"Failed to find user widget {state['widget_class']} in the client - did you run bw-generate-cli to generate the plugin files?"
-            ) from e
-        obj = self._ipython_registry.get(gui_id)
-        if obj is None:
-            widget = widget_class(gui_id=gui_id, name=name, parent=parent)
-            self._ipython_registry[gui_id] = widget
-        else:
-            widget = obj
-        obj = RPCReference(registry=self._ipython_registry, gui_id=gui_id)
-        return obj
+        request_id = str(uuid.uuid4())
+        rpc_msg = messages.GUIInstructionMessage(
+            action=method,
+            parameter={"args": args, "kwargs": kwargs, "gui_id": self._gui_id},
+            metadata={"request_id": request_id},
+        )
 
+        # pylint: disable=protected-access
+        receiver = self._root._gui_id
+        if wait_for_rpc_response:
+            self._rpc_response = None
+            self._msg_wait_event.clear()
+            self._client.connector.register(
+                MessageEndpoints.gui_instruction_response(request_id),
+                cb=self._on_rpc_response,
+                parent=self,
+            )
 
-if __name__ == "__main__":  # pragma: no cover
-    from bec_lib.client import BECClient
-    from bec_lib.service_config import ServiceConfig
+        self._client.connector.set_and_publish(MessageEndpoints.gui_instructions(receiver), rpc_msg)
 
-    try:
-        config = ServiceConfig()
-        bec_client = BECClient(config)
-        bec_client.start()
+        if wait_for_rpc_response:
+            try:
+                finished = self._msg_wait_event.wait(10)
+                if not finished:
+                    raise RPCResponseTimeoutError(request_id, timeout)
+            finally:
+                self._msg_wait_event.clear()
+                self._client.connector.unregister(
+                    MessageEndpoints.gui_instruction_response(request_id), cb=self._on_rpc_response
+                )
+            # get class name
+            if not self._rpc_response.accepted:
+                raise ValueError(self._rpc_response.message["error"])
+            msg_result = self._rpc_response.message.get("result")
+            self._rpc_response = None
+            return self._create_widget_from_msg_result(msg_result)
 
-        # Test the client_utils.py module
-        gui = BECGuiClient()
+    @staticmethod
+    def _on_rpc_response(msg: MessageObject, parent: RPCBase) -> None:
+        msg = msg.value
+        parent._msg_wait_event.set()
+        parent._rpc_response = msg
 
-        gui.start(wait=True)
-        gui.new().new(widget="Waveform")
-        time.sleep(10)
-    finally:
-        gui.kill_server()
+    def _create_widget_from_msg_result(self, msg_result):
+        if msg_result is None:
+            return None
+        if isinstance(msg_result, list):
+            return [self._create_widget_from_msg_result(res) for res in msg_result]
+        if isinstance(msg_result, dict):
+            if "__rpc__" not in msg_result:
+                return {
+                    key: self._create_widget_from_msg_result(val) for key, val in msg_result.items()
+                }
+            cls = msg_result.pop("widget_class", None)
+            msg_result.pop("__rpc__", None)
+
+            if not cls:
+                return msg_result
+
+            cls = getattr(client, cls)
+            # print(msg_result)
+            return cls(parent=self, **msg_result)
+        return msg_result
+
+    def gui_is_alive(self):
+        """
+        Check if the GUI is alive.
+        """
+        heart = self._client.connector.get(MessageEndpoints.gui_heartbeat(self._root._gui_id))
+        if heart is None:
+            return False
+        if heart.status == messages.BECStatus.RUNNING:
+            return True
+        return False

bec_widgets/cli/generate_cli.py

@@ -2,21 +2,16 @@
 from __future__ import annotations
 
 import argparse
-import importlib
 import inspect
 import os
 import sys
-from pathlib import Path
 
 import black
 import isort
-from bec_lib.logger import bec_logger
 from qtpy.QtCore import Property as QtProperty
 
-from bec_widgets.utils.generate_designer_plugin import DesignerPluginGenerator, plugin_filenames
-from bec_widgets.utils.plugin_utils import BECClassContainer, get_custom_classes
-
-logger = bec_logger.logger
+from bec_widgets.utils.generate_designer_plugin import DesignerPluginGenerator
+from bec_widgets.utils.plugin_utils import BECClassContainer, get_rpc_classes
 
 if sys.version_info >= (3, 11):
     from typing import get_overloads
@@ -34,25 +29,13 @@ else:
 
 
 class ClientGenerator:
-    def __init__(self, base=False):
-        self._base = base
-        base_imports = (
-            """import enum
-import inspect
-from typing import Literal, Optional
-"""
-            if self._base
-            else "\n"
-        )
-        self.header = f"""# This file was automatically generated by generate_cli.py\n
+    def __init__(self):
+        self.header = """# This file was automatically generated by generate_cli.py\n
 from __future__ import annotations
-{base_imports}
-from bec_lib.logger import bec_logger
+import enum
+from typing import Literal, Optional, overload
 
-from bec_widgets.cli.rpc.rpc_base import RPCBase, rpc_call
-{"from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets, get_plugin_client_module" if self._base else ""}
-
-logger = bec_logger.logger
+from bec_widgets.cli.client_utils import RPCBase, rpc_call, BECGuiClientMixin
 
 # pylint: skip-file"""
 
@@ -60,26 +43,18 @@ logger = bec_logger.logger
 
     def generate_client(self, class_container: BECClassContainer):
         """
-        Generate the client for the published classes, skipping any classes
-        that have `RPC = False`.
+        Generate the client for the published classes.
 
         Args:
             class_container: The class container with the classes to generate the client for.
         """
-        # Filter out classes that explicitly have RPC=False
-        rpc_top_level_classes = [
-            cls for cls in class_container.rpc_top_level_classes if getattr(cls, "RPC", True)
-        ]
+        rpc_top_level_classes = class_container.rpc_top_level_classes
         rpc_top_level_classes.sort(key=lambda x: x.__name__)
-
-        connector_classes = [
-            cls for cls in class_container.connector_classes if getattr(cls, "RPC", True)
-        ]
+        connector_classes = class_container.connector_classes
         connector_classes.sort(key=lambda x: x.__name__)
 
         self.write_client_enum(rpc_top_level_classes)
         for cls in connector_classes:
-            logger.debug(f"generating RPC client class for {cls.__name__}")
             self.content += "\n\n"
             self.generate_content_for_class(cls)
 
@@ -87,48 +62,14 @@ logger = bec_logger.logger
         """
         Write the client enum to the content.
         """
-        if self._base:
-            self.content += """
-class _WidgetsEnumType(str, enum.Enum):
-    \"\"\" Enum for the available widgets, to be generated programatically  \"\"\"
-    ...
-    """
-
         self.content += """
-
-_Widgets = {
+class Widgets(str, enum.Enum):
+    \"\"\"
+    Enum for the available widgets.
+    \"\"\"
     """
         for cls in published_classes:
-            self.content += f'"{cls.__name__}": "{cls.__name__}",\n    '
-
-        self.content += """}
-"""
-        if self._base:
-            self.content += """
-
-_plugin_widgets = get_all_plugin_widgets()
-plugin_client = get_plugin_client_module()
-Widgets = _WidgetsEnumType("Widgets", {name: name for name in _plugin_widgets} | _Widgets)
-
-if (_overlap := _Widgets.keys() & _plugin_widgets.keys()) != set():
-    for _widget in _overlap:
-        logger.warning(f"Detected duplicate widget {_widget} in plugin repo file: {inspect.getfile(_plugin_widgets[_widget])} !")
-for plugin_name, plugin_class in inspect.getmembers(plugin_client, inspect.isclass):
-    if issubclass(plugin_class, RPCBase) and plugin_class is not RPCBase:
-        if plugin_name in globals():
-            conflicting_file = (
-                inspect.getfile(_plugin_widgets[plugin_name])
-                if plugin_name in _plugin_widgets
-                else f"{plugin_client}"
-            )
-            logger.warning(
-                f"Plugin widget {plugin_name} from {conflicting_file} conflicts with a built-in class!"
-            )
-            continue
-        if plugin_name not in _overlap:
-            globals()[plugin_name] = plugin_class
-
-"""
+            self.content += f'{cls.__name__} = "{cls.__name__}"\n    '
 
     def generate_content_for_class(self, cls):
         """
@@ -140,28 +81,16 @@ for plugin_name, plugin_class in inspect.getmembers(plugin_client, inspect.iscla
 
         class_name = cls.__name__
 
-        if class_name == "BECDockArea":
+        # Generate the content
+        if cls.__name__ == "BECDockArea":
             self.content += f"""
-class {class_name}(RPCBase):"""
+class {class_name}(RPCBase, BECGuiClientMixin):"""
         else:
             self.content += f"""
 class {class_name}(RPCBase):"""
-
-        if cls.__doc__:
-            # We only want the first line of the docstring
-            # But skip the first line if it's a blank line
-            first_line = cls.__doc__.split("\n")[0]
-            if first_line:
-                class_docs = first_line
-            else:
-                class_docs = cls.__doc__.split("\n")[1]
-            self.content += f"""
-    \"\"\"{class_docs}\"\"\"
-    """
         if not cls.USER_ACCESS:
             self.content += """...
     """
-
         for method in cls.USER_ACCESS:
             is_property_setter = False
             obj = getattr(cls, method, None)
@@ -171,10 +100,8 @@ class {class_name}(RPCBase):"""
                 method = method.split(".setter")[0]
             if obj is None:
                 raise AttributeError(
-                    f"Method {method} not found in class {cls.__name__}. "
-                    f"Please check the USER_ACCESS list."
+                    f"Method {method} not found in class {cls.__name__}. Please check the USER_ACCESS list."
                 )
-
             if isinstance(obj, (property, QtProperty)):
                 # for the cli, we can map qt properties to regular properties
                 if is_property_setter:
@@ -240,61 +167,41 @@ def main():
     """
 
     parser = argparse.ArgumentParser(description="Auto-generate the client for RPC widgets")
-    parser.add_argument(
-        "--target",
-        action="store",
-        type=str,
-        help="Which package to generate plugin files for. Should be installed in the local environment (example: my_plugin_repo)",
-    )
+    parser.add_argument("--core", action="store_true", help="Whether to generate the core client")
 
     args = parser.parse_args()
-    if args.target is None:
-        logger.error(
-            "You must provide a target - for safety, the default of running this on bec_widgets core has been removed. To generate the client for bec_widgets, run bw-generate-cli --target bec_widgets"
-        )
-        return
 
-    logger.info(f"BEC Widget code generation tool started with args: {args}")
+    if args.core:
+        current_path = os.path.dirname(__file__)
+        client_path = os.path.join(current_path, "client.py")
 
-    client_subdir = "cli" if args.target == "bec_widgets" else "widgets"
-    module_name = "bec_widgets" if args.target == "bec_widgets" else f"{args.target}.bec_widgets"
+        rpc_classes = get_rpc_classes("bec_widgets")
 
-    try:
-        module = importlib.import_module(module_name)
-        assert module.__file__ is not None
-        module_file = Path(module.__file__)
-        module_dir = module_file.parent if module_file.is_file() else module_file
-    except Exception as e:
-        logger.error(f"Failed to load module {module_name} for code generation: {e}")
-        return
+        generator = ClientGenerator()
+        generator.generate_client(rpc_classes)
+        generator.write(client_path)
 
-    client_path = module_dir / client_subdir / "client.py"
+        for cls in rpc_classes.plugins:
+            plugin = DesignerPluginGenerator(cls)
+            if not hasattr(plugin, "info"):
+                continue
 
-    rpc_classes = get_custom_classes(module_name)
-    logger.info(f"Obtained classes with RPC objects: {rpc_classes!r}")
-
-    generator = ClientGenerator(base=module_name == "bec_widgets")
-    logger.info(f"Generating client file at {client_path}")
-    generator.generate_client(rpc_classes)
-    generator.write(str(client_path))
-
-    for cls in rpc_classes.plugins:
-        logger.info(f"Writing bec-designer plugin files for {cls.__name__}...")
-        plugin = DesignerPluginGenerator(cls)
-        if not hasattr(plugin, "info"):
-            continue
-
-        def _exists(file: str):
-            return os.path.exists(os.path.join(plugin.info.base_path, file))
-
-        if any(_exists(file) for file in plugin_filenames(plugin.info.plugin_name_snake)):
-            logger.debug(
-                f"Skipping generation of extra plugin files for {plugin.info.plugin_name_snake} - at least one file out of 'plugin.py', 'pyproject', and 'register_{plugin.info.plugin_name_snake}.py' already exists."
-            )
-            continue
-
-        plugin.run()
+            # if the class directory already has a register, plugin and pyproject file, skip
+            if os.path.exists(
+                os.path.join(plugin.info.base_path, f"register_{plugin.info.plugin_name_snake}.py")
+            ):
+                continue
+            if os.path.exists(
+                os.path.join(plugin.info.base_path, f"{plugin.info.plugin_name_snake}_plugin.py")
+            ):
+                continue
+            if os.path.exists(
+                os.path.join(plugin.info.base_path, f"{plugin.info.plugin_name_snake}.pyproject")
+            ):
+                continue
+            plugin.run()
 
 
 if __name__ == "__main__":  # pragma: no cover
+    sys.argv = ["generate_cli.py", "--core"]
     main()

bec_widgets/cli/rpc/rpc_base.py

@@ -1,260 +0,0 @@
-from __future__ import annotations
-
-import inspect
-import threading
-import uuid
-from functools import wraps
-from typing import TYPE_CHECKING, Any
-
-from bec_lib.client import BECClient
-from bec_lib.endpoints import MessageEndpoints
-from bec_lib.utils.import_utils import lazy_import, lazy_import_from
-
-if TYPE_CHECKING:  # pragma: no cover
-    from bec_lib import messages
-    from bec_lib.connector import MessageObject
-
-    import bec_widgets.cli.client as client
-else:
-    client = lazy_import("bec_widgets.cli.client")  # avoid circular import
-    messages = lazy_import("bec_lib.messages")
-    MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))
-
-# pylint: disable=protected-access
-
-
-def rpc_call(func):
-    """
-    A decorator for calling a function on the server.
-
-    Args:
-        func: The function to call.
-
-    Returns:
-        The result of the function call.
-    """
-
-    @wraps(func)
-    def wrapper(self, *args, **kwargs):
-        # we could rely on a strict type check here, but this is more flexible
-        # moreover, it would anyway crash for objects...
-        caller_frame = inspect.currentframe().f_back
-        while caller_frame:
-            if "jedi" in caller_frame.f_globals:
-                # Jedi module is present, likely tab completion
-                # Do not run the RPC call
-                return None  # func(*args, **kwargs)
-            caller_frame = caller_frame.f_back
-
-        out = []
-        for arg in args:
-            if hasattr(arg, "name"):
-                arg = arg.name
-            out.append(arg)
-        args = tuple(out)
-        for key, val in kwargs.items():
-            if hasattr(val, "name"):
-                kwargs[key] = val.name
-        if not self._root._gui_is_alive():
-            raise RuntimeError("GUI is not alive")
-        return self._run_rpc(func.__name__, *args, **kwargs)
-
-    return wrapper
-
-
-class RPCResponseTimeoutError(Exception):
-    """Exception raised when an RPC response is not received within the expected time."""
-
-    def __init__(self, request_id, timeout):
-        super().__init__(
-            f"RPC response not received within {timeout} seconds for request ID {request_id}"
-        )
-
-
-class DeletedWidgetError(Exception): ...
-
-
-def check_for_deleted_widget(func):
-    @wraps(func)
-    def wrapper(self, *args, **kwargs):
-        if self._gui_id not in self._registry:
-            raise DeletedWidgetError(f"Widget with gui_id {self._gui_id} has been deleted")
-        return func(self, *args, **kwargs)
-
-    return wrapper
-
-
-class RPCReference:
-    def __init__(self, registry: dict, gui_id: str) -> None:
-        self._registry = registry
-        self._gui_id = gui_id
-
-    @check_for_deleted_widget
-    def __getattr__(self, name):
-        if name in ["_registry", "_gui_id"]:
-            return super().__getattribute__(name)
-        return self._registry[self._gui_id].__getattribute__(name)
-
-    @check_for_deleted_widget
-    def __getitem__(self, key):
-        return self._registry[self._gui_id].__getitem__(key)
-
-    def __repr__(self):
-        if self._gui_id not in self._registry:
-            return f"<Deleted widget with gui_id {self._gui_id}>"
-        return self._registry[self._gui_id].__repr__()
-
-    def __str__(self):
-        if self._gui_id not in self._registry:
-            return f"<Deleted widget with gui_id {self._gui_id}>"
-        return self._registry[self._gui_id].__str__()
-
-    def __dir__(self):
-        if self._gui_id not in self._registry:
-            return []
-        return self._registry[self._gui_id].__dir__()
-
-
-class RPCBase:
-    def __init__(
-        self,
-        gui_id: str | None = None,
-        config: dict | None = None,
-        name: str | None = None,
-        parent=None,
-    ) -> None:
-        self._client = BECClient()  # BECClient is a singleton; here, we simply get the instance
-        self._config = config if config is not None else {}
-        self._gui_id = gui_id if gui_id is not None else str(uuid.uuid4())[:5]
-        self._name = name if name is not None else str(uuid.uuid4())[:5]
-        self._parent = parent
-        self._msg_wait_event = threading.Event()
-        self._rpc_response = None
-        super().__init__()
-        self._rpc_references: dict[str, str] = {}
-
-    def __repr__(self):
-        type_ = type(self)
-        qualname = type_.__qualname__
-        return f"<{qualname} with name: {self.widget_name}>"
-
-    def remove(self):
-        """
-        Remove the widget.
-        """
-        self._run_rpc("remove")
-
-    @property
-    def widget_name(self):
-        """
-        Get the widget name.
-        """
-        return self._name
-
-    @property
-    def _root(self):
-        """
-        Get the root widget. This is the BECFigure widget that holds
-        the anchor gui_id.
-        """
-        parent = self
-        # pylint: disable=protected-access
-        while parent._parent is not None:
-            parent = parent._parent
-        return parent
-
-    def _run_rpc(self, method, *args, wait_for_rpc_response=True, timeout=3, **kwargs) -> Any:
-        """
-        Run the RPC call.
-
-        Args:
-            method: The method to call.
-            args: The arguments to pass to the method.
-            wait_for_rpc_response: Whether to wait for the RPC response.
-            kwargs: The keyword arguments to pass to the method.
-
-        Returns:
-            The result of the RPC call.
-        """
-        request_id = str(uuid.uuid4())
-        rpc_msg = messages.GUIInstructionMessage(
-            action=method,
-            parameter={"args": args, "kwargs": kwargs, "gui_id": self._gui_id},
-            metadata={"request_id": request_id},
-        )
-        # pylint: disable=protected-access
-        receiver = self._root._gui_id
-        if wait_for_rpc_response:
-            self._rpc_response = None
-            self._msg_wait_event.clear()
-            self._client.connector.register(
-                MessageEndpoints.gui_instruction_response(request_id),
-                cb=self._on_rpc_response,
-                parent=self,
-            )
-
-        self._client.connector.set_and_publish(MessageEndpoints.gui_instructions(receiver), rpc_msg)
-
-        if wait_for_rpc_response:
-            try:
-                finished = self._msg_wait_event.wait(timeout)
-                if not finished:
-                    raise RPCResponseTimeoutError(request_id, timeout)
-            finally:
-                self._msg_wait_event.clear()
-                self._client.connector.unregister(
-                    MessageEndpoints.gui_instruction_response(request_id), cb=self._on_rpc_response
-                )
-            # get class name
-            if not self._rpc_response.accepted:
-                raise ValueError(self._rpc_response.message["error"])
-            msg_result = self._rpc_response.message.get("result")
-            self._rpc_response = None
-            return self._create_widget_from_msg_result(msg_result)
-
-    @staticmethod
-    def _on_rpc_response(msg: MessageObject, parent: RPCBase) -> None:
-        msg = msg.value
-        parent._msg_wait_event.set()
-        parent._rpc_response = msg
-
-    def _create_widget_from_msg_result(self, msg_result):
-        if msg_result is None:
-            return None
-        if isinstance(msg_result, list):
-            return [self._create_widget_from_msg_result(res) for res in msg_result]
-        if isinstance(msg_result, dict):
-            if "__rpc__" not in msg_result:
-                return {
-                    key: self._create_widget_from_msg_result(val) for key, val in msg_result.items()
-                }
-            cls = msg_result.pop("widget_class", None)
-            msg_result.pop("__rpc__", None)
-
-            if not cls:
-                return msg_result
-
-            cls = getattr(client, cls)
-            # The namespace of the object will be updated dynamically on the client side
-            # Therefor it is important to check if the object is already in the registry
-            # If yes, we return the reference to the object, otherwise we create a new object
-            # pylint: disable=protected-access
-            if msg_result["gui_id"] in self._root._ipython_registry:
-                return RPCReference(self._root._ipython_registry, msg_result["gui_id"])
-            ret = cls(parent=self, **msg_result)
-            self._root._ipython_registry[ret._gui_id] = ret
-            obj = RPCReference(self._root._ipython_registry, ret._gui_id)
-            return obj
-            # return ret
-        return msg_result
-
-    def _gui_is_alive(self):
-        """
-        Check if the GUI is alive.
-        """
-        heart = self._client.connector.get(MessageEndpoints.gui_heartbeat(self._root._gui_id))
-        if heart is None:
-            return False
-        if heart.status == messages.BECStatus.RUNNING:
-            return True
-        return False

bec_widgets/cli/rpc/rpc_register.py

@@ -1,176 +0,0 @@
-from __future__ import annotations
-
-from functools import wraps
-from threading import Lock, RLock
-from typing import TYPE_CHECKING, Callable
-from weakref import WeakValueDictionary
-
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import QObject
-
-if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.utils.bec_connector import BECConnector
-    from bec_widgets.utils.bec_widget import BECWidget
-    from bec_widgets.widgets.containers.dock.dock import BECDock
-    from bec_widgets.widgets.containers.dock.dock_area import BECDockArea
-
-logger = bec_logger.logger
-
-
-def broadcast_update(func):
-    """
-    Decorator to broadcast updates to the RPCRegister whenever a new RPC object is added or removed.
-    If class attribute _skip_broadcast is set to True, the broadcast will be skipped
-    """
-
-    @wraps(func)
-    def wrapper(self, *args, **kwargs):
-        result = func(self, *args, **kwargs)
-        self.broadcast()
-        return result
-
-    return wrapper
-
-
-class RPCRegister:
-    """
-    A singleton class that keeps track of all the RPC objects registered in the system for CLI usage.
-    """
-
-    _instance = None
-    _initialized = False
-
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(RPCRegister, cls).__new__(cls)
-            cls._initialized = False
-        return cls._instance
-
-    def __init__(self):
-        if self._initialized:
-            return
-        self._rpc_register = WeakValueDictionary()
-        self._broadcast_on_hold = RPCRegisterBroadcast(self)
-        self._lock = RLock()
-        self._skip_broadcast = False
-        self._initialized = True
-        self.callbacks = []
-
-    @classmethod
-    def delayed_broadcast(cls):
-        """
-        Delay the broadcast of the update to all the callbacks.
-        """
-        register = cls()
-        return register._broadcast_on_hold
-
-    @broadcast_update
-    def add_rpc(self, rpc: QObject):
-        """
-        Add an RPC object to the register.
-
-        Args:
-            rpc(QObject): The RPC object to be added to the register.
-        """
-        if not hasattr(rpc, "gui_id"):
-            raise ValueError("RPC object must have a 'gui_id' attribute.")
-        self._rpc_register[rpc.gui_id] = rpc
-
-    @broadcast_update
-    def remove_rpc(self, rpc: str):
-        """
-        Remove an RPC object from the register.
-
-        Args:
-            rpc(str): The RPC object to be removed from the register.
-        """
-        if not hasattr(rpc, "gui_id"):
-            raise ValueError(f"RPC object {rpc} must have a 'gui_id' attribute.")
-        self._rpc_register.pop(rpc.gui_id, None)
-
-    def get_rpc_by_id(self, gui_id: str) -> QObject | None:
-        """
-        Get an RPC object by its ID.
-
-        Args:
-            gui_id(str): The ID of the RPC object to be retrieved.
-
-        Returns:
-            QObject | None: The RPC object with the given ID or None
-        """
-        rpc_object = self._rpc_register.get(gui_id, None)
-        return rpc_object
-
-    def list_all_connections(self) -> dict:
-        """
-        List all the registered RPC objects.
-
-        Returns:
-            dict: A dictionary containing all the registered RPC objects.
-        """
-        with self._lock:
-            connections = dict(self._rpc_register)
-        return connections
-
-    def get_names_of_rpc_by_class_type(
-        self, cls: BECWidget | BECConnector | BECDock | BECDockArea
-    ) -> list[str]:
-        """Get all the names of the widgets.
-
-        Args:
-            cls(BECWidget | BECConnector): The class of the RPC object to be retrieved.
-        """
-        # This retrieves any rpc objects that are subclass of BECWidget,
-        # i.e. curve and image items are excluded
-        widgets = [rpc for rpc in self._rpc_register.values() if isinstance(rpc, cls)]
-        return [widget._name for widget in widgets]
-
-    def broadcast(self):
-        """
-        Broadcast the update to all the callbacks.
-        """
-
-        if self._skip_broadcast:
-            return
-        connections = self.list_all_connections()
-        for callback in self.callbacks:
-            callback(connections)
-
-    def add_callback(self, callback: Callable[[dict], None]):
-        """
-        Add a callback that will be called whenever the registry is updated.
-
-        Args:
-            callback(Callable[[dict], None]): The callback to be added. It should accept a dictionary of all the
-            registered RPC objects as an argument.
-        """
-        self.callbacks.append(callback)
-
-    @classmethod
-    def reset_singleton(cls):
-        """
-        Reset the singleton instance.
-        """
-        cls._instance = None
-        cls._initialized = False
-
-
-class RPCRegisterBroadcast:
-    """Context manager for RPCRegister broadcast."""
-
-    def __init__(self, rpc_register: RPCRegister) -> None:
-        self.rpc_register = rpc_register
-        self._call_depth = 0
-
-    def __enter__(self):
-        """Enter the context manager"""
-        self._call_depth += 1  # Needed for nested calls
-        self.rpc_register._skip_broadcast = True
-        return self.rpc_register
-
-    def __exit__(self, *exc):
-        """Exit the context manager"""
-        self._call_depth -= 1  # Remove nested calls
-        if self._call_depth == 0:  # Last one to exit is repsonsible for broadcasting
-            self.rpc_register._skip_broadcast = False
-        self.rpc_register.broadcast()

bec_widgets/cli/rpc/rpc_widget_handler.py

@@ -1,57 +0,0 @@
-from __future__ import annotations
-
-from bec_widgets.cli.client_utils import IGNORE_WIDGETS
-from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.plugin_utils import get_custom_classes
-
-
-class RPCWidgetHandler:
-    """Handler class for creating widgets from RPC messages."""
-
-    def __init__(self):
-        self._widget_classes = None
-
-    @property
-    def widget_classes(self) -> dict[str, type[BECWidget]]:
-        """
-        Get the available widget classes.
-
-        Returns:
-            dict: The available widget classes.
-        """
-        if self._widget_classes is None:
-            self.update_available_widgets()
-        return self._widget_classes  # type: ignore
-
-    def update_available_widgets(self):
-        """
-        Update the available widgets.
-
-        Returns:
-            None
-        """
-        clss = get_custom_classes("bec_widgets")
-        self._widget_classes = get_all_plugin_widgets() | {
-            cls.__name__: cls for cls in clss.widgets if cls.__name__ not in IGNORE_WIDGETS
-        }
-
-    def create_widget(self, widget_type, name: str | None = None, **kwargs) -> BECWidget:
-        """
-        Create a widget from an RPC message.
-
-        Args:
-            widget_type(str): The type of the widget.
-            name (str): The name of the widget.
-            **kwargs: The keyword arguments for the widget.
-
-        Returns:
-            widget(BECWidget): The created widget.
-        """
-        widget_class = self.widget_classes.get(widget_type)  # type: ignore
-        if widget_class:
-            return widget_class(name=name, **kwargs)
-        raise ValueError(f"Unknown widget type: {widget_type}")
-
-
-widget_handler = RPCWidgetHandler()

bec_widgets/cli/rpc_register.py

@@ -0,0 +1,80 @@
+from threading import Lock
+from weakref import WeakValueDictionary
+
+from qtpy.QtCore import QObject
+
+
+class RPCRegister:
+    """
+    A singleton class that keeps track of all the RPC objects registered in the system for CLI usage.
+    """
+
+    _instance = None
+    _initialized = False
+    _lock = Lock()
+
+    def __new__(cls, *args, **kwargs):
+        if cls._instance is None:
+            cls._instance = super(RPCRegister, cls).__new__(cls)
+            cls._initialized = False
+        return cls._instance
+
+    def __init__(self):
+        if self._initialized:
+            return
+        self._rpc_register = WeakValueDictionary()
+        self._initialized = True
+
+    def add_rpc(self, rpc: QObject):
+        """
+        Add an RPC object to the register.
+
+        Args:
+            rpc(QObject): The RPC object to be added to the register.
+        """
+        if not hasattr(rpc, "gui_id"):
+            raise ValueError("RPC object must have a 'gui_id' attribute.")
+        self._rpc_register[rpc.gui_id] = rpc
+
+    def remove_rpc(self, rpc: str):
+        """
+        Remove an RPC object from the register.
+
+        Args:
+            rpc(str): The RPC object to be removed from the register.
+        """
+        if not hasattr(rpc, "gui_id"):
+            raise ValueError(f"RPC object {rpc} must have a 'gui_id' attribute.")
+        self._rpc_register.pop(rpc.gui_id, None)
+
+    def get_rpc_by_id(self, gui_id: str) -> QObject:
+        """
+        Get an RPC object by its ID.
+
+        Args:
+            gui_id(str): The ID of the RPC object to be retrieved.
+
+        Returns:
+            QObject: The RPC object with the given ID.
+        """
+        rpc_object = self._rpc_register.get(gui_id, None)
+        return rpc_object
+
+    def list_all_connections(self) -> dict:
+        """
+        List all the registered RPC objects.
+
+        Returns:
+            dict: A dictionary containing all the registered RPC objects.
+        """
+        with self._lock:
+            connections = dict(self._rpc_register)
+        return connections
+
+    @classmethod
+    def reset_singleton(cls):
+        """
+        Reset the singleton instance.
+        """
+        cls._instance = None
+        cls._initialized = False

bec_widgets/cli/rpc_wigdet_handler.py

@@ -0,0 +1,53 @@
+from bec_widgets.utils import BECConnector
+
+
+class RPCWidgetHandler:
+    """Handler class for creating widgets from RPC messages."""
+
+    def __init__(self):
+        self._widget_classes = None
+
+    @property
+    def widget_classes(self):
+        """
+        Get the available widget classes.
+
+        Returns:
+            dict: The available widget classes.
+        """
+        if self._widget_classes is None:
+            self.update_available_widgets()
+        return self._widget_classes
+
+    def update_available_widgets(self):
+        """
+        Update the available widgets.
+
+        Returns:
+            None
+        """
+        from bec_widgets.utils.plugin_utils import get_rpc_classes
+
+        clss = get_rpc_classes("bec_widgets")
+        self._widget_classes = {cls.__name__: cls for cls in clss.top_level_classes}
+
+    def create_widget(self, widget_type, **kwargs) -> BECConnector:
+        """
+        Create a widget from an RPC message.
+
+        Args:
+            widget_type(str): The type of the widget.
+            **kwargs: The keyword arguments for the widget.
+
+        Returns:
+            widget(BECConnector): The created widget.
+        """
+        if self._widget_classes is None:
+            self.update_available_widgets()
+        widget_class = self._widget_classes.get(widget_type)
+        if widget_class:
+            return widget_class(**kwargs)
+        raise ValueError(f"Unknown widget type: {widget_type}")
+
+
+widget_handler = RPCWidgetHandler()

bec_widgets/cli/server.py

@@ -1,55 +1,29 @@
 from __future__ import annotations
 
-import functools
+import inspect
 import json
 import signal
 import sys
-import traceback
-import types
-from contextlib import contextmanager, redirect_stderr, redirect_stdout
+from contextlib import redirect_stderr, redirect_stdout
 from typing import Union
 
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.service_config import ServiceConfig
 from bec_lib.utils.import_utils import lazy_import
-from qtpy.QtCore import Qt, QTimer
-from redis.exceptions import RedisError
+from qtpy.QtCore import QTimer
 
-from bec_widgets.cli.rpc.rpc_register import RPCRegister
+from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
-from bec_widgets.utils.error_popups import ErrorPopupUtility
-from bec_widgets.widgets.containers.dock import BECDockArea
-from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
+from bec_widgets.utils.bec_dispatcher import QtRedisConnector
+from bec_widgets.widgets.dock.dock_area import BECDockArea
+from bec_widgets.widgets.figure import BECFigure
 
 messages = lazy_import("bec_lib.messages")
 logger = bec_logger.logger
 
 
-@contextmanager
-def rpc_exception_hook(err_func):
-    """This context replaces the popup message box for error display with a specific hook"""
-    # get error popup utility singleton
-    popup = ErrorPopupUtility()
-    # save current setting
-    old_exception_hook = popup.custom_exception_hook
-
-    # install err_func, if it is a callable
-    # IMPORTANT, Keep self here, because this method is overwriting the custom_exception_hook
-    # of the ErrorPopupUtility (popup instance) class.
-    def custom_exception_hook(self, exc_type, value, tb, **kwargs):
-        err_func({"error": popup.get_error_message(exc_type, value, tb)})
-
-    popup.custom_exception_hook = types.MethodType(custom_exception_hook, popup)
-
-    try:
-        yield popup
-    finally:
-        # restore state of error popup utility singleton
-        popup.custom_exception_hook = old_exception_hook
-
-
 class BECWidgetsCLIServer:
 
     def __init__(
@@ -58,17 +32,16 @@ class BECWidgetsCLIServer:
         dispatcher: BECDispatcher = None,
         client=None,
         config=None,
-        gui_class: type[BECDockArea] = BECDockArea,
-        gui_class_id: str = "bec",
+        gui_class: Union[BECFigure, BECDockArea] = BECFigure,
     ) -> None:
         self.status = messages.BECStatus.BUSY
         self.dispatcher = BECDispatcher(config=config) if dispatcher is None else dispatcher
         self.client = self.dispatcher.client if client is None else client
         self.client.start()
         self.gui_id = gui_id
-        # register broadcast callback
+        self.gui = gui_class(gui_id=self.gui_id)
         self.rpc_register = RPCRegister()
-        self.rpc_register.add_callback(self.broadcast_registry_update)
+        self.rpc_register.add_rpc(self.gui)
 
         self.dispatcher.connect_slot(
             self.on_rpc_update, MessageEndpoints.gui_instructions(self.gui_id)
@@ -80,27 +53,23 @@ class BECWidgetsCLIServer:
         self._heartbeat_timer.start(200)
 
         self.status = messages.BECStatus.RUNNING
-        with RPCRegister.delayed_broadcast():
-            self.gui = gui_class(parent=None, name=gui_class_id, gui_id=gui_class_id)
         logger.success(f"Server started with gui_id: {self.gui_id}")
-        # Create initial object -> BECFigure or BECDockArea
 
     def on_rpc_update(self, msg: dict, metadata: dict):
         request_id = metadata.get("request_id")
         logger.debug(f"Received RPC instruction: {msg}, metadata: {metadata}")
-        with rpc_exception_hook(functools.partial(self.send_response, request_id, False)):
-            try:
-                obj = self.get_object_from_config(msg["parameter"])
-                method = msg["action"]
-                args = msg["parameter"].get("args", [])
-                kwargs = msg["parameter"].get("kwargs", {})
-                res = self.run_rpc(obj, method, args, kwargs)
-            except Exception as e:
-                logger.error(f"Error while executing RPC instruction: {traceback.format_exc()}")
-                self.send_response(request_id, False, {"error": str(e)})
-            else:
-                logger.debug(f"RPC instruction executed successfully: {res}")
-                self.send_response(request_id, True, {"result": res})
+        try:
+            obj = self.get_object_from_config(msg["parameter"])
+            method = msg["action"]
+            args = msg["parameter"].get("args", [])
+            kwargs = msg["parameter"].get("kwargs", {})
+            res = self.run_rpc(obj, method, args, kwargs)
+        except Exception as e:
+            logger.error(f"Error while executing RPC instruction: {e}")
+            self.send_response(request_id, False, {"error": str(e)})
+        else:
+            logger.debug(f"RPC instruction executed successfully: {res}")
+            self.send_response(request_id, True, {"result": res})
 
     def send_response(self, request_id: str, accepted: bool, msg: dict):
         self.client.connector.set_and_publish(
@@ -117,72 +86,54 @@ class BECWidgetsCLIServer:
         return obj
 
     def run_rpc(self, obj, method, args, kwargs):
-        # Run with rpc registry broadcast, but only once
-        with RPCRegister.delayed_broadcast():
-            logger.debug(f"Running RPC instruction: {method} with args: {args}, kwargs: {kwargs}")
-            method_obj = getattr(obj, method)
-            # check if the method accepts args and kwargs
-            if not callable(method_obj):
-                if not args:
-                    res = method_obj
-                else:
-                    setattr(obj, method, args[0])
-                    res = None
+        logger.debug(f"Running RPC instruction: {method} with args: {args}, kwargs: {kwargs}")
+        method_obj = getattr(obj, method)
+        # check if the method accepts args and kwargs
+        if not callable(method_obj):
+            if not args:
+                res = method_obj
             else:
+                setattr(obj, method, args[0])
+                res = None
+        else:
+            sig = inspect.signature(method_obj)
+            if sig.parameters:
                 res = method_obj(*args, **kwargs)
-
-            if isinstance(res, list):
-                res = [self.serialize_object(obj) for obj in res]
-            elif isinstance(res, dict):
-                res = {key: self.serialize_object(val) for key, val in res.items()}
             else:
-                res = self.serialize_object(res)
-            return res
+                res = method_obj()
+
+        if isinstance(res, list):
+            res = [self.serialize_object(obj) for obj in res]
+        elif isinstance(res, dict):
+            res = {key: self.serialize_object(val) for key, val in res.items()}
+        else:
+            res = self.serialize_object(res)
+        return res
 
     def serialize_object(self, obj):
         if isinstance(obj, BECConnector):
-            config = obj.config.model_dump()
-            config["parent_id"] = obj.parent_id  # add parent_id to config
             return {
                 "gui_id": obj.gui_id,
-                "name": (
-                    obj._name if hasattr(obj, "_name") else obj.__class__.__name__
-                ),  # pylint: disable=protected-access
                 "widget_class": obj.__class__.__name__,
-                "config": config,
+                "config": obj.config.model_dump(),
                 "__rpc__": True,
             }
         return obj
 
     def emit_heartbeat(self):
         logger.trace(f"Emitting heartbeat for {self.gui_id}")
-        try:
-            self.client.connector.set(
-                MessageEndpoints.gui_heartbeat(self.gui_id),
-                messages.StatusMessage(name=self.gui_id, status=self.status, info={}),
-                expire=10,
-            )
-        except RedisError as exc:
-            logger.error(f"Error while emitting heartbeat: {exc}")
-
-    def broadcast_registry_update(self, connections: dict):
-        """
-        Broadcast the updated registry to all clients.
-        """
-
-        # We only need to broadcast the dock areas
-        data = {key: self.serialize_object(val) for key, val in connections.items()}
-        self.client.connector.xadd(
-            MessageEndpoints.gui_registry_state(self.gui_id),
-            msg_dict={"data": messages.GUIRegistryStateMessage(state=data)},
-            max_size=1,  # only single message in stream
+        self.client.connector.set(
+            MessageEndpoints.gui_heartbeat(self.gui_id),
+            messages.StatusMessage(name=self.gui_id, status=self.status, info={}),
+            expire=10,
         )
 
     def shutdown(self):  # TODO not sure if needed when cleanup is done at level of BECConnector
+        logger.info(f"Shutting down server with gui_id: {self.gui_id}")
         self.status = messages.BECStatus.IDLE
         self._heartbeat_timer.stop()
         self.emit_heartbeat()
-        logger.info("Succeded in shutting down gui")
+        self.gui.close()
         self.client.shutdown()
 
 
@@ -204,9 +155,7 @@ class SimpleFileLikeFromLogOutputFunc:
         return
 
 
-def _start_server(
-    gui_id: str, gui_class: BECDockArea, gui_class_id: str = "bec", config: str | None = None
-):
+def _start_server(gui_id: str, gui_class: Union[BECFigure, BECDockArea], config: str | None = None):
     if config:
         try:
             config = json.loads(config)
@@ -223,9 +172,7 @@ def _start_server(
     #     service_name="BECWidgetsCLIServer",
     #     service_config=service_config.service_config,
     # )
-    server = BECWidgetsCLIServer(
-        gui_id=gui_id, config=service_config, gui_class=gui_class, gui_class_id=gui_class_id
-    )
+    server = BECWidgetsCLIServer(gui_id=gui_id, config=service_config, gui_class=gui_class)
     return server
 
 
@@ -235,50 +182,42 @@ def main():
 
     from qtpy.QtCore import QSize
     from qtpy.QtGui import QIcon
-    from qtpy.QtWidgets import QApplication
+    from qtpy.QtWidgets import QApplication, QMainWindow
 
     import bec_widgets
 
+    bec_logger.level = bec_logger.LOGLEVEL.DEBUG
+    if __name__ != "__main__":
+        # if not running as main, set the log level to critical
+        # pylint: disable=protected-access
+        bec_logger._stderr_log_level = bec_logger.LOGLEVEL.CRITICAL
+
     parser = argparse.ArgumentParser(description="BEC Widgets CLI Server")
-    parser.add_argument("--id", type=str, default="test", help="The id of the server")
+    parser.add_argument("--id", type=str, help="The id of the server")
     parser.add_argument(
         "--gui_class",
         type=str,
         help="Name of the gui class to be rendered. Possible values: \n- BECFigure\n- BECDockArea",
     )
-    parser.add_argument(
-        "--gui_class_id",
-        type=str,
-        default="bec",
-        help="The id of the gui class that is added to the QApplication",
-    )
     parser.add_argument("--config", type=str, help="Config file or config string.")
-    parser.add_argument("--hide", action="store_true", help="Hide on startup")
 
     args = parser.parse_args()
 
-    bec_logger.level = bec_logger.LOGLEVEL.INFO
-    if args.hide:
-        # pylint: disable=protected-access
-        bec_logger._stderr_log_level = bec_logger.LOGLEVEL.ERROR
-        bec_logger._update_sinks()
-
-    if args.gui_class == "BECDockArea":
+    if args.gui_class == "BECFigure":
+        gui_class = BECFigure
+    elif args.gui_class == "BECDockArea":
         gui_class = BECDockArea
     else:
         print(
             "Please specify a valid gui_class to run. Use -h for help."
             "\n Starting with default gui_class BECFigure."
         )
-        gui_class = BECDockArea
+        gui_class = BECFigure
 
     with redirect_stdout(SimpleFileLikeFromLogOutputFunc(logger.info)):
         with redirect_stderr(SimpleFileLikeFromLogOutputFunc(logger.error)):
             app = QApplication(sys.argv)
-            # set close on last window, only if not under control of client ;
-            # indeed, Qt considers a hidden window a closed window, so if all windows
-            # are hidden by default it exits
-            app.setQuitOnLastWindowClosed(not args.hide)
+            app.setApplicationName("BEC Figure")
             module_path = os.path.dirname(bec_widgets.__file__)
             icon = QIcon()
             icon.addFile(
@@ -286,40 +225,30 @@ def main():
                 size=QSize(48, 48),
             )
             app.setWindowIcon(icon)
-            # store gui id within QApplication object, to make it available to all widgets
-            app.gui_id = args.id
 
-            # args.id = "abff6"
-            server = _start_server(args.id, gui_class, args.gui_class_id, args.config)
+            win = QMainWindow()
+            win.setWindowTitle("BEC Widgets")
 
-            win = BECMainWindow(gui_id=f"{server.gui_id}:window")
-            win.setAttribute(Qt.WA_ShowWithoutActivating)
-            win.setWindowTitle("BEC")
+            server = _start_server(args.id, gui_class, args.config)
 
-            RPCRegister().add_rpc(win)
             gui = server.gui
             win.setCentralWidget(gui)
-            if not args.hide:
-                win.show()
+            win.resize(800, 600)
+            win.show()
 
             app.aboutToQuit.connect(server.shutdown)
 
             def sigint_handler(*args):
                 # display message, for people to let it terminate gracefully
                 print("Caught SIGINT, exiting")
-                # Widgets should be all closed.
-                with RPCRegister.delayed_broadcast():
-                    for widget in QApplication.instance().topLevelWidgets():
-                        widget.close()
                 app.quit()
 
-            # gui.bec.close()
-            # win.shutdown()
             signal.signal(signal.SIGINT, sigint_handler)
             signal.signal(signal.SIGTERM, sigint_handler)
 
             sys.exit(app.exec())
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
+    sys.argv = ["bec_widgets.cli.server", "--id", "e2860", "--gui_class", "BECDockArea"]
     main()

bec_widgets/examples/jupyter_console/jupyter_console_window.py

@@ -3,11 +3,12 @@ import os
 import numpy as np
 import pyqtgraph as pg
 from bec_qthemes import material_icon
+from qtpy.QtCore import QSize
+from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import (
     QApplication,
     QGroupBox,
     QHBoxLayout,
-    QPushButton,
     QSplitter,
     QTabWidget,
     QVBoxLayout,
@@ -15,16 +16,10 @@ from qtpy.QtWidgets import (
 )
 
 from bec_widgets.utils import BECDispatcher
-from bec_widgets.utils.widget_io import WidgetHierarchy as wh
-from bec_widgets.widgets.containers.dock import BECDockArea
-from bec_widgets.widgets.containers.layout_manager.layout_manager import LayoutManagerWidget
-from bec_widgets.widgets.editors.jupyter_console.jupyter_console import BECJupyterConsole
-from bec_widgets.widgets.plots.image.image import Image
-from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
-from bec_widgets.widgets.plots.multi_waveform.multi_waveform import MultiWaveform
-from bec_widgets.widgets.plots.plot_base import PlotBase
-from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
-from bec_widgets.widgets.plots.waveform.waveform import Waveform
+from bec_widgets.utils.colors import apply_theme
+from bec_widgets.widgets.dock.dock_area import BECDockArea
+from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.jupyter_console.jupyter_console import BECJupyterConsole
 
 
 class JupyterConsoleWindow(QWidget):  # pragma: no cover:
@@ -41,24 +36,26 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
                 {
                     "np": np,
                     "pg": pg,
-                    "wh": wh,
+                    "fig": self.figure,
                     "dock": self.dock,
+                    "w1": self.w1,
+                    "w2": self.w2,
+                    "w3": self.w3,
+                    "w4": self.w4,
+                    "w5": self.w5,
+                    "w6": self.w6,
+                    "w7": self.w7,
+                    "w8": self.w8,
+                    "w9": self.w9,
+                    "w10": self.w10,
+                    "d0": self.d0,
+                    "d1": self.d1,
+                    "d2": self.d2,
+                    "wave": self.wf,
+                    # "bar": self.bar,
+                    # "cm": self.colormap,
                     "im": self.im,
-                    "mi": self.mi,
                     "mm": self.mm,
-                    "lm": self.lm,
-                    "btn1": self.btn1,
-                    "btn2": self.btn2,
-                    "btn3": self.btn3,
-                    "btn4": self.btn4,
-                    "btn5": self.btn5,
-                    "btn6": self.btn6,
-                    "pb": self.pb,
-                    "pi": self.pi,
-                    "wf": self.wf,
-                    "scatter": self.scatter,
-                    "scatter_mi": self.scatter,
-                    "mwf": self.mwf,
                 }
             )
 
@@ -77,85 +74,117 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
         first_tab_layout.addWidget(self.dock)
         tab_widget.addTab(first_tab, "Dock Area")
 
-        third_tab = QWidget()
-        third_tab_layout = QVBoxLayout(third_tab)
-        self.lm = LayoutManagerWidget()
-        third_tab_layout.addWidget(self.lm)
-        tab_widget.addTab(third_tab, "Layout Manager Widget")
-
-        fourth_tab = QWidget()
-        fourth_tab_layout = QVBoxLayout(fourth_tab)
-        self.pb = PlotBase()
-        self.pi = self.pb.plot_item
-        fourth_tab_layout.addWidget(self.pb)
-        tab_widget.addTab(fourth_tab, "PlotBase")
-
-        tab_widget.setCurrentIndex(3)
+        second_tab = QWidget()
+        second_tab_layout = QVBoxLayout(second_tab)
+        self.figure = BECFigure(parent=self, gui_id="figure")
+        second_tab_layout.addWidget(self.figure)
+        tab_widget.addTab(second_tab, "BEC Figure")
 
         group_box = QGroupBox("Jupyter Console", splitter)
         group_box_layout = QVBoxLayout(group_box)
         self.console = BECJupyterConsole(inprocess=True)
         group_box_layout.addWidget(self.console)
 
-        # Some buttons for layout testing
-        self.btn1 = QPushButton("Button 1")
-        self.btn2 = QPushButton("Button 2")
-        self.btn3 = QPushButton("Button 3")
-        self.btn4 = QPushButton("Button 4")
-        self.btn5 = QPushButton("Button 5")
-        self.btn6 = QPushButton("Button 6")
+        # add stuff to figure
+        self._init_figure()
 
-        fifth_tab = QWidget()
-        fifth_tab_layout = QVBoxLayout(fifth_tab)
-        self.wf = Waveform()
-        fifth_tab_layout.addWidget(self.wf)
-        tab_widget.addTab(fifth_tab, "Waveform Next Gen")
-        tab_widget.setCurrentIndex(4)
-
-        sixth_tab = QWidget()
-        sixth_tab_layout = QVBoxLayout(sixth_tab)
-        self.im = Image()
-        self.mi = self.im.main_image
-        sixth_tab_layout.addWidget(self.im)
-        tab_widget.addTab(sixth_tab, "Image Next Gen")
-        tab_widget.setCurrentIndex(5)
-
-        seventh_tab = QWidget()
-        seventh_tab_layout = QVBoxLayout(seventh_tab)
-        self.scatter = ScatterWaveform()
-        self.scatter_mi = self.scatter.main_curve
-        self.scatter.plot("samx", "samy", "bpm4i")
-        seventh_tab_layout.addWidget(self.scatter)
-        tab_widget.addTab(seventh_tab, "Scatter Waveform")
-        tab_widget.setCurrentIndex(6)
-
-        eighth_tab = QWidget()
-        eighth_tab_layout = QVBoxLayout(eighth_tab)
-        self.mm = MotorMap()
-        eighth_tab_layout.addWidget(self.mm)
-        tab_widget.addTab(eighth_tab, "Motor Map")
-        tab_widget.setCurrentIndex(7)
-
-        ninth_tab = QWidget()
-        ninth_tab_layout = QVBoxLayout(ninth_tab)
-        self.mwf = MultiWaveform()
-        ninth_tab_layout.addWidget(self.mwf)
-        tab_widget.addTab(ninth_tab, "MultiWaveform")
-        tab_widget.setCurrentIndex(8)
-
-        # add stuff to the new Waveform widget
-        self._init_waveform()
+        # init dock for testing
+        self._init_dock()
 
         self.setWindowTitle("Jupyter Console Window")
 
-    def _init_waveform(self):
-        self.wf.plot(y_name="bpm4i", y_entry="bpm4i", dap="GaussianModel")
-        self.wf.plot(y_name="bpm3a", y_entry="bpm3a", dap="GaussianModel")
+    def _init_figure(self):
+        self.w1 = self.figure.plot(
+            x_name="samx",
+            y_name="bpm4i",
+            # title="Standard Plot with sync device, custom labels - w1",
+            # x_label="Motor Position",
+            # y_label="Intensity (A.U.)",
+            row=0,
+            col=0,
+        )
+        self.w1.set(
+            title="Standard Plot with sync device, custom labels - w1",
+            x_label="Motor Position",
+            y_label="Intensity (A.U.)",
+        )
+        self.w2 = self.figure.motor_map("samx", "samy", row=0, col=1)
+        self.w3 = self.figure.image(
+            "eiger", color_map="viridis", vrange=(0, 100), title="Eiger Image - w3", row=0, col=2
+        )
+        self.w4 = self.figure.plot(
+            x_name="samx",
+            y_name="samy",
+            z_name="bpm4i",
+            color_map_z="magma",
+            new=True,
+            title="2D scatter plot - w4",
+            row=0,
+            col=3,
+        )
+        self.w5 = self.figure.plot(
+            y_name="bpm4i",
+            new=True,
+            title="Best Effort Plot - w5",
+            dap="GaussianModel",
+            row=1,
+            col=0,
+        )
+        self.w6 = self.figure.plot(
+            x_name="timestamp", y_name="bpm4i", new=True, title="Timestamp Plot - w6", row=1, col=1
+        )
+        self.w7 = self.figure.plot(
+            x_name="index", y_name="bpm4i", new=True, title="Index Plot - w7", row=1, col=2
+        )
+        self.w8 = self.figure.plot(
+            y_name="monitor_async", new=True, title="Async Plot - Best Effort - w8", row=2, col=0
+        )
+        self.w9 = self.figure.plot(
+            x_name="timestamp",
+            y_name="monitor_async",
+            new=True,
+            title="Async Plot - timestamp - w9",
+            row=2,
+            col=1,
+        )
+        self.w10 = self.figure.plot(
+            x_name="index",
+            y_name="monitor_async",
+            new=True,
+            title="Async Plot - index - w10",
+            row=2,
+            col=2,
+        )
+
+    def _init_dock(self):
+
+        self.d0 = self.dock.add_dock(name="dock_0")
+        self.mm = self.d0.add_widget("BECMotorMapWidget")
+        self.mm.change_motors("samx", "samy")
+
+        self.d1 = self.dock.add_dock(name="dock_1", position="right")
+        self.im = self.d1.add_widget("BECImageWidget")
+        self.im.image("waveform", "1d")
+
+        self.d2 = self.dock.add_dock(name="dock_2", position="bottom")
+        self.wf = self.d2.add_widget("BECWaveformWidget", row=0, col=0)
+        self.wf.plot(x_name="samx", y_name="bpm3a")
+        self.wf.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
+        # self.bar = self.d2.add_widget("RingProgressBar", row=0, col=1)
+        # self.bar.set_diameter(200)
+
+        # self.d3 = self.dock.add_dock(name="dock_3", position="bottom")
+        # self.colormap = pg.GradientWidget()
+        # self.d3.add_widget(self.colormap, row=0, col=0)
+
+        self.dock.save_state()
 
     def closeEvent(self, event):
         """Override to handle things when main window is closed."""
         self.dock.cleanup()
         self.dock.close()
+        self.figure.cleanup()
+        self.figure.close()
         self.console.close()
 
         super().closeEvent(event)
@@ -171,7 +200,8 @@ if __name__ == "__main__":  # pragma: no cover
     app = QApplication(sys.argv)
     app.setApplicationName("Jupyter Console")
     app.setApplicationDisplayName("Jupyter Console")
-    icon = material_icon("terminal", color=(255, 255, 255, 255), filled=True)
+    apply_theme("dark")
+    icon = material_icon("terminal", color="#434343", filled=True)
     app.setWindowIcon(icon)
 
     bec_dispatcher = BECDispatcher()
@@ -180,7 +210,6 @@ if __name__ == "__main__":  # pragma: no cover
 
     win = JupyterConsoleWindow()
     win.show()
-    win.resize(1500, 800)
 
     app.aboutToQuit.connect(win.close)
     sys.exit(app.exec_())

bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py

@@ -6,7 +6,7 @@ from qtpy.QtGui import QAction
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
 
 from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe
-from bec_widgets.utils.error_popups import SafeSlot as Slot
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 
 
 class TicTacToeDialog(QDialog):  # pragma: no cover

bec_widgets/qt_utils/error_popups.py

@@ -2,93 +2,9 @@ import functools
 import sys
 import traceback
 
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import Property, QObject, Qt, Signal, Slot
+from qtpy.QtCore import QObject, Qt, Signal, Slot
 from qtpy.QtWidgets import QApplication, QMessageBox, QPushButton, QVBoxLayout, QWidget
 
-logger = bec_logger.logger
-
-
-def SafeProperty(prop_type, *prop_args, popup_error: bool = False, default=None, **prop_kwargs):
-    """
-    Decorator to create a Qt Property with safe getter and setter so that
-    Qt Designer won't crash if an exception occurs in either method.
-
-    Args:
-        prop_type: The property type (e.g., str, bool, int, custom classes, etc.)
-        popup_error (bool): If True, show a popup for any error; otherwise, ignore or log silently.
-        default: Any default/fallback value to return if the getter raises an exception.
-        *prop_args, **prop_kwargs: Passed along to the underlying Qt Property constructor.
-
-    Usage:
-        @SafeProperty(int, default=-1)
-        def some_value(self) -> int:
-            # your getter logic
-            return ...   # if an exception is raised, returns -1
-
-        @some_value.setter
-        def some_value(self, val: int):
-            # your setter logic
-            ...
-    """
-
-    def decorator(py_getter):
-        """Decorator for the user's property getter function."""
-
-        @functools.wraps(py_getter)
-        def safe_getter(self_):
-            try:
-                return py_getter(self_)
-            except Exception:
-                # Identify which property function triggered error
-                prop_name = f"{py_getter.__module__}.{py_getter.__qualname__}"
-                error_msg = traceback.format_exc()
-
-                if popup_error:
-                    ErrorPopupUtility().custom_exception_hook(*sys.exc_info(), popup_error=True)
-                logger.error(f"SafeProperty error in GETTER of '{prop_name}':\n{error_msg}")
-                return default
-
-        class PropertyWrapper:
-            """
-            Intermediate wrapper used so that the user can optionally chain .setter(...).
-            """
-
-            def __init__(self, getter_func):
-                # We store only our safe_getter in the wrapper
-                self.getter_func = safe_getter
-
-            def setter(self, setter_func):
-                """Wraps the user-defined setter to handle errors safely."""
-
-                @functools.wraps(setter_func)
-                def safe_setter(self_, value):
-                    try:
-                        return setter_func(self_, value)
-                    except Exception:
-                        prop_name = f"{setter_func.__module__}.{setter_func.__qualname__}"
-                        error_msg = traceback.format_exc()
-
-                        if popup_error:
-                            ErrorPopupUtility().custom_exception_hook(
-                                *sys.exc_info(), popup_error=True
-                            )
-                        logger.error(f"SafeProperty error in SETTER of '{prop_name}':\n{error_msg}")
-                        return
-
-                # Return the full read/write Property
-                return Property(prop_type, self.getter_func, safe_setter, *prop_args, **prop_kwargs)
-
-            def __call__(self):
-                """
-                If user never calls `.setter(...)`, produce a read-only property.
-                """
-                return Property(prop_type, self.getter_func, None, *prop_args, **prop_kwargs)
-
-        return PropertyWrapper(py_getter)
-
-    return decorator
-
 
 def SafeSlot(*slot_args, **slot_kwargs):  # pylint: disable=invalid-name
     """Function with args, acting like a decorator, applying "error_managed" decorator + Qt Slot
@@ -106,13 +22,7 @@ def SafeSlot(*slot_args, **slot_kwargs):  # pylint: disable=invalid-name
             try:
                 return method(*args, **kwargs)
             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
-                    )
-                logger.error(f"SafeSlot error in slot '{slot_name}':\n{error_msg}")
+                ErrorPopupUtility().custom_exception_hook(*sys.exc_info(), popup_error=popup_error)
 
         return wrapper
 
@@ -181,12 +91,6 @@ class _ErrorPopupUtility(QObject):
         msg.setMinimumHeight(400)
         msg.exec_()
 
-    def show_property_error(self, title, message, widget):
-        """
-        Show a property-specific error message.
-        """
-        self.error_occurred.emit(title, message, widget)
-
     def format_traceback(self, traceback_message: str) -> str:
         """
         Format the traceback message to be displayed in the error popup by adding indentation to each line.
@@ -223,14 +127,12 @@ class _ErrorPopupUtility(QObject):
             error_message = " ".join(captured_message)
         return error_message
 
-    def get_error_message(self, exctype, value, tb):
-        return "".join(traceback.format_exception(exctype, value, tb))
-
     def custom_exception_hook(self, exctype, value, tb, popup_error=False):
         if popup_error or self.enable_error_popup:
+            error_message = traceback.format_exception(exctype, value, tb)
             self.error_occurred.emit(
                 "Method error" if popup_error else "Application Error",
-                self.get_error_message(exctype, value, tb),
+                "".join(error_message),
                 self.parent(),
             )
         else:

bec_widgets/qt_utils/palette_viewer.py

@@ -13,7 +13,7 @@ from qtpy.QtWidgets import (
 
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors, get_theme_palette
-from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
+from bec_widgets.widgets.dark_mode_button.dark_mode_button import DarkModeButton
 
 
 class PaletteViewer(BECWidget, QWidget):

bec_widgets/qt_utils/settings_dialog.py

@@ -1,6 +1,6 @@
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QHBoxLayout, QPushButton, QVBoxLayout, QWidget
 
-from bec_widgets.utils.error_popups import SafeSlot
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 
 
 class SettingWidget(QWidget):
@@ -20,14 +20,14 @@ class SettingWidget(QWidget):
     def set_target_widget(self, target_widget: QWidget):
         self.target_widget = target_widget
 
-    @SafeSlot()
+    @Slot()
     def accept_changes(self):
         """
         Accepts the changes made in the settings widget and applies them to the target widget.
         """
         pass
 
-    @SafeSlot(dict)
+    @Slot(dict)
     def display_current_settings(self, config_dict: dict):
         """
         Displays the current settings of the target widget in the settings widget.
@@ -54,13 +54,12 @@ class SettingsDialog(QDialog):
         settings_widget: SettingWidget = None,
         window_title: str = "Settings",
         config: dict = None,
-        modal: bool = False,
         *args,
         **kwargs,
     ):
         super().__init__(parent, *args, **kwargs)
 
-        self.setModal(modal)
+        self.setModal(False)
 
         self.setWindowTitle(window_title)
 
@@ -93,7 +92,7 @@ class SettingsDialog(QDialog):
         ok_button.setDefault(True)
         ok_button.setAutoDefault(True)
 
-    @SafeSlot()
+    @Slot()
     def accept(self):
         """
         Accept the changes made in the settings widget and close the dialog.
@@ -101,7 +100,7 @@ class SettingsDialog(QDialog):
         self.widget.accept_changes()
         super().accept()
 
-    @SafeSlot()
+    @Slot()
     def apply_changes(self):
         """
         Apply the changes made in the settings widget without closing the dialog.

bec_widgets/qt_utils/toolbar.py

@@ -0,0 +1,296 @@
+# pylint: disable=no-name-in-module
+from __future__ import annotations
+
+import os
+from abc import ABC, abstractmethod
+from collections import defaultdict
+from typing import Literal
+
+from bec_qthemes._icon.material_icons import material_icon
+from qtpy.QtCore import QSize, Qt
+from qtpy.QtGui import QAction, QColor, QIcon
+from qtpy.QtWidgets import (
+    QComboBox,
+    QHBoxLayout,
+    QLabel,
+    QMenu,
+    QSizePolicy,
+    QToolBar,
+    QToolButton,
+    QWidget,
+)
+
+import bec_widgets
+
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
+
+class ToolBarAction(ABC):
+    """
+    Abstract base class for toolbar actions.
+
+    Args:
+        icon_path (str, optional): The name of the icon file from `assets/toolbar_icons`. Defaults to None.
+        tooltip (bool, optional): The tooltip for the action. Defaults to None.
+        checkable (bool, optional): Whether the action is checkable. Defaults to False.
+    """
+
+    def __init__(self, icon_path: str = None, tooltip: str = None, checkable: bool = False):
+        self.icon_path = (
+            os.path.join(MODULE_PATH, "assets", "toolbar_icons", icon_path) if icon_path else None
+        )
+        self.tooltip = tooltip
+        self.checkable = checkable
+        self.action = None
+
+    @abstractmethod
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        """Adds an action or widget to a toolbar.
+
+        Args:
+            toolbar (QToolBar): The toolbar to add the action or widget to.
+            target (QWidget): The target widget for the action.
+        """
+
+
+class SeparatorAction(ToolBarAction):
+    """Separator action for the toolbar."""
+
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        toolbar.addSeparator()
+
+
+class IconAction(ToolBarAction):
+    """
+    Action with an icon for the toolbar.
+
+    Args:
+        icon_path (str): The path to the icon file.
+        tooltip (str): The tooltip for the action.
+        checkable (bool, optional): Whether the action is checkable. Defaults to False.
+    """
+
+    def __init__(self, icon_path: str = None, tooltip: str = None, checkable: bool = False):
+        super().__init__(icon_path, tooltip, checkable)
+
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        icon = QIcon()
+        icon.addFile(self.icon_path, size=QSize(20, 20))
+        self.action = QAction(icon, self.tooltip, target)
+        self.action.setCheckable(self.checkable)
+        toolbar.addAction(self.action)
+
+
+class MaterialIconAction:
+    """
+    Action with a Material icon for the toolbar.
+
+    Args:
+        icon_path (str, optional): The name of the Material icon. Defaults to None.
+        tooltip (bool, optional): The tooltip for the action. Defaults to None.
+        checkable (bool, optional): Whether the action is checkable. Defaults to False.
+        filled (bool, optional): Whether the icon is filled. Defaults to False.
+    """
+
+    def __init__(
+        self,
+        icon_name: str = None,
+        tooltip: str = None,
+        checkable: bool = False,
+        filled: bool = False,
+        color: str | tuple | QColor | dict[Literal["dark", "light"], str] | None = None,
+    ):
+        self.icon_name = icon_name
+        self.tooltip = tooltip
+        self.checkable = checkable
+        self.action = None
+        self.filled = filled
+        self.color = color
+
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        icon = self.get_icon()
+        self.action = QAction(icon, self.tooltip, target)
+        self.action.setCheckable(self.checkable)
+        toolbar.addAction(self.action)
+
+    def get_icon(self):
+
+        icon = material_icon(
+            self.icon_name,
+            size=(20, 20),
+            convert_to_pixmap=False,
+            filled=self.filled,
+            color=self.color,
+        )
+        return icon
+
+
+class DeviceSelectionAction(ToolBarAction):
+    """
+    Action for selecting a device in a combobox.
+
+    Args:
+        label (str): The label for the combobox.
+        device_combobox (DeviceComboBox): The combobox for selecting the device.
+
+    """
+
+    def __init__(self, label: str, device_combobox):
+        super().__init__()
+        self.label = label
+        self.device_combobox = device_combobox
+        self.device_combobox.currentIndexChanged.connect(lambda: self.set_combobox_style("#ffa700"))
+
+    def add_to_toolbar(self, toolbar, target):
+        widget = QWidget()
+        layout = QHBoxLayout(widget)
+        label = QLabel(f"{self.label}")
+        layout.addWidget(label)
+        layout.addWidget(self.device_combobox)
+        toolbar.addWidget(widget)
+
+    def set_combobox_style(self, color: str):
+        self.device_combobox.setStyleSheet(f"QComboBox {{ background-color: {color}; }}")
+
+
+class WidgetAction(ToolBarAction):
+    """
+    Action for adding any widget to the toolbar.
+
+    Args:
+        label (str|None): The label for the widget.
+        widget (QWidget): The widget to be added to the toolbar.
+
+    """
+
+    def __init__(self, label: str | None = None, widget: QWidget = None, parent=None):
+        super().__init__(parent)
+        self.label = label
+        self.widget = widget
+
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        container = QWidget()
+        layout = QHBoxLayout(container)
+        layout.setContentsMargins(0, 0, 0, 0)
+        layout.setSpacing(5)
+
+        if self.label is not None:
+            label_widget = QLabel(f"{self.label}")
+            label_widget.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
+            label_widget.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
+            layout.addWidget(label_widget)
+
+        if isinstance(self.widget, QComboBox):
+            self.widget.setSizeAdjustPolicy(QComboBox.AdjustToContents)
+
+            size_policy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+            self.widget.setSizePolicy(size_policy)
+
+            self.widget.setMinimumWidth(self.calculate_minimum_width(self.widget))
+
+        else:
+            self.widget.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
+
+        layout.addWidget(self.widget)
+
+        toolbar.addWidget(container)
+
+    @staticmethod
+    def calculate_minimum_width(combo_box: QComboBox) -> int:
+        """
+        Calculate the minimum width required to display the longest item in the combo box.
+
+        Args:
+            combo_box (QComboBox): The combo box to calculate the width for.
+
+        Returns:
+            int: The calculated minimum width in pixels.
+        """
+        font_metrics = combo_box.fontMetrics()
+        max_width = max(font_metrics.width(combo_box.itemText(i)) for i in range(combo_box.count()))
+        return max_width + 60
+
+
+class ExpandableMenuAction(ToolBarAction):
+    """
+    Action for an expandable menu in the toolbar.
+
+    Args:
+        label (str): The label for the menu.
+        actions (dict): A dictionary of actions to populate the menu.
+        icon_path (str, optional): The path to the icon file. Defaults to None.
+
+    """
+
+    def __init__(self, label: str, actions: dict, icon_path: str = None):
+        super().__init__(icon_path, label)
+        self.actions = actions
+        self.widgets = defaultdict(dict)
+
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        button = QToolButton(toolbar)
+        if self.icon_path:
+            button.setIcon(QIcon(self.icon_path))
+        button.setText(self.tooltip)
+        button.setPopupMode(QToolButton.InstantPopup)
+        button.setStyleSheet(
+            """
+                   QToolButton {
+                       font-size: 14px;
+                   }
+                   QMenu {
+                       font-size: 14px;
+                   }
+               """
+        )
+        menu = QMenu(button)
+        for action_id, action in self.actions.items():
+            sub_action = QAction(action.tooltip, target)
+            if hasattr(action, "icon_path"):
+                icon = QIcon()
+                icon.addFile(action.icon_path, size=QSize(20, 20))
+                sub_action.setIcon(icon)
+            elif hasattr(action, "get_icon"):
+                sub_action.setIcon(action.get_icon())
+            sub_action.setCheckable(action.checkable)
+            menu.addAction(sub_action)
+            self.widgets[action_id] = sub_action
+        button.setMenu(menu)
+        toolbar.addWidget(button)
+
+
+class ModularToolBar(QToolBar):
+    """Modular toolbar with optional automatic initialization.
+    Args:
+        parent (QWidget, optional): The parent widget of the toolbar. Defaults to None.
+        actions (list[ToolBarAction], optional): A list of action creators to populate the toolbar. Defaults to None.
+        target_widget (QWidget, optional): The widget that the actions will target. Defaults to None.
+    """
+
+    def __init__(self, parent=None, actions: dict | None = None, target_widget=None):
+        super().__init__(parent)
+
+        self.widgets = defaultdict(dict)
+        self.set_background_color()
+
+        if actions is not None and target_widget is not None:
+            self.populate_toolbar(actions, target_widget)
+
+    def populate_toolbar(self, actions: dict, target_widget):
+        """Populates the toolbar with a set of actions.
+
+        Args:
+            actions (list[ToolBarAction]): A list of action creators to populate the toolbar.
+            target_widget (QWidget): The widget that the actions will target.
+        """
+        self.clear()
+        for action_id, action in actions.items():
+            action.add_to_toolbar(self, target_widget)
+            self.widgets[action_id] = action
+
+    def set_background_color(self):
+        self.setIconSize(QSize(20, 20))
+        self.setMovable(False)
+        self.setFloatable(False)
+        self.setContentsMargins(0, 0, 0, 0)
+        self.setStyleSheet("QToolBar { background-color: rgba(0, 0, 0, 0); border: none; }")

bec_widgets/tests/utils.py

@@ -224,11 +224,3 @@ DEVICES = [
     Positioner("test", limits=[-10, 10], read_value=2.0),
     Device("test_device"),
 ]
-
-
-def check_remote_data_size(widget, plot_name, num_elements):
-    """
-    Check if the remote data has the correct number of elements.
-    Used in the qtbot.waitUntil function.
-    """
-    return len(widget.get_all_data()[plot_name]["x"]) == num_elements

bec_widgets/utils/bec_connector.py

@@ -4,8 +4,7 @@ from __future__ import annotations
 import os
 import time
 import uuid
-from datetime import datetime
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from bec_lib.logger import bec_logger
 from bec_lib.utils.import_utils import lazy_import_from
@@ -13,16 +12,11 @@ from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import QObject, QRunnable, QThreadPool, Signal
 from qtpy.QtWidgets import QApplication
 
-from bec_widgets.cli.rpc.rpc_register import RPCRegister
-from bec_widgets.utils.container_utils import WidgetContainerUtils
-from bec_widgets.utils.error_popups import ErrorPopupUtility
-from bec_widgets.utils.error_popups import SafeSlot as pyqtSlot
+from bec_widgets.cli.rpc_register import RPCRegister
+from bec_widgets.qt_utils.error_popups import ErrorPopupUtility
+from bec_widgets.qt_utils.error_popups import SafeSlot as pyqtSlot
 from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui
 
-if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.utils.bec_dispatcher import BECDispatcher
-    from bec_widgets.widgets.containers.dock import BECDock
-
 logger = bec_logger.logger
 BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))
 
@@ -42,7 +36,8 @@ class ConnectionConfig(BaseModel):
         """Generate a GUI ID if none is provided."""
         if v is None:
             widget_class = values.data["widget_class"]
-            v = f"{widget_class}_{datetime.now().strftime('%Y_%m_%d_%H_%M_%S_%f')}"
+            v = f"{widget_class}_{str(time.time())}"
+            return v
         return v
 
 
@@ -74,22 +69,13 @@ class Worker(QRunnable):
 class BECConnector:
     """Connection mixin class to handle BEC client and device manager"""
 
-    USER_ACCESS = ["_config_dict", "_get_all_rpc", "_rpc_id"]
+    USER_ACCESS = ["_config_dict", "_get_all_rpc"]
     EXIT_HANDLERS = {}
 
-    def __init__(
-        self,
-        client=None,
-        config: ConnectionConfig | None = None,
-        gui_id: str | None = None,
-        name: str | None = None,
-        parent_dock: BECDock | None = None,
-        parent_id: str | None = None,
-    ):
+    def __init__(self, client=None, config: ConnectionConfig = None, gui_id: str = None):
         # BEC related connections
         self.bec_dispatcher = BECDispatcher(client=client)
         self.client = self.bec_dispatcher.client if client is None else client
-        self._parent_dock = parent_dock
 
         if not self.client in BECConnector.EXIT_HANDLERS:
             # register function to clean connections at exit;
@@ -114,20 +100,15 @@ class BECConnector:
             )
             self.config = ConnectionConfig(widget_class=self.__class__.__name__)
 
-        self.parent_id = parent_id
-        # If the gui_id is passed, it should be respected. However, this should be revisted since
-        # the gui_id has to be unique, and may no longer be.
         if gui_id:
             self.config.gui_id = gui_id
-            self.gui_id: str = gui_id  # Keep namespace in sync
+            self.gui_id = gui_id
         else:
-            self.gui_id: str = self.config.gui_id  # type: ignore
-        if name is None:
-            name = self.__class__.__name__
-        else:
-            if not WidgetContainerUtils.has_name_valid_chars(name):
-                raise ValueError(f"Name {name} contains invalid characters.")
-        self._name = name if name else self.__class__.__name__
+            self.gui_id = self.config.gui_id
+
+        # register widget to rpc register
+        # be careful: when registering, and the object is not a BECWidget,
+        # cleanup has to called manually since there is no 'closeEvent'
         self.rpc_register = RPCRegister()
         self.rpc_register.add_rpc(self)
 
@@ -135,8 +116,6 @@ class BECConnector:
         self.error_utility = ErrorPopupUtility()
 
         self._thread_pool = QThreadPool.globalInstance()
-        # Store references to running workers so they're not garbage collected prematurely.
-        self._workers = []
 
     def submit_task(self, fn, *args, on_complete: pyqtSlot = None, **kwargs) -> Worker:
         """
@@ -165,14 +144,11 @@ class BECConnector:
             >>> def on_complete():
             >>>     print("Task complete")
             >>> self.submit_task(my_function, 1, 2, on_complete=on_complete)
+
         """
         worker = Worker(fn, *args, **kwargs)
         if on_complete:
             worker.signals.completed.connect(on_complete)
-        # Keep a reference to the worker so it is not garbage collected.
-        self._workers.append(worker)
-        # When the worker is done, remove it from our list.
-        worker.signals.completed.connect(lambda: self._workers.remove(worker))
         self._thread_pool.start(worker)
         return worker
 
@@ -204,39 +180,37 @@ class BECConnector:
     @_config_dict.setter
     def _config_dict(self, config: BaseModel) -> None:
         """
-        Set the configuration of the widget.
+        Get the configuration of the widget.
 
-        Args:
-            config (BaseModel): The new configuration model.
+        Returns:
+            dict: The configuration of the widget.
         """
         self.config = config
 
-    # FIXME some thoughts are required to decide how thhis should work with rpc registry
     def apply_config(self, config: dict, generate_new_id: bool = True) -> None:
         """
         Apply the configuration to the widget.
 
         Args:
-            config (dict): Configuration settings.
-            generate_new_id (bool): If True, generate a new GUI ID for the widget.
+            config(dict): Configuration settings.
+            generate_new_id(bool): If True, generate a new GUI ID for the widget.
         """
         self.config = ConnectionConfig(**config)
         if generate_new_id is True:
             gui_id = str(uuid.uuid4())
             self.rpc_register.remove_rpc(self)
-            self._set_gui_id(gui_id)
+            self.set_gui_id(gui_id)
             self.rpc_register.add_rpc(self)
         else:
             self.gui_id = self.config.gui_id
 
-    # FIXME some thoughts are required to decide how thhis should work with rpc registry
     def load_config(self, path: str | None = None, gui: bool = False):
         """
         Load the configuration of the widget from YAML.
 
         Args:
-            path (str | None): Path to the configuration file for non-GUI dialog mode.
-            gui (bool): If True, use the GUI dialog to load the configuration file.
+            path(str): Path to the configuration file for non-GUI dialog mode.
+            gui(bool): If True, use the GUI dialog to load the configuration file.
         """
         if gui is True:
             config = load_yaml_gui(self)
@@ -255,8 +229,8 @@ class BECConnector:
         Save the configuration of the widget to YAML.
 
         Args:
-            path (str | None): Path to save the configuration file for non-GUI dialog mode.
-            gui (bool): If True, use the GUI dialog to save the configuration file.
+            path(str): Path to save the configuration file for non-GUI dialog mode.
+            gui(bool): If True, use the GUI dialog to save the configuration file.
         """
         if gui is True:
             save_yaml_gui(self, self._config_dict)
@@ -264,15 +238,16 @@ class BECConnector:
             if path is None:
                 path = os.getcwd()
             file_path = os.path.join(path, f"{self.__class__.__name__}_config.yaml")
+
             save_yaml(file_path, self._config_dict)
 
-    # @pyqtSlot(str)
-    def _set_gui_id(self, gui_id: str) -> None:
+    @pyqtSlot(str)
+    def set_gui_id(self, gui_id: str) -> None:
         """
         Set the GUI ID for the widget.
 
         Args:
-            gui_id (str): GUI ID.
+            gui_id(str): GUI ID
         """
         self.config.gui_id = gui_id
         self.gui_id = gui_id
@@ -293,7 +268,7 @@ class BECConnector:
         """Update the client and device manager from BEC and create object for BEC shortcuts.
 
         Args:
-            client: BEC client.
+            client: BEC client
         """
         self.client = client
         self.get_bec_shortcuts()
@@ -304,72 +279,25 @@ class BECConnector:
         Update the configuration for the widget.
 
         Args:
-            config (ConnectionConfig | dict): Configuration settings.
+            config(ConnectionConfig): Configuration settings.
         """
-        gui_id = getattr(config, "gui_id", None)
         if isinstance(config, dict):
             config = ConnectionConfig(**config)
-        self.config = config
-        if gui_id and config.gui_id != gui_id:  # Recreating config should not overwrite the gui_id
-            self.config.gui_id = gui_id
+            # TODO add error handler
 
-    def remove(self):
-        """Cleanup the BECConnector"""
-        # If the widget is attached to a dock, remove it from the dock.
-        if self._parent_dock is not None:
-            self._parent_dock.delete(self._name)
-        # If the widget is from Qt, trigger its close method.
-        elif hasattr(self, "close"):
-            self.close()
-        # If the widget is neither from a Dock nor from Qt, remove it from the RPC registry.
-        # i.e. Curve Item from Waveform
-        else:
-            self.rpc_register.remove_rpc(self)
+        self.config = config
 
     def get_config(self, dict_output: bool = True) -> dict | BaseModel:
         """
         Get the configuration of the widget.
 
         Args:
-            dict_output (bool): If True, return the configuration as a dictionary.
-                                If False, return the configuration as a pydantic model.
+            dict_output(bool): If True, return the configuration as a dictionary. If False, return the configuration as a pydantic model.
 
         Returns:
-            dict | BaseModel: The configuration of the widget.
+            dict: The configuration of the plot widget.
         """
         if dict_output:
             return self.config.model_dump()
         else:
             return self.config
-
-
-# --- Example usage of BECConnector: running a simple task ---
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    # Create a QApplication instance (required for QThreadPool)
-    app = QApplication(sys.argv)
-
-    connector = BECConnector()
-
-    def print_numbers():
-        """
-        Task function that prints numbers 1 to 10 with a 0.5 second delay between each.
-        """
-        for i in range(1, 11):
-            print(i)
-            time.sleep(0.5)
-
-    def task_complete():
-        """
-        Called when the task is complete.
-        """
-        print("Task complete")
-        # Exit the application after the task completes.
-        app.quit()
-
-    # Submit the task using the connector's submit_task method.
-    connector.submit_task(print_numbers, on_complete=task_complete)
-
-    # Start the Qt event loop.
-    sys.exit(app.exec_())

bec_widgets/utils/bec_designer.py

@@ -1,8 +1,4 @@
-import ast
 import importlib.metadata
-import importlib.util
-import inspect
-import itertools
 import json
 import os
 import site
@@ -10,14 +6,9 @@ import sys
 import sysconfig
 from pathlib import Path
 
-from bec_lib.logger import bec_logger
 from bec_qthemes import material_icon
 from qtpy import PYSIDE6
 from qtpy.QtGui import QIcon
-from zmq import PLAIN
-
-from bec_widgets.utils.bec_plugin_helper import user_widget_plugin
-from bec_widgets.utils.bec_widget import BECWidget
 
 if PYSIDE6:
     from PySide6.scripts.pyside_tool import (
@@ -31,8 +22,6 @@ if PYSIDE6:
 
 import bec_widgets
 
-logger = bec_logger.logger
-
 
 def designer_material_icon(icon_name: str) -> QIcon:
     """
@@ -104,24 +93,17 @@ def patch_designer():  # pragma: no cover
             _extend_path_var("PATH", os.fspath(Path(sys._base_executable).parent), True)
     else:
         if sys.platform == "linux":
+            suffix = f"{sys.abiflags}.so"
             env_var = "LD_PRELOAD"
-            current_pid = os.getpid()
-            with open(f"/proc/{current_pid}/maps", "rt") as f:
-                for line in f:
-                    if "libpython" in line:
-                        lib_path = line.split()[-1]
-                        os.environ[env_var] = lib_path
-                        break
-
         elif sys.platform == "darwin":
             suffix = ".dylib"
             env_var = "DYLD_INSERT_LIBRARIES"
-            version = f"{major_version}.{minor_version}"
-            library_name = f"libpython{version}{suffix}"
-            lib_path = str(Path(sysconfig.get_config_var("LIBDIR")) / library_name)
-            os.environ[env_var] = lib_path
         else:
             raise RuntimeError(f"Unsupported platform: {sys.platform}")
+        version = f"{major_version}.{minor_version}"
+        library_name = f"libpython{version}{suffix}"
+        lib_path = str(Path(sysconfig.get_config_var("LIBDIR")) / library_name)
+        os.environ[env_var] = lib_path
 
         if is_pyenv_python() or is_virtual_env():
             # append all editable packages to the PYTHONPATH
@@ -131,43 +113,14 @@ def patch_designer():  # pragma: no cover
     qt_tool_wrapper(ui_tool_binary("designer"), sys.argv[1:])
 
 
-def _plugin_classes_for_python_file(file: Path):
-    logger.debug(f"getting plugin classes for {file}")
-    if not str(file).endswith(".py"):
-        raise ValueError("Please pass a python file")
-    spec = importlib.util.spec_from_file_location("_temp", file)
-    mod = importlib.util.module_from_spec(spec)
-    sys.modules["_temp"] = mod
-    spec.loader.exec_module(mod)
-
-    plugin_widgets = list(
-        mem[0]
-        for mem in inspect.getmembers(mod, inspect.isclass)
-        if issubclass(mem[1], BECWidget) and hasattr(mem[1], "PLUGIN") and mem[1].PLUGIN is True
-    )
-    logger.debug(f"Found: {plugin_widgets}")
-    return plugin_widgets
-
-
-def _plugin_classes_for_pyproject(path: Path):
-    if not str(path).endswith(".pyproject"):
-        raise ValueError("Please pass the path of the designer pyproject file")
-    with open(path) as pyproject:
-        plugin_filenames = ast.literal_eval(pyproject.read())["files"]
-    plugin_files = (path.parent / file for file in plugin_filenames)
-    return itertools.chain(*(_plugin_classes_for_python_file(f) for f in plugin_files))
-
-
-def find_plugin_paths(base_path: Path) -> dict[str, list[str]]:
+def find_plugin_paths(base_path: Path):
     """
-    Recursively find all directories containing a .pyproject file. Returns a dictionary with keys of
-    such paths, and values of the names of the classes contained in them if those classes are
-    desginer plugins.
+    Recursively find all directories containing a .pyproject file.
     """
-    return {
-        str(path.parent): list(_plugin_classes_for_pyproject(path))
-        for path in base_path.rglob("*.pyproject")
-    }
+    plugin_paths = []
+    for path in base_path.rglob("*.pyproject"):
+        plugin_paths.append(str(path.parent))
+    return plugin_paths
 
 
 def set_plugin_environment_variable(plugin_paths):
@@ -184,33 +137,14 @@ def set_plugin_environment_variable(plugin_paths):
     os.environ["PYSIDE_DESIGNER_PLUGINS"] = os.pathsep.join(current_paths)
 
 
-def _extend_plugin_paths(plugin_paths: dict[str, list[str]], plugin_repo_dir: Path):
-    plugin_plugin_paths = find_plugin_paths(plugin_repo_dir)
-    builtin_plugin_names = list(itertools.chain(*plugin_paths.values()))
-    for plugin_file, plugin_classes in plugin_plugin_paths.items():
-        logger.info(f"{plugin_classes} {builtin_plugin_names}")
-        if any(name in builtin_plugin_names for name in plugin_classes):
-            logger.warning(
-                f"Ignoring plugin {plugin_file} because it contains widgets {plugin_classes} which include duplicates of built-in widgets!"
-            )
-        else:
-            plugin_paths[plugin_file] = plugin_classes
-
-
 # Patch the designer function
 def main():  # pragma: no cover
     if not PYSIDE6:
         print("PYSIDE6 is not available in the environment. Exiting...")
         return
     base_dir = Path(os.path.dirname(bec_widgets.__file__)).resolve()
-
     plugin_paths = find_plugin_paths(base_dir)
-
-    if (plugin_repo := user_widget_plugin()) and isinstance(plugin_repo.__file__, str):
-        plugin_repo_dir = Path(os.path.dirname(plugin_repo.__file__)).resolve()
-        _extend_plugin_paths(plugin_paths, plugin_repo_dir)
-
-    set_plugin_environment_variable(plugin_paths.keys())
+    set_plugin_environment_variable(plugin_paths)
 
     patch_designer()
 

bec_widgets/utils/bec_plugin_helper.py

@@ -1,89 +0,0 @@
-from __future__ import annotations
-
-import importlib.metadata
-import inspect
-import pkgutil
-from importlib import util as importlib_util
-from importlib.machinery import FileFinder, ModuleSpec, SourceFileLoader
-from types import ModuleType
-from typing import Generator
-
-from bec_widgets.utils.bec_widget import BECWidget
-
-
-def _submodule_specs(module: ModuleType) -> tuple[ModuleSpec | None, ...]:
-    """Return specs for all submodules of the given module."""
-    return tuple(
-        module_info.module_finder.find_spec(module_info.name)
-        for module_info in pkgutil.iter_modules(module.__path__)
-        if isinstance(module_info.module_finder, FileFinder)
-    )
-
-
-def _loaded_submodules_from_specs(
-    submodule_specs: tuple[ModuleSpec | None, ...]
-) -> Generator[ModuleType, None, None]:
-    """Load all submodules from the given specs."""
-    for submodule in (
-        importlib_util.module_from_spec(spec) for spec in submodule_specs if spec is not None
-    ):
-        assert isinstance(
-            submodule.__loader__, SourceFileLoader
-        ), "Module found from FileFinder should have SourceFileLoader!"
-        submodule.__loader__.exec_module(submodule)
-        yield submodule
-
-
-def _submodule_by_name(module: ModuleType, name: str):
-    for submod in _loaded_submodules_from_specs(_submodule_specs(module)):
-        if submod.__name__ == name:
-            return submod
-    return None
-
-
-def _get_widgets_from_module(module: ModuleType) -> dict[str, "type[BECWidget]"]:
-    """Find any BECWidget subclasses in the given module and return them with their names."""
-    from bec_widgets.utils.bec_widget import BECWidget  # avoid circular import
-
-    return dict(
-        inspect.getmembers(
-            module,
-            predicate=lambda item: inspect.isclass(item)
-            and issubclass(item, BECWidget)
-            and item is not BECWidget,
-        )
-    )
-
-
-def _all_widgets_from_all_submods(module):
-    """Recursively load submodules, find any BECWidgets, and return them all as a flat dict."""
-    widgets = _get_widgets_from_module(module)
-    if not hasattr(module, "__path__"):
-        return widgets
-    for submod in _loaded_submodules_from_specs(_submodule_specs(module)):
-        widgets.update(_all_widgets_from_all_submods(submod))
-    return widgets
-
-
-def user_widget_plugin() -> ModuleType | None:
-    plugins = importlib.metadata.entry_points(group="bec.widgets.user_widgets")  # type: ignore
-    return None if len(plugins) == 0 else tuple(plugins)[0].load()
-
-
-def get_plugin_client_module() -> ModuleType | None:
-    """If there is a plugin repository installed, return the client module."""
-    return _submodule_by_name(plugin, "client") if (plugin := user_widget_plugin()) else None
-
-
-def get_all_plugin_widgets() -> dict[str, "type[BECWidget]"]:
-    """If there is a plugin repository installed, load all widgets from it."""
-    if plugin := user_widget_plugin():
-        return _all_widgets_from_all_submods(plugin)
-    else:
-        return {}
-
-
-if __name__ == "__main__":  # pragma: no cover
-    #  print(get_all_plugin_widgets())
-    client = get_plugin_client_module()
-    ...

bec_widgets/utils/bec_signal_proxy.py

@@ -5,43 +5,28 @@ analyse data. Requesting a new fit may lead to request piling up and an overall
 will allow you to decide by yourself when to unblock and execute the callback again."""
 
 from pyqtgraph import SignalProxy
-from qtpy.QtCore import QTimer, Signal
-
-from bec_widgets.utils.error_popups import SafeSlot
+from qtpy.QtCore import Signal, Slot
 
 
 class BECSignalProxy(SignalProxy):
-    """
-    Thin wrapper around the SignalProxy class to allow signal calls to be blocked,
-    but arguments still being stored.
+    """Thin wrapper around the SignalProxy class to allow signal calls to be blocked, but args still being stored
 
     Args:
-        *args: Arguments to pass to the SignalProxy class.
-        rateLimit (int): The rateLimit of the proxy.
-        timeout (float): The number of seconds after which the proxy automatically
-                         unblocks if still blocked. Default is 10.0 seconds.
-        **kwargs: Keyword arguments to pass to the SignalProxy class.
+        *args: Arguments to pass to the SignalProxy class
+        rateLimit (int): The rateLimit of the proxy
+        **kwargs: Keyword arguments to pass to the SignalProxy class
 
     Example:
-        >>> proxy = BECSignalProxy(signal, rate_limit=25, slot=callback)
-    """
+    >>> proxy = BECSignalProxy(signal, rate_limit=25, slot=callback)"""
 
     is_blocked = Signal(bool)
 
-    def __init__(self, *args, rateLimit=25, timeout=10.0, **kwargs):
+    def __init__(self, *args, rateLimit=25, **kwargs):
         super().__init__(*args, rateLimit=rateLimit, **kwargs)
         self._blocking = False
         self.old_args = None
         self.new_args = None
 
-        # Store timeout value (in seconds)
-        self._timeout = timeout
-
-        # Create a single-shot timer for auto-unblocking
-        self._timer = QTimer()
-        self._timer.setSingleShot(True)
-        self._timer.timeout.connect(self._timeout_unblock)
-
     @property
     def blocked(self):
         """Returns if the proxy is blocked"""
@@ -61,30 +46,9 @@ class BECSignalProxy(SignalProxy):
         self.old_args = args
         super().signalReceived(*args)
 
-        self._timer.start(int(self._timeout * 1000))
-
-    @SafeSlot()
+    @Slot()
     def unblock_proxy(self):
         """Unblock the proxy, and call the signalReceived method in case there was an update of the args."""
-        if self.blocked:
-            self._timer.stop()
-            self.blocked = False
-            if self.new_args != self.old_args:
-                self.signalReceived(*self.new_args)
-
-    @SafeSlot()
-    def _timeout_unblock(self):
-        """
-        Internal method called by the QTimer upon timeout. Unblocks the proxy
-        automatically if it is still blocked.
-        """
-        if self.blocked:
-            self.unblock_proxy()
-
-    def cleanup(self):
-        """
-        Cleanup the proxy by stopping the timer and disconnecting the timeout signal.
-        """
-        self._timer.stop()
-        self._timer.timeout.disconnect(self._timeout_unblock)
-        self._timer.deleteLater()
+        self.blocked = False
+        if self.new_args != self.old_args:
+            self.signalReceived(*self.new_args)

bec_widgets/utils/bec_widget.py

@@ -1,19 +1,13 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 import darkdetect
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QApplication, QWidget
 
-from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
 from bec_widgets.utils.colors import set_theme
 
-if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.widgets.containers.dock import BECDock
-
 logger = bec_logger.logger
 
 
@@ -23,19 +17,13 @@ class BECWidget(BECConnector):
     # The icon name is the name of the icon in the icon theme, typically a name taken
     # from fonts.google.com/icons. Override this in subclasses to set the icon name.
     ICON_NAME = "widgets"
-    USER_ACCESS = ["remove"]
 
-    # pylint: disable=too-many-arguments
     def __init__(
         self,
         client=None,
         config: ConnectionConfig = None,
-        gui_id: str | None = None,
+        gui_id: str = None,
         theme_update: bool = False,
-        name: str | None = None,
-        parent_dock: BECDock | None = None,
-        parent_id: str | None = None,
-        **kwargs,
     ):
         """
         Base class for all BEC widgets. This class should be used as a mixin class for all BEC widgets, e.g.:
@@ -56,15 +44,9 @@ class BECWidget(BECConnector):
         """
         if not isinstance(self, QWidget):
             raise RuntimeError(f"{repr(self)} is not a subclass of QWidget")
+        super().__init__(client=client, config=config, gui_id=gui_id)
 
-        super().__init__(
-            client=client,
-            config=config,
-            gui_id=gui_id,
-            name=name,
-            parent_dock=parent_dock,
-            parent_id=parent_id,
-        )
+        # Set the theme to auto if it is not set yet
         app = QApplication.instance()
         if not hasattr(app, "theme"):
             # DO NOT SET THE THEME TO AUTO! Otherwise, the qwebengineview will segfault
@@ -84,7 +66,7 @@ class BECWidget(BECConnector):
         if hasattr(qapp, "theme_signal"):
             qapp.theme_signal.theme_updated.connect(self._update_theme)
 
-    def _update_theme(self, theme: str | None = None):
+    def _update_theme(self, theme: str):
         """Update the theme."""
         if theme is None:
             qapp = QApplication.instance()
@@ -105,13 +87,10 @@ class BECWidget(BECConnector):
 
     def cleanup(self):
         """Cleanup the widget."""
-        with RPCRegister.delayed_broadcast():
-            # All widgets need to call super().cleanup() in their cleanup method
-            self.rpc_register.remove_rpc(self)
 
     def closeEvent(self, event):
-        """Wrap the close even to ensure the rpc_register is cleaned up."""
+        self.rpc_register.remove_rpc(self)
         try:
             self.cleanup()
         finally:
-            super().closeEvent(event)  # pylint: disable=no-member
+            super().closeEvent(event)

bec_widgets/utils/collapsible_panel_manager.py

@@ -1,380 +0,0 @@
-from __future__ import annotations
-
-import sys
-from typing import Literal
-
-import pyqtgraph as pg
-from qtpy.QtCore import Property, QEasingCurve, QObject, QPropertyAnimation
-from qtpy.QtWidgets import (
-    QApplication,
-    QHBoxLayout,
-    QMainWindow,
-    QPushButton,
-    QSizePolicy,
-    QVBoxLayout,
-    QWidget,
-)
-from typeguard import typechecked
-
-from bec_widgets.widgets.containers.layout_manager.layout_manager import LayoutManagerWidget
-
-
-class DimensionAnimator(QObject):
-    """
-    Helper class to animate the size of a panel widget.
-    """
-
-    def __init__(self, panel_widget: QWidget, direction: str):
-        super().__init__()
-        self.panel_widget = panel_widget
-        self.direction = direction
-        self._size = 0
-
-    @Property(int)
-    def panel_width(self):
-        """
-        Returns the current width of the panel widget.
-        """
-        return self._size
-
-    @panel_width.setter
-    def panel_width(self, val: int):
-        """
-        Set the width of the panel widget.
-
-        Args:
-            val(int): The width to set.
-        """
-        self._size = val
-        self.panel_widget.setFixedWidth(val)
-
-    @Property(int)
-    def panel_height(self):
-        """
-        Returns the current height of the panel widget.
-        """
-        return self._size
-
-    @panel_height.setter
-    def panel_height(self, val: int):
-        """
-        Set the height of the panel widget.
-
-        Args:
-            val(int): The height to set.
-        """
-        self._size = val
-        self.panel_widget.setFixedHeight(val)
-
-
-class CollapsiblePanelManager(QObject):
-    """
-    Manager class to handle collapsible panels from a main widget using LayoutManagerWidget.
-    """
-
-    def __init__(self, layout_manager: LayoutManagerWidget, reference_widget: QWidget, parent=None):
-        super().__init__(parent)
-        self.layout_manager = layout_manager
-        self.reference_widget = reference_widget
-        self.animations = {}
-        self.panels = {}
-        self.direction_settings = {
-            "left": {"property": b"maximumWidth", "default_size": 200},
-            "right": {"property": b"maximumWidth", "default_size": 200},
-            "top": {"property": b"maximumHeight", "default_size": 150},
-            "bottom": {"property": b"maximumHeight", "default_size": 150},
-        }
-
-    def add_panel(
-        self,
-        direction: Literal["left", "right", "top", "bottom"],
-        panel_widget: QWidget,
-        target_size: int | None = None,
-        duration: int = 300,
-    ):
-        """
-        Add a panel widget to the layout manager.
-
-        Args:
-            direction(Literal["left", "right", "top", "bottom"]): Direction of the panel.
-            panel_widget(QWidget): The panel widget to add.
-            target_size(int, optional): The target size of the panel. Defaults to None.
-            duration(int): The duration of the animation in milliseconds. Defaults to 300.
-        """
-        if direction not in self.direction_settings:
-            raise ValueError("Direction must be one of 'left', 'right', 'top', 'bottom'.")
-
-        if target_size is None:
-            target_size = self.direction_settings[direction]["default_size"]
-
-        self.layout_manager.add_widget_relative(
-            widget=panel_widget, reference_widget=self.reference_widget, position=direction
-        )
-        panel_widget.setVisible(False)
-
-        # Set initial constraints as flexible
-        if direction in ["left", "right"]:
-            panel_widget.setMaximumWidth(0)
-            panel_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-        else:
-            panel_widget.setMaximumHeight(0)
-            panel_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-
-        self.panels[direction] = {
-            "widget": panel_widget,
-            "direction": direction,
-            "target_size": target_size,
-            "duration": duration,
-            "animator": None,
-        }
-
-    def toggle_panel(
-        self,
-        direction: Literal["left", "right", "top", "bottom"],
-        target_size: int | None = None,
-        duration: int | None = None,
-        easing_curve: QEasingCurve = QEasingCurve.InOutQuad,
-        ensure_max: bool = False,
-        scale: float | None = None,
-        animation: bool = True,
-    ):
-        """
-        Toggle the specified panel.
-
-        Parameters:
-            direction (Literal["left", "right", "top", "bottom"]): Direction of the panel to toggle.
-            target_size (int, optional): Override target size for this toggle.
-            duration (int, optional): Override the animation duration.
-            easing_curve (QEasingCurve): Animation easing curve.
-            ensure_max (bool): If True, animate as a fixed-size panel.
-            scale (float, optional): If provided, calculate target_size from main widget size.
-            animation (bool): If False, no animation is performed; panel instantly toggles.
-        """
-        if direction not in self.panels:
-            raise ValueError(f"No panel found in direction '{direction}'.")
-
-        panel_info = self.panels[direction]
-        panel_widget = panel_info["widget"]
-        dir_settings = self.direction_settings[direction]
-
-        # Determine final target size
-        if scale is not None:
-            main_rect = self.reference_widget.geometry()
-            if direction in ["left", "right"]:
-                computed_target = int(main_rect.width() * scale)
-            else:
-                computed_target = int(main_rect.height() * scale)
-            final_target_size = computed_target
-        else:
-            if target_size is None:
-                final_target_size = panel_info["target_size"]
-            else:
-                final_target_size = target_size
-
-        if duration is None:
-            duration = panel_info["duration"]
-
-        expanding_property = dir_settings["property"]
-        currently_visible = panel_widget.isVisible()
-
-        if ensure_max:
-            if panel_info["animator"] is None:
-                panel_info["animator"] = DimensionAnimator(panel_widget, direction)
-            animator = panel_info["animator"]
-
-            if direction in ["left", "right"]:
-                prop_name = b"panel_width"
-            else:
-                prop_name = b"panel_height"
-        else:
-            animator = None
-            prop_name = expanding_property
-
-        if currently_visible:
-            # Hide the panel
-            if ensure_max:
-                start_value = final_target_size
-                end_value = 0
-                finish_callback = lambda w=panel_widget, d=direction: self._after_hide_reset(w, d)
-            else:
-                start_value = (
-                    panel_widget.width()
-                    if direction in ["left", "right"]
-                    else panel_widget.height()
-                )
-                end_value = 0
-                finish_callback = lambda w=panel_widget: w.setVisible(False)
-        else:
-            # Show the panel
-            start_value = 0
-            end_value = final_target_size
-            finish_callback = None
-            if ensure_max:
-                # Fix panel exactly
-                if direction in ["left", "right"]:
-                    panel_widget.setMinimumWidth(0)
-                    panel_widget.setMaximumWidth(final_target_size)
-                    panel_widget.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
-                else:
-                    panel_widget.setMinimumHeight(0)
-                    panel_widget.setMaximumHeight(final_target_size)
-                    panel_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
-            else:
-                # Flexible mode
-                if direction in ["left", "right"]:
-                    panel_widget.setMinimumWidth(0)
-                    panel_widget.setMaximumWidth(final_target_size)
-                    panel_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-                else:
-                    panel_widget.setMinimumHeight(0)
-                    panel_widget.setMaximumHeight(final_target_size)
-                    panel_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-
-            panel_widget.setVisible(True)
-
-        if not animation:
-            # No animation: instantly set final state
-            if end_value == 0:
-                # Hiding
-                if ensure_max:
-                    # Reset after hide
-                    self._after_hide_reset(panel_widget, direction)
-                else:
-                    panel_widget.setVisible(False)
-            else:
-                # Showing
-                if ensure_max:
-                    # Already set fixed size
-                    if direction in ["left", "right"]:
-                        panel_widget.setFixedWidth(end_value)
-                    else:
-                        panel_widget.setFixedHeight(end_value)
-                else:
-                    # Just set maximum dimension
-                    if direction in ["left", "right"]:
-                        panel_widget.setMaximumWidth(end_value)
-                    else:
-                        panel_widget.setMaximumHeight(end_value)
-            return
-
-        # With animation
-        animation = QPropertyAnimation(animator if ensure_max else panel_widget, prop_name)
-        animation.setDuration(duration)
-        animation.setStartValue(start_value)
-        animation.setEndValue(end_value)
-        animation.setEasingCurve(easing_curve)
-
-        if end_value == 0 and finish_callback:
-            animation.finished.connect(finish_callback)
-        elif end_value == 0 and not finish_callback:
-            animation.finished.connect(lambda w=panel_widget: w.setVisible(False))
-
-        animation.start()
-        self.animations[panel_widget] = animation
-
-    @typechecked
-    def _after_hide_reset(
-        self, panel_widget: QWidget, direction: Literal["left", "right", "top", "bottom"]
-    ):
-        """
-        Reset the panel widget after hiding it in ensure_max mode.
-
-        Args:
-            panel_widget(QWidget): The panel widget to reset.
-            direction(Literal["left", "right", "top", "bottom"]): The direction of the panel.
-        """
-        # Called after hiding a panel in ensure_max mode
-        panel_widget.setVisible(False)
-        if direction in ["left", "right"]:
-            panel_widget.setMinimumWidth(0)
-            panel_widget.setMaximumWidth(0)
-            panel_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-        else:
-            panel_widget.setMinimumHeight(0)
-            panel_widget.setMaximumHeight(16777215)
-            panel_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-
-
-####################################################################################################
-# The following code is for the GUI control panel to interact with the CollapsiblePanelManager.
-# It is not covered by any tests as it serves only as an example for the CollapsiblePanelManager class.
-####################################################################################################
-
-
-class MainWindow(QMainWindow):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self.setWindowTitle("Panels with ensure_max, scale, and animation toggle")
-        self.resize(800, 600)
-
-        central_widget = QWidget()
-        self.setCentralWidget(central_widget)
-        main_layout = QVBoxLayout(central_widget)
-        main_layout.setContentsMargins(10, 10, 10, 10)
-        main_layout.setSpacing(10)
-
-        # Buttons
-        buttons_layout = QHBoxLayout()
-        self.btn_left = QPushButton("Toggle Left (ensure_max=True)")
-        self.btn_top = QPushButton("Toggle Top (scale=0.5, no animation)")
-        self.btn_right = QPushButton("Toggle Right (ensure_max=True, scale=0.3)")
-        self.btn_bottom = QPushButton("Toggle Bottom (no animation)")
-
-        buttons_layout.addWidget(self.btn_left)
-        buttons_layout.addWidget(self.btn_top)
-        buttons_layout.addWidget(self.btn_right)
-        buttons_layout.addWidget(self.btn_bottom)
-
-        main_layout.addLayout(buttons_layout)
-
-        self.layout_manager = LayoutManagerWidget()
-        main_layout.addWidget(self.layout_manager)
-
-        # Main widget
-        self.main_plot = pg.PlotWidget()
-        self.main_plot.plot([1, 2, 3, 4], [4, 3, 2, 1])
-        self.layout_manager.add_widget(self.main_plot, 0, 0)
-
-        self.panel_manager = CollapsiblePanelManager(self.layout_manager, self.main_plot)
-
-        # Panels
-        self.left_panel = pg.PlotWidget()
-        self.left_panel.plot([1, 2, 3], [3, 2, 1])
-        self.panel_manager.add_panel("left", self.left_panel, target_size=200)
-
-        self.right_panel = pg.PlotWidget()
-        self.right_panel.plot([10, 20, 30], [1, 10, 1])
-        self.panel_manager.add_panel("right", self.right_panel, target_size=200)
-
-        self.top_panel = pg.PlotWidget()
-        self.top_panel.plot([1, 2, 3], [1, 2, 3])
-        self.panel_manager.add_panel("top", self.top_panel, target_size=150)
-
-        self.bottom_panel = pg.PlotWidget()
-        self.bottom_panel.plot([2, 4, 6], [10, 5, 10])
-        self.panel_manager.add_panel("bottom", self.bottom_panel, target_size=150)
-
-        # Connect buttons
-        # Left with ensure_max
-        self.btn_left.clicked.connect(
-            lambda: self.panel_manager.toggle_panel("left", ensure_max=True)
-        )
-        # Top with scale=0.5 and no animation
-        self.btn_top.clicked.connect(
-            lambda: self.panel_manager.toggle_panel("top", scale=0.5, animation=False)
-        )
-        # Right with ensure_max, scale=0.3
-        self.btn_right.clicked.connect(
-            lambda: self.panel_manager.toggle_panel("right", ensure_max=True, scale=0.3)
-        )
-        # Bottom no animation
-        self.btn_bottom.clicked.connect(
-            lambda: self.panel_manager.toggle_panel("bottom", target_size=100, animation=False)
-        )
-
-
-if __name__ == "__main__":  # pragma: no cover
-    app = QApplication(sys.argv)
-    w = MainWindow()
-    w.show()
-    sys.exit(app.exec())

bec_widgets/utils/colors.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import itertools
 import re
 from typing import TYPE_CHECKING, Literal
 
@@ -70,64 +71,15 @@ def apply_theme(theme: Literal["dark", "light"]):
     Apply the theme to all pyqtgraph widgets. Do not use this function directly. Use set_theme instead.
     """
     app = QApplication.instance()
-    graphic_layouts = [
-        child
-        for top in app.topLevelWidgets()
-        for child in top.findChildren(pg.GraphicsLayoutWidget)
-    ]
-
-    plot_items = [
-        item
-        for gl in graphic_layouts
-        for item in gl.ci.items.keys()  # ci is internal pg.GraphicsLayout that hosts all items
-        if isinstance(item, pg.PlotItem)
-    ]
-
-    histograms = [
-        item
-        for gl in graphic_layouts
-        for item in gl.ci.items.keys()  # ci is internal pg.GraphicsLayout that hosts all items
-        if isinstance(item, pg.HistogramLUTItem)
-    ]
-
-    # Update background color based on the theme
-    if theme == "light":
-        background_color = "#e9ecef"  # Subtle contrast for light mode
-        foreground_color = "#141414"
-        label_color = "#000000"
-        axis_color = "#666666"
-    else:
-        background_color = "#141414"  # Dark mode
-        foreground_color = "#e9ecef"
-        label_color = "#FFFFFF"
-        axis_color = "#CCCCCC"
-
-    # update GraphicsLayoutWidget
-    pg.setConfigOptions(foreground=foreground_color, background=background_color)
-    for pg_widget in graphic_layouts:
-        pg_widget.setBackground(background_color)
-
-    # update PlotItems
-    for plot_item in plot_items:
-        for axis in ["left", "right", "top", "bottom"]:
-            plot_item.getAxis(axis).setPen(pg.mkPen(color=axis_color))
-            plot_item.getAxis(axis).setTextPen(pg.mkPen(color=label_color))
-
-        # Change title color
-        plot_item.titleLabel.setText(plot_item.titleLabel.text, color=label_color)
-
-        # Change legend color
-        if hasattr(plot_item, "legend") and plot_item.legend is not None:
-            plot_item.legend.setLabelTextColor(label_color)
-            # if legend is in plot item and theme is changed, has to be like that because of pg opt logic
-            for sample, label in plot_item.legend.items:
-                label_text = label.text
-                label.setText(label_text, color=label_color)
-
-    # update HistogramLUTItem
-    for histogram in histograms:
-        histogram.axis.setPen(pg.mkPen(color=axis_color))
-        histogram.axis.setTextPen(pg.mkPen(color=label_color))
+    # go through all pyqtgraph widgets and set background
+    children = itertools.chain.from_iterable(
+        top.findChildren(pg.GraphicsLayoutWidget) for top in app.topLevelWidgets()
+    )
+    pg.setConfigOptions(
+        foreground="d" if theme == "dark" else "k", background="k" if theme == "dark" else "w"
+    )
+    for pg_widget in children:
+        pg_widget.setBackground("k" if theme == "dark" else "w")
 
     # now define stylesheet according to theme and apply it
     style = bec_qthemes.load_stylesheet(theme)

bec_widgets/utils/container_utils.py

@@ -1,55 +1,30 @@
 from __future__ import annotations
 
 import itertools
-from typing import Literal, Type
+from typing import Type
 
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.cli.rpc.rpc_register import RPCRegister
-
 
 class WidgetContainerUtils:
 
-    # We need one handler that checks if a WIDGET of a given name is already created for that DOCKAREA
-    # 1. If the name exists, then it depends whether the name was auto-generated -> add _1 to the name
-    #    or alternatively raise an error that it can't be added again ( just raise an error)
-    # 2. Dock names in between docks should also be unique
-
     @staticmethod
-    def has_name_valid_chars(name: str) -> bool:
-        """Check if the name is valid.
+    def generate_unique_widget_id(container: dict, prefix: str = "widget") -> str:
+        """
+        Generate a unique widget ID.
 
         Args:
-            name(str): The name to be checked.
+            container(dict): The container of widgets.
+            prefix(str): The prefix of the widget ID.
 
         Returns:
-            bool: True if the name is valid, False otherwise.
+            widget_id(str): The unique widget ID.
         """
-        if not name or len(name) > 256:
-            return False  # Don't accept empty names or names longer than 256 characters
-        check_value = name.replace("_", "").replace("-", "")
-        if not check_value.isalnum() or not check_value.isascii():
-            return False
-        return True
-
-    @staticmethod
-    def generate_unique_name(name: str, list_of_names: list[str] | None = None) -> str:
-        """Generate a unique ID.
-
-        Args:
-            name(str): The name of the widget.
-        Returns:
-            tuple (str): The unique name
-        """
-        if list_of_names is None:
-            list_of_names = []
-        ii = 0
-        while ii < 1000:  # 1000 is arbritrary!
-            name_candidate = f"{name}_{ii}"
-            if name_candidate not in list_of_names:
-                return name_candidate
-            ii += 1
-        raise ValueError("Could not generate a unique name after within 1000 attempts.")
+        existing_ids = set(container.keys())
+        for i in itertools.count(1):
+            widget_id = f"{prefix}_{i}"
+            if widget_id not in existing_ids:
+                return widget_id
 
     @staticmethod
     def find_first_widget_by_class(

bec_widgets/utils/crosshair.py

@@ -1,7 +1,4 @@
-from __future__ import annotations
-
 from collections import defaultdict
-from typing import Any
 
 import numpy as np
 import pyqtgraph as pg
@@ -9,16 +6,13 @@ from qtpy.QtCore import QObject, Qt, Signal, Slot
 from qtpy.QtWidgets import QApplication
 
 
-class CrosshairScatterItem(pg.ScatterPlotItem):
+class NonDownsamplingScatterPlotItem(pg.ScatterPlotItem):
     def setDownsampling(self, ds=None, auto=None, method=None):
         pass
 
     def setClipToView(self, state):
         pass
 
-    def setAlpha(self, *args, **kwargs):
-        pass
-
 
 class Crosshair(QObject):
     # QT Position of mouse cursor
@@ -53,15 +47,9 @@ class Crosshair(QObject):
         self.v_line.skip_auto_range = True
         self.h_line = pg.InfiniteLine(angle=0, movable=False)
         self.h_line.skip_auto_range = True
-        # Add custom attribute to identify crosshair lines
-        self.v_line.is_crosshair = True
-        self.h_line.is_crosshair = True
         self.plot_item.addItem(self.v_line, ignoreBounds=True)
         self.plot_item.addItem(self.h_line, ignoreBounds=True)
 
-        # Initialize highlighted curve in a case of multiple curves
-        self.highlighted_curve_index = None
-
         # Add TextItem to display coordinates
         self.coord_label = pg.TextItem("", anchor=(1, 1), fill=(0, 0, 0, 100))
         self.coord_label.setVisible(False)  # Hide initially
@@ -82,7 +70,6 @@ class Crosshair(QObject):
         self.plot_item.ctrl.downsampleSpin.valueChanged.connect(self.clear_markers)
 
         # Initialize markers
-        self.items = []
         self.marker_moved_1d = {}
         self.marker_clicked_1d = {}
         self.marker_2d = None
@@ -126,103 +113,61 @@ class Crosshair(QObject):
         self.coord_label.fill = pg.mkBrush(label_bg_color)
         self.coord_label.border = pg.mkPen(None)
 
-    @Slot(int)
-    def update_highlighted_curve(self, curve_index: int):
-        """
-        Update the highlighted curve in the case of multiple curves in a plot item.
-
-        Args:
-            curve_index(int): The index of curve to highlight
-        """
-        self.highlighted_curve_index = curve_index
-        self.clear_markers()
-        self.update_markers()
-
     def update_markers(self):
         """Update the markers for the crosshair, creating new ones if necessary."""
 
-        if self.highlighted_curve_index is not None and hasattr(self.plot_item, "visible_curves"):
-            # Focus on the highlighted curve only
-            self.items = [self.plot_item.visible_curves[self.highlighted_curve_index]]
-        else:
-            # Handle all curves
-            self.items = self.plot_item.items
-
-        # Create or update markers
-        for item in self.items:
+        # Create new markers
+        for item in self.plot_item.items:
             if isinstance(item, pg.PlotDataItem):  # 1D plot
+                if item.name() in self.marker_moved_1d:
+                    continue
                 pen = item.opts["pen"]
                 color = pen.color() if hasattr(pen, "color") else pg.mkColor(pen)
-                name = item.name() or str(id(item))
-                if name in self.marker_moved_1d:
-                    # Update existing markers
-                    marker_moved = self.marker_moved_1d[name]
-                    marker_moved.setPen(pg.mkPen(color))
-                    # Update clicked markers' brushes
-                    for marker_clicked in self.marker_clicked_1d[name]:
-                        alpha = marker_clicked.opts["brush"].color().alpha()
-                        marker_clicked.setBrush(
-                            pg.mkBrush(color.red(), color.green(), color.blue(), alpha)
-                        )
-                    # Update z-values
-                    marker_moved.setZValue(item.zValue() + 1)
-                    for marker_clicked in self.marker_clicked_1d[name]:
-                        marker_clicked.setZValue(item.zValue() + 1)
-                else:
-                    # Create new markers
-                    marker_moved = CrosshairScatterItem(
-                        size=10, pen=pg.mkPen(color), brush=pg.mkBrush(None)
-                    )
-                    marker_moved.skip_auto_range = True
-                    marker_moved.is_crosshair = True
-                    self.marker_moved_1d[name] = marker_moved
-                    self.plot_item.addItem(marker_moved)
-                    # Set marker z-value higher than the curve
-                    marker_moved.setZValue(item.zValue() + 1)
+                marker_moved = NonDownsamplingScatterPlotItem(
+                    size=10, pen=pg.mkPen(color), brush=pg.mkBrush(None)
+                )
+                marker_moved.skip_auto_range = True
+                self.marker_moved_1d[item.name()] = marker_moved
+                self.plot_item.addItem(marker_moved)
+
+                # Create glowing effect markers for clicked events
+                for size, alpha in [(18, 64), (14, 128), (10, 255)]:
+                    marker_clicked = NonDownsamplingScatterPlotItem(
+                        size=size,
+                        pen=pg.mkPen(None),
+                        brush=pg.mkBrush(color.red(), color.green(), color.blue(), alpha),
+                    )
+                    marker_clicked.skip_auto_range = True
+                    self.marker_clicked_1d[item.name()] = marker_clicked
+                    self.plot_item.addItem(marker_clicked)
 
-                    # Create glowing effect markers for clicked events
-                    marker_clicked_list = []
-                    for size, alpha in [(18, 64), (14, 128), (10, 255)]:
-                        marker_clicked = CrosshairScatterItem(
-                            size=size,
-                            pen=pg.mkPen(None),
-                            brush=pg.mkBrush(color.red(), color.green(), color.blue(), alpha),
-                        )
-                        marker_clicked.skip_auto_range = True
-                        marker_clicked.is_crosshair = True
-                        self.plot_item.addItem(marker_clicked)
-                        marker_clicked.setZValue(item.zValue() + 1)
-                        marker_clicked_list.append(marker_clicked)
-                    self.marker_clicked_1d[name] = marker_clicked_list
             elif isinstance(item, pg.ImageItem):  # 2D plot
                 if self.marker_2d is not None:
                     continue
                 self.marker_2d = pg.ROI(
                     [0, 0], size=[1, 1], pen=pg.mkPen("r", width=2), movable=False
                 )
-                self.marker_2d.skip_auto_range = True
                 self.plot_item.addItem(self.marker_2d)
 
-    def snap_to_data(
-        self, x: float, y: float
-    ) -> tuple[None, None] | tuple[defaultdict[Any, list], defaultdict[Any, list]]:
+    def snap_to_data(self, x, y) -> tuple[defaultdict[list], defaultdict[list]]:
         """
         Finds the nearest data points to the given x and y coordinates.
 
         Args:
-            x(float): The x-coordinate of the mouse cursor
-            y(float): The y-coordinate of the mouse cursor
+            x: The x-coordinate of the mouse cursor
+            y: The y-coordinate of the mouse cursor
 
         Returns:
             tuple: x and y values snapped to the nearest data
         """
         y_values = defaultdict(list)
         x_values = defaultdict(list)
+        image_2d = None
 
         # Iterate through items in the plot
-        for item in self.items:
+        for item in self.plot_item.items:
             if isinstance(item, pg.PlotDataItem):  # 1D plot
-                name = item.name() or str(id(item))
+                name = item.name()
                 plot_data = item._getDisplayDataset()
                 if plot_data is None:
                     continue
@@ -241,9 +186,9 @@ class Crosshair(QObject):
                     y_values[name] = closest_y
                     x_values[name] = closest_x
             elif isinstance(item, pg.ImageItem):  # 2D plot
-                name = item.config.monitor or str(id(item))
+                name = item.config.monitor
                 image_2d = item.image
-                # Clip the x and y values to the image dimensions to avoid out of bounds errors
+                # clip the x and y values to the image dimensions to avoid out of bounds errors
                 y_values[name] = int(np.clip(y, 0, image_2d.shape[1] - 1))
                 x_values[name] = int(np.clip(x, 0, image_2d.shape[0] - 1))
 
@@ -311,9 +256,9 @@ class Crosshair(QObject):
                 # not sure how we got here, but just to be safe...
                 return
 
-            for item in self.items:
+            for item in self.plot_item.items:
                 if isinstance(item, pg.PlotDataItem):
-                    name = item.name() or str(id(item))
+                    name = item.name()
                     x, y = x_snap_values[name], y_snap_values[name]
                     if x is None or y is None:
                         continue
@@ -326,7 +271,7 @@ class Crosshair(QObject):
                     )
                     self.coordinatesChanged1D.emit(coordinate_to_emit)
                 elif isinstance(item, pg.ImageItem):
-                    name = item.config.monitor or str(id(item))
+                    name = item.config.monitor
                     x, y = x_snap_values[name], y_snap_values[name]
                     if x is None or y is None:
                         continue
@@ -364,14 +309,13 @@ class Crosshair(QObject):
                 # not sure how we got here, but just to be safe...
                 return
 
-            for item in self.items:
+            for item in self.plot_item.items:
                 if isinstance(item, pg.PlotDataItem):
-                    name = item.name() or str(id(item))
+                    name = item.name()
                     x, y = x_snap_values[name], y_snap_values[name]
                     if x is None or y is None:
                         continue
-                    for marker_clicked in self.marker_clicked_1d[name]:
-                        marker_clicked.setData([x], [y])
+                    self.marker_clicked_1d[name].setData([x], [y])
                     x_snapped_scaled, y_snapped_scaled = self.scale_emitted_coordinates(x, y)
                     coordinate_to_emit = (
                         name,
@@ -380,7 +324,7 @@ class Crosshair(QObject):
                     )
                     self.coordinatesClicked1D.emit(coordinate_to_emit)
                 elif isinstance(item, pg.ImageItem):
-                    name = item.config.monitor or str(id(item))
+                    name = item.config.monitor
                     x, y = x_snap_values[name], y_snap_values[name]
                     if x is None or y is None:
                         continue
@@ -393,12 +337,9 @@ class Crosshair(QObject):
     def clear_markers(self):
         """Clears the markers from the plot."""
         for marker in self.marker_moved_1d.values():
-            self.plot_item.removeItem(marker)
-        for markers in self.marker_clicked_1d.values():
-            for marker in markers:
-                self.plot_item.removeItem(marker)
-        self.marker_moved_1d.clear()
-        self.marker_clicked_1d.clear()
+            marker.clear()
+        for marker in self.marker_clicked_1d.values():
+            marker.clear()
 
     def scale_emitted_coordinates(self, x, y):
         """Scales the emitted coordinates if the axes are in log scale.
@@ -424,17 +365,9 @@ class Crosshair(QObject):
         """
         x, y = pos
         x_scaled, y_scaled = self.scale_emitted_coordinates(x, y)
-        text = f"({x_scaled:.{self.precision}g}, {y_scaled:.{self.precision}g})"
-        for item in self.items:
-            if isinstance(item, pg.ImageItem):
-                image = item.image
-                ix = int(np.clip(x, 0, image.shape[0] - 1))
-                iy = int(np.clip(y, 0, image.shape[1] - 1))
-                intensity = image[ix, iy]
-                text += f"\nIntensity: {intensity:.{self.precision}g}"
-                break
-        # Update coordinate label
-        self.coord_label.setText(text)
+
+        # # Update coordinate label
+        self.coord_label.setText(f"({x_scaled:.{self.precision}g}, {y_scaled:.{self.precision}g})")
         self.coord_label.setPos(x, y)
         self.coord_label.setVisible(True)
 
@@ -450,9 +383,6 @@ class Crosshair(QObject):
         self.clear_markers()
 
     def cleanup(self):
-        if self.marker_2d is not None:
-            self.plot_item.removeItem(self.marker_2d)
-            self.marker_2d = None
         self.plot_item.removeItem(self.v_line)
         self.plot_item.removeItem(self.h_line)
         self.plot_item.removeItem(self.coord_label)

bec_widgets/utils/entry_validator.py

@@ -22,9 +22,7 @@ class EntryValidator:
         if entry is None or entry == "":
             entry = next(iter(device._hints), name) if hasattr(device, "_hints") else name
         if entry not in description:
-            raise ValueError(
-                f"Entry '{entry}' not found in device '{name}' signals. Available signals: {description.keys()}"
-            )
+            raise ValueError(f"Entry '{entry}' not found in device '{name}' signals")
 
         return entry
 

bec_widgets/utils/expandable_frame.py

@@ -1,72 +0,0 @@
-from __future__ import annotations
-
-from bec_qthemes import material_icon
-from qtpy.QtWidgets import (
-    QFrame,
-    QHBoxLayout,
-    QLabel,
-    QLayout,
-    QSizePolicy,
-    QToolButton,
-    QVBoxLayout,
-    QWidget,
-)
-
-from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-
-
-class ExpandableGroupFrame(QFrame):
-
-    EXPANDED_ICON_NAME: str = "collapse_all"
-    COLLAPSED_ICON_NAME: str = "expand_all"
-
-    def __init__(self, title: str, parent: QWidget | None = None, expanded: bool = True) -> None:
-        super().__init__(parent=parent)
-        self._expanded = expanded
-
-        self.setFrameStyle(QFrame.Shape.StyledPanel | QFrame.Shadow.Plain)
-        self.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
-        self._layout = QVBoxLayout()
-        self._layout.setContentsMargins(0, 0, 0, 0)
-        self.setLayout(self._layout)
-        self._title_layout = QHBoxLayout()
-        self._layout.addLayout(self._title_layout)
-        self._expansion_button = QToolButton()
-        self._update_icon()
-        self._title = QLabel(f"<b>{title}</b>")
-        self._title_layout.addWidget(self._expansion_button)
-        self._title_layout.addWidget(self._title)
-
-        self._contents = QWidget()
-        self._layout.addWidget(self._contents)
-
-        self._expansion_button.clicked.connect(self.switch_expanded_state)
-        self.expanded = self._expanded  # type: ignore
-
-    def set_layout(self, layout: QLayout) -> None:
-        self._contents.setLayout(layout)
-        self._contents.layout().setContentsMargins(0, 0, 0, 0)  # type: ignore
-
-    @SafeSlot()
-    def switch_expanded_state(self):
-        self.expanded = not self.expanded  # type: ignore
-        self._update_icon()
-
-    @SafeProperty(bool)
-    def expanded(self):  # type: ignore
-        return self._expanded
-
-    @expanded.setter
-    def expanded(self, expanded: bool):
-        self._expanded = expanded
-        self._contents.setVisible(expanded)
-        self.updateGeometry()
-
-    def _update_icon(self):
-        self._expansion_button.setIcon(
-            material_icon(icon_name=self.EXPANDED_ICON_NAME, size=(10, 10), convert_to_pixmap=False)
-            if self.expanded
-            else material_icon(
-                icon_name=self.COLLAPSED_ICON_NAME, size=(10, 10), convert_to_pixmap=False
-            )
-        )

bec_widgets/utils/generate_designer_plugin.py

@@ -1,23 +1,12 @@
 import inspect
 import os
 import re
-from typing import NamedTuple
 
 from qtpy.QtCore import QObject
 
 EXCLUDED_PLUGINS = ["BECConnector", "BECDockArea", "BECDock", "BECFigure"]
 
 
-class PluginFilenames(NamedTuple):
-    register: str
-    plugin: str
-    pyproj: str
-
-
-def plugin_filenames(name: str) -> PluginFilenames:
-    return PluginFilenames(f"register_{name}.py", f"{name}_plugin.py", f"{name}.pyproject")
-
-
 class DesignerPluginInfo:
     def __init__(self, plugin_class):
         self.plugin_class = plugin_class
@@ -64,15 +53,11 @@ class DesignerPluginGenerator:
             self._excluded = True
             return
 
-        self.templates: dict[str, str] = {}
+        self.templates = {}
         self.template_path = os.path.join(
             os.path.dirname(os.path.abspath(__file__)), "plugin_templates"
         )
 
-    @property
-    def filenames(self):
-        return plugin_filenames(self.info.plugin_name_snake)
-
     def run(self, validate=True):
         if self._excluded:
             print(f"Plugin {self.widget.__name__} is excluded from generation.")
@@ -127,18 +112,26 @@ class DesignerPluginGenerator:
                 f"Widget class {self.widget.__name__} must call the super constructor with parent."
             )
 
-    def _write_file(self, name: str, contents: str):
-        with open(os.path.join(self.info.base_path, name), "w", encoding="utf-8") as f:
-            f.write(contents)
-
-    def _format(self, name: str):
-        return self.templates[name].format(**self.info.__dict__)
-
     def _write_templates(self):
-        self._write_file(self.filenames.register, self._format("register"))
-        self._write_file(self.filenames.plugin, self._format("plugin"))
-        pyproj = str({"files": [f"{self.info.plugin_class.__module__.split('.')[-1]}.py"]})
-        self._write_file(self.filenames.pyproj, pyproj)
+        self._write_register()
+        self._write_plugin()
+        self._write_pyproject()
+
+    def _write_register(self):
+        file_path = os.path.join(self.info.base_path, f"register_{self.info.plugin_name_snake}.py")
+        with open(file_path, "w", encoding="utf-8") as f:
+            f.write(self.templates["register"].format(**self.info.__dict__))
+
+    def _write_plugin(self):
+        file_path = os.path.join(self.info.base_path, f"{self.info.plugin_name_snake}_plugin.py")
+        with open(file_path, "w", encoding="utf-8") as f:
+            f.write(self.templates["plugin"].format(**self.info.__dict__))
+
+    def _write_pyproject(self):
+        file_path = os.path.join(self.info.base_path, f"{self.info.plugin_name_snake}.pyproject")
+        out = {"files": [f"{self.info.plugin_class.__module__.split('.')[-1]}.py"]}
+        with open(file_path, "w", encoding="utf-8") as f:
+            f.write(str(out))
 
     def _load_templates(self):
         for file in os.listdir(self.template_path):
@@ -150,7 +143,7 @@ class DesignerPluginGenerator:
 
 if __name__ == "__main__":  # pragma: no cover
     # from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
-    from bec_widgets.widgets.utility.spinner import SpinnerWidget
+    from bec_widgets.widgets.spinner.spinner import SpinnerWidget
 
     generator = DesignerPluginGenerator(SpinnerWidget)
     generator.run(validate=False)

bec_widgets/utils/plot_indicator_items.py

@@ -148,7 +148,10 @@ class BECTickItem(BECIndicatorItem):
     def cleanup(self) -> None:
         """Cleanup the item"""
         self.remove_from_plot()
-        self.tick_item = None
+        if self.tick_item is not None:
+            self.tick_item.close()
+            self.tick_item.deleteLater()
+            self.tick_item = None
 
 
 class BECArrowItem(BECIndicatorItem):
@@ -171,7 +174,7 @@ class BECArrowItem(BECIndicatorItem):
 
     def __init__(self, plot_item: pg.PlotItem = None, parent=None):
         super().__init__(plot_item=plot_item, parent=parent)
-        self.arrow_item = pg.ArrowItem()
+        self.arrow_item = pg.ArrowItem(parent=parent)
         self.arrow_item.skip_auto_range = True
         self._pos = (0, 0)
         self.arrow_item.setVisible(False)

bec_widgets/utils/plugin_utils.py

@@ -53,15 +53,12 @@ class BECClassInfo:
     obj: type
     is_connector: bool = False
     is_widget: bool = False
-    is_plugin: bool = False
+    is_top_level: bool = False
 
 
 class BECClassContainer:
     def __init__(self):
-        self._collection: list[BECClassInfo] = []
-
-    def __repr__(self):
-        return str(list(cl.name for cl in self.collection))
+        self._collection = []
 
     def add_class(self, class_info: BECClassInfo):
         """
@@ -91,14 +88,14 @@ class BECClassContainer:
         """
         Get all top-level classes.
         """
-        return [info.obj for info in self.collection if info.is_plugin]
+        return [info.obj for info in self.collection if info.is_top_level]
 
     @property
     def plugins(self):
         """
         Get all plugins. These are all classes that are on the top level and are widgets.
         """
-        return [info.obj for info in self.collection if info.is_widget and info.is_plugin]
+        return [info.obj for info in self.collection if info.is_widget and info.is_top_level]
 
     @property
     def widgets(self):
@@ -112,17 +109,10 @@ class BECClassContainer:
         """
         Get all top-level classes that are RPC-enabled. These are all classes that users can choose from.
         """
-        return [info.obj for info in self.collection if info.is_plugin and info.is_connector]
-
-    @property
-    def classes(self):
-        """
-        Get all classes.
-        """
-        return [info.obj for info in self.collection]
+        return [info.obj for info in self.collection if info.is_top_level and info.is_connector]
 
 
-def get_custom_classes(repo_name: str) -> BECClassContainer:
+def get_rpc_classes(repo_name: str) -> BECClassContainer:
     """
     Get all RPC-enabled classes in the specified repository.
 
@@ -163,8 +153,6 @@ def get_custom_classes(repo_name: str) -> BECClassContainer:
                         issubclass(obj, QWidget) or issubclass(obj, QGraphicsWidget)
                     ):
                         class_info.is_top_level = True
-                    if hasattr(obj, "PLUGIN") and obj.PLUGIN:
-                        class_info.is_plugin = True
                     collection.add_class(class_info)
 
     return collection

bec_widgets/utils/round_frame.py

@@ -1,152 +0,0 @@
-import pyqtgraph as pg
-from qtpy.QtCore import Property
-from qtpy.QtWidgets import QApplication, QFrame, QHBoxLayout, QVBoxLayout, QWidget
-
-from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
-
-
-class RoundedFrame(QFrame):
-    """
-    A custom QFrame with rounded corners and optional theme updates.
-    The frame can contain any QWidget, however it is mainly designed to wrap PlotWidgets to provide a consistent look and feel with other BEC Widgets.
-    """
-
-    def __init__(
-        self,
-        parent=None,
-        content_widget: QWidget = None,
-        background_color: str = None,
-        radius: int = 10,
-    ):
-        QFrame.__init__(self, parent)
-
-        self.background_color = background_color
-        self._radius = radius
-
-        # Apply rounded frame styling
-        self.setProperty("skip_settings", True)
-        self.setObjectName("roundedFrame")
-
-        # Create a layout for the frame
-        self.layout = QHBoxLayout(self)
-        self.layout.setContentsMargins(5, 5, 5, 5)  # Set 5px margin
-
-        # Add the content widget to the layout
-        if content_widget:
-            self.layout.addWidget(content_widget)
-
-        # Store reference to the content widget
-        self.content_widget = content_widget
-
-        # Automatically apply initial styles to the GraphicalLayoutWidget if applicable
-        self.apply_plot_widget_style()
-
-    def apply_theme(self, theme: str):
-        """
-        Apply the theme to the frame and its content if theme updates are enabled.
-        """
-        if self.content_widget is not None and isinstance(
-            self.content_widget, pg.GraphicsLayoutWidget
-        ):
-            self.content_widget.setBackground(self.background_color)
-
-        # Update background color based on the theme
-        if theme == "light":
-            self.background_color = "#e9ecef"  # Subtle contrast for light mode
-        else:
-            self.background_color = "#141414"  # Dark mode
-
-        self.update_style()
-
-    @Property(int)
-    def radius(self):
-        """Radius of the rounded corners."""
-        return self._radius
-
-    @radius.setter
-    def radius(self, value: int):
-        self._radius = value
-        self.update_style()
-
-    def update_style(self):
-        """
-        Update the style of the frame based on the background color.
-        """
-        if self.background_color:
-            self.setStyleSheet(
-                f"""
-                QFrame#roundedFrame {{
-                    background-color: {self.background_color}; 
-                    border-radius: {self._radius}; /* Rounded corners */
-                }}
-            """
-            )
-        self.apply_plot_widget_style()
-
-    def apply_plot_widget_style(self, border: str = "none"):
-        """
-        Automatically apply background, border, and axis styles to the PlotWidget.
-
-        Args:
-            border (str): Border style (e.g., 'none', '1px solid red').
-        """
-        if isinstance(self.content_widget, pg.GraphicsLayoutWidget):
-            # Apply border style via stylesheet
-            self.content_widget.setStyleSheet(
-                f"""
-                GraphicsLayoutWidget {{
-                    border: {border}; /* Explicitly set the border */
-                }}
-            """
-            )
-            self.content_widget.setBackground(self.background_color)
-
-
-class ExampleApp(QWidget):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self.setWindowTitle("Rounded Plots Example")
-
-        # Main layout
-        layout = QVBoxLayout(self)
-
-        dark_button = DarkModeButton()
-
-        # Create PlotWidgets
-        plot1 = pg.GraphicsLayoutWidget()
-        plot_item_1 = pg.PlotItem()
-        plot_item_1.plot([1, 3, 2, 4, 6, 5], pen="r")
-        plot1.plot_item = plot_item_1
-
-        plot2 = pg.GraphicsLayoutWidget()
-        plot_item_2 = pg.PlotItem()
-        plot_item_2.plot([1, 2, 4, 8, 16, 32], pen="r")
-        plot2.plot_item = plot_item_2
-
-        # Wrap PlotWidgets in RoundedFrame
-        rounded_plot1 = RoundedFrame(parent=self, content_widget=plot1)
-        rounded_plot2 = RoundedFrame(parent=self, content_widget=plot2)
-
-        # Add to layout
-        layout.addWidget(dark_button)
-        layout.addWidget(rounded_plot1)
-        layout.addWidget(rounded_plot2)
-
-        self.setLayout(layout)
-
-        from qtpy.QtCore import QTimer
-
-        def change_theme():
-            rounded_plot1.apply_theme("light")
-            rounded_plot2.apply_theme("dark")
-
-        QTimer.singleShot(100, change_theme)
-
-
-if __name__ == "__main__":  # pragma: no cover
-    app = QApplication([])
-
-    window = ExampleApp()
-    window.show()
-
-    app.exec()

bec_widgets/utils/side_panel.py

@@ -1,377 +0,0 @@
-import sys
-from typing import Literal, Optional
-
-from qtpy.QtCore import Property, QEasingCurve, QPropertyAnimation
-from qtpy.QtGui import QAction
-from qtpy.QtWidgets import (
-    QApplication,
-    QFrame,
-    QHBoxLayout,
-    QLabel,
-    QMainWindow,
-    QScrollArea,
-    QSizePolicy,
-    QStackedWidget,
-    QVBoxLayout,
-    QWidget,
-)
-
-from bec_widgets.utils.toolbar import MaterialIconAction, ModularToolBar
-
-
-class SidePanel(QWidget):
-    """
-    Side panel widget that can be placed on the left, right, top, or bottom of the main widget.
-    """
-
-    def __init__(
-        self,
-        parent=None,
-        orientation: Literal["left", "right", "top", "bottom"] = "left",
-        panel_max_width: int = 200,
-        animation_duration: int = 200,
-        animations_enabled: bool = True,
-    ):
-        super().__init__(parent=parent)
-
-        self.setProperty("skip_settings", True)
-        self.setObjectName("SidePanel")
-
-        self._orientation = orientation
-        self._panel_max_width = panel_max_width
-        self._animation_duration = animation_duration
-        self._animations_enabled = animations_enabled
-
-        self._panel_width = 0
-        self._panel_height = 0
-        self.panel_visible = False
-        self.current_action: Optional[QAction] = None
-        self.current_index: Optional[int] = None
-        self.switching_actions = False
-
-        self._init_ui()
-
-    def _init_ui(self):
-        """
-        Initialize the UI elements.
-        """
-        if self._orientation in ("left", "right"):
-            self.main_layout = QHBoxLayout(self)
-            self.main_layout.setContentsMargins(0, 0, 0, 0)
-            self.main_layout.setSpacing(0)
-
-            self.toolbar = ModularToolBar(target_widget=self, orientation="vertical")
-
-            self.container = QWidget()
-            self.container.layout = QVBoxLayout(self.container)
-            self.container.layout.setContentsMargins(0, 0, 0, 0)
-            self.container.layout.setSpacing(0)
-
-            self.stack_widget = QStackedWidget()
-            self.stack_widget.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
-            self.stack_widget.setMinimumWidth(5)
-            self.stack_widget.setMaximumWidth(self._panel_max_width)
-
-            if self._orientation == "left":
-                self.main_layout.addWidget(self.toolbar)
-                self.main_layout.addWidget(self.container)
-            else:
-                self.main_layout.addWidget(self.container)
-                self.main_layout.addWidget(self.toolbar)
-
-            self.container.layout.addWidget(self.stack_widget)
-
-            self.menu_anim = QPropertyAnimation(self, b"panel_width")
-            self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
-            self.panel_width = 0  # start hidden
-
-        else:
-            self.main_layout = QVBoxLayout(self)
-            self.main_layout.setContentsMargins(0, 0, 0, 0)
-            self.main_layout.setSpacing(0)
-
-            self.toolbar = ModularToolBar(target_widget=self, orientation="horizontal")
-
-            self.container = QWidget()
-            self.container.layout = QVBoxLayout(self.container)
-            self.container.layout.setContentsMargins(0, 0, 0, 0)
-            self.container.layout.setSpacing(0)
-
-            self.stack_widget = QStackedWidget()
-            self.stack_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
-            self.stack_widget.setMinimumHeight(5)
-            self.stack_widget.setMaximumHeight(self._panel_max_width)
-
-            if self._orientation == "top":
-                self.main_layout.addWidget(self.toolbar)
-                self.main_layout.addWidget(self.container)
-            else:
-                self.main_layout.addWidget(self.container)
-                self.main_layout.addWidget(self.toolbar)
-
-            self.container.layout.addWidget(self.stack_widget)
-
-            self.menu_anim = QPropertyAnimation(self, b"panel_height")
-            self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
-            self.panel_height = 0  # start hidden
-
-        self.menu_anim.setDuration(self._animation_duration)
-        self.menu_anim.setEasingCurve(QEasingCurve.InOutQuad)
-
-    @Property(int)
-    def panel_width(self):
-        """Get the panel width."""
-        return self._panel_width
-
-    @panel_width.setter
-    def panel_width(self, width: int):
-        """Set the panel width."""
-        self._panel_width = width
-        if self._orientation in ("left", "right"):
-            self.stack_widget.setFixedWidth(width)
-
-    @Property(int)
-    def panel_height(self):
-        """Get the panel height."""
-        return self._panel_height
-
-    @panel_height.setter
-    def panel_height(self, height: int):
-        """Set the panel height."""
-        self._panel_height = height
-        if self._orientation in ("top", "bottom"):
-            self.stack_widget.setFixedHeight(height)
-
-    @Property(int)
-    def panel_max_width(self):
-        """Get the maximum width of the panel."""
-        return self._panel_max_width
-
-    @panel_max_width.setter
-    def panel_max_width(self, size: int):
-        """Set the maximum width of the panel."""
-        self._panel_max_width = size
-        if self._orientation in ("left", "right"):
-            self.stack_widget.setMaximumWidth(self._panel_max_width)
-        else:
-            self.stack_widget.setMaximumHeight(self._panel_max_width)
-
-    @Property(int)
-    def animation_duration(self):
-        """Get the duration of the animation."""
-        return self._animation_duration
-
-    @animation_duration.setter
-    def animation_duration(self, duration: int):
-        """Set the duration of the animation."""
-        self._animation_duration = duration
-        self.menu_anim.setDuration(duration)
-
-    @Property(bool)
-    def animations_enabled(self):
-        """Get the status of the animations."""
-        return self._animations_enabled
-
-    @animations_enabled.setter
-    def animations_enabled(self, enabled: bool):
-        """Set the status of the animations."""
-        self._animations_enabled = enabled
-
-    def show_panel(self, idx: int):
-        """
-        Show the side panel with animation and switch to idx.
-        """
-        self.stack_widget.setCurrentIndex(idx)
-        self.panel_visible = True
-        self.current_index = idx
-
-        if self._orientation in ("left", "right"):
-            start_val, end_val = 0, self._panel_max_width
-        else:
-            start_val, end_val = 0, self._panel_max_width
-
-        if self._animations_enabled:
-            self.menu_anim.stop()
-            self.menu_anim.setStartValue(start_val)
-            self.menu_anim.setEndValue(end_val)
-            self.menu_anim.start()
-        else:
-            if self._orientation in ("left", "right"):
-                self.panel_width = end_val
-            else:
-                self.panel_height = end_val
-
-    def hide_panel(self):
-        """
-        Hide the side panel with animation.
-        """
-        self.panel_visible = False
-        self.current_index = None
-
-        if self._orientation in ("left", "right"):
-            start_val, end_val = self._panel_max_width, 0
-        else:
-            start_val, end_val = self._panel_max_width, 0
-
-        if self._animations_enabled:
-            self.menu_anim.stop()
-            self.menu_anim.setStartValue(start_val)
-            self.menu_anim.setEndValue(end_val)
-            self.menu_anim.start()
-        else:
-            if self._orientation in ("left", "right"):
-                self.panel_width = end_val
-            else:
-                self.panel_height = end_val
-
-    def switch_to(self, idx: int):
-        """
-        Switch to the specified index without animation.
-        """
-        if self.current_index != idx:
-            self.stack_widget.setCurrentIndex(idx)
-            self.current_index = idx
-
-    def add_menu(
-        self,
-        action_id: str,
-        icon_name: str,
-        tooltip: str,
-        widget: QWidget,
-        title: str | None = None,
-    ):
-        """
-        Add a menu to the side panel.
-
-        Args:
-            action_id(str): The ID of the action.
-            icon_name(str): The name of the icon.
-            tooltip(str): The tooltip for the action.
-            widget(QWidget): The widget to add to the panel.
-            title(str): The title of the panel.
-        """
-        # container_widget: top-level container for the stacked page
-        container_widget = QWidget()
-        container_layout = QVBoxLayout(container_widget)
-        container_layout.setContentsMargins(0, 0, 0, 0)
-        container_layout.setSpacing(5)
-
-        if title is not None:
-            title_label = QLabel(f"<b>{title}</b>")
-            title_label.setStyleSheet("font-size: 16px;")
-            container_layout.addWidget(title_label)
-
-        # Create a QScrollArea for the actual widget to ensure scrolling if the widget inside is too large
-        scroll_area = QScrollArea()
-        scroll_area.setFrameShape(QFrame.NoFrame)
-        scroll_area.setWidgetResizable(True)
-        # Let the scroll area expand in both directions if there's room
-        scroll_area.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-        scroll_area.setWidget(widget)
-
-        # Put the scroll area in the container layout
-        container_layout.addWidget(scroll_area)
-
-        # Optionally stretch the scroll area to fill vertical space
-        container_layout.setStretchFactor(scroll_area, 1)
-
-        # Add container_widget to the stacked widget
-        index = self.stack_widget.count()
-        self.stack_widget.addWidget(container_widget)
-
-        # Add an action to the toolbar
-        action = MaterialIconAction(icon_name=icon_name, tooltip=tooltip, checkable=True)
-        self.toolbar.add_action(action_id, action, target_widget=self)
-
-        def on_action_toggled(checked: bool):
-            if self.switching_actions:
-                return
-
-            if checked:
-                if self.current_action and self.current_action != action.action:
-                    self.switching_actions = True
-                    self.current_action.setChecked(False)
-                    self.switching_actions = False
-
-                self.current_action = action.action
-
-                if not self.panel_visible:
-                    self.show_panel(index)
-                else:
-                    self.switch_to(index)
-            else:
-                if self.current_action == action.action:
-                    self.current_action = None
-                    self.hide_panel()
-
-        action.action.toggled.connect(on_action_toggled)
-
-
-############################################
-# DEMO APPLICATION
-############################################
-
-
-class ExampleApp(QMainWindow):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self.setWindowTitle("Side Panel Example")
-
-        central_widget = QWidget()
-        self.setCentralWidget(central_widget)
-        self.layout = QHBoxLayout(central_widget)
-
-        # Create side panel
-        self.side_panel = SidePanel(self, orientation="left", panel_max_width=250)
-        self.layout.addWidget(self.side_panel)
-
-        from bec_widgets.widgets.plots.waveform.waveform import Waveform
-
-        self.plot = Waveform()
-        self.layout.addWidget(self.plot)
-
-        self.add_side_menus()
-
-    def add_side_menus(self):
-        widget1 = QWidget()
-        layout1 = QVBoxLayout(widget1)
-        for i in range(15):
-            layout1.addWidget(QLabel(f"Widget 1 label row {i}"))
-        self.side_panel.add_menu(
-            action_id="widget1",
-            icon_name="counter_1",
-            tooltip="Show Widget 1",
-            widget=widget1,
-            title="Widget 1 Panel",
-        )
-
-        widget2 = QWidget()
-        layout2 = QVBoxLayout(widget2)
-        layout2.addWidget(QLabel("Short widget 2 content"))
-        self.side_panel.add_menu(
-            action_id="widget2",
-            icon_name="counter_2",
-            tooltip="Show Widget 2",
-            widget=widget2,
-            title="Widget 2 Panel",
-        )
-
-        widget3 = QWidget()
-        layout3 = QVBoxLayout(widget3)
-        for i in range(10):
-            layout3.addWidget(QLabel(f"Line {i} for Widget 3"))
-        self.side_panel.add_menu(
-            action_id="widget3",
-            icon_name="counter_3",
-            tooltip="Show Widget 3",
-            widget=widget3,
-            title="Widget 3 Panel",
-        )
-
-
-if __name__ == "__main__":  # pragma: no cover
-    app = QApplication(sys.argv)
-    window = ExampleApp()
-    window.resize(1000, 700)
-    window.show()
-    sys.exit(app.exec())

bec_widgets/utils/ui_loader.py

@@ -4,7 +4,7 @@ from qtpy import PYQT6, PYSIDE6, QT_VERSION
 from qtpy.QtCore import QFile, QIODevice
 
 from bec_widgets.utils.generate_designer_plugin import DesignerPluginInfo
-from bec_widgets.utils.plugin_utils import get_custom_classes
+from bec_widgets.utils.plugin_utils import get_rpc_classes
 
 if PYSIDE6:
     from PySide6.QtUiTools import QUiLoader
@@ -30,7 +30,7 @@ class UILoader:
     def __init__(self, parent=None):
         self.parent = parent
 
-        widgets = get_custom_classes("bec_widgets").classes
+        widgets = get_rpc_classes("bec_widgets").top_level_classes
 
         self.custom_widgets = {widget.__name__: widget for widget in widgets}
 

bec_widgets/utils/widget_io.py

@@ -1,7 +1,6 @@
 # pylint: disable=no-name-in-module
-from __future__ import annotations
-
 from abc import ABC, abstractmethod
+from typing import Literal
 
 from qtpy.QtWidgets import (
     QApplication,
@@ -10,7 +9,6 @@ from qtpy.QtWidgets import (
     QDoubleSpinBox,
     QLabel,
     QLineEdit,
-    QSlider,
     QSpinBox,
     QTableWidget,
     QTableWidgetItem,
@@ -18,8 +16,6 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
-from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch
-
 
 class WidgetHandler(ABC):
     """Abstract base class for all widget handlers."""
@@ -32,15 +28,6 @@ class WidgetHandler(ABC):
     def set_value(self, widget: QWidget, value):
         """Set a value on the widget instance."""
 
-    def connect_change_signal(self, widget: QWidget, slot):
-        """
-        Connect a change signal from this widget to the given slot.
-        If the widget type doesn't have a known "value changed" signal, do nothing.
-
-        slot: a function accepting two arguments (widget, value)
-        """
-        pass
-
 
 class LineEditHandler(WidgetHandler):
     """Handler for QLineEdit widgets."""
@@ -51,9 +38,6 @@ class LineEditHandler(WidgetHandler):
     def set_value(self, widget: QLineEdit, value: str) -> None:
         widget.setText(value)
 
-    def connect_change_signal(self, widget: QLineEdit, slot):
-        widget.textChanged.connect(lambda text, w=widget: slot(w, text))
-
 
 class ComboBoxHandler(WidgetHandler):
     """Handler for QComboBox widgets."""
@@ -69,11 +53,6 @@ class ComboBoxHandler(WidgetHandler):
         if isinstance(value, int):
             widget.setCurrentIndex(value)
 
-    def connect_change_signal(self, widget: QComboBox, slot):
-        # currentIndexChanged(int) or currentIndexChanged(str) both possible.
-        # We use currentIndexChanged(int) for a consistent behavior.
-        widget.currentIndexChanged.connect(lambda idx, w=widget: slot(w, self.get_value(w)))
-
 
 class TableWidgetHandler(WidgetHandler):
     """Handler for QTableWidget widgets."""
@@ -93,84 +72,39 @@ class TableWidgetHandler(WidgetHandler):
                 item = QTableWidgetItem(str(cell_value))
                 widget.setItem(row, col, item)
 
-    def connect_change_signal(self, widget: QTableWidget, slot):
-        # If desired, we could connect cellChanged(row, col) and then fetch all data.
-        # This might be noisy if table is large.
-        # For demonstration, connect cellChanged to update entire table value.
-        def on_cell_changed(row, col, w=widget):
-            val = self.get_value(w)
-            slot(w, val)
-
-        widget.cellChanged.connect(on_cell_changed)
-
 
 class SpinBoxHandler(WidgetHandler):
     """Handler for QSpinBox and QDoubleSpinBox widgets."""
 
-    def get_value(self, widget: QSpinBox | QDoubleSpinBox, **kwargs):
+    def get_value(self, widget, **kwargs):
         return widget.value()
 
-    def set_value(self, widget: QSpinBox | QDoubleSpinBox, value):
+    def set_value(self, widget, value):
         widget.setValue(value)
 
-    def connect_change_signal(self, widget: QSpinBox | QDoubleSpinBox, slot):
-        widget.valueChanged.connect(lambda val, w=widget: slot(w, val))
-
 
 class CheckBoxHandler(WidgetHandler):
     """Handler for QCheckBox widgets."""
 
-    def get_value(self, widget: QCheckBox, **kwargs):
+    def get_value(self, widget, **kwargs):
         return widget.isChecked()
 
-    def set_value(self, widget: QCheckBox, value):
+    def set_value(self, widget, value):
         widget.setChecked(value)
 
-    def connect_change_signal(self, widget: QCheckBox, slot):
-        widget.toggled.connect(lambda val, w=widget: slot(w, val))
-
-
-class SlideHandler(WidgetHandler):
-    """Handler for QCheckBox widgets."""
-
-    def get_value(self, widget: QSlider, **kwargs):
-        return widget.value()
-
-    def set_value(self, widget: QSlider, value):
-        widget.setValue(value)
-
-    def connect_change_signal(self, widget: QSlider, slot):
-        widget.valueChanged.connect(lambda val, w=widget: slot(w, val))
-
-
-class ToggleSwitchHandler(WidgetHandler):
-    """Handler for ToggleSwitch widgets."""
-
-    def get_value(self, widget: ToggleSwitch, **kwargs):
-        return widget.checked
-
-    def set_value(self, widget: ToggleSwitch, value):
-        widget.checked = value
-
-    def connect_change_signal(self, widget: ToggleSwitch, slot):
-        widget.enabled.connect(lambda val, w=widget: slot(w, val))
-
 
 class LabelHandler(WidgetHandler):
     """Handler for QLabel widgets."""
 
-    def get_value(self, widget: QLabel, **kwargs):
+    def get_value(self, widget, **kwargs):
         return widget.text()
 
-    def set_value(self, widget: QLabel, value):
+    def set_value(self, widget, value):
         widget.setText(value)
 
-    # QLabel typically doesn't have user-editable changes. No signal to connect.
-    # If needed, this can remain empty.
-
 
 class WidgetIO:
-    """Public interface for getting, setting values and connecting signals using handler mapping"""
+    """Public interface for getting and setting values using handler mapping"""
 
     _handlers = {
         QLineEdit: LineEditHandler,
@@ -180,8 +114,6 @@ class WidgetIO:
         QDoubleSpinBox: SpinBoxHandler,
         QCheckBox: CheckBoxHandler,
         QLabel: LabelHandler,
-        ToggleSwitch: ToggleSwitchHandler,
-        QSlider: SlideHandler,
     }
 
     @staticmethod
@@ -216,17 +148,6 @@ class WidgetIO:
         elif not ignore_errors:
             raise ValueError(f"No handler for widget type: {type(widget)}")
 
-    @staticmethod
-    def connect_widget_change_signal(widget, slot):
-        """
-        Connect the widget's value-changed signal to a generic slot function (widget, value).
-        This now delegates the logic to the widget's handler.
-        """
-        handler_class = WidgetIO._find_handler(widget)
-        if handler_class:
-            handler = handler_class()
-            handler.connect_change_signal(widget, slot)
-
     @staticmethod
     def check_and_adjust_limits(spin_box: QDoubleSpinBox, number: float):
         """
@@ -388,8 +309,8 @@ class WidgetHierarchy:
                 WidgetHierarchy.import_config_from_dict(child, widget_config, set_values)
 
 
-# Example usage
-def hierarchy_example():  # pragma: no cover
+# Example application to demonstrate the usage of the functions
+if __name__ == "__main__":  # pragma: no cover
     app = QApplication([])
 
     # Create instance of WidgetHierarchy
@@ -444,37 +365,3 @@ def hierarchy_example():  # pragma: no cover
     print(f"Config dict new REDUCED: {config_dict_new_reduced}")
 
     app.exec()
-
-
-def widget_io_signal_example():  # pragma: no cover
-    app = QApplication([])
-
-    main_widget = QWidget()
-    layout = QVBoxLayout(main_widget)
-    line_edit = QLineEdit(main_widget)
-    combo_box = QComboBox(main_widget)
-    spin_box = QSpinBox(main_widget)
-    combo_box.addItems(["Option 1", "Option 2", "Option 3"])
-
-    layout.addWidget(line_edit)
-    layout.addWidget(combo_box)
-    layout.addWidget(spin_box)
-
-    main_widget.show()
-
-    def universal_slot(w, val):
-        print(f"Widget {w.objectName() or w} changed, new value: {val}")
-
-    # Connect all supported widgets through their handlers
-    WidgetIO.connect_widget_change_signal(line_edit, universal_slot)
-    WidgetIO.connect_widget_change_signal(combo_box, universal_slot)
-    WidgetIO.connect_widget_change_signal(spin_box, universal_slot)
-
-    app.exec_()
-
-
-if __name__ == "__main__":  # pragma: no cover
-    # Change example function to test different scenarios
-
-    # hierarchy_example()
-    widget_io_signal_example()

bec_widgets/utils/widget_state_manager.py

@@ -1,223 +0,0 @@
-from __future__ import annotations
-
-from bec_lib import bec_logger
-from qtpy.QtCore import QSettings
-from qtpy.QtWidgets import (
-    QApplication,
-    QCheckBox,
-    QFileDialog,
-    QHBoxLayout,
-    QLabel,
-    QLineEdit,
-    QPushButton,
-    QSpinBox,
-    QVBoxLayout,
-    QWidget,
-)
-
-logger = bec_logger.logger
-
-
-class WidgetStateManager:
-    """
-    A class to manage the state of a widget by saving and loading the state to and from a INI file.
-
-    Args:
-        widget(QWidget): The widget to manage the state for.
-    """
-
-    def __init__(self, widget):
-        self.widget = widget
-
-    def save_state(self, filename: str = None):
-        """
-        Save the state of the widget to an INI file.
-
-        Args:
-            filename(str): The filename to save the state to.
-        """
-        if not filename:
-            filename, _ = QFileDialog.getSaveFileName(
-                self.widget, "Save Settings", "", "INI Files (*.ini)"
-            )
-        if filename:
-            settings = QSettings(filename, QSettings.IniFormat)
-            self._save_widget_state_qsettings(self.widget, settings)
-
-    def load_state(self, filename: str = None):
-        """
-        Load the state of the widget from an INI file.
-
-        Args:
-            filename(str): The filename to load the state from.
-        """
-        if not filename:
-            filename, _ = QFileDialog.getOpenFileName(
-                self.widget, "Load Settings", "", "INI Files (*.ini)"
-            )
-        if filename:
-            settings = QSettings(filename, QSettings.IniFormat)
-            self._load_widget_state_qsettings(self.widget, settings)
-
-    def _save_widget_state_qsettings(self, widget: QWidget, settings: QSettings):
-        """
-        Save the state of the widget to QSettings.
-
-        Args:
-            widget(QWidget): The widget to save the state for.
-            settings(QSettings): The QSettings object to save the state to.
-        """
-        if widget.property("skip_settings") is True:
-            return
-
-        meta = widget.metaObject()
-        widget_name = self._get_full_widget_name(widget)
-        settings.beginGroup(widget_name)
-        for i in range(meta.propertyCount()):
-            prop = meta.property(i)
-            name = prop.name()
-            if (
-                name == "objectName"
-                or not prop.isReadable()
-                or not prop.isWritable()
-                or not prop.isStored()  # can be extended to fine filter
-            ):
-                continue
-            value = widget.property(name)
-            settings.setValue(name, value)
-        settings.endGroup()
-
-        # Recursively process children (only if they aren't skipped)
-        for child in widget.children():
-            if (
-                child.objectName()
-                and child.property("skip_settings") is not True
-                and not isinstance(child, QLabel)
-            ):
-                self._save_widget_state_qsettings(child, settings)
-
-    def _load_widget_state_qsettings(self, widget: QWidget, settings: QSettings):
-        """
-        Load the state of the widget from QSettings.
-
-        Args:
-            widget(QWidget): The widget to load the state for.
-            settings(QSettings): The QSettings object to load the state from.
-        """
-        if widget.property("skip_settings") is True:
-            return
-
-        meta = widget.metaObject()
-        widget_name = self._get_full_widget_name(widget)
-        settings.beginGroup(widget_name)
-        for i in range(meta.propertyCount()):
-            prop = meta.property(i)
-            name = prop.name()
-            if settings.contains(name):
-                value = settings.value(name)
-                widget.setProperty(name, value)
-        settings.endGroup()
-
-        # Recursively process children (only if they aren't skipped)
-        for child in widget.children():
-            if (
-                child.objectName()
-                and child.property("skip_settings") is not True
-                and not isinstance(child, QLabel)
-            ):
-                self._load_widget_state_qsettings(child, settings)
-
-    def _get_full_widget_name(self, widget: QWidget):
-        """
-        Get the full name of the widget including its parent names.
-
-        Args:
-            widget(QWidget): The widget to get the full name for.
-
-        Returns:
-            str: The full name of the widget.
-        """
-        name = widget.objectName()
-        parent = widget.parent()
-        while parent:
-            obj_name = parent.objectName() or parent.metaObject().className()
-            name = obj_name + "." + name
-            parent = parent.parent()
-        return name
-
-
-class ExampleApp(QWidget):  # pragma: no cover:
-    def __init__(self):
-        super().__init__()
-        self.setObjectName("MainWindow")
-        self.setWindowTitle("State Manager Example")
-
-        layout = QVBoxLayout(self)
-
-        # A line edit to store some user text
-        self.line_edit = QLineEdit(self)
-        self.line_edit.setObjectName("MyLineEdit")
-        self.line_edit.setPlaceholderText("Enter some text here...")
-        layout.addWidget(self.line_edit)
-
-        # A spin box to hold a numeric value
-        self.spin_box = QSpinBox(self)
-        self.spin_box.setObjectName("MySpinBox")
-        self.spin_box.setRange(0, 100)
-        layout.addWidget(self.spin_box)
-
-        # A checkbox to hold a boolean value
-        self.check_box = QCheckBox("Enable feature?", self)
-        self.check_box.setObjectName("MyCheckBox")
-        layout.addWidget(self.check_box)
-
-        # A checkbox that we want to skip
-        self.check_box_skip = QCheckBox("Enable feature - skip save?", self)
-        self.check_box_skip.setProperty("skip_state", True)
-        self.check_box_skip.setObjectName("MyCheckBoxSkip")
-        layout.addWidget(self.check_box_skip)
-
-        #  CREATE A "SIDE PANEL" with nested structure and skip all what is inside
-        self.side_panel = QWidget(self)
-        self.side_panel.setObjectName("SidePanel")
-        self.side_panel.setProperty("skip_settings", True)  # skip the ENTIRE panel
-        layout.addWidget(self.side_panel)
-
-        # Put some sub-widgets inside side_panel
-        panel_layout = QVBoxLayout(self.side_panel)
-        self.panel_label = QLabel("Label in side panel", self.side_panel)
-        self.panel_label.setObjectName("PanelLabel")
-        panel_layout.addWidget(self.panel_label)
-
-        self.panel_edit = QLineEdit(self.side_panel)
-        self.panel_edit.setObjectName("PanelLineEdit")
-        self.panel_edit.setPlaceholderText("I am inside side panel")
-        panel_layout.addWidget(self.panel_edit)
-
-        self.panel_checkbox = QCheckBox("Enable feature in side panel?", self.side_panel)
-        self.panel_checkbox.setObjectName("PanelCheckBox")
-        panel_layout.addWidget(self.panel_checkbox)
-
-        # Save/Load buttons
-        button_layout = QHBoxLayout()
-        self.save_button = QPushButton("Save State", self)
-        self.load_button = QPushButton("Load State", self)
-        button_layout.addWidget(self.save_button)
-        button_layout.addWidget(self.load_button)
-        layout.addLayout(button_layout)
-
-        # Create the state manager
-        self.state_manager = WidgetStateManager(self)
-
-        # Connect buttons
-        self.save_button.clicked.connect(lambda: self.state_manager.save_state())
-        self.load_button.clicked.connect(lambda: self.state_manager.load_state())
-
-
-if __name__ == "__main__":  # pragma: no cover:
-    import sys
-
-    app = QApplication(sys.argv)
-    w = ExampleApp()
-    w.show()
-    sys.exit(app.exec_())

bec_widgets/widgets/__init__.py

@@ -0,0 +1 @@
+

bec_widgets/widgets/base_classes/device_input_base.py

@@ -5,7 +5,6 @@ import enum
 from bec_lib.device import ComputedSignal, Device, Positioner, ReadoutPriority
 from bec_lib.device import Signal as BECSignal
 from bec_lib.logger import bec_logger
-from pydantic import field_validator
 from qtpy.QtCore import Property, Signal, Slot
 
 from bec_widgets.utils import ConnectionConfig
@@ -26,35 +25,13 @@ class BECDeviceFilter(enum.Enum):
 
 
 class DeviceInputConfig(ConnectionConfig):
-    device_filter: list[str] = []
-    readout_filter: list[str] = []
+    device_filter: list[BECDeviceFilter] = []
+    readout_filter: list[ReadoutPriority] = []
     devices: list[str] = []
     default: str | None = None
     arg_name: str | None = None
     apply_filter: bool = True
 
-    @field_validator("device_filter")
-    @classmethod
-    def check_device_filter(cls, v, values):
-        valid_device_filters = [entry.value for entry in BECDeviceFilter]
-        for filt in v:
-            if filt not in valid_device_filters:
-                raise ValueError(
-                    f"Device filter {filt} is not a valid device filter {valid_device_filters}."
-                )
-        return v
-
-    @field_validator("readout_filter")
-    @classmethod
-    def check_readout_filter(cls, v, values):
-        valid_device_filters = [entry.value for entry in ReadoutPriority]
-        for filt in v:
-            if filt not in valid_device_filters:
-                raise ValueError(
-                    f"Device filter {filt} is not a valid device filter {valid_device_filters}."
-                )
-        return v
-
 
 class DeviceInputBase(BECWidget):
     """
@@ -82,7 +59,7 @@ class DeviceInputBase(BECWidget):
         ReadoutPriority.ON_REQUEST: "readout_on_request",
     }
 
-    def __init__(self, client=None, config=None, gui_id: str | None = None, **kwargs):
+    def __init__(self, client=None, config=None, gui_id: str = None):
 
         if config is None:
             config = DeviceInputConfig(widget_class=self.__class__.__name__)
@@ -90,7 +67,7 @@ class DeviceInputBase(BECWidget):
             if isinstance(config, dict):
                 config = DeviceInputConfig(**config)
             self.config = config
-        super().__init__(client=client, config=config, gui_id=gui_id, theme_update=True, **kwargs)
+        super().__init__(client=client, config=config, gui_id=gui_id, theme_update=True)
         self.get_bec_shortcuts()
         self._device_filter = []
         self._readout_filter = []

bec_widgets/widgets/base_classes/device_signal_input_base.py

@@ -35,14 +35,14 @@ class DeviceSignalInputBase(BECWidget):
         Kind.config: "include_config_signals",
     }
 
-    def __init__(self, client=None, config=None, gui_id: str = None, **kwargs):
+    def __init__(self, client=None, config=None, gui_id: str = None):
         if config is None:
             config = DeviceSignalInputBaseConfig(widget_class=self.__class__.__name__)
         else:
             if isinstance(config, dict):
                 config = DeviceSignalInputBaseConfig(**config)
             self.config = config
-        super().__init__(client=client, config=config, gui_id=gui_id, **kwargs)
+        super().__init__(client=client, config=config, gui_id=gui_id)
 
         self._device = None
         self.get_bec_shortcuts()

bec_widgets/widgets/bec_progressbar/bec_progress_bar_plugin.py

@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.progress.bec_progressbar.bec_progressbar import BECProgressBar
+from bec_widgets.widgets.bec_progressbar.bec_progressbar import BECProgressBar
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/bec_progressbar/bec_progressbar.py

@@ -14,7 +14,6 @@ class BECProgressBar(BECWidget, QWidget):
     A custom progress bar with smooth transitions. The displayed text can be customized using a template.
     """
 
-    PLUGIN = True
     USER_ACCESS = [
         "set_value",
         "set_maximum",
@@ -24,8 +23,8 @@ class BECProgressBar(BECWidget, QWidget):
     ]
     ICON_NAME = "page_control"
 
-    def __init__(self, parent=None, client=None, config=None, gui_id=None, **kwargs):
-        super().__init__(client=client, config=config, gui_id=gui_id, **kwargs)
+    def __init__(self, parent=None, client=None, config=None, gui_id=None):
+        super().__init__(client=client, config=config, gui_id=gui_id)
         QWidget.__init__(self, parent=parent)
 
         accent_colors = get_accent_colors()

bec_widgets/widgets/bec_progressbar/register_bec_progress_bar.py

@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.progress.bec_progressbar.bec_progress_bar_plugin import (
-        BECProgressBarPlugin,
-    )
+    from bec_widgets.widgets.bec_progressbar.bec_progress_bar_plugin import BECProgressBarPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(BECProgressBarPlugin())
 

bec_widgets/widgets/bec_queue/bec_queue.py

@@ -6,14 +6,14 @@ from qtpy.QtCore import Property, Qt, Signal, Slot
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QHeaderView, QLabel, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget
 
+from bec_widgets.qt_utils.compact_popup import CompactPopupWidget
+from bec_widgets.qt_utils.toolbar import ModularToolBar, SeparatorAction, WidgetAction
 from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.compact_popup import CompactPopupWidget
-from bec_widgets.utils.toolbar import ModularToolBar, SeparatorAction, WidgetAction
-from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton
-from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton
-from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton
-from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
+from bec_widgets.widgets.button_abort.button_abort import AbortButton
+from bec_widgets.widgets.button_reset.button_reset import ResetButton
+from bec_widgets.widgets.button_resume.button_resume import ResumeButton
+from bec_widgets.widgets.stop_button.stop_button import StopButton
 
 
 class BECQueue(BECWidget, CompactPopupWidget):
@@ -21,7 +21,6 @@ class BECQueue(BECWidget, CompactPopupWidget):
     Widget to display the BEC queue.
     """
 
-    PLUGIN = True
     ICON_NAME = "edit_note"
     status_colors = {
         "STOPPED": "red",
@@ -42,9 +41,8 @@ class BECQueue(BECWidget, CompactPopupWidget):
         config: ConnectionConfig = None,
         gui_id: str = None,
         refresh_upon_start: bool = True,
-        **kwargs,
     ):
-        super().__init__(client=client, config=config, gui_id=gui_id, **kwargs)
+        super().__init__(client, config, gui_id)
         CompactPopupWidget.__init__(self, parent=parent, layout=QVBoxLayout)
         self.layout.setSpacing(0)
         self.layout.setContentsMargins(0, 0, 0, 0)

bec_widgets/widgets/bec_queue/bec_queue_plugin.py

@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.services.bec_queue.bec_queue import BECQueue
+from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/bec_queue/register_bec_queue.py

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.services.bec_queue.bec_queue_plugin import BECQueuePlugin
+    from bec_widgets.widgets.bec_queue.bec_queue_plugin import BECQueuePlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(BECQueuePlugin())
 

bec_widgets/widgets/bec_status_box/bec_status_box.py

@@ -4,17 +4,18 @@ The widget automatically updates the status of all running BEC services, and dis
 
 from __future__ import annotations
 
+import sys
 from collections import defaultdict
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 from bec_lib.utils.import_utils import lazy_import_from
 from qtpy.QtCore import QObject, QTimer, Signal, Slot
-from qtpy.QtWidgets import QHBoxLayout, QTreeWidget, QTreeWidgetItem
+from qtpy.QtWidgets import QHBoxLayout, QTreeWidget, QTreeWidgetItem, QWidget
 
+from bec_widgets.qt_utils.compact_popup import CompactPopupWidget
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.compact_popup import CompactPopupWidget
-from bec_widgets.widgets.services.bec_status_box.status_item import StatusItem
+from bec_widgets.widgets.bec_status_box.status_item import StatusItem
 
 if TYPE_CHECKING:
     from bec_lib.client import BECClient
@@ -74,7 +75,6 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
         gui_id Optional(str): The unique id for the widget. Defaults to None.
     """
 
-    PLUGIN = True
     CORE_SERVICES = ["DeviceServer", "ScanServer", "SciHub", "ScanBundler", "FileWriterManager"]
 
     service_update = Signal(BECServiceInfoContainer)
@@ -87,9 +87,8 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
         client: BECClient = None,
         bec_service_status_mixin: BECServiceStatusMixin = None,
         gui_id: str = None,
-        **kwargs,
     ):
-        super().__init__(client=client, gui_id=gui_id, **kwargs)
+        super().__init__(client=client, gui_id=gui_id)
         CompactPopupWidget.__init__(self, parent=parent, layout=QHBoxLayout)
 
         self.box_name = box_name

bec_widgets/widgets/bec_status_box/bec_status_box_plugin.py

@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.services.bec_status_box.bec_status_box import BECStatusBox
+from bec_widgets.widgets.bec_status_box.bec_status_box import BECStatusBox
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/bec_status_box/register_bec_status_box.py

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.services.bec_status_box.bec_status_box_plugin import BECStatusBoxPlugin
+    from bec_widgets.widgets.bec_status_box.bec_status_box_plugin import BECStatusBoxPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(BECStatusBoxPlugin())
 

bec_widgets/widgets/button_abort/abort_button_plugin.py

@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton
+from bec_widgets.widgets.button_abort.button_abort import AbortButton
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/button_abort/button_abort.py

@@ -2,27 +2,19 @@ from bec_qthemes import material_icon
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QHBoxLayout, QPushButton, QToolButton, QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.error_popups import SafeSlot
 
 
 class AbortButton(BECWidget, QWidget):
     """A button that abort the scan."""
 
-    PLUGIN = True
     ICON_NAME = "cancel"
 
     def __init__(
-        self,
-        parent=None,
-        client=None,
-        config=None,
-        gui_id=None,
-        toolbar=False,
-        scan_id=None,
-        **kwargs,
+        self, parent=None, client=None, config=None, gui_id=None, toolbar=False, scan_id=None
     ):
-        super().__init__(client=client, config=config, gui_id=gui_id, **kwargs)
+        super().__init__(client=client, config=config, gui_id=gui_id)
         QWidget.__init__(self, parent=parent)
 
         self.get_bec_shortcuts()

bec_widgets/widgets/button_abort/register_abort_button.py

@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.control.buttons.button_abort.abort_button_plugin import (
-        AbortButtonPlugin,
-    )
+    from bec_widgets.widgets.button_abort.abort_button_plugin import AbortButtonPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(AbortButtonPlugin())
 

bec_widgets/widgets/button_reset/button_reset.py

@@ -2,18 +2,17 @@ from bec_qthemes import material_icon
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QHBoxLayout, QMessageBox, QPushButton, QToolButton, QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.error_popups import SafeSlot
 
 
 class ResetButton(BECWidget, QWidget):
     """A button that resets the scan queue."""
 
-    PLUGIN = True
     ICON_NAME = "restart_alt"
 
-    def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False, **kwargs):
-        super().__init__(client=client, config=config, gui_id=gui_id, **kwargs)
+    def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False):
+        super().__init__(client=client, config=config, gui_id=gui_id)
         QWidget.__init__(self, parent=parent)
 
         self.get_bec_shortcuts()

bec_widgets/widgets/button_reset/register_reset_button.py

@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.control.buttons.button_reset.reset_button_plugin import (
-        ResetButtonPlugin,
-    )
+    from bec_widgets.widgets.button_reset.reset_button_plugin import ResetButtonPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(ResetButtonPlugin())
 

bec_widgets/widgets/button_reset/reset_button_plugin.py

@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton
+from bec_widgets.widgets.button_reset.button_reset import ResetButton
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/button_resume/button_resume.py

@@ -2,18 +2,17 @@ from bec_qthemes import material_icon
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QHBoxLayout, QPushButton, QToolButton, QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.error_popups import SafeSlot
 
 
 class ResumeButton(BECWidget, QWidget):
     """A button that continue scan queue."""
 
-    PLUGIN = True
     ICON_NAME = "resume"
 
-    def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False, **kwargs):
-        super().__init__(client=client, config=config, gui_id=gui_id, **kwargs)
+    def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False):
+        super().__init__(client=client, config=config, gui_id=gui_id)
         QWidget.__init__(self, parent=parent)
 
         self.get_bec_shortcuts()

bec_widgets/widgets/button_resume/register_resume_button.py

@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.control.buttons.button_resume.resume_button_plugin import (
-        ResumeButtonPlugin,
-    )
+    from bec_widgets.widgets.button_resume.resume_button_plugin import ResumeButtonPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(ResumeButtonPlugin())
 

bec_widgets/widgets/button_resume/resume_button_plugin.py

@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton
+from bec_widgets.widgets.button_resume.button_resume import ResumeButton
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/color_button/color_button.py

@@ -6,7 +6,7 @@ import pyqtgraph as pg
 from qtpy.QtCore import Qt, Signal
 from qtpy.QtWidgets import QHBoxLayout, QWidget
 
-from bec_widgets.utils.error_popups import SafeSlot
+from bec_widgets.qt_utils.error_popups import SafeSlot
 
 
 class ColorButton(QWidget):
@@ -17,7 +17,6 @@ class ColorButton(QWidget):
 
     color_selected = Signal(str)
 
-    PLUGIN = True
     ICON_NAME = "colors"
 
     def __init__(self, *args, **kwargs):

bec_widgets/widgets/color_button/color_button_plugin.py

@@ -4,7 +4,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.utility.visual.color_button.color_button import ColorButton
+from bec_widgets.widgets.color_button.color_button import ColorButton
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/color_button/register_color_button.py

@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.utility.visual.color_button.color_button_plugin import (
-        ColorButtonPlugin,
-    )
+    from bec_widgets.widgets.color_button.color_button_plugin import ColorButtonPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(ColorButtonPlugin())
 

bec_widgets/widgets/colormap_selector/colormap_selector.py

@@ -47,7 +47,6 @@ class ColormapSelector(QWidget):
 
     colormap_changed_signal = Signal(str)
     ICON_NAME = "palette"
-    PLUGIN = True
 
     def __init__(self, parent=None, default_colormaps=None):
         super().__init__(parent=parent)

bec_widgets/widgets/colormap_selector/colormap_selector_plugin.py

@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.utility.visual.colormap_selector.colormap_selector import ColormapSelector
+from bec_widgets.widgets.colormap_selector.colormap_selector import ColormapSelector
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/colormap_selector/register_colormap_selector.py

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.utility.visual.colormap_selector.colormap_selector_plugin import (
+    from bec_widgets.widgets.colormap_selector.colormap_selector_plugin import (
         ColormapSelectorPlugin,
     )
 

bec_widgets/widgets/colormap_widget/bec_color_map_widget_plugin.py

@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.utility.visual.colormap_widget.colormap_widget import BECColorMapWidget
+from bec_widgets.widgets.colormap_widget.colormap_widget import BECColorMapWidget
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/colormap_widget/colormap_widget.py

@@ -10,17 +10,16 @@ class BECColorMapWidget(BECWidget, QWidget):
     colormap_changed_signal = Signal(str)
     ICON_NAME = "palette"
     USER_ACCESS = ["colormap"]
-    PLUGIN = True
 
-    def __init__(self, parent=None, cmap: str = "magma", **kwargs):
-        super().__init__(**kwargs)
+    def __init__(self, parent=None, cmap: str = "magma"):
+        super().__init__()
         QWidget.__init__(self, parent=parent)
 
         # Create the ColorMapButton
         self.button = ColorMapButton()
 
         # Set the size policy and minimum width
-        size_policy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
+        size_policy = QSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Fixed)
         self.button.setSizePolicy(size_policy)
         self.button.setMinimumWidth(100)
         self.button.setMinimumHeight(30)

bec_widgets/widgets/colormap_widget/register_bec_color_map_widget.py

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.utility.visual.colormap_widget.bec_color_map_widget_plugin import (
+    from bec_widgets.widgets.colormap_widget.bec_color_map_widget_plugin import (
         BECColorMapWidgetPlugin,
     )
 

bec_widgets/widgets/console/console.py

@@ -10,13 +10,9 @@ import fcntl
 import html
 import os
 import pty
-import re
-import signal
 import sys
-import time
 
 import pyte
-from pygments.token import Token
 from pyte.screens import History
 from qtpy import QtCore, QtGui, QtWidgets
 from qtpy.QtCore import Property as pyqtProperty
@@ -25,7 +21,7 @@ from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtGui import QClipboard, QColor, QPalette, QTextCursor
 from qtpy.QtWidgets import QApplication, QHBoxLayout, QScrollBar, QSizePolicy
 
-from bec_widgets.utils.error_popups import SafeSlot as Slot
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 
 ansi_colors = {
     "black": "#000000",
@@ -236,17 +232,12 @@ class Backend(QtCore.QObject):
 class BECConsole(QtWidgets.QWidget):
     """Container widget for the terminal text area"""
 
-    PLUGIN = True
     ICON_NAME = "terminal"
 
-    prompt = pyqtSignal(bool)
-
     def __init__(self, parent=None, cols=132):
         super().__init__(parent)
 
         self.term = _TerminalWidget(self, cols, rows=43)
-        self.term.prompt.connect(self.prompt)  # forward signal from term to this widget
-
         self.scroll_bar = QScrollBar(Qt.Vertical, self)
         # self.scroll_bar.hide()
         layout = QHBoxLayout(self)
@@ -328,38 +319,9 @@ class BECConsole(QtWidgets.QWidget):
     def start(self, deactivate_ctrl_d=True):
         self.term.start(deactivate_ctrl_d=deactivate_ctrl_d)
 
-    def push(self, text, hit_return=False):
+    def push(self, text):
         """Push some text to the terminal"""
-        return self.term.push(text, hit_return=hit_return)
-
-    def execute_command(self, command):
-        self.push(command, hit_return=True)
-
-    def set_prompt_tokens(self, *tokens):
-        """Prepare regexp to identify prompt, based on tokens
-
-        Tokens are returned from get_ipython().prompts.in_prompt_tokens()
-        """
-        regex_parts = []
-        for token_type, token_value in tokens:
-            if token_type == Token.PromptNum:  # Handle dynamic prompt number
-                regex_parts.append(r"[\d\?]+")  # Match one or more digits or '?'
-            else:
-                # Escape other prompt parts (e.g., "In [", "]: ")
-                if not token_value:
-                    regex_parts.append(".+?")  # arbitrary string
-                else:
-                    regex_parts.append(re.escape(token_value))
-
-        # Combine into a single regex
-        prompt_pattern = "".join(regex_parts)
-        self.term._prompt_re = re.compile(prompt_pattern + r"\s*$")
-
-    def terminate(self, timeout=10):
-        self.term.stop(timeout=timeout)
-
-    def send_ctrl_c(self, timeout=None):
-        self.term.send_ctrl_c(timeout)
+        return self.term.push(text)
 
     cols = pyqtProperty(int, get_cols, set_cols)
     rows = pyqtProperty(int, get_rows, set_rows)
@@ -373,15 +335,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
     Start ``Backend`` process and render Pyte output as text.
     """
 
-    prompt = pyqtSignal(bool)
-
     def __init__(self, parent, cols=125, rows=50, **kwargs):
-        # regexp to match prompt
-        self._prompt_re = None
-        # last prompt
-        self._prompt_str = None
-        # process pid
-        self.pid = None
         # file descriptor to communicate with the subprocess
         self.fd = None
         self.backend = None
@@ -478,7 +432,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
         self.update_term_size()
 
         # Start the Bash process
-        self.pid, self.fd = self.fork_shell()
+        self.fd = self.fork_shell()
 
         if self.fd:
             # Create the ``Backend`` object
@@ -494,62 +448,6 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
         self.appendHtml(f"<br><h2>{repr(self._cmd)} - Process exited.</h2>")
         self.setReadOnly(True)
 
-    def send_ctrl_c(self, wait_prompt=True, timeout=None):
-        """Send CTRL-C to the process
-
-        If wait_prompt=True (default), wait for a new prompt after CTRL-C
-        If no prompt is displayed after 'timeout' seconds, TimeoutError is raised
-        """
-        os.kill(self.pid, signal.SIGINT)
-        if wait_prompt:
-            timeout_error = False
-            if timeout:
-
-                def set_timeout_error():
-                    nonlocal timeout_error
-                    timeout_error = True
-
-                timeout_timer = QTimer()
-                timeout_timer.singleShot(timeout * 1000, set_timeout_error)
-            while self._prompt_str is None:
-                QApplication.instance().process_events()
-                if timeout_error:
-                    raise TimeoutError(
-                        f"CTRL-C: could not get back to prompt after {timeout} seconds."
-                    )
-
-    def _is_running(self):
-        if os.waitpid(self.pid, os.WNOHANG) == (0, 0):
-            return True
-        return False
-
-    def stop(self, kill=True, timeout=None):
-        """Stop the running process
-
-        SIGTERM is the default signal for terminating processes.
-
-        If kill=True (default), SIGKILL will be sent if the process does not exit after timeout
-        """
-        # try to exit gracefully
-        os.kill(self.pid, signal.SIGTERM)
-
-        # wait until process is truly dead
-        t0 = time.perf_counter()
-        while self._is_running():
-            time.sleep(1)
-            if timeout is not None and time.perf_counter() - t0 > timeout:
-                # still alive after 'timeout' seconds
-                if kill:
-                    # send SIGKILL and make a last check in loop
-                    os.kill(self.pid, signal.SIGKILL)
-                    kill = False
-                else:
-                    # still running after timeout...
-                    raise TimeoutError(
-                        f"Could not terminate process with pid: {self.pid} within timeout"
-                    )
-        self.process_exited()
-
     def data_ready(self, screen):
         """Handle new screen: redraw, set scroll bar max and slider, move cursor to its position
 
@@ -641,13 +539,11 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
         elif code is not None:
             self.write(code)
 
-    def push(self, text, hit_return=False):
+    def push(self, text):
         """
         Write 'text' to terminal
         """
         self.write(text.encode("utf-8"))
-        if hit_return:
-            self.write(b"\n")
 
     def contextMenuEvent(self, event):
         if self.fd is None:
@@ -753,20 +649,6 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
                 self.output[line_no] = line
             # fill the text area with HTML contents in one go
             self.appendHtml(f"<pre>{chr(10).join(self.output)}</pre>")
-
-            if self._prompt_re is not None:
-                text_buf = self.toPlainText()
-                prompt = self._prompt_re.search(text_buf)
-                if prompt is None:
-                    if self._prompt_str:
-                        self.prompt.emit(False)
-                    self._prompt_str = None
-                else:
-                    prompt_str = prompt.string.rstrip()
-                    if prompt_str != self._prompt_str:
-                        self._prompt_str = prompt_str
-                        self.prompt.emit(True)
-
             # did updates, all clean
             screen.dirty.clear()
 
@@ -828,7 +710,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
             # We are in the parent process.
             # Set file control
             fcntl.fcntl(fd, fcntl.F_SETFL, os.O_NONBLOCK)
-            return pid, fd
+            return fd
 
 
 if __name__ == "__main__":
@@ -845,24 +727,6 @@ if __name__ == "__main__":
 
     console = BECConsole(mainwin)
     mainwin.setCentralWidget(console)
-
-    def check_prompt(at_prompt):
-        if at_prompt:
-            print("NEW PROMPT")
-        else:
-            print("EXECUTING SOMETHING...")
-
-    console.set_prompt_tokens(
-        (Token.OutPromptNum, "•"),
-        (Token.Prompt, ""),  # will match arbitrary string,
-        (Token.Prompt, " ["),
-        (Token.PromptNum, "3"),
-        (Token.Prompt, "/"),
-        (Token.PromptNum, "1"),
-        (Token.Prompt, "] "),
-        (Token.Prompt, "❯❯"),
-    )
-    console.prompt.connect(check_prompt)
     console.start()
 
     # Show widget and launch Qt's event loop.

bec_widgets/widgets/console/console_plugin.py

@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.editors.console.console import BECConsole
+from bec_widgets.widgets.console.console import BECConsole
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/console/register_console.py

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.editors.console.console_plugin import BECConsolePlugin
+    from bec_widgets.widgets.console.console_plugin import BECConsolePlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(BECConsolePlugin())