wip test client import fix

.github/actions/bw_install/action.yml

@@ -62,4 +62,4 @@ runs:
         uv pip install --system -e ./ophyd_devices
         uv pip install --system -e ./bec/bec_lib[dev]
         uv pip install --system -e ./bec/bec_ipython_client
-        uv pip install --system -e ./bec_widgets[dev,qtermwidget]
+        uv pip install --system -e ./bec_widgets[dev,pyside6]

.gitignore

@@ -177,6 +177,4 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-#
-tombi.toml
+#.idea/

CHANGELOG.md

@@ -1,58 +1,6 @@
 # CHANGELOG
 
 
-## v3.5.0 (2026-04-14)
-
-### Bug Fixes
-
-- Connect signals the correct way around
-  ([`f562c61`](https://github.com/bec-project/bec_widgets/commit/f562c61e3cec3387f6821bad74403beeb3436355))
-
-- Create new bec shell if deleted
-  ([`1754e75`](https://github.com/bec-project/bec_widgets/commit/1754e759f0c59f2f4063f661bacd334127326947))
-
-- Formatting in plugin template
-  ([`fa2ef83`](https://github.com/bec-project/bec_widgets/commit/fa2ef83bb9dfeeb4c5fc7cd77168c16101c32693))
-
-- **bec_console**: Persistent bec session
-  ([`9b0ec9d`](https://github.com/bec-project/bec_widgets/commit/9b0ec9dd79ad1adc5d211dd703db7441da965f34))
-
-### Features
-
-- Add qtermwidget plugin and replace web term
-  ([`02cb393`](https://github.com/bec-project/bec_widgets/commit/02cb393bb086165dc64917b633d5570d02e1a2a9))
-
-### Refactoring
-
-- Code cleanup
-  ([`bda5d38`](https://github.com/bec-project/bec_widgets/commit/bda5d389651bb2b13734cd31159679e85b1bd583))
-
-
-## v3.4.4 (2026-04-14)
-
-### Bug Fixes
-
-- Check duplicate stream sub
-  ([`c7de320`](https://github.com/bec-project/bec_widgets/commit/c7de320ca564264a31b84931f553170f25659685))
-
-- Check for duplicate subscriptions in GUIClient
-  ([`37747ba`](https://github.com/bec-project/bec_widgets/commit/37747babda407040333c6bd04646be9a49e0ee81))
-
-- Make gui client registry callback non static
-  ([`32f5d48`](https://github.com/bec-project/bec_widgets/commit/32f5d486d3fc8d41df2668c58932ae982819b285))
-
-- Remove staticmethod subscription
-  ([`0ff1fdc`](https://github.com/bec-project/bec_widgets/commit/0ff1fdc81578eec3ffc5d4030fca7b357a0b4c2f))
-
-
-## v3.4.3 (2026-04-13)
-
-### Bug Fixes
-
-- Set OPHYD_CONTROL_LAYER to dummy for tests
-  ([`5e84d3b`](https://github.com/bec-project/bec_widgets/commit/5e84d3bec608ae9f2ee6dae67db2e3e1387b1f59))
-
-
 ## v3.4.2 (2026-04-01)
 
 ### Bug Fixes

bec_widgets/__init__.py

@@ -1,19 +1,21 @@
 import os
 import sys
 
-import bec_widgets.widgets.containers.qt_ads as QtAds
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-
 if sys.platform.startswith("linux"):
     qt_platform = os.environ.get("QT_QPA_PLATFORM", "")
     if qt_platform != "offscreen":
         os.environ["QT_QPA_PLATFORM"] = "xcb"
 
-# Default QtAds configuration
-QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.eConfigFlag.FocusHighlighting, True)
-QtAds.CDockManager.setConfigFlag(
-    QtAds.CDockManager.eConfigFlag.RetainTabSizeWhenCloseButtonHidden, True
-)
-
 __all__ = ["BECWidget", "SafeSlot", "SafeProperty"]
+
+
+def __getattr__(name: str):
+    if name == "BECWidget":
+        from bec_widgets.utils.bec_widget import BECWidget
+
+        return BECWidget
+    if name in {"SafeProperty", "SafeSlot"}:
+        from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
+
+        return {"SafeProperty": SafeProperty, "SafeSlot": SafeSlot}[name]
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

bec_widgets/applications/views/developer_view/developer_widget.py

@@ -16,9 +16,9 @@ from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
 from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
 from bec_widgets.widgets.containers.qt_ads import CDockWidget
-from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole, BECShell
 from bec_widgets.widgets.editors.monaco.monaco_dock import MonacoDock
 from bec_widgets.widgets.editors.monaco.monaco_widget import MonacoWidget
+from bec_widgets.widgets.editors.web_console.web_console import BECShell, WebConsole
 from bec_widgets.widgets.utility.ide_explorer.ide_explorer import IDEExplorer
 
 
@@ -96,7 +96,7 @@ class DeveloperWidget(DockAreaWidget):
 
         self.console = BECShell(self, rpc_exposed=False)
         self.console.setObjectName("BEC Shell")
-        self.terminal = BecConsole(self, rpc_exposed=False)
+        self.terminal = WebConsole(self, rpc_exposed=False)
         self.terminal.setObjectName("Terminal")
         self.monaco = MonacoDock(self, rpc_exposed=False, rpc_passthrough_children=False)
         self.monaco.setObjectName("MonacoEditor")
@@ -410,3 +410,23 @@ class DeveloperWidget(DockAreaWidget):
         """Clean up resources used by the developer widget."""
         self.delete_all()
         return super().cleanup()
+
+
+if __name__ == "__main__":
+    import sys
+
+    from bec_qthemes import apply_theme
+    from qtpy.QtWidgets import QApplication
+
+    from bec_widgets.applications.main_app import BECMainApp
+
+    app = QApplication(sys.argv)
+    apply_theme("dark")
+
+    _app = BECMainApp()
+    _app.show()
+    # developer_view.show()
+    # developer_view.setWindowTitle("Developer View")
+    # developer_view.resize(1920, 1080)
+    # developer_view.set_stretch(horizontal=[1, 3, 2], vertical=[5, 5]) #can be set during runtime
+    sys.exit(app.exec_())

bec_widgets/applications/views/device_manager_view/device_manager_dialogs/__init__.py

@@ -1,2 +0,0 @@
-from .config_choice_dialog import ConfigChoiceDialog
-from .device_form_dialog import DeviceFormDialog

bec_widgets/applications/views/device_manager_view/device_manager_dialogs/device_form_dialog.py

@@ -8,14 +8,16 @@ from ophyd_devices.interfaces.device_config_templates.ophyd_templates import OPH
 from qtpy import QtCore, QtWidgets
 
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.widgets.control.device_manager.components import OphydValidation
 from bec_widgets.widgets.control.device_manager.components.device_config_template.device_config_template import (
     DeviceConfigTemplate,
 )
 from bec_widgets.widgets.control.device_manager.components.device_config_template.template_items import (
     validate_name,
 )
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation import (
+    OphydValidation,
+)
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
     ConfigStatus,
     ConnectionStatus,
     format_error_to_md,

bec_widgets/applications/views/device_manager_view/device_manager_dialogs/upload_redis_dialog.py

@@ -12,7 +12,7 @@ from qtpy import QtCore, QtGui, QtWidgets
 
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
     ConfigStatus,
     ConnectionStatus,
     get_validation_icons,

bec_widgets/applications/views/device_manager_view/device_manager_display_widget.py

@@ -13,6 +13,7 @@ from bec_lib.file_utils import DeviceConfigWriter
 from bec_lib.logger import bec_logger
 from bec_lib.messages import ConfigAction, ScanStatusMessage
 from bec_lib.plugin_helper import plugin_package_name, plugin_repo_path
+from bec_lib.utils.import_utils import lazy_import_from
 from bec_qthemes import apply_theme, material_icon
 from qtpy.QtCore import QMetaObject, Qt, QThreadPool, Signal
 from qtpy.QtGui import QColor
@@ -26,26 +27,18 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
-from bec_widgets.applications.views.device_manager_view.device_manager_dialogs import (
-    ConfigChoiceDialog,
-    DeviceFormDialog,
-)
-from bec_widgets.applications.views.device_manager_view.device_manager_dialogs.upload_redis_dialog import (
-    UploadRedisDialog,
-)
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.toolbars.actions import MaterialIconAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
-from bec_widgets.widgets.control.device_manager.components import (
-    DeviceTable,
-    DMConfigView,
-    DocstringView,
-    OphydValidation,
-)
 from bec_widgets.widgets.control.device_manager.components._util import SharedSelectionSignal
+from bec_widgets.widgets.control.device_manager.components.device_table.device_table import (
+    DeviceTable,
+)
+from bec_widgets.widgets.control.device_manager.components.dm_config_view import DMConfigView
+from bec_widgets.widgets.control.device_manager.components.dm_docstring_view import DocstringView
 from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
     ConfigStatus,
     ConnectionStatus,
@@ -61,8 +54,29 @@ from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
 if TYPE_CHECKING:  # pragma: no cover
     from bec_lib.client import BECClient
 
+    from bec_widgets.applications.views.device_manager_view.device_manager_dialogs.upload_redis_dialog import (
+        UploadRedisDialog,
+    )
+
 logger = bec_logger.logger
 
+ConfigChoiceDialog = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_dialogs.config_choice_dialog",
+    ("ConfigChoiceDialog",),
+)
+DeviceFormDialog = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_dialogs.device_form_dialog",
+    ("DeviceFormDialog",),
+)
+UploadRedisDialog = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_dialogs.upload_redis_dialog",
+    ("UploadRedisDialog",),
+)
+OphydValidation = lazy_import_from(
+    "bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation",
+    ("OphydValidation",),
+)
+
 _yes_no_question = partial(
     QMessageBox.question,
     buttons=QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,

bec_widgets/applications/views/device_manager_view/device_manager_view.py

@@ -1,14 +1,17 @@
 """Module for Device Manager View."""
 
+from bec_lib.utils.import_utils import lazy_import_from
 from qtpy.QtCore import QRect
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.applications.views.device_manager_view.device_manager_widget import (
-    DeviceManagerWidget,
-)
 from bec_widgets.applications.views.view import ViewBase, ViewTourSteps
 from bec_widgets.utils.error_popups import SafeSlot
 
+DeviceManagerWidget = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_widget",
+    ("DeviceManagerWidget",),
+)
+
 
 class DeviceManagerView(ViewBase):
     """

bec_widgets/applications/views/device_manager_view/device_manager_widget.py

@@ -6,15 +6,18 @@ import os
 
 from bec_lib.bec_yaml_loader import yaml_load
 from bec_lib.logger import bec_logger
+from bec_lib.utils.import_utils import lazy_import_from
 from bec_qthemes import material_icon
 from qtpy import QtCore, QtWidgets
 
-from bec_widgets.applications.views.device_manager_view.device_manager_display_widget import (
-    DeviceManagerDisplayWidget,
-)
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeSlot
 
+DeviceManagerDisplayWidget = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_display_widget",
+    ("DeviceManagerDisplayWidget",),
+)
+
 logger = bec_logger.logger
 
 

bec_widgets/cli/client.py

@@ -32,7 +32,6 @@ _Widgets = {
     "BECQueue": "BECQueue",
     "BECShell": "BECShell",
     "BECStatusBox": "BECStatusBox",
-    "BecConsole": "BecConsole",
     "DapComboBox": "DapComboBox",
     "DeviceBrowser": "DeviceBrowser",
     "Heatmap": "Heatmap",
@@ -57,6 +56,7 @@ _Widgets = {
     "SignalLabel": "SignalLabel",
     "TextBox": "TextBox",
     "Waveform": "Waveform",
+    "WebConsole": "WebConsole",
     "WebsiteWidget": "WebsiteWidget",
 }
 
@@ -506,7 +506,7 @@ class BECQueue(RPCBase):
 
 
 class BECShell(RPCBase):
-    """A BecConsole pre-configured to run the BEC shell."""
+    """A WebConsole pre-configured to run the BEC shell."""
 
     @rpc_call
     def remove(self):
@@ -691,28 +691,6 @@ class BaseROI(RPCBase):
         """
 
 
-class BecConsole(RPCBase):
-    """A console widget with access to a shared registry of terminals, such that instances can be moved around."""
-
-    @rpc_call
-    def remove(self):
-        """
-        Cleanup the BECConnector
-        """
-
-    @rpc_call
-    def attach(self):
-        """
-        None
-        """
-
-    @rpc_call
-    def detach(self):
-        """
-        Detach the widget from its parent dock widget (if widget is in the dock), making it a floating widget.
-        """
-
-
 class CircularROI(RPCBase):
     """Circular Region of Interest with center/diameter tracking and auto-labeling."""
 
@@ -6439,6 +6417,28 @@ class WaveformViewPopup(RPCBase):
         """
 
 
+class WebConsole(RPCBase):
+    """A simple widget to display a website"""
+
+    @rpc_call
+    def remove(self):
+        """
+        Cleanup the BECConnector
+        """
+
+    @rpc_call
+    def attach(self):
+        """
+        None
+        """
+
+    @rpc_call
+    def detach(self):
+        """
+        Detach the widget from its parent dock widget (if widget is in the dock), making it a floating widget.
+        """
+
+
 class WebsiteWidget(RPCBase):
     """A simple widget to display a website"""
 

bec_widgets/cli/client_utils.py

@@ -10,9 +10,9 @@ import threading
 import time
 from contextlib import contextmanager
 from threading import Lock
-from typing import TYPE_CHECKING, Callable, Literal, TypeAlias, cast
+from typing import TYPE_CHECKING, Literal, TypeAlias, cast
 
-from bec_lib.endpoints import EndpointInfo, MessageEndpoints
+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
@@ -232,11 +232,6 @@ class BECGuiClient(RPCBase):
         """The launcher object."""
         return RPCBase(gui_id=f"{self._gui_id}:launcher", parent=self, object_name="launcher")
 
-    def _safe_register_stream(self, endpoint: EndpointInfo, cb: Callable, **kwargs):
-        """Check if already registered for registration in idempotent functions."""
-        if not self._client.connector.any_stream_is_registered(endpoint, cb=cb):
-            self._client.connector.register(endpoint, cb=cb, **kwargs)
-
     def connect_to_gui_server(self, gui_id: str) -> None:
         """Connect to a GUI server"""
         # Unregister the old callback
@@ -252,9 +247,10 @@ class BECGuiClient(RPCBase):
         self._ipython_registry = {}
 
         # Register the new callback
-        self._safe_register_stream(
+        self._client.connector.register(
             MessageEndpoints.gui_registry_state(self._gui_id),
             cb=self._handle_registry_update,
+            parent=self,
             from_start=True,
         )
 
@@ -535,14 +531,20 @@ class BECGuiClient(RPCBase):
 
     def _start(self, wait: bool = False) -> None:
         self._killed = False
-        self._safe_register_stream(
-            MessageEndpoints.gui_registry_state(self._gui_id), cb=self._handle_registry_update
+        self._client.connector.register(
+            MessageEndpoints.gui_registry_state(self._gui_id),
+            cb=self._handle_registry_update,
+            parent=self,
         )
         return self._start_server(wait=wait)
 
-    def _handle_registry_update(self, msg: dict[str, GUIRegistryStateMessage]) -> None:
+    @staticmethod
+    def _handle_registry_update(
+        msg: dict[str, GUIRegistryStateMessage], parent: BECGuiClient
+    ) -> None:
         # This was causing a deadlock during shutdown, not sure why.
         # with self._lock:
+        self = parent
         self._server_registry = cast(dict[str, RegistryState], msg["data"].state)
         self._update_dynamic_namespace(self._server_registry)
 

bec_widgets/cli/rpc/rpc_base.py

@@ -248,7 +248,9 @@ class RPCBase:
             self._rpc_response = None
             self._msg_wait_event.clear()
             self._client.connector.register(
-                MessageEndpoints.gui_instruction_response(request_id), cb=self._on_rpc_response
+                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)
@@ -274,10 +276,11 @@ class RPCBase:
             self._rpc_response = None
             return self._create_widget_from_msg_result(msg_result)
 
-    def _on_rpc_response(self, msg_obj: MessageObject) -> None:
+    @staticmethod
+    def _on_rpc_response(msg_obj: MessageObject, parent: RPCBase) -> None:
         msg = cast(messages.RequestResponseMessage, msg_obj.value)
-        self._rpc_response = msg
-        self._msg_wait_event.set()
+        parent._rpc_response = msg
+        parent._msg_wait_event.set()
 
     def _create_widget_from_msg_result(self, msg_result):
         if msg_result is None:

bec_widgets/cli/rpc/rpc_widget_handler.py

@@ -1,9 +1,19 @@
 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
+from typing import TYPE_CHECKING
+
+from bec_lib.utils.import_utils import lazy_import_from
+
+from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widget_references
+from bec_widgets.utils.plugin_utils import get_custom_class_references
+
+try:
+    from bec_widgets.cli.constants import IGNORE_WIDGETS
+except ModuleNotFoundError:  # pragma: no cover
+    IGNORE_WIDGETS = ["LaunchWindow"]
+
+if TYPE_CHECKING:  # pragma: no cover
+    from bec_widgets.utils.bec_widget import BECWidget
 
 
 class RPCWidgetHandler:
@@ -13,7 +23,7 @@ class RPCWidgetHandler:
         self._widget_classes = None
 
     @property
-    def widget_classes(self) -> dict[str, type[BECWidget]]:
+    def widget_classes(self) -> dict[str, type["BECWidget"]]:
         """
         Get the available widget classes.
 
@@ -31,12 +41,24 @@ class RPCWidgetHandler:
         Returns:
             None
         """
-        self._widget_classes = (
-            get_custom_classes("bec_widgets", packages=("widgets", "applications"))
-            + get_all_plugin_widgets()
-        ).as_dict(IGNORE_WIDGETS)
+        ignored = set(IGNORE_WIDGETS)
+        widget_classes = {
+            reference.name: lazy_import_from(reference.module, (reference.name,))
+            for reference in get_all_plugin_widget_references()
+            if reference.name not in ignored
+        }
+        widget_classes.update(
+            {
+                reference.name: lazy_import_from(reference.module, (reference.name,))
+                for reference in get_custom_class_references(
+                    "bec_widgets", packages=("widgets", "applications")
+                )
+                if reference.name not in ignored
+            }
+        )
+        self._widget_classes = widget_classes
 
-    def create_widget(self, widget_type, **kwargs) -> BECWidget:
+    def create_widget(self, widget_type, **kwargs) -> "BECWidget":
         """
         Create a widget from an RPC message.
 

bec_widgets/utils/__init__.py

@@ -1,13 +0,0 @@
-from qtpy.QtWebEngineWidgets import QWebEngineView
-
-from .bec_connector import BECConnector, ConnectionConfig
-from .bec_dispatcher import BECDispatcher
-from .bec_table import BECTable
-from .colors import Colors
-from .container_utils import WidgetContainerUtils
-from .crosshair import Crosshair
-from .entry_validator import EntryValidator
-from .layout_manager import GridLayoutManager
-from .rpc_decorator import register_rpc_methods, rpc_public
-from .ui_loader import UILoader
-from .validator_delegate import DoubleValidationDelegate

bec_widgets/utils/bec_dispatcher.py

@@ -175,15 +175,12 @@ class BECDispatcher:
             cb_info (dict | None): A dictionary containing information about the callback. Defaults to None.
         """
         qt_slot = QtThreadSafeCallback(cb=slot, cb_info=cb_info)
-        if not self.client.connector.any_stream_is_registered(topics, qt_slot):
-            if qt_slot not in self._registered_slots:
-                self._registered_slots[qt_slot] = qt_slot
-            qt_slot = self._registered_slots[qt_slot]
-            self.client.connector.register(topics, cb=qt_slot, **kwargs)
-            topics_str, _ = self.client.connector._convert_endpointinfo(topics)
-            qt_slot.topics.update(set(topics_str))
-        else:
-            logger.warning(f"Attempted to create duplicate stream subscription for {topics=}")
+        if qt_slot not in self._registered_slots:
+            self._registered_slots[qt_slot] = qt_slot
+        qt_slot = self._registered_slots[qt_slot]
+        self.client.connector.register(topics, cb=qt_slot, **kwargs)
+        topics_str, _ = self.client.connector._convert_endpointinfo(topics)
+        qt_slot.topics.update(set(topics_str))
 
     def disconnect_slot(
         self, slot: Callable, topics: EndpointInfo | str | list[EndpointInfo] | list[str]

bec_widgets/utils/bec_plugin_helper.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
+import ast
 import importlib.metadata
 import inspect
+import os
 import pkgutil
 import traceback
 from importlib import util as importlib_util
@@ -11,11 +13,61 @@ from typing import Generator
 
 from bec_lib.logger import bec_logger
 
-from bec_widgets.utils.plugin_utils import BECClassContainer, BECClassInfo
+from bec_widgets.utils.plugin_utils import (
+    BECClassContainer,
+    BECClassInfo,
+    BECClassReference,
+    _ast_node_name,
+    _class_has_rpc_markers,
+)
 
 logger = bec_logger.logger
 
 
+def _plugin_class_is_candidate(node: ast.ClassDef) -> bool:
+    base_names = {_ast_node_name(base) for base in node.bases}
+    return bool({"BECWidget", "BECConnector"} & base_names) or _class_has_rpc_markers(node)
+
+
+def get_all_plugin_widget_references() -> list[BECClassReference]:
+    references: list[BECClassReference] = []
+    seen_names: set[str] = set()
+    for entry_point in importlib.metadata.entry_points(group="bec.widgets.user_widgets"):  # type: ignore
+        spec = importlib_util.find_spec(entry_point.module)
+        if spec is None:
+            continue
+
+        package_roots = list(spec.submodule_search_locations or ())
+        if spec.origin and not package_roots:
+            package_roots = [os.path.dirname(spec.origin)]
+
+        for package_root in package_roots:
+            for root, _, files in sorted(os.walk(package_root)):
+                for file_name in sorted(files):
+                    if not file_name.endswith(".py") or file_name.startswith("__"):
+                        continue
+                    path = os.path.join(root, file_name)
+                    with open(path, encoding="utf-8") as file_handle:
+                        module = ast.parse(file_handle.read(), filename=path)
+                    module_name = ".".join(
+                        os.path.relpath(path, package_root).removesuffix(".py").split(os.sep)
+                    )
+                    for node in module.body:
+                        if not isinstance(node, ast.ClassDef) or not _plugin_class_is_candidate(
+                            node
+                        ):
+                            continue
+                        if node.name in seen_names:
+                            continue
+                        references.append(
+                            BECClassReference(
+                                name=node.name, module=f"{entry_point.module}.{module_name}"
+                            )
+                        )
+                        seen_names.add(node.name)
+    return references
+
+
 def _submodule_specs(module: ModuleType) -> tuple[ModuleSpec | None, ...]:
     """Return specs for all submodules of the given module."""
     return tuple(

bec_widgets/utils/bec_widget.py

@@ -20,7 +20,6 @@ from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
 
 if TYPE_CHECKING:  # pragma: no cover
     from bec_widgets.utils.busy_loader import BusyLoaderOverlay
-    from bec_widgets.widgets.containers.dock import BECDock
 
 logger = bec_logger.logger
 

bec_widgets/utils/plugin_templates/plugin.template

@@ -22,7 +22,7 @@ class {plugin_name_pascal}Plugin(QDesignerCustomWidgetInterface):  # pragma: no
 
     def createWidget(self, parent):
         if parent is None:
-            return QWidget()
+           return QWidget()
         t = {plugin_name_pascal}(parent)
         return t
 

bec_widgets/utils/plugin_utils.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import ast
 import importlib
 import inspect
 import os
@@ -7,16 +8,16 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING, Iterable
 
 from bec_lib.plugin_helper import _get_available_plugins
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils import BECConnector
-from bec_widgets.utils.bec_widget import BECWidget
 
 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.auto_update.auto_updates import AutoUpdates
 
+_DISCOVERY_BASE_NAMES = frozenset({"BECConnector", "BECWidget", "ViewBase"})
 
-def get_plugin_widgets() -> dict[str, BECConnector]:
+
+def get_plugin_widgets() -> dict[str, "BECConnector"]:
     """
     Get all available widgets from the plugin directory. Widgets are classes that inherit from BECConnector.
     The plugins are provided through python plugins and specified in the respective pyproject.toml file using
@@ -48,6 +49,8 @@ def get_plugin_widgets() -> dict[str, BECConnector]:
 
 
 def _filter_plugins(obj):
+    from bec_widgets.utils.bec_connector import BECConnector
+
     return inspect.isclass(obj) and issubclass(obj, BECConnector)
 
 
@@ -90,14 +93,20 @@ class BECClassInfo:
     name: str
     module: str
     file: str
-    obj: type[BECWidget]
+    obj: type["BECWidget"]
     is_connector: bool = False
     is_widget: bool = False
     is_plugin: bool = False
 
 
+@dataclass(frozen=True)
+class BECClassReference:
+    name: str
+    module: str
+
+
 class BECClassContainer:
-    def __init__(self, initial: Iterable[BECClassInfo] = []):
+    def __init__(self, initial: Iterable[BECClassInfo] = ()):
         self._collection: list[BECClassInfo] = list(initial)
 
     def __repr__(self):
@@ -109,12 +118,13 @@ class BECClassContainer:
     def __add__(self, other: BECClassContainer):
         return BECClassContainer((*self, *(c for c in other if c.name not in self.names)))
 
-    def as_dict(self, ignores: list[str] = []) -> dict[str, type[BECWidget]]:
+    def as_dict(self, ignores: list[str] | None = None) -> dict[str, type["BECWidget"]]:
         """get a dict of {name: Type} for all the entries in the collection.
 
         Args:
             ignores(list[str]): a list of class names to exclude from the dictionary."""
-        return {c.name: c.obj for c in self if c.name not in ignores}
+        ignore_set = set(ignores or ())
+        return {c.name: c.obj for c in self if c.name not in ignore_set}
 
     def add_class(self, class_info: BECClassInfo):
         """
@@ -166,48 +176,126 @@ class BECClassContainer:
         return [info.obj for info in self.collection]
 
 
-def _collect_classes_from_package(repo_name: str, package: str) -> BECClassContainer:
-    """Collect classes from a package subtree (for example ``widgets`` or ``applications``)."""
-    collection = BECClassContainer()
+def _ast_node_name(node: ast.expr) -> str | None:
+    if isinstance(node, ast.Name):
+        return node.id
+    if isinstance(node, ast.Attribute):
+        return node.attr
+    return None
+
+
+def _class_has_rpc_markers(node: ast.ClassDef) -> bool:
+    for stmt in node.body:
+        if isinstance(stmt, ast.Assign):
+            target_names = {target.id for target in stmt.targets if isinstance(target, ast.Name)}
+            if (
+                "PLUGIN" in target_names
+                and isinstance(stmt.value, ast.Constant)
+                and stmt.value.value
+            ):
+                return True
+            if {"RPC_CONTENT_CLASS", "USER_ACCESS"} & target_names:
+                return True
+        if isinstance(stmt, ast.AnnAssign) and isinstance(stmt.target, ast.Name):
+            if (
+                stmt.target.id == "PLUGIN"
+                and isinstance(stmt.value, ast.Constant)
+                and stmt.value.value
+            ):
+                return True
+            if stmt.target.id in {"RPC_CONTENT_CLASS", "USER_ACCESS"}:
+                return True
+    return False
+
+
+def _class_is_candidate(node: ast.ClassDef) -> bool:
+    base_names = {_ast_node_name(base) for base in node.bases}
+    return bool(_DISCOVERY_BASE_NAMES & base_names) or _class_has_rpc_markers(node)
+
+
+def _candidate_top_level_class_names(path: str) -> list[str]:
+    with open(path, encoding="utf-8") as file_handle:
+        module = ast.parse(file_handle.read(), filename=path)
+    return [
+        node.name
+        for node in module.body
+        if isinstance(node, ast.ClassDef) and _class_is_candidate(node)
+    ]
+
+
+def _iter_candidate_modules(repo_name: str, package: str) -> Iterable[tuple[str, str, list[str]]]:
     try:
         anchor_module = importlib.import_module(f"{repo_name}.{package}")
     except ModuleNotFoundError as exc:
-        # Some plugin repositories expose only one subtree. Skip gracefully if it does not exist.
         if exc.name == f"{repo_name}.{package}":
-            return collection
+            return ()
         raise
 
     directory = os.path.dirname(anchor_module.__file__)
-    for root, _, files in sorted(os.walk(directory)):
-        for file in files:
-            if not file.endswith(".py") or file.startswith("__"):
+    return (
+        (f"{repo_name}.{package}.{module_name}", path, class_names)
+        for root, _, files in sorted(os.walk(directory))
+        for file_name in sorted(files)
+        if file_name.endswith(".py")
+        and not file_name.startswith("__")
+        and not file_name.startswith("register_")
+        and not file_name.endswith("_plugin.py")
+        for path in (os.path.join(root, file_name),)
+        for rel_dir in (os.path.dirname(os.path.relpath(path, directory)),)
+        for module_name in (
+            [
+                (
+                    file_name.removesuffix(".py")
+                    if rel_dir in ("", ".")
+                    else ".".join(rel_dir.split(os.sep) + [file_name.removesuffix(".py")])
+                )
+            ]
+        )
+        for class_names in (_candidate_top_level_class_names(path),)
+        if class_names
+    )
+
+
+def _collect_classes_from_package(repo_name: str, package: str) -> BECClassContainer:
+    """Collect classes from a package subtree (for example ``widgets`` or ``applications``)."""
+    collection = BECClassContainer()
+    for module_name, path, _ in _iter_candidate_modules(repo_name, package):
+        from qtpy.QtWidgets import QWidget
+
+        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils.bec_widget import BECWidget
+
+        module = importlib.import_module(module_name)
+        for name, obj in inspect.getmembers(module, inspect.isclass):
+            if obj.__module__ != module.__name__:
                 continue
-
-            path = os.path.join(root, file)
-            rel_dir = os.path.dirname(os.path.relpath(path, directory))
-            if rel_dir in ("", "."):
-                module_name = file.split(".")[0]
-            else:
-                module_name = ".".join(rel_dir.split(os.sep) + [file.split(".")[0]])
-
-            module = importlib.import_module(f"{repo_name}.{package}.{module_name}")
-
-            for name in dir(module):
-                obj = getattr(module, name)
-                if not hasattr(obj, "__module__") or obj.__module__ != module.__name__:
-                    continue
-                if isinstance(obj, type):
-                    class_info = BECClassInfo(name=name, module=module.__name__, file=path, obj=obj)
-                    if issubclass(obj, BECConnector):
-                        class_info.is_connector = True
-                    if issubclass(obj, QWidget) or issubclass(obj, BECWidget):
-                        class_info.is_widget = True
-                    if hasattr(obj, "PLUGIN") and obj.PLUGIN:
-                        class_info.is_plugin = True
-                    collection.add_class(class_info)
+            class_info = BECClassInfo(name=name, module=module.__name__, file=path, obj=obj)
+            if issubclass(obj, BECConnector):
+                class_info.is_connector = True
+            if issubclass(obj, QWidget) or issubclass(obj, BECWidget):
+                class_info.is_widget = True
+            if hasattr(obj, "PLUGIN") and obj.PLUGIN:
+                class_info.is_plugin = True
+            collection.add_class(class_info)
     return collection
 
 
+def get_custom_class_references(
+    repo_name: str, packages: tuple[str, ...] | None = None
+) -> list[BECClassReference]:
+    selected_packages = packages or ("widgets",)
+    references: list[BECClassReference] = []
+    seen_names: set[str] = set()
+    for package in selected_packages:
+        for module_name, _, class_names in _iter_candidate_modules(repo_name, package):
+            for class_name in class_names:
+                if class_name in seen_names:
+                    continue
+                references.append(BECClassReference(name=class_name, module=module_name))
+                seen_names.add(class_name)
+    return references
+
+
 def get_custom_classes(
     repo_name: str, packages: tuple[str, ...] | None = None
 ) -> BECClassContainer:

bec_widgets/utils/rpc_server.py

@@ -15,8 +15,8 @@ from qtpy.QtWidgets import QWidget
 from redis.exceptions import RedisError
 
 from bec_widgets.cli.rpc.rpc_register import RPCRegister
-from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.utils.container_utils import WidgetContainerUtils
 from bec_widgets.utils.error_popups import ErrorPopupUtility
 from bec_widgets.utils.screen_utils import apply_window_geometry
@@ -25,7 +25,6 @@ from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
 
 if TYPE_CHECKING:  # pragma: no cover
     from bec_lib import messages
-    from qtpy.QtCore import QObject
 else:
     messages = lazy_import("bec_lib.messages")
 logger = bec_logger.logger

bec_widgets/utils/widget_io.py

@@ -26,7 +26,7 @@ from qtpy.QtWidgets import (
 from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch
 
 if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.utils import BECConnector
+    from bec_widgets.utils.bec_connector import BECConnector
 
 logger = bec_logger.logger
 
@@ -418,7 +418,7 @@ class WidgetHierarchy:
             only_bec_widgets(bool, optional): Whether to print only widgets that are instances of BECWidget.
             show_parent(bool, optional): Whether to display which BECWidget is the parent of each discovered BECWidget.
         """
-        from bec_widgets.utils import BECConnector
+        from bec_widgets.utils.bec_connector import BECConnector
         from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
         for node in WidgetHierarchy.iter_widget_tree(
@@ -468,7 +468,7 @@ class WidgetHierarchy:
 
         from qtpy.QtWidgets import QApplication
 
-        from bec_widgets.utils import BECConnector
+        from bec_widgets.utils.bec_connector import BECConnector
         from bec_widgets.widgets.plots.plot_base import PlotBase
 
         # 1) Gather ALL QWidget-based BECConnector objects
@@ -534,7 +534,7 @@ class WidgetHierarchy:
         Returns:
             The nearest ancestor that is a BECConnector, or None if not found.
         """
-        from bec_widgets.utils import BECConnector
+        from bec_widgets.utils.bec_connector import BECConnector
 
         # Guard against deleted/invalid Qt wrappers
         if not shb.isValid(widget):
@@ -636,7 +636,7 @@ class WidgetHierarchy:
         Return all BECConnector instances whose closest BECConnector ancestor is the given widget,
         including the widget itself if it is a BECConnector.
         """
-        from bec_widgets.utils import BECConnector
+        from bec_widgets.utils.bec_connector import BECConnector
 
         connectors: list[BECConnector] = []
         if isinstance(widget, BECConnector):
@@ -664,7 +664,7 @@ class WidgetHierarchy:
             return None
 
         try:
-            from bec_widgets.utils import BECConnector  # local import to avoid cycles
+            from bec_widgets.utils.bec_connector import BECConnector  # local import to avoid cycles
 
             is_bec_target = False
             if isinstance(ancestor_class, str):

bec_widgets/widgets/containers/dock_area/dock_area.py

@@ -21,7 +21,7 @@ import bec_widgets.widgets.containers.qt_ads as QtAds
 from bec_widgets import BECWidget, SafeProperty, SafeSlot
 from bec_widgets.applications.views.view import ViewTourSteps
 from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
-from bec_widgets.utils import BECDispatcher
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.rpc_decorator import rpc_timeout
 from bec_widgets.utils.toolbars.actions import (
@@ -68,8 +68,8 @@ from bec_widgets.widgets.containers.dock_area.toolbar_components.workspace_actio
 from bec_widgets.widgets.containers.main_window.main_window import BECMainWindowNoRPC
 from bec_widgets.widgets.containers.qt_ads import CDockWidget
 from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox, PositionerBox2D
-from bec_widgets.widgets.control.scan_control import ScanControl
-from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole, BECShell
+from bec_widgets.widgets.control.scan_control.scan_control import ScanControl
+from bec_widgets.widgets.editors.web_console.web_console import BECShell, WebConsole
 from bec_widgets.widgets.plots.heatmap.heatmap import Heatmap
 from bec_widgets.widgets.plots.image.image import Image
 from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
@@ -372,7 +372,7 @@ class BECDockArea(DockAreaWidget):
                 "Add Circular ProgressBar",
                 "RingProgressBar",
             ),
-            "terminal": (BecConsole.ICON_NAME, "Add Terminal", "BecConsole"),
+            "terminal": (WebConsole.ICON_NAME, "Add Terminal", "WebConsole"),
             "bec_shell": (BECShell.ICON_NAME, "Add BEC Shell", "BECShell"),
             "log_panel": (LogPanel.ICON_NAME, "Add LogPanel - Disabled", "LogPanel"),
             "sbb_monitor": ("train", "Add SBB Monitor", "SBBMonitor"),

bec_widgets/widgets/containers/main_window/addons/notification_center/notification_banner.py

@@ -28,7 +28,7 @@ from qtpy.QtCore import QObject, QTimer
 from qtpy.QtWidgets import QApplication, QFrame, QMainWindow, QScrollArea, QWidget
 
 from bec_widgets import SafeProperty, SafeSlot
-from bec_widgets.utils import BECConnector
+from bec_widgets.utils.bec_connector import BECConnector
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.widget_io import WidgetIO
 

bec_widgets/widgets/containers/main_window/main_window.py

@@ -18,10 +18,10 @@ from qtpy.QtWidgets import (
 )
 
 import bec_widgets
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeSlot
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.widgets.containers.main_window.addons.hover_widget import HoverWidget
 from bec_widgets.widgets.containers.main_window.addons.notification_center.notification_banner import (
     BECNotificationBroker,

bec_widgets/widgets/containers/qt_ads/__init__.py

@@ -1 +1,4 @@
 from PySide6QtAds import *
+
+CDockManager.setConfigFlag(CDockManager.eConfigFlag.FocusHighlighting, True)
+CDockManager.setConfigFlag(CDockManager.eConfigFlag.RetainTabSizeWhenCloseButtonHidden, True)

bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py

@@ -11,9 +11,9 @@ from qtpy.QtCore import Qt, Signal
 from qtpy.QtGui import QDoubleValidator
 from qtpy.QtWidgets import QDoubleSpinBox
 
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.colors import apply_theme, get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import (
     DeviceUpdateUIComponents,
     PositionerBoxBase,

bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py

@@ -12,9 +12,9 @@ from qtpy.QtCore import Signal
 from qtpy.QtGui import QDoubleValidator
 from qtpy.QtWidgets import QDoubleSpinBox
 
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import (
     DeviceUpdateUIComponents,
     PositionerBoxBase,

bec_widgets/widgets/control/device_input/base_classes/device_input_base.py

@@ -7,7 +7,7 @@ from bec_lib.device import Signal as BECSignal
 from bec_lib.logger import bec_logger
 from pydantic import field_validator
 
-from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.filter_io import FilterIO

bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py

@@ -3,7 +3,7 @@ from bec_lib.device import Signal
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Property
 
-from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.filter_io import FilterIO

bec_widgets/widgets/control/device_manager/__init__.py

@@ -1 +0,0 @@
-from .components import DeviceTable, DMConfigView, DocstringView, OphydValidation

bec_widgets/widgets/control/device_manager/components/__init__.py

@@ -1,5 +0,0 @@
-# from .device_table_view import DeviceTableView
-from .device_table.device_table import DeviceTable
-from .dm_config_view import DMConfigView
-from .dm_docstring_view import DocstringView, docstring_to_markdown
-from .ophyd_validation.ophyd_validation import OphydValidation

bec_widgets/widgets/control/device_manager/components/available_device_resources/__init__.py

@@ -1,3 +0,0 @@
-from .available_device_resources import AvailableDeviceResources
-
-__all__ = ["AvailableDeviceResources"]

bec_widgets/widgets/control/device_manager/components/device_table/device_table.py

@@ -22,7 +22,7 @@ from bec_widgets.utils.fuzzy_search import is_match
 from bec_widgets.widgets.control.device_manager.components.device_table.device_table_row import (
     DeviceTableRow,
 )
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
     ConfigStatus,
     ConnectionStatus,
     get_validation_icons,

bec_widgets/widgets/control/device_manager/components/device_table/device_table_row.py

@@ -2,7 +2,7 @@
 
 from bec_lib.atlas_models import Device as DeviceModel
 
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
     ConfigStatus,
     ConnectionStatus,
 )

bec_widgets/widgets/control/device_manager/components/ophyd_validation/__init__.py

@@ -1,8 +0,0 @@
-from .ophyd_validation_utils import (
-    ConfigStatus,
-    ConnectionStatus,
-    DeviceTestModel,
-    format_error_to_md,
-    get_validation_icons,
-)
-from .validation_list_item import ValidationButton, ValidationListItem

bec_widgets/widgets/control/device_manager/components/ophyd_validation/ophyd_validation.py

@@ -22,15 +22,17 @@ from bec_widgets.utils.bec_list import BECList
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
     ConfigStatus,
     ConnectionStatus,
     DeviceTestModel,
-    ValidationButton,
-    ValidationListItem,
     format_error_to_md,
     get_validation_icons,
 )
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.validation_list_item import (
+    ValidationButton,
+    ValidationListItem,
+)
 
 READY_TO_TEST = False
 

bec_widgets/widgets/control/device_manager/components/ophyd_validation/validation_list_item.py

@@ -7,7 +7,7 @@ from qtpy import QtCore, QtGui, QtWidgets
 
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
     ConfigStatus,
     ConnectionStatus,
     DeviceTestModel,

bec_widgets/widgets/control/scan_control/__init__.py

@@ -1 +0,0 @@
-from .scan_control import ScanControl

bec_widgets/widgets/control/scan_control/scan_control.py

@@ -19,7 +19,7 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
-from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import apply_theme, get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot

bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py

@@ -5,10 +5,10 @@ from bec_lib.logger import bec_logger
 from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QPushButton, QSizePolicy, QTreeWidgetItem, QVBoxLayout, QWidget
 
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
+from bec_widgets.utils.ui_loader import UILoader
 
 logger = bec_logger.logger
 

bec_widgets/widgets/editors/bec_console/bec_console.py

@@ -1,605 +0,0 @@
-from __future__ import annotations
-
-import enum
-from dataclasses import dataclass, field
-from uuid import uuid4
-from weakref import WeakValueDictionary
-
-import shiboken6
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import Qt, Signal
-from qtpy.QtGui import QMouseEvent
-from qtpy.QtWidgets import (
-    QApplication,
-    QHBoxLayout,
-    QLabel,
-    QStackedLayout,
-    QTabWidget,
-    QVBoxLayout,
-    QWidget,
-)
-
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.widgets.utility.bec_term.protocol import BecTerminal
-from bec_widgets.widgets.utility.bec_term.util import get_current_bec_term_class
-
-logger = bec_logger.logger
-
-_BecTermClass = get_current_bec_term_class()
-
-# Note on definitions:
-# Terminal: an instance of a terminal widget with a system shell
-# Console: one of possibly several widgets which may share ownership of one single terminal
-# Shell: a Console set to start the BEC IPython client in its terminal
-
-
-class ConsoleMode(str, enum.Enum):
-    ACTIVE = "active"
-    INACTIVE = "inactive"
-    HIDDEN = "hidden"
-
-
-@dataclass
-class _TerminalOwnerInfo:
-    """Should be managed only by the BecConsoleRegistry. Consoles should ask the registry for
-    necessary ownership info."""
-
-    owner_console_id: str | None = None
-    registered_console_ids: set[str] = field(default_factory=set)
-    instance: BecTerminal | None = None
-    terminal_id: str = ""
-    initialized: bool = False
-    persist_session: bool = False
-    fallback_holder: QWidget | None = None
-
-
-class BecConsoleRegistry:
-    """
-    A registry for the BecConsole class to manage its instances.
-    """
-
-    def __init__(self):
-        """
-        Initialize the registry.
-        """
-        self._consoles: WeakValueDictionary[str, BecConsole] = WeakValueDictionary()
-        self._terminal_registry: dict[str, _TerminalOwnerInfo] = {}
-
-    @staticmethod
-    def _is_valid_qobject(obj: object | None) -> bool:
-        return obj is not None and shiboken6.isValid(obj)
-
-    def _connect_app_cleanup(self) -> None:
-        app = QApplication.instance()
-        if app is None:
-            return
-        app.aboutToQuit.connect(self.clear, Qt.ConnectionType.UniqueConnection)
-
-    @staticmethod
-    def _new_terminal_info(console: BecConsole) -> _TerminalOwnerInfo:
-        term = _BecTermClass()
-        return _TerminalOwnerInfo(
-            registered_console_ids={console.console_id},
-            owner_console_id=console.console_id,
-            instance=term,
-            terminal_id=console.terminal_id,
-            persist_session=console.persist_terminal_session,
-        )
-
-    @staticmethod
-    def _replace_terminal(info: _TerminalOwnerInfo, console: BecConsole) -> None:
-        info.instance = _BecTermClass()
-        info.initialized = False
-        info.owner_console_id = console.console_id
-        info.registered_console_ids.add(console.console_id)
-        info.persist_session = info.persist_session or console.persist_terminal_session
-
-    def _delete_terminal_info(self, info: _TerminalOwnerInfo) -> None:
-        if self._is_valid_qobject(info.instance):
-            info.instance.deleteLater()  # type: ignore[union-attr]
-        info.instance = None
-        if self._is_valid_qobject(info.fallback_holder):
-            info.fallback_holder.deleteLater()
-        info.fallback_holder = None
-
-    def _parking_parent(
-        self,
-        info: _TerminalOwnerInfo,
-        console: BecConsole | None = None,
-        *,
-        avoid_console: bool = False,
-    ) -> QWidget | None:
-        for console_id in info.registered_console_ids:
-            candidate = self._consoles.get(console_id)
-            if candidate is None or candidate is console:
-                continue
-            if self._is_valid_qobject(candidate):
-                return candidate._term_holder
-
-        if console is None or not self._is_valid_qobject(console):
-            return None
-
-        window = console.window()
-        if window is not None and window is not console and self._is_valid_qobject(window):
-            return window
-
-        if not avoid_console:
-            return console._term_holder
-        return None
-
-    def _fallback_holder(
-        self,
-        info: _TerminalOwnerInfo,
-        console: BecConsole | None = None,
-        *,
-        avoid_console: bool = False,
-    ) -> QWidget:
-        if not self._is_valid_qobject(info.fallback_holder):
-            info.fallback_holder = QWidget(
-                parent=self._parking_parent(info, console, avoid_console=avoid_console)
-            )
-            info.fallback_holder.setObjectName(f"_bec_console_terminal_holder_{info.terminal_id}")
-            info.fallback_holder.hide()
-        return info.fallback_holder
-
-    def _park_terminal(
-        self,
-        info: _TerminalOwnerInfo,
-        console: BecConsole | None = None,
-        *,
-        avoid_console: bool = False,
-    ) -> None:
-        if not self._is_valid_qobject(info.instance):
-            return
-
-        parent = self._parking_parent(info, console, avoid_console=avoid_console)
-        if parent is None and info.persist_session:
-            parent = self._fallback_holder(info, console, avoid_console=avoid_console)
-
-        info.instance.hide()  # type: ignore[union-attr]
-        info.instance.setParent(parent)  # type: ignore[union-attr]
-
-    def clear(self) -> None:
-        """Delete every tracked terminal and holder."""
-        for info in list(self._terminal_registry.values()):
-            self._delete_terminal_info(info)
-        self._terminal_registry.clear()
-        self._consoles.clear()
-
-    def register(self, console: BecConsole):
-        """
-        Register an instance of BecConsole. If there is already a terminal with the associated
-        terminal_id, this does not automatically grant ownership.
-
-        Args:
-            console (BecConsole): The instance to register.
-        """
-        self._connect_app_cleanup()
-        self._consoles[console.console_id] = console
-        console_id, terminal_id = console.console_id, console.terminal_id
-        term_info = self._terminal_registry.get(terminal_id)
-        if term_info is None:
-            self._terminal_registry[terminal_id] = self._new_terminal_info(console)
-            return
-
-        term_info.persist_session = term_info.persist_session or console.persist_terminal_session
-        had_registered_consoles = bool(term_info.registered_console_ids)
-        term_info.registered_console_ids.add(console_id)
-        if not self._is_valid_qobject(term_info.instance):
-            self._replace_terminal(term_info, console)
-            return
-        if (
-            term_info.owner_console_id is not None
-            and term_info.owner_console_id not in self._consoles
-        ):
-            term_info.owner_console_id = None
-        if term_info.owner_console_id is None and not had_registered_consoles:
-            term_info.owner_console_id = console_id
-        logger.info(f"Registered new console {console_id} for terminal {terminal_id}")
-
-    def unregister(self, console: BecConsole):
-        """
-        Unregister an instance of BecConsole.
-
-        Args:
-            console (BecConsole): The instance to unregister.
-        """
-        console_id, terminal_id = console.console_id, console.terminal_id
-        if console_id in self._consoles:
-            del self._consoles[console_id]
-        if (term_info := self._terminal_registry.get(terminal_id)) is None:
-            return
-        detached = console._detach_terminal_widget(term_info.instance)
-        if console_id in term_info.registered_console_ids:
-            term_info.registered_console_ids.remove(console_id)
-        if term_info.owner_console_id == console_id:
-            term_info.owner_console_id = None
-        if not term_info.registered_console_ids:
-            if term_info.persist_session and self._is_valid_qobject(term_info.instance):
-                self._park_terminal(term_info, console, avoid_console=True)
-                logger.info(f"Unregistered console {console_id} for terminal {terminal_id}")
-                return
-
-            self._delete_terminal_info(term_info)
-            del self._terminal_registry[terminal_id]
-        elif detached:
-            self._park_terminal(term_info, console, avoid_console=True)
-
-        logger.info(f"Unregistered console {console_id} for terminal {terminal_id}")
-
-    def is_owner(self, console: BecConsole):
-        """Returns true if the given console is the owner of its terminal"""
-        if console not in self._consoles.values():
-            return False
-        if (info := self._terminal_registry.get(console.terminal_id)) is None:
-            logger.warning(f"Console {console.console_id} references an unknown terminal!")
-            return False
-        if not self._is_valid_qobject(info.instance):
-            return False
-        return info.owner_console_id == console.console_id
-
-    def take_ownership(self, console: BecConsole) -> BecTerminal | None:
-        """
-        Transfer ownership of a terminal to the given console.
-
-        Args:
-            console: the console which wishes to take ownership of its associated terminal.
-        Returns:
-            BecTerminal | None: The instance if ownership transfer was successful, None otherwise.
-        """
-        console_id, terminal_id = console.console_id, console.terminal_id
-
-        if terminal_id not in self._terminal_registry:
-            self.register(console)
-
-        instance_info = self._terminal_registry[terminal_id]
-        if not self._is_valid_qobject(instance_info.instance):
-            self._replace_terminal(instance_info, console)
-        if (old_owner_console_ide := instance_info.owner_console_id) is not None:
-            if (
-                old_owner_console_ide != console_id
-                and (old_owner := self._consoles.get(old_owner_console_ide)) is not None
-            ):
-                old_owner.yield_ownership()  # call this on the old owner to make sure it is updated
-        instance_info.owner_console_id = console_id
-        instance_info.registered_console_ids.add(console_id)
-        logger.info(f"Transferred ownership of terminal {terminal_id} to {console_id}")
-        return instance_info.instance
-
-    def try_get_term(self, console: BecConsole) -> BecTerminal | None:
-        """
-        Return the terminal instance if the requesting console is the owner
-
-        Args:
-            console: the requesting console.
-        Returns:
-            BecTerminal | None: The instance if the console is the owner, None otherwise.
-        """
-        console_id, terminal_id = console.console_id, console.terminal_id
-        logger.debug(f"checking term for {console_id}")
-        if terminal_id not in self._terminal_registry:
-            logger.warning(f"Terminal {terminal_id} not found in registry")
-            return None
-
-        instance_info = self._terminal_registry[terminal_id]
-        if not self._is_valid_qobject(instance_info.instance):
-            if instance_info.owner_console_id == console_id:
-                self._replace_terminal(instance_info, console)
-            else:
-                return None
-        if instance_info.owner_console_id == console_id:
-            return instance_info.instance
-
-    def yield_ownership(self, console: BecConsole):
-        """
-        Yield ownership of an instance without destroying it. The instance remains in the
-        registry with no owner, available for another widget to claim.
-
-        Args:
-            console (BecConsole): The console which wishes to yield ownership of its associated terminal.
-        """
-        console_id, terminal_id = console.console_id, console.terminal_id
-        logger.debug(f"Console {console_id} attempted to yield ownership")
-        if console_id not in self._consoles or terminal_id not in self._terminal_registry:
-            return
-
-        term_info = self._terminal_registry[terminal_id]
-        if term_info.owner_console_id != console_id:
-            logger.debug(f"But it was not the owner, which was {term_info.owner_console_id}!")
-            return
-        term_info.owner_console_id = None
-        console._detach_terminal_widget(term_info.instance)
-        self._park_terminal(term_info, console)
-
-    def should_initialize(self, console: BecConsole) -> bool:
-        """Return true if the console should send its startup command to the terminal."""
-        info = self._terminal_registry.get(console.terminal_id)
-        if info is None:
-            return False
-        return (
-            info.owner_console_id == console.console_id
-            and not info.initialized
-            and self._is_valid_qobject(info.instance)
-        )
-
-    def mark_initialized(self, console: BecConsole) -> None:
-        info = self._terminal_registry.get(console.terminal_id)
-        if info is not None and info.owner_console_id == console.console_id:
-            info.initialized = True
-
-    def owner_is_visible(self, term_id: str) -> bool:
-        """
-        Check if the owner of an instance is currently visible.
-
-        Args:
-            term_id (str): The terminal ID to check.
-        Returns:
-            bool: True if the owner is visible, False otherwise.
-        """
-        instance_info = self._terminal_registry.get(term_id)
-        if (
-            instance_info is None
-            or instance_info.owner_console_id is None
-            or not self._is_valid_qobject(instance_info.instance)
-        ):
-            return False
-
-        if (owner := self._consoles.get(instance_info.owner_console_id)) is None:
-            return False
-        return owner.isVisible()
-
-
-_bec_console_registry = BecConsoleRegistry()
-
-
-class _Overlay(QWidget):
-    def __init__(self, console: BecConsole):
-        super().__init__(parent=console)
-        self._console = console
-
-    def mousePressEvent(self, event: QMouseEvent) -> None:
-        if event.button() == Qt.MouseButton.LeftButton:
-            self._console.take_terminal_ownership()
-            event.accept()
-            return
-        return super().mousePressEvent(event)
-
-
-class BecConsole(BECWidget, QWidget):
-    """A console widget with access to a shared registry of terminals, such that instances can be moved around."""
-
-    _js_callback = Signal(bool)
-    initialized = Signal()
-
-    PLUGIN = True
-    ICON_NAME = "terminal"
-    persist_terminal_session = False
-
-    def __init__(
-        self,
-        parent=None,
-        config=None,
-        client=None,
-        gui_id=None,
-        startup_cmd: str | None = None,
-        terminal_id: str | None = None,
-        **kwargs,
-    ):
-        super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
-        self._mode = ConsoleMode.INACTIVE
-        self._startup_cmd = startup_cmd
-        self._is_initialized = False
-        self.terminal_id = terminal_id or str(uuid4())
-        self.console_id = self.gui_id
-        self.term: BecTerminal | None = None  # Will be set in _set_up_instance
-
-        self._set_up_instance()
-
-    def _set_up_instance(self):
-        """
-        Set up the web instance and UI elements.
-        """
-        self._stacked_layout = QStackedLayout()
-        # self._stacked_layout.setStackingMode(QStackedLayout.StackingMode.StackAll)
-        self._term_holder = QWidget()
-        self._term_layout = QVBoxLayout()
-        self._term_layout.setContentsMargins(0, 0, 0, 0)
-        self._term_holder.setLayout(self._term_layout)
-
-        self.setLayout(self._stacked_layout)
-
-        # prepare overlay
-        self._overlay = _Overlay(self)
-        layout = QVBoxLayout(self._overlay)
-        layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        label = QLabel("Click to activate terminal", self._overlay)
-        layout.addWidget(label)
-
-        self._stacked_layout.addWidget(self._term_holder)
-        self._stacked_layout.addWidget(self._overlay)
-
-        # will create a new terminal instance if there isn't already one for this ID
-        _bec_console_registry.register(self)
-        self._infer_mode()
-        self._ensure_startup_started()
-
-    def _infer_mode(self):
-        self.term = _bec_console_registry.try_get_term(self)
-        if self.term:
-            self._set_mode(ConsoleMode.ACTIVE)
-        elif self.isHidden():
-            self._set_mode(ConsoleMode.HIDDEN)
-        else:
-            self._set_mode(ConsoleMode.INACTIVE)
-
-    def _set_mode(self, mode: ConsoleMode):
-        """
-        Set the mode of the web console.
-
-        Args:
-            mode (ConsoleMode): The mode to set.
-        """
-
-        match mode:
-            case ConsoleMode.ACTIVE:
-                if self.term:
-                    if self._term_layout.indexOf(self.term) == -1:  # type: ignore[arg-type]
-                        self._term_layout.addWidget(self.term)  # type: ignore # BecTerminal is QWidget
-                    self.term.show()  # type: ignore[attr-defined]
-                    self._stacked_layout.setCurrentIndex(0)
-                    self._mode = mode
-                else:
-                    self._stacked_layout.setCurrentIndex(1)
-                    self._mode = ConsoleMode.INACTIVE
-            case ConsoleMode.INACTIVE:
-                self._stacked_layout.setCurrentIndex(1)
-                self._mode = mode
-            case ConsoleMode.HIDDEN:
-                self._stacked_layout.setCurrentIndex(1)
-                self._mode = mode
-
-    @property
-    def startup_cmd(self):
-        """
-        Get the startup command for the web console.
-        """
-        return self._startup_cmd
-
-    @startup_cmd.setter
-    def startup_cmd(self, cmd: str | None):
-        """
-        Set the startup command for the console.
-        """
-        self._startup_cmd = cmd
-
-    def write(self, data: str, send_return: bool = True):
-        """
-        Send data to the console
-
-        Args:
-            data (str): The data to send.
-            send_return (bool): Whether to send a return after the data.
-        """
-        if self.term:
-            self.term.write(data, send_return)
-
-    def _ensure_startup_started(self):
-        if not self.startup_cmd or not _bec_console_registry.should_initialize(self):
-            return
-        self.write(self.startup_cmd, True)
-        _bec_console_registry.mark_initialized(self)
-
-    def _detach_terminal_widget(self, term: BecTerminal | None) -> bool:
-        if term is None or not BecConsoleRegistry._is_valid_qobject(term):
-            if self.term is term:
-                self.term = None
-            return False
-
-        is_child = self.isAncestorOf(term)  # type: ignore[arg-type]
-        if self._term_layout.indexOf(term) != -1:  # type: ignore[arg-type]
-            self._term_layout.removeWidget(term)  # type: ignore[arg-type]
-            is_child = True
-        if is_child:
-            term.hide()  # type: ignore[attr-defined]
-            term.setParent(None)  # type: ignore[attr-defined]
-        if self.term is term:
-            self.term = None
-        return is_child
-
-    def take_terminal_ownership(self):
-        """
-        Take ownership of a web instance from the registry. This will transfer the instance
-        from its current owner (if any) to this widget.
-        """
-        # Get the instance from registry
-        self.term = _bec_console_registry.take_ownership(self)
-        self._infer_mode()
-        self._ensure_startup_started()
-        if self._mode == ConsoleMode.ACTIVE:
-            logger.debug(f"Widget {self.gui_id} took ownership of instance {self.terminal_id}")
-
-    def yield_ownership(self):
-        """
-        Yield ownership of the instance. The instance remains in the registry with no owner,
-        available for another widget to claim. This is automatically called when the
-        widget becomes hidden.
-        """
-        _bec_console_registry.yield_ownership(self)
-        self._infer_mode()
-        if self._mode != ConsoleMode.ACTIVE:
-            logger.debug(f"Widget {self.gui_id} yielded ownership of instance {self.terminal_id}")
-
-    def hideEvent(self, event):
-        """Called when the widget is hidden. Automatically yields ownership."""
-        self.yield_ownership()
-        super().hideEvent(event)
-
-    def showEvent(self, event):
-        """Called when the widget is shown. Updates UI state based on ownership."""
-        super().showEvent(event)
-        if not _bec_console_registry.is_owner(self):
-            if not _bec_console_registry.owner_is_visible(self.terminal_id):
-                self.take_terminal_ownership()
-
-    def cleanup(self):
-        """Unregister this console on destruction."""
-        _bec_console_registry.unregister(self)
-        super().cleanup()
-
-
-class BECShell(BecConsole):
-    """
-    A BecConsole pre-configured to run the BEC shell.
-    We cannot simply expose the web console properties to Qt as we need to have a deterministic
-    startup behavior for sharing the same shell instance across multiple widgets.
-    """
-
-    ICON_NAME = "hub"
-    persist_terminal_session = True
-
-    def __init__(self, parent=None, config=None, client=None, gui_id=None, **kwargs):
-        super().__init__(
-            parent=parent,
-            config=config,
-            client=client,
-            gui_id=gui_id,
-            terminal_id="bec_shell",
-            **kwargs,
-        )
-
-    @property
-    def startup_cmd(self):
-        """
-        Get the startup command for the BEC shell.
-        """
-        if self.bec_dispatcher.cli_server is None:
-            return "bec --nogui"
-        return f"bec --gui-id {self.bec_dispatcher.cli_server.gui_id}"
-
-    @startup_cmd.setter
-    def startup_cmd(self, cmd: str | None): ...
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    app = QApplication(sys.argv)
-    widget = QTabWidget()
-
-    # Create two consoles with different unique_ids
-    bec_console_1a = BecConsole(startup_cmd="htop", gui_id="console_1_a", terminal_id="terminal_1")
-    bec_console_1b = BecConsole(startup_cmd="htop", gui_id="console_1_b", terminal_id="terminal_1")
-    bec_console_1 = QWidget()
-    bec_console_1_layout = QHBoxLayout(bec_console_1)
-    bec_console_1_layout.addWidget(bec_console_1a)
-    bec_console_1_layout.addWidget(bec_console_1b)
-    bec_console2 = BECShell()
-    bec_console3 = BecConsole(gui_id="console_3", terminal_id="terminal_1")
-    widget.addTab(bec_console_1, "Console 1")
-    widget.addTab(bec_console2, "Console 2 - BEC Shell")
-    widget.addTab(bec_console3, "Console 3 -- mirror of Console 1")
-    widget.show()
-
-    widget.resize(800, 600)
-
-    sys.exit(app.exec_())

bec_widgets/widgets/editors/bec_console/bec_console.pyproject

@@ -1 +0,0 @@
-{'files': ['bec_console.py']}

bec_widgets/widgets/editors/bec_console/bec_shell.pyproject

@@ -1 +0,0 @@
-{'files': ['bec_console.py']}

bec_widgets/widgets/editors/jupyter_console/jupyter_console.py

@@ -1,10 +1,12 @@
-from bec_ipython_client.main import BECIPythonClient
+from bec_lib.utils.import_utils import lazy_import_from
 from qtconsole.inprocess import QtInProcessKernelManager
 from qtconsole.manager import QtKernelManager
 from qtconsole.rich_jupyter_widget import RichJupyterWidget
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QApplication, QMainWindow
 
+BECIPythonClient = lazy_import_from("bec_ipython_client.main", ("BECIPythonClient",))
+
 
 class BECJupyterConsole(RichJupyterWidget):  # pragma: no cover:
     def __init__(self, inprocess: bool = False):

bec_widgets/widgets/editors/monaco/scan_control_dialog.py

@@ -11,7 +11,7 @@ from bec_lib.logger import bec_logger
 from qtpy.QtCore import QSize, Qt
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QPushButton, QVBoxLayout
 
-from bec_widgets.widgets.control.scan_control import ScanControl
+from bec_widgets.widgets.control.scan_control.scan_control import ScanControl
 
 logger = bec_logger.logger
 

bec_widgets/widgets/editors/web_console/bec_shell.pyproject

@@ -0,0 +1 @@
+{'files': ['web_console.py']}

bec_widgets/widgets/editors/web_console/bec_shell_plugin.py

@@ -5,7 +5,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.editors.bec_console.bec_console import BECShell
+from bec_widgets.widgets.editors.web_console.web_console import BECShell
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/editors/web_console/register_bec_shell.py

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.editors.bec_console.bec_shell_plugin import BECShellPlugin
+    from bec_widgets.widgets.editors.web_console.bec_shell_plugin import BECShellPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(BECShellPlugin())
 

bec_widgets/widgets/editors/web_console/register_web_console.py

@@ -6,9 +6,9 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.editors.bec_console.bec_console_plugin import BecConsolePlugin
+    from bec_widgets.widgets.editors.web_console.web_console_plugin import WebConsolePlugin
 
-    QPyDesignerCustomWidgetCollection.addCustomWidget(BecConsolePlugin())
+    QPyDesignerCustomWidgetCollection.addCustomWidget(WebConsolePlugin())
 
 
 if __name__ == "__main__":  # pragma: no cover

bec_widgets/widgets/editors/web_console/web_console.py

@@ -0,0 +1,705 @@
+from __future__ import annotations
+
+import enum
+import json
+import secrets
+import subprocess
+import time
+
+from bec_lib.logger import bec_logger
+from louie.saferef import safe_ref
+from pydantic import BaseModel
+from qtpy.QtCore import Qt, QTimer, QUrl, Signal, qInstallMessageHandler
+from qtpy.QtGui import QMouseEvent, QResizeEvent
+from qtpy.QtWebEngineWidgets import QWebEnginePage, QWebEngineView
+from qtpy.QtWidgets import QApplication, QLabel, QTabWidget, QVBoxLayout, QWidget
+
+from bec_widgets.utils.bec_widget import BECWidget
+
+logger = bec_logger.logger
+
+
+class ConsoleMode(str, enum.Enum):
+    ACTIVE = "active"
+    INACTIVE = "inactive"
+    HIDDEN = "hidden"
+
+
+class PageOwnerInfo(BaseModel):
+    owner_gui_id: str | None = None
+    widget_ids: list[str] = []
+    page: QWebEnginePage | None = None
+    initialized: bool = False
+
+    model_config = {"arbitrary_types_allowed": True}
+
+
+class WebConsoleRegistry:
+    """
+    A registry for the WebConsole class to manage its instances.
+    """
+
+    def __init__(self):
+        """
+        Initialize the registry.
+        """
+        self._instances = {}
+        self._server_process = None
+        self._server_port = None
+        self._token = secrets.token_hex(16)
+        self._page_registry: dict[str, PageOwnerInfo] = {}
+
+    def register(self, instance: WebConsole):
+        """
+        Register an instance of WebConsole.
+
+        Args:
+            instance (WebConsole): The instance to register.
+        """
+        self._instances[instance.gui_id] = safe_ref(instance)
+        self.cleanup()
+
+        if instance._unique_id:
+            self._register_page(instance)
+
+        if self._server_process is None:
+            # Start the ttyd server if not already running
+            self.start_ttyd()
+
+    def start_ttyd(self, use_zsh: bool | None = None):
+        """
+        Start the ttyd server
+        ttyd -q -W -t 'theme={"background": "black"}' zsh
+
+        Args:
+            use_zsh (bool): Whether to use zsh or bash. If None, it will try to detect if zsh is available.
+        """
+
+        # First, check if ttyd is installed
+        try:
+            subprocess.run(["ttyd", "--version"], check=True, stdout=subprocess.PIPE)
+        except FileNotFoundError:
+            # pylint: disable=raise-missing-from
+            raise RuntimeError("ttyd is not installed. Please install it first.")
+
+        if use_zsh is None:
+            # Check if we can use zsh
+            try:
+                subprocess.run(["zsh", "--version"], check=True, stdout=subprocess.PIPE)
+                use_zsh = True
+            except FileNotFoundError:
+                use_zsh = False
+
+        command = [
+            "ttyd",
+            "-p",
+            "0",
+            "-W",
+            "-t",
+            'theme={"background": "black"}',
+            "-c",
+            f"user:{self._token}",
+        ]
+        if use_zsh:
+            command.append("zsh")
+        else:
+            command.append("bash")
+
+        # Start the ttyd server
+        self._server_process = subprocess.Popen(
+            command, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+
+        self._wait_for_server_port()
+
+        self._server_process.stdout.close()
+        self._server_process.stderr.close()
+
+    def _wait_for_server_port(self, timeout: float = 10):
+        """
+        Wait for the ttyd server to start and get the port number.
+
+        Args:
+            timeout (float): The timeout in seconds to wait for the server to start.
+        """
+        start_time = time.time()
+        while True:
+            output = self._server_process.stderr.readline()
+            if output == b"" and self._server_process.poll() is not None:
+                break
+            if not output:
+                continue
+
+            output = output.decode("utf-8").strip()
+            if "Listening on" in output:
+                # Extract the port number from the output
+                self._server_port = int(output.split(":")[-1])
+                logger.info(f"ttyd server started on port {self._server_port}")
+                break
+            if time.time() - start_time > timeout:
+                raise TimeoutError(
+                    "Timeout waiting for ttyd server to start. Please check if ttyd is installed and available in your PATH."
+                )
+
+    def cleanup(self):
+        """
+        Clean up the registry by removing any instances that are no longer valid.
+        """
+        for gui_id, weak_ref in list(self._instances.items()):
+            if weak_ref() is None:
+                del self._instances[gui_id]
+
+        if not self._instances and self._server_process:
+            # If no instances are left, terminate the server process
+            self._server_process.terminate()
+            self._server_process = None
+            self._server_port = None
+            logger.info("ttyd server terminated")
+
+    def unregister(self, instance: WebConsole):
+        """
+        Unregister an instance of WebConsole.
+
+        Args:
+            instance (WebConsole): The instance to unregister.
+        """
+        if instance.gui_id in self._instances:
+            del self._instances[instance.gui_id]
+
+        if instance._unique_id:
+            self._unregister_page(instance._unique_id, instance.gui_id)
+
+        self.cleanup()
+
+    def _register_page(self, instance: WebConsole):
+        """
+        Register a page in the registry. Please note that this does not transfer ownership
+        for already existing pages; it simply records which widget currently owns the page.
+        Use transfer_page_ownership to change ownership.
+
+        Args:
+            instance (WebConsole): The instance to register.
+        """
+
+        unique_id = instance._unique_id
+        gui_id = instance.gui_id
+
+        if unique_id is None:
+            return
+
+        if unique_id not in self._page_registry:
+            page = BECWebEnginePage()
+            page.authenticationRequired.connect(instance._authenticate)
+            self._page_registry[unique_id] = PageOwnerInfo(
+                owner_gui_id=gui_id, widget_ids=[gui_id], page=page
+            )
+            logger.info(f"Registered new page {unique_id} for {gui_id}")
+            return
+
+        if gui_id not in self._page_registry[unique_id].widget_ids:
+            self._page_registry[unique_id].widget_ids.append(gui_id)
+
+    def _unregister_page(self, unique_id: str, gui_id: str):
+        """
+        Unregister a page from the registry.
+
+        Args:
+            unique_id (str): The unique identifier for the page.
+            gui_id (str): The GUI ID of the widget.
+        """
+        if unique_id not in self._page_registry:
+            return
+        page_info = self._page_registry[unique_id]
+        if gui_id in page_info.widget_ids:
+            page_info.widget_ids.remove(gui_id)
+        if page_info.owner_gui_id == gui_id:
+            page_info.owner_gui_id = None
+        if not page_info.widget_ids:
+            if page_info.page:
+                page_info.page.deleteLater()
+            del self._page_registry[unique_id]
+
+        logger.info(f"Unregistered page {unique_id} for {gui_id}")
+
+    def get_page_info(self, unique_id: str) -> PageOwnerInfo | None:
+        """
+        Get a page from the registry.
+
+        Args:
+            unique_id (str): The unique identifier for the page.
+
+        Returns:
+            PageOwnerInfo | None: The page info if found, None otherwise.
+        """
+        if unique_id not in self._page_registry:
+            return None
+        return self._page_registry[unique_id]
+
+    def take_page_ownership(self, unique_id: str, new_owner_gui_id: str) -> QWebEnginePage | None:
+        """
+        Transfer ownership of a page to a new owner.
+
+        Args:
+            unique_id (str): The unique identifier for the page.
+            new_owner_gui_id (str): The GUI ID of the new owner.
+
+        Returns:
+            QWebEnginePage | None: The page if ownership transfer was successful, None otherwise.
+        """
+        if unique_id not in self._page_registry:
+            logger.warning(f"Page {unique_id} not found in registry")
+            return None
+
+        page_info = self._page_registry[unique_id]
+        old_owner_gui_id = page_info.owner_gui_id
+        if old_owner_gui_id:
+            old_owner_ref = self._instances.get(old_owner_gui_id)
+            if old_owner_ref:
+                old_owner_instance = old_owner_ref()
+                if old_owner_instance:
+                    old_owner_instance.yield_ownership()
+        page_info.owner_gui_id = new_owner_gui_id
+
+        logger.info(f"Transferred ownership of page {unique_id} to {new_owner_gui_id}")
+        return page_info.page
+
+    def yield_ownership(self, gui_id: str) -> bool:
+        """
+        Yield ownership of a page without destroying it. The page remains in the
+        registry with no owner, available for another widget to claim.
+
+        Args:
+            gui_id (str): The GUI ID of the widget yielding ownership.
+
+        Returns:
+            bool: True if ownership was yielded, False otherwise.
+        """
+        if gui_id not in self._instances:
+            return False
+
+        instance = self._instances[gui_id]()
+        if instance is None:
+            return False
+
+        unique_id = instance._unique_id
+        if unique_id is None:
+            return False
+
+        if unique_id not in self._page_registry:
+            return False
+
+        page_owner_info = self._page_registry[unique_id]
+        if page_owner_info.owner_gui_id != gui_id:
+            return False
+
+        page_owner_info.owner_gui_id = None
+        return True
+
+    def owner_is_visible(self, unique_id: str) -> bool:
+        """
+        Check if the owner of a page is currently visible.
+
+        Args:
+            unique_id (str): The unique identifier for the page.
+        Returns:
+            bool: True if the owner is visible, False otherwise.
+        """
+        page_info = self.get_page_info(unique_id)
+        if page_info is None or page_info.owner_gui_id is None:
+            return False
+
+        owner_ref = self._instances.get(page_info.owner_gui_id)
+        if owner_ref is None:
+            return False
+
+        owner_instance = owner_ref()
+        if owner_instance is None:
+            return False
+
+        return owner_instance.isVisible()
+
+
+_web_console_registry = WebConsoleRegistry()
+
+
+def suppress_qt_messages(type_, context, msg):
+    if context.category in ["js", "default"]:
+        return
+    print(msg)
+
+
+qInstallMessageHandler(suppress_qt_messages)
+
+
+class BECWebEnginePage(QWebEnginePage):
+    def javaScriptConsoleMessage(self, level, message, lineNumber, sourceID):
+        logger.info(f"[JS Console] {level.name} at line {lineNumber} in {sourceID}: {message}")
+
+
+class WebConsole(BECWidget, QWidget):
+    """
+    A simple widget to display a website
+    """
+
+    _js_callback = Signal(bool)
+    initialized = Signal()
+
+    PLUGIN = True
+    ICON_NAME = "terminal"
+
+    def __init__(
+        self,
+        parent=None,
+        config=None,
+        client=None,
+        gui_id=None,
+        startup_cmd: str | None = None,
+        is_bec_shell: bool = False,
+        unique_id: str | None = None,
+        **kwargs,
+    ):
+        super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
+        self._mode = ConsoleMode.INACTIVE
+        self._is_bec_shell = is_bec_shell
+        self._startup_cmd = startup_cmd
+        self._is_initialized = False
+        self._unique_id = unique_id
+        self.page = None  # Will be set in _set_up_page
+
+        self._startup_timer = QTimer()
+        self._startup_timer.setInterval(500)
+        self._startup_timer.timeout.connect(self._check_page_ready)
+        self._startup_timer.start()
+        self._js_callback.connect(self._on_js_callback)
+
+        self._set_up_page()
+
+    def _set_up_page(self):
+        """
+        Set up the web page and UI elements.
+        """
+        layout = QVBoxLayout()
+        layout.setContentsMargins(0, 0, 0, 0)
+        self.browser = QWebEngineView(self)
+
+        layout.addWidget(self.browser)
+        self.setLayout(layout)
+
+        # prepare overlay
+        self.overlay = QWidget(self)
+        layout = QVBoxLayout(self.overlay)
+        layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        label = QLabel("Click to activate terminal", self.overlay)
+        layout.addWidget(label)
+        self.overlay.hide()
+
+        _web_console_registry.register(self)
+        self._token = _web_console_registry._token
+
+        # If no unique_id is provided, create a new page
+        if not self._unique_id:
+            self.page = BECWebEnginePage(self)
+            self.page.authenticationRequired.connect(self._authenticate)
+            self.page.setUrl(QUrl(f"http://localhost:{_web_console_registry._server_port}"))
+            self.browser.setPage(self.page)
+            self._set_mode(ConsoleMode.ACTIVE)
+            return
+
+        # Try to get the page from the registry
+        page_info = _web_console_registry.get_page_info(self._unique_id)
+        if page_info and page_info.page:
+            self.page = page_info.page
+            if not page_info.owner_gui_id or page_info.owner_gui_id == self.gui_id:
+                self.browser.setPage(self.page)
+            # Only set URL if this is a newly created page (no URL set yet)
+            if self.page.url().isEmpty():
+                self.page.setUrl(QUrl(f"http://localhost:{_web_console_registry._server_port}"))
+            else:
+                # We have an existing page, so we don't need the startup timer
+                self._startup_timer.stop()
+            if page_info.owner_gui_id != self.gui_id:
+                self._set_mode(ConsoleMode.INACTIVE)
+            else:
+                self._set_mode(ConsoleMode.ACTIVE)
+
+    def _set_mode(self, mode: ConsoleMode):
+        """
+        Set the mode of the web console.
+
+        Args:
+            mode (ConsoleMode): The mode to set.
+        """
+        if not self._unique_id:
+            # For non-unique_id consoles, always active
+            mode = ConsoleMode.ACTIVE
+
+        self._mode = mode
+        match mode:
+            case ConsoleMode.ACTIVE:
+                self.browser.setVisible(True)
+                self.overlay.hide()
+            case ConsoleMode.INACTIVE:
+                self.browser.setVisible(False)
+                self.overlay.show()
+            case ConsoleMode.HIDDEN:
+                self.browser.setVisible(False)
+                self.overlay.hide()
+
+    def _check_page_ready(self):
+        """
+        Check if the page is ready and stop the timer if it is.
+        """
+        if not self.page or self.page.isLoading():
+            return
+
+        self.page.runJavaScript("window.term !== undefined", self._js_callback.emit)
+
+    def _on_js_callback(self, ready: bool):
+        """
+        Callback for when the JavaScript is ready.
+        """
+        if not ready:
+            return
+        self._is_initialized = True
+        self._startup_timer.stop()
+        if self.startup_cmd:
+            if self._unique_id:
+                page_info = _web_console_registry.get_page_info(self._unique_id)
+                if page_info is None:
+                    return
+                if not page_info.initialized:
+                    page_info.initialized = True
+                    self.write(self.startup_cmd)
+            else:
+                self.write(self.startup_cmd)
+        self.initialized.emit()
+
+    @property
+    def startup_cmd(self):
+        """
+        Get the startup command for the web console.
+        """
+        if self._is_bec_shell:
+            if self.bec_dispatcher.cli_server is None:
+                return "bec --nogui"
+            return f"bec --gui-id {self.bec_dispatcher.cli_server.gui_id}"
+        return self._startup_cmd
+
+    @startup_cmd.setter
+    def startup_cmd(self, cmd: str):
+        """
+        Set the startup command for the web console.
+        """
+        if not isinstance(cmd, str):
+            raise ValueError("Startup command must be a string.")
+        self._startup_cmd = cmd
+
+    def write(self, data: str, send_return: bool = True):
+        """
+        Send data to the web page
+
+        Args:
+            data (str): The data to send.
+            send_return (bool): Whether to send a return after the data.
+        """
+        cmd = f"window.term.paste({json.dumps(data)});"
+        if self.page is None:
+            logger.warning("Cannot write to web console: page is not initialized.")
+            return
+        self.page.runJavaScript(cmd)
+        if send_return:
+            self.send_return()
+
+    def take_page_ownership(self, unique_id: str | None = None):
+        """
+        Take ownership of a web page from the registry. This will transfer the page
+        from its current owner (if any) to this widget.
+
+        Args:
+            unique_id (str): The unique identifier of the page to take ownership of.
+                           If None, uses this widget's unique_id.
+        """
+        if unique_id is None:
+            unique_id = self._unique_id
+
+        if not unique_id:
+            logger.warning("Cannot take page ownership without a unique_id")
+            return
+
+        # Get the page from registry
+        page = _web_console_registry.take_page_ownership(unique_id, self.gui_id)
+
+        if not page:
+            logger.warning(f"Page {unique_id} not found in registry")
+            return
+
+        self.page = page
+        self.browser.setPage(page)
+        self._set_mode(ConsoleMode.ACTIVE)
+        logger.info(f"Widget {self.gui_id} took ownership of page {unique_id}")
+
+    def _on_ownership_lost(self):
+        """
+        Called when this widget loses ownership of its page.
+        Displays the overlay and hides the browser.
+        """
+        self._set_mode(ConsoleMode.INACTIVE)
+        logger.info(f"Widget {self.gui_id} lost ownership of page {self._unique_id}")
+
+    def yield_ownership(self):
+        """
+        Yield ownership of the page. The page remains in the registry with no owner,
+        available for another widget to claim. This is automatically called when the
+        widget becomes hidden.
+        """
+        if not self._unique_id:
+            return
+        success = _web_console_registry.yield_ownership(self.gui_id)
+        if success:
+            self._on_ownership_lost()
+            logger.info(f"Widget {self.gui_id} yielded ownership of page {self._unique_id}")
+
+    def has_ownership(self) -> bool:
+        """
+        Check if this widget currently has ownership of a page.
+
+        Returns:
+            bool: True if this widget owns a page, False otherwise.
+        """
+        if not self._unique_id:
+            return False
+        page_info = _web_console_registry.get_page_info(self._unique_id)
+        if page_info is None:
+            return False
+        return page_info.owner_gui_id == self.gui_id
+
+    def hideEvent(self, event):
+        """
+        Called when the widget is hidden. Automatically yields ownership.
+        """
+        if self.has_ownership():
+            self.yield_ownership()
+        self._set_mode(ConsoleMode.HIDDEN)
+        super().hideEvent(event)
+
+    def showEvent(self, event):
+        """
+        Called when the widget is shown. Updates UI state based on ownership.
+        """
+        super().showEvent(event)
+        if self._unique_id and not self.has_ownership():
+            # Take ownership if the page does not have an owner or
+            # the owner is not visible
+            page_info = _web_console_registry.get_page_info(self._unique_id)
+            if page_info is None:
+                self._set_mode(ConsoleMode.INACTIVE)
+                return
+            if page_info.owner_gui_id is None or not _web_console_registry.owner_is_visible(
+                self._unique_id
+            ):
+                self.take_page_ownership(self._unique_id)
+                return
+            if page_info.owner_gui_id != self.gui_id:
+                self._set_mode(ConsoleMode.INACTIVE)
+                return
+
+    def resizeEvent(self, event: QResizeEvent) -> None:
+        super().resizeEvent(event)
+        self.overlay.resize(event.size())
+
+    def mousePressEvent(self, event: QMouseEvent) -> None:
+        if event.button() == Qt.MouseButton.LeftButton and not self.has_ownership():
+            self.take_page_ownership(self._unique_id)
+            event.accept()
+            return
+        return super().mousePressEvent(event)
+
+    def _authenticate(self, _, auth):
+        """
+        Authenticate the request with the provided username and password.
+        """
+        auth.setUser("user")
+        auth.setPassword(self._token)
+
+    def send_return(self):
+        """
+        Send return to the web page
+        """
+        self.page.runJavaScript(
+            "document.querySelector('textarea.xterm-helper-textarea').dispatchEvent(new KeyboardEvent('keypress', {charCode: 13}))"
+        )
+
+    def send_ctrl_c(self):
+        """
+        Send Ctrl+C to the web page
+        """
+        self.page.runJavaScript(
+            "document.querySelector('textarea.xterm-helper-textarea').dispatchEvent(new KeyboardEvent('keypress', {charCode: 3}))"
+        )
+
+    def set_readonly(self, readonly: bool):
+        """
+        Set the web console to read-only mode.
+        """
+        if not isinstance(readonly, bool):
+            raise ValueError("Readonly must be a boolean.")
+        self.setEnabled(not readonly)
+
+    def cleanup(self):
+        """
+        Clean up the registry by removing any instances that are no longer valid.
+        """
+        self._startup_timer.stop()
+        _web_console_registry.unregister(self)
+        super().cleanup()
+
+
+class BECShell(WebConsole):
+    """
+    A WebConsole pre-configured to run the BEC shell.
+    We cannot simply expose the web console properties to Qt as we need to have a deterministic
+    startup behavior for sharing the same shell instance across multiple widgets.
+    """
+
+    ICON_NAME = "hub"
+
+    def __init__(self, parent=None, config=None, client=None, gui_id=None, **kwargs):
+        super().__init__(
+            parent=parent,
+            config=config,
+            client=client,
+            gui_id=gui_id,
+            is_bec_shell=True,
+            unique_id="bec_shell",
+            **kwargs,
+        )
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    app = QApplication(sys.argv)
+    widget = QTabWidget()
+
+    # Create two consoles with different unique_ids
+    web_console1 = WebConsole(startup_cmd="bec --nogui", unique_id="console1")
+    web_console2 = WebConsole(startup_cmd="htop")
+    web_console3 = WebConsole(startup_cmd="bec --nogui", unique_id="console1")
+    widget.addTab(web_console1, "Console 1")
+    widget.addTab(web_console2, "Console 2")
+    widget.addTab(web_console3, "Console 3 -- mirror of Console 1")
+    widget.show()
+
+    # Demonstrate page sharing:
+    # After initialization, web_console2 can take ownership of console1's page:
+    # web_console2.take_page_ownership("console1")
+
+    widget.resize(800, 600)
+
+    def _close_cons1():
+        web_console2.close()
+        web_console2.deleteLater()
+
+    # QTimer.singleShot(3000, _close_cons1)
+
+    sys.exit(app.exec_())

bec_widgets/widgets/editors/web_console/web_console.pyproject

@@ -0,0 +1 @@
+{'files': ['web_console.py']}

bec_widgets/widgets/editors/web_console/web_console_plugin.py

@@ -5,17 +5,17 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole
+from bec_widgets.widgets.editors.web_console.web_console import WebConsole
 
 DOM_XML = """
 <ui language='c++'>
-    <widget class='BecConsole' name='bec_console'>
+    <widget class='WebConsole' name='web_console'>
     </widget>
 </ui>
 """
 
 
-class BecConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+class WebConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
         super().__init__()
         self._form_editor = None
@@ -23,20 +23,20 @@ class BecConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def createWidget(self, parent):
         if parent is None:
             return QWidget()
-        t = BecConsole(parent)
+        t = WebConsole(parent)
         return t
 
     def domXml(self):
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Developer"
 
     def icon(self):
-        return designer_material_icon(BecConsole.ICON_NAME)
+        return designer_material_icon(WebConsole.ICON_NAME)
 
     def includeFile(self):
-        return "bec_console"
+        return "web_console"
 
     def initialize(self, form_editor):
         self._form_editor = form_editor
@@ -48,10 +48,10 @@ class BecConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return self._form_editor is not None
 
     def name(self):
-        return "BecConsole"
+        return "WebConsole"
 
     def toolTip(self):
-        return "A console widget with access to a shared registry of terminals, such that instances can be moved around."
+        return ""
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/plots/heatmap/heatmap.py

@@ -19,8 +19,8 @@ from scipy.interpolate import (
 from scipy.spatial import cKDTree
 from toolz import partition
 
-from bec_widgets.utils import Colors
 from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.actions import MaterialIconAction

bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py

@@ -4,9 +4,9 @@ import os
 
 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout
 
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader
 
 
 class HeatmapSettings(SettingWidget):

bec_widgets/widgets/plots/image/image.py

@@ -10,7 +10,7 @@ from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import QTimer
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.colors import Colors, apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.widgets.plots.image.image_base import ImageBase

bec_widgets/widgets/plots/image/image_base.py

@@ -9,7 +9,7 @@ from pydantic import BaseModel, ConfigDict, Field, ValidationError
 from qtpy.QtCore import QPointF, Signal, SignalInstance
 from qtpy.QtWidgets import QDialog, QVBoxLayout
 
-from bec_widgets.utils import Colors
+from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.container_utils import WidgetContainerUtils
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.side_panel import SidePanel

bec_widgets/widgets/plots/image/image_item.py

@@ -9,7 +9,8 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Signal
 from qtpy.QtGui import QTransform
 
-from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils.colors import Colors
 from bec_widgets.widgets.plots.image.image_processor import (
     ImageProcessor,
     ImageStats,

bec_widgets/widgets/plots/image/setting_widgets/image_roi_tree.py

@@ -20,7 +20,8 @@ from qtpy.QtWidgets import (
 )
 
 from bec_widgets import BECWidget
-from bec_widgets.utils import BECDispatcher, ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.utils.toolbars.actions import WidgetAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction, ModularToolBar

bec_widgets/widgets/plots/motor_map/motor_map.py

@@ -10,8 +10,8 @@ from qtpy.QtCore import Signal
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QHBoxLayout, QMainWindow, QWidget
 
-from bec_widgets.utils import Colors, ConnectionConfig
-from bec_widgets.utils.colors import apply_theme
+from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.colors import Colors, apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction

bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py

@@ -2,9 +2,9 @@ import os
 
 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget
 
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.utils.widget_io import WidgetIO
 
 

bec_widgets/widgets/plots/multi_waveform/multi_waveform.py

@@ -10,7 +10,8 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.utils import Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.side_panel import SidePanel
 from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox

bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py

@@ -2,9 +2,9 @@ import os
 
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.utils.widget_io import WidgetIO
 
 

bec_widgets/widgets/plots/plot_base.py

@@ -8,8 +8,10 @@ from bec_lib import bec_logger
 from qtpy.QtCore import QPoint, QPointF, Qt, Signal
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QMainWindow, QVBoxLayout, QWidget
 
-from bec_widgets.utils import ConnectionConfig, Crosshair, EntryValidator
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.crosshair import Crosshair
+from bec_widgets.utils.entry_validator import EntryValidator
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.fps_counter import FPSCounter
 from bec_widgets.utils.plot_indicator_items import BECArrowItem, BECTickItem

bec_widgets/widgets/plots/roi/image_roi.py

@@ -10,7 +10,7 @@ from qtpy import QtCore
 from qtpy.QtCore import QObject, Signal
 
 from bec_widgets import SafeProperty
-from bec_widgets.utils import BECConnector, ConnectionConfig
+from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
 from bec_widgets.utils.colors import Colors
 
 if TYPE_CHECKING:

bec_widgets/widgets/plots/scatter_waveform/scatter_curve.py

@@ -8,7 +8,8 @@ from bec_lib import bec_logger
 from pydantic import BaseModel, Field, ValidationError, field_validator
 from qtpy import QtCore
 
-from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils.colors import Colors
 
 if TYPE_CHECKING:  # pragma: no cover
     from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform

bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py

@@ -7,7 +7,8 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import QTimer, Signal
 from qtpy.QtWidgets import QHBoxLayout, QMainWindow, QWidget
 
-from bec_widgets.utils import Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction

bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py

@@ -2,9 +2,9 @@ import os
 
 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout
 
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader
 
 
 class ScatterCurveSettings(SettingWidget):

bec_widgets/widgets/plots/setting_menus/axis_settings.py

@@ -2,9 +2,9 @@ import os
 
 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget
 
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.utils.widget_io import WidgetIO
 
 

bec_widgets/widgets/plots/waveform/curve.py

@@ -8,7 +8,8 @@ from bec_lib import bec_logger
 from pydantic import BaseModel, Field, field_validator
 from qtpy import QtCore
 
-from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils.colors import Colors
 
 if TYPE_CHECKING:  # pragma: no cover
     from bec_widgets.widgets.plots.waveform.waveform import Waveform

bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py

@@ -50,9 +50,10 @@ from qtpy.QtWidgets import (
 )
 
 from bec_widgets import SafeSlot
-from bec_widgets.utils import ConnectionConfig, EntryValidator
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import Colors
+from bec_widgets.utils.entry_validator import EntryValidator
 from bec_widgets.utils.toolbars.actions import WidgetAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction, ModularToolBar

bec_widgets/widgets/plots/waveform/waveform.py

@@ -25,7 +25,7 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
-from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_signal_proxy import BECSignalProxy
 from bec_widgets.utils.colors import Colors, apply_theme
 from bec_widgets.utils.container_utils import WidgetContainerUtils

bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar.py

@@ -6,8 +6,8 @@ from bec_lib.logger import bec_logger
 from qtpy.QtCore import QPointF, QSize, Qt
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget
 
-from bec_widgets.utils import Colors
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.error_popups import SafeProperty
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.actions import MaterialIconAction

bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py

@@ -19,9 +19,9 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.widgets.progress.ring_progress_bar.ring import Ring
 from bec_widgets.widgets.utility.visual.colormap_widget.colormap_widget import BECColorMapWidget
 

bec_widgets/widgets/services/device_browser/device_browser.py

@@ -17,10 +17,10 @@ from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.list_of_expandable_frames import ListOfExpandableFrames
 from bec_widgets.utils.ui_loader import UILoader
-from bec_widgets.widgets.services.device_browser.device_item import DeviceItem
 from bec_widgets.widgets.services.device_browser.device_item.device_config_dialog import (
     DirectUpdateDeviceConfigDialog,
 )
+from bec_widgets.widgets.services.device_browser.device_item.device_item import DeviceItem
 from bec_widgets.widgets.services.device_browser.util import map_device_type_to_icon
 
 logger = bec_logger.logger

bec_widgets/widgets/services/device_browser/device_item/__init__.py

@@ -1 +0,0 @@
-from .device_item import DeviceItem

bec_widgets/widgets/services/scan_history_browser/components/__init__.py

@@ -1,5 +0,0 @@
-from .scan_history_device_viewer import ScanHistoryDeviceViewer
-from .scan_history_metadata_viewer import ScanHistoryMetadataViewer
-from .scan_history_view import ScanHistoryView
-
-__all__ = ["ScanHistoryDeviceViewer", "ScanHistoryMetadataViewer", "ScanHistoryView"]

bec_widgets/widgets/services/scan_history_browser/components/scan_history_view.py

@@ -330,8 +330,10 @@ class ScanHistoryView(BECWidget, QtWidgets.QTreeWidget):
 if __name__ == "__main__":  # pragma: no cover
     # pylint: disable=import-outside-toplevel
 
-    from bec_widgets.widgets.services.scan_history_browser.components import (
+    from bec_widgets.widgets.services.scan_history_browser.components.scan_history_device_viewer import (
         ScanHistoryDeviceViewer,
+    )
+    from bec_widgets.widgets.services.scan_history_browser.components.scan_history_metadata_viewer import (
         ScanHistoryMetadataViewer,
     )
     from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton

bec_widgets/widgets/services/scan_history_browser/scan_history_browser.py

@@ -1,9 +1,13 @@
 from qtpy import QtCore, QtWidgets
 
 from bec_widgets.utils.bec_widget import BECWidget, ConnectionConfig
-from bec_widgets.widgets.services.scan_history_browser.components import (
+from bec_widgets.widgets.services.scan_history_browser.components.scan_history_device_viewer import (
     ScanHistoryDeviceViewer,
+)
+from bec_widgets.widgets.services.scan_history_browser.components.scan_history_metadata_viewer import (
     ScanHistoryMetadataViewer,
+)
+from bec_widgets.widgets.services.scan_history_browser.components.scan_history_view import (
     ScanHistoryView,
 )
 

bec_widgets/widgets/utility/bec_term/__init__.py

@@ -1,11 +0,0 @@
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from pyside6_qtermwidget import QTermWidget  # pylint: disable=ungrouped-imports
-    from qtpy.QtWidgets import QApplication  # pylint: disable=ungrouped-imports
-
-    app = QApplication(sys.argv)
-    widget = QTermWidget()
-
-    widget.show()
-    sys.exit(app.exec())

bec_widgets/widgets/utility/bec_term/protocol.py

@@ -1,8 +0,0 @@
-from typing import Protocol, runtime_checkable
-
-
-@runtime_checkable
-class BecTerminal(Protocol):
-    """Implementors of this protocol must also be subclasses of QWidget"""
-
-    def write(self, text: str, add_newline: bool = True): ...

bec_widgets/widgets/utility/bec_term/qtermwidget_wrapper.py

@@ -1,241 +0,0 @@
-"""A wrapper for the optional external dependency pyside6_qtermwidget.
-Simply displays a message in a QLabel if the dependency is not installed."""
-
-import os
-from functools import wraps
-from typing import Sequence
-
-from qtpy.QtCore import QIODevice, QPoint, QSize, QUrl, Signal  # type: ignore
-from qtpy.QtGui import QAction, QFont, QKeyEvent, QResizeEvent, Qt  # type: ignore
-from qtpy.QtWidgets import QLabel, QVBoxLayout, QWidget
-
-try:
-    from pyside6_qtermwidget import QTermWidget
-except ImportError:
-    QTermWidget = None
-
-
-def _forward(func):
-    """Apply to a private method to forward the call to the method on QTermWidget with the same name,
-    (with leading '_' removed) if it is defined, otherwise do nothing."""
-
-    @wraps(func)
-    def wrapper(self, *args, **kwargs):
-        target = getattr(self, "_main_widget")
-        if QTermWidget:
-            method = getattr(target, func.__name__[1:])
-            return method(*args, **kwargs)
-        else:
-            ...
-
-    return wrapper
-
-
-class BecQTerm(QWidget):
-    activity = Signal()
-    bell = Signal(str)
-    copy_available = Signal(bool)
-    current_directory_changed = Signal(str)
-    finished = Signal()
-    profile_changed = Signal(str)
-    received_data = Signal(str)
-    silence = Signal()
-    term_got_focus = Signal()
-    term_key_pressed = Signal(QKeyEvent)
-    term_lost_focus = Signal()
-    title_changed = Signal()
-    url_activated = Signal(QUrl, bool)
-
-    def __init__(self, /, parent: QWidget | None = None, **kwargs) -> None:
-        super().__init__(parent)
-        self._layout = QVBoxLayout()
-        self.setLayout(self._layout)
-        if QTermWidget:
-            self._main_widget = QTermWidget(parent=self)
-            self._main_widget.activity.connect(self.activity)
-            self._main_widget.bell.connect(self.bell)
-            self._main_widget.copyAvailable.connect(self.copy_available)
-            self._main_widget.currentDirectoryChanged.connect(self.current_directory_changed)
-            self._main_widget.finished.connect(self.finished)
-            self._main_widget.profileChanged.connect(self.profile_changed)
-            self._main_widget.receivedData.connect(self.received_data)
-            self._main_widget.silence.connect(self.silence)
-            self._main_widget.termGetFocus.connect(self.term_got_focus)
-            self._main_widget.termKeyPressed.connect(self.term_key_pressed)
-            self._main_widget.termLostFocus.connect(self.term_lost_focus)
-            self._main_widget.titleChanged.connect(self.title_changed)
-            self._main_widget.urlActivated.connect(self.url_activated)
-            self._setEnvironment([f"{k}={v}" for k, v in os.environ.items()])
-            self._setColorScheme("Solarized")
-        else:
-            self._layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
-            self._main_widget = QLabel("pyside6_qterminal is not installed!")
-
-        self._layout.addWidget(self._main_widget)
-
-    def write(self, text: str, add_newline: bool = True):
-        if add_newline:
-            text += "\n"
-        self._sendText(text)
-
-    # automatically forwarded to the widget only if it exists
-    @_forward
-    def _addCustomColorSchemeDir(self, custom_dir: str, /) -> None: ...
-    @_forward
-    def _autoHideMouseAfter(self, delay: int, /) -> None: ...
-    @_forward
-    def _availableColorSchemes(self) -> list[str]: ...
-    @_forward
-    def _availableKeyBindings(self) -> list[str]: ...
-    @_forward
-    def _bracketText(self, text: str, /) -> None: ...
-    @_forward
-    def _bracketedPasteModeIsDisabled(self, /) -> bool: ...
-    @_forward
-    def _changeDir(self, dir: str, /) -> None: ...
-    @_forward
-    def _clear(self, /) -> None: ...
-    @_forward
-    def _clearCustomKeyBindingsDir(self, /) -> None: ...
-    @_forward
-    def _copyClipboard(self, /) -> None: ...
-    @_forward
-    def _disableBracketedPasteMode(self, disable: bool, /) -> None: ...
-    @_forward
-    def _filterActions(self, position: QPoint, /) -> list[QAction]: ...
-    @_forward
-    def _flowControlEnabled(self, /) -> bool: ...
-    @_forward
-    def _getAvailableColorSchemes(self, /) -> list[str]: ...
-    @_forward
-    def _getForegroundProcessId(self, /) -> int: ...
-    @_forward
-    def _getMargin(self, /) -> int: ...
-    @_forward
-    def _getPtySlaveFd(self, /) -> int: ...
-    @_forward
-    def _getSelectionEnd(self, row: int, column: int, /) -> None: ...
-    @_forward
-    def _getSelectionStart(self, row: int, column: int, /) -> None: ...
-    @_forward
-    def _getShellPID(self, /) -> int: ...
-    @_forward
-    def _getTerminalFont(self, /) -> QFont: ...
-    @_forward
-    def _historyLinesCount(self, /) -> int: ...
-    @_forward
-    def _historySize(self, /) -> int: ...
-    @_forward
-    def _icon(self, /) -> str: ...
-    @_forward
-    def _isBidiEnabled(self, /) -> bool: ...
-    @_forward
-    def _isTitleChanged(self, /) -> bool: ...
-    @_forward
-    def _keyBindings(self, /) -> str: ...
-    @_forward
-    def _pasteClipboard(self, /) -> None: ...
-    @_forward
-    def _pasteSelection(self, /) -> None: ...
-    @_forward
-    def _resizeEvent(self, arg__1: QResizeEvent, /) -> None: ...
-    @_forward
-    def _saveHistory(self, device: QIODevice, /) -> None: ...
-    @_forward
-    def _screenColumnsCount(self, /) -> int: ...
-    @_forward
-    def _screenLinesCount(self, /) -> int: ...
-    @_forward
-    def _scrollToEnd(self, /) -> None: ...
-    @_forward
-    def _selectedText(self, /, preserveLineBreaks: bool = ...) -> str: ...
-    @_forward
-    def _selectionChanged(self, textSelected: bool, /) -> None: ...
-    @_forward
-    def _sendKeyEvent(self, e: QKeyEvent, /) -> None: ...
-    @_forward
-    def _sendText(self, text: str, /) -> None: ...
-    @_forward
-    def _sessionFinished(self, /) -> None: ...
-    @_forward
-    def _setArgs(self, args: Sequence[str], /) -> None: ...
-    @_forward
-    def _setAutoClose(self, arg__1: bool, /) -> None: ...
-    @_forward
-    def _setBidiEnabled(self, enabled: bool, /) -> None: ...
-    @_forward
-    def _setBlinkingCursor(self, blink: bool, /) -> None: ...
-    @_forward
-    def _setBoldIntense(self, boldIntense: bool, /) -> None: ...
-    @_forward
-    def _setColorScheme(self, name: str, /) -> None: ...
-    @_forward
-    def _setConfirmMultilinePaste(self, confirmMultilinePaste: bool, /) -> None: ...
-    @_forward
-    def _setCustomKeyBindingsDir(self, custom_dir: str, /) -> None: ...
-    @_forward
-    def _setDrawLineChars(self, drawLineChars: bool, /) -> None: ...
-    @_forward
-    def _setEnvironment(self, environment: Sequence[str], /) -> None: ...
-    @_forward
-    def _setFlowControlEnabled(self, enabled: bool, /) -> None: ...
-    @_forward
-    def _setFlowControlWarningEnabled(self, enabled: bool, /) -> None: ...
-    @_forward
-    def _setHistorySize(self, lines: int, /) -> None: ...
-    @_forward
-    def _setKeyBindings(self, kb: str, /) -> None: ...
-    @_forward
-    def _setMargin(self, arg__1: int, /) -> None: ...
-    @_forward
-    def _setMonitorActivity(self, arg__1: bool, /) -> None: ...
-    @_forward
-    def _setMonitorSilence(self, arg__1: bool, /) -> None: ...
-    @_forward
-    def _setMotionAfterPasting(self, arg__1: int, /) -> None: ...
-    @_forward
-    def _setSelectionEnd(self, row: int, column: int, /) -> None: ...
-    @_forward
-    def _setSelectionStart(self, row: int, column: int, /) -> None: ...
-    @_forward
-    def _setShellProgram(self, program: str, /) -> None: ...
-    @_forward
-    def _setSilenceTimeout(self, seconds: int, /) -> None: ...
-    @_forward
-    def _setSize(self, arg__1: QSize, /) -> None: ...
-    @_forward
-    def _setTerminalBackgroundImage(self, backgroundImage: str, /) -> None: ...
-    @_forward
-    def _setTerminalBackgroundMode(self, mode: int, /) -> None: ...
-    @_forward
-    def _setTerminalFont(self, font: QFont | str | Sequence[str], /) -> None: ...
-    @_forward
-    def _setTerminalOpacity(self, level: float, /) -> None: ...
-    @_forward
-    def _setTerminalSizeHint(self, enabled: bool, /) -> None: ...
-    @_forward
-    def _setTrimPastedTrailingNewlines(self, trimPastedTrailingNewlines: bool, /) -> None: ...
-    @_forward
-    def _setWordCharacters(self, chars: str, /) -> None: ...
-    @_forward
-    def _setWorkingDirectory(self, dir: str, /) -> None: ...
-    @_forward
-    def _sizeHint(self, /) -> QSize: ...
-    @_forward
-    def _startShellProgram(self, /) -> None: ...
-    @_forward
-    def _startTerminalTeletype(self, /) -> None: ...
-    @_forward
-    def _terminalSizeHint(self, /) -> bool: ...
-    @_forward
-    def _title(self, /) -> str: ...
-    @_forward
-    def _toggleShowSearchBar(self, /) -> None: ...
-    @_forward
-    def _wordCharacters(self, /) -> str: ...
-    @_forward
-    def _workingDirectory(self, /) -> str: ...
-    @_forward
-    def _zoomIn(self, /) -> None: ...
-    @_forward
-    def _zoomOut(self, /) -> None: ...

bec_widgets/widgets/utility/bec_term/util.py

@@ -1,6 +0,0 @@
-from bec_widgets.widgets.utility.bec_term.protocol import BecTerminal
-from bec_widgets.widgets.utility.bec_term.qtermwidget_wrapper import BecQTerm
-
-
-def get_current_bec_term_class() -> type[BecTerminal]:
-    return BecQTerm

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

@@ -3,8 +3,7 @@ from qtpy import QtCore, QtGui
 from qtpy.QtCore import Property, Signal, Slot
 from qtpy.QtWidgets import QSizePolicy, QVBoxLayout, QWidget
 
-from bec_widgets.utils import Colors
-from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.colors import Colors
 
 
 class RoundedColorMapButton(ColorMapButton):

bec_widgets/widgets/utility/widget_hierarchy_tree/widget_hierarchy_tree.py

@@ -19,7 +19,7 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
-from bec_widgets.utils import BECConnector
+from bec_widgets.utils.bec_connector import BECConnector
 from bec_widgets.utils.widget_highlighter import WidgetHighlighter
 from bec_widgets.utils.widget_io import WidgetHierarchy
 

pyproject.toml

@@ -1,34 +1,54 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
 [project]
 name = "bec_widgets"
-version = "3.5.0"
+version = "3.4.2"
 description = "BEC Widgets"
 requires-python = ">=3.11"
 classifiers = [
-  "Development Status :: 3 - Alpha",
-  "Programming Language :: Python :: 3",
-  "Topic :: Scientific/Engineering",
+    "Development Status :: 3 - Alpha",
+    "Programming Language :: Python :: 3",
+    "Topic :: Scientific/Engineering",
 ]
 dependencies = [
-  "PyJWT~=2.9",
-  "PySide6==6.9.0",
-  "PySide6-QtAds==4.4.0",
-  "bec_ipython_client~=3.107,>=3.107.2",  # needed for jupyter console
-  "bec_lib~=3.107,>=3.107.2",
-  "bec_qthemes~=1.0, >=1.3.4",
-  "black>=26,<27",  # needed for bw-generate-cli
-  "copier~=9.7",
-  "darkdetect~=0.8",
-  "isort>=5.13, <9.0",  # needed for bw-generate-cli
-  "markdown~=3.9",
-  "ophyd_devices~=1.29, >=1.29.1",
-  "pydantic~=2.0",
-  "pylsp-bec~=1.2",
-  "pyqtgraph==0.13.7",
-  "qtconsole~=5.5, >=5.5.1",  # needed for jupyter console
-  "qtmonaco~=0.8, >=0.8.1",
-  "qtpy~=2.4",
-  "thefuzz~=0.22",
-  "typer~=0.15",
+    "bec_ipython_client~=3.107,>=3.107.2",     # needed for jupyter console
+    "bec_lib~=3.107,>=3.107.2",
+    "bec_qthemes~=1.0, >=1.3.4",
+    "black>=26,<27",                 # needed for bw-generate-cli
+    "isort>=5.13, <9.0",             # needed for bw-generate-cli
+    "ophyd_devices~=1.29, >=1.29.1",
+    "pydantic~=2.0",
+    "pyqtgraph==0.13.7",
+    "PySide6==6.9.0",
+    "qtconsole~=5.5, >=5.5.1",       # needed for jupyter console
+    "qtpy~=2.4",
+    "thefuzz~=0.22",
+    "qtmonaco~=0.8, >=0.8.1",
+    "darkdetect~=0.8",
+    "PySide6-QtAds==4.4.0",
+    "pylsp-bec~=1.2",
+    "copier~=9.7",
+    "typer~=0.15",
+    "markdown~=3.9",
+    "PyJWT~=2.9",
+]
+
+
+[project.optional-dependencies]
+dev = [
+    "coverage~=7.0",
+    "fakeredis~=2.23, >=2.23.2",
+    "pytest-bec-e2e>=2.21.4, <=4.0",
+    "pytest-qt~=4.4",
+    "pytest-random-order~=1.1",
+    "pytest-timeout~=2.2",
+    "pytest-xvfb~=3.0",
+    "pytest~=8.0",
+    "pytest-cov~=6.1.1",
+    "watchdog~=6.0",
+    "pre_commit~=4.2",
 ]
 
 [project.urls]
@@ -36,47 +56,10 @@ dependencies = [
 Homepage = "https://gitlab.psi.ch/bec/bec_widgets"
 
 [project.scripts]
-bec-app = "bec_widgets.applications.main_app:main"
-bec-designer = "bec_widgets.utils.bec_designer:main"
-bec-gui-server = "bec_widgets.cli.server:main"
 bw-generate-cli = "bec_widgets.cli.generate_cli:main"
-
-[project.optional-dependencies]
-dev = [
-  "coverage~=7.0",
-  "fakeredis~=2.23, >=2.23.2",
-  "pytest-bec-e2e>=2.21.4, <=4.0",
-  "pytest-qt~=4.4",
-  "pytest-random-order~=1.1",
-  "pytest-timeout~=2.2",
-  "pytest-xvfb~=3.0",
-  "pytest~=8.0",
-  "pytest-cov~=6.1.1",
-  "watchdog~=6.0",
-  "pre_commit~=4.2",
-]
-qtermwidget = [
-  "pyside6_qtermwidget",
-]
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.black]
-line-length = 100
-skip-magic-trailing-comma = true
-
-[tool.coverage.report]
-skip_empty = true  # exclude empty *files*, e.g. __init__.py, from the report
-exclude_lines = [
-  "pragma: no cover",
-  "if TYPE_CHECKING:",
-  "return NotImplemented",
-  "raise NotImplementedError",
-  "\\.\\.\\.",
-  'if __name__ == "__main__":',
-]
+bec-gui-server = "bec_widgets.cli.server:main"
+bec-designer = "bec_widgets.utils.bec_designer:main"
+bec-app = "bec_widgets.applications.main_app:main"
 
 [tool.hatch.build.targets.wheel]
 include = ["*"]
@@ -86,6 +69,10 @@ exclude = ["docs/**", "tests/**"]
 include = ["*"]
 exclude = ["docs/**", "tests/**"]
 
+[tool.black]
+line-length = 100
+skip-magic-trailing-comma = true
+
 [tool.isort]
 profile = "black"
 line_length = 100
@@ -93,12 +80,6 @@ multi_line_output = 3
 include_trailing_comma = true
 known_first_party = ["bec_widgets"]
 
-[tool.ruff]
-line-length = 100
-
-[tool.ruff.format]
-skip-magic-trailing-comma = true
-
 [tool.semantic_release]
 build_command = "pip install build wheel && python -m build"
 version_toml = ["pyproject.toml:project.version"]
@@ -109,16 +90,16 @@ default = "semantic-release <semantic-release>"
 
 [tool.semantic_release.commit_parser_options]
 allowed_tags = [
-  "build",
-  "chore",
-  "ci",
-  "docs",
-  "feat",
-  "fix",
-  "perf",
-  "style",
-  "refactor",
-  "test",
+    "build",
+    "chore",
+    "ci",
+    "docs",
+    "feat",
+    "fix",
+    "perf",
+    "style",
+    "refactor",
+    "test",
 ]
 minor_tags = ["feat"]
 patch_tags = ["fix", "perf"]
@@ -135,3 +116,14 @@ env = "GH_TOKEN"
 [tool.semantic_release.publish]
 dist_glob_patterns = ["dist/*"]
 upload_to_vcs_release = true
+
+[tool.coverage.report]
+skip_empty = true # exclude empty *files*, e.g. __init__.py, from the report
+exclude_lines = [
+    "pragma: no cover",
+    "if TYPE_CHECKING:",
+    "return NotImplemented",
+    "raise NotImplementedError",
+    "\\.\\.\\.",
+    'if __name__ == "__main__":',
+]

tests/end-2-end/conftest.py

@@ -5,7 +5,7 @@ import random
 import pytest
 
 from bec_widgets.cli.client_utils import BECGuiClient
-from bec_widgets.widgets.control.scan_control import ScanControl
+from bec_widgets.widgets.control.scan_control.scan_control import ScanControl
 
 # pylint: disable=unused-argument
 # pylint: disable=redefined-outer-name

tests/end-2-end/test_bec_dock_rpc_e2e.py

@@ -1,7 +1,6 @@
 import pytest
 
 from bec_widgets.cli.client import Image, MotorMap, Waveform
-from bec_widgets.cli.client_utils import BECGuiClient
 from bec_widgets.cli.rpc.rpc_base import RPCReference
 
 # pylint: disable=unused-argument
@@ -123,7 +122,7 @@ def test_ring_bar(qtbot, connected_client_gui_obj):
     assert gui._ipython_registry[bar._gui_id].__class__.__name__ == "RingProgressBar"
 
 
-def test_rpc_gui_obj(connected_client_gui_obj: BECGuiClient, qtbot):
+def test_rpc_gui_obj(connected_client_gui_obj, qtbot):
     gui = connected_client_gui_obj
 
     qtbot.waitUntil(lambda: len(gui.windows) == 1, timeout=3000)

tests/end-2-end/test_rpc_widgets_e2e.py

@@ -93,8 +93,8 @@ def test_available_widgets(qtbot, connected_client_gui_obj):
         if object_name == "BECShell":
             continue
 
-        # Skip BecConsole as ttyd is not installed
-        if object_name == "BecConsole":
+        # Skip WebConsole as ttyd is not installed
+        if object_name == "WebConsole":
             continue
 
         #############################

tests/end-2-end/test_with_plugins_e2e.py

@@ -10,7 +10,7 @@ except ImportError:
 from qtpy.QtWidgets import QGridLayout
 
 from bec_widgets.utils.widget_io import WidgetIO
-from bec_widgets.widgets.control.scan_control import ScanControl
+from bec_widgets.widgets.control.scan_control.scan_control import ScanControl
 
 
 @pytest.fixture(scope="function")

tests/unit_tests/conftest.py

@@ -1,8 +1,3 @@
-# Force ophyd onto its dummy control layer in tests so importing it does not
-# try to create a real EPICS CA context.
-import os
-
-os.environ.setdefault("OPHYD_CONTROL_LAYER", "dummy")
 import json
 import time
 from unittest import mock
@@ -18,7 +13,7 @@ from bec_lib.client import BECClient
 from bec_lib.messages import _StoredDataInfo
 from bec_qthemes import apply_theme
 from bec_qthemes._theme import Theme
-from ophyd._dummy_shim import _dispatcher
+from ophyd._pyepics_shim import _dispatcher
 from pytestqt.exceptions import TimeoutError as QtBotTimeoutError
 from qtpy.QtCore import QEvent, QEventLoop
 from qtpy.QtWidgets import QApplication, QMessageBox

tests/unit_tests/test_bec_connector.py

@@ -5,7 +5,7 @@ import pytest
 from qtpy.QtCore import QObject
 from qtpy.QtWidgets import QApplication, QWidget
 
-from bec_widgets.utils import BECConnector
+from bec_widgets.utils.bec_connector import BECConnector
 from bec_widgets.utils.error_popups import SafeProperty
 from bec_widgets.utils.error_popups import SafeSlot as Slot
 

tests/unit_tests/test_bec_console.py

@@ -1,252 +0,0 @@
-from unittest import mock
-
-import pytest
-import shiboken6
-from qtpy.QtCore import QEvent, QEventLoop, Qt
-from qtpy.QtGui import QHideEvent, QShowEvent
-from qtpy.QtTest import QTest
-from qtpy.QtWidgets import QApplication, QWidget
-
-import bec_widgets.widgets.editors.bec_console.bec_console as bec_console_module
-from bec_widgets.widgets.editors.bec_console.bec_console import (
-    BecConsole,
-    BECShell,
-    ConsoleMode,
-    _bec_console_registry,
-)
-
-from .client_mocks import mocked_client
-
-
-def process_deferred_deletes():
-    app = QApplication.instance()
-    app.sendPostedEvents(None, QEvent.DeferredDelete)
-    app.processEvents(QEventLoop.AllEvents)
-
-
-@pytest.fixture(autouse=True)
-def clean_bec_console_registry():
-    _bec_console_registry.clear()
-    yield
-    _bec_console_registry.clear()
-    process_deferred_deletes()
-
-
-@pytest.fixture
-def console_widget(qtbot):
-    """Create a BecConsole widget."""
-    widget = BecConsole(client=mocked_client, gui_id="test_console", terminal_id="test_terminal")
-    qtbot.addWidget(widget)
-    return widget
-
-
-@pytest.fixture
-def two_console_widgets_same_terminal(qtbot):
-    widget1 = BecConsole(client=mocked_client, gui_id="console_1", terminal_id="shared_terminal")
-    widget2 = BecConsole(client=mocked_client, gui_id="console_2", terminal_id="shared_terminal")
-    qtbot.addWidget(widget1)
-    qtbot.addWidget(widget2)
-    return widget1, widget2
-
-
-def test_bec_console_initialization(console_widget: BecConsole):
-    assert console_widget.console_id == "test_console"
-    assert console_widget.terminal_id == "test_terminal"
-    assert console_widget._mode == ConsoleMode.ACTIVE
-    assert console_widget.term is not None
-    assert console_widget._overlay.isHidden()
-    console_widget.show()
-    assert console_widget.isVisible()
-    assert _bec_console_registry.owner_is_visible(console_widget.terminal_id)
-
-
-def test_bec_console_yield_terminal_ownership(console_widget):
-    console_widget.show()
-    console_widget.take_terminal_ownership()
-    console_widget.yield_ownership()
-    assert console_widget.term is None
-    assert console_widget._mode == ConsoleMode.INACTIVE
-
-
-def test_bec_console_hide_event_yields_ownership(console_widget):
-    console_widget.take_terminal_ownership()
-    console_widget.hideEvent(QHideEvent())
-    assert console_widget.term is None
-    assert console_widget._mode == ConsoleMode.HIDDEN
-
-
-def test_bec_console_show_event_takes_ownership(console_widget):
-    console_widget.yield_ownership()
-    console_widget.showEvent(QShowEvent())
-    assert console_widget.term is not None
-    assert console_widget._mode == ConsoleMode.ACTIVE
-
-
-def test_bec_console_overlay_click_takes_ownership(qtbot, console_widget):
-    console_widget.yield_ownership()
-    assert console_widget._mode == ConsoleMode.HIDDEN
-
-    QTest.mouseClick(console_widget._overlay, Qt.LeftButton)
-    assert console_widget.term is not None
-    assert console_widget._mode == ConsoleMode.ACTIVE
-    assert not console_widget._overlay.isVisible()
-
-
-def test_two_consoles_shared_terminal(two_console_widgets_same_terminal):
-    widget1, widget2 = two_console_widgets_same_terminal
-
-    # Widget1 takes ownership
-    widget1.take_terminal_ownership()
-    assert widget1.term is not None
-    assert widget1._mode == ConsoleMode.ACTIVE
-    assert widget2.term is None
-    assert widget2._mode == ConsoleMode.HIDDEN
-
-    # Widget2 takes ownership
-    widget2.take_terminal_ownership()
-    assert widget2.term is not None
-    assert widget2._mode == ConsoleMode.ACTIVE
-    assert widget1.term is None
-    assert widget1._mode == ConsoleMode.HIDDEN
-
-
-def test_bec_console_registry_cleanup(console_widget: BecConsole):
-    console_widget.take_terminal_ownership()
-    terminal_id = console_widget.terminal_id
-
-    assert terminal_id in _bec_console_registry._terminal_registry
-    _bec_console_registry.unregister(console_widget)
-    assert terminal_id not in _bec_console_registry._terminal_registry
-
-
-def test_bec_shell_initialization(qtbot):
-    widget = BECShell(gui_id="bec_shell")
-    qtbot.addWidget(widget)
-
-    assert widget.console_id == "bec_shell"
-    assert widget.terminal_id == "bec_shell"
-    assert widget.startup_cmd is not None
-
-
-def test_bec_console_write(console_widget):
-    console_widget.take_terminal_ownership()
-    with mock.patch.object(console_widget.term, "write") as mock_write:
-        console_widget.write("test command")
-        mock_write.assert_called_once_with("test command", True)
-
-
-def test_is_owner(console_widget: BecConsole):
-    assert _bec_console_registry.is_owner(console_widget)
-    mock_console = mock.MagicMock()
-    mock_console.console_id = "fake_console"
-    _bec_console_registry._consoles["fake_console"] = mock_console
-    assert not _bec_console_registry.is_owner(mock_console)
-    mock_console.terminal_id = console_widget.terminal_id
-    assert not _bec_console_registry.is_owner(mock_console)
-
-
-def test_closing_active_console_keeps_terminal_valid_for_remaining_console(qtbot):
-    widget1 = BecConsole(client=mocked_client, gui_id="close_owner", terminal_id="shared_close")
-    widget2 = BecConsole(client=mocked_client, gui_id="remaining", terminal_id="shared_close")
-    qtbot.addWidget(widget2)
-
-    widget1.take_terminal_ownership()
-    term = widget1.term
-    assert term is not None
-
-    widget1.close()
-    widget1.deleteLater()
-    process_deferred_deletes()
-
-    assert shiboken6.isValid(term)
-    widget2.take_terminal_ownership()
-
-    assert widget2.term is term
-    assert widget2._mode == ConsoleMode.ACTIVE
-
-
-def test_active_console_detaches_terminal_before_destruction(qtbot):
-    widget1 = BecConsole(client=mocked_client, gui_id="owner", terminal_id="shared_detach")
-    widget2 = BecConsole(client=mocked_client, gui_id="survivor", terminal_id="shared_detach")
-    qtbot.addWidget(widget1)
-    qtbot.addWidget(widget2)
-
-    widget1.take_terminal_ownership()
-    term = widget1.term
-    assert term is not None
-    assert widget1.isAncestorOf(term)
-
-    widget1.close()
-
-    assert shiboken6.isValid(term)
-    assert not widget1.isAncestorOf(term)
-    assert term.parent() is widget2._term_holder
-
-
-def test_bec_shell_terminal_persists_after_last_shell_unregisters(qtbot):
-    shell = BECShell(gui_id="bec_shell_persistent")
-    qtbot.addWidget(shell)
-    term = shell.term
-    assert term is not None
-
-    _bec_console_registry.unregister(shell)
-
-    info = _bec_console_registry._terminal_registry["bec_shell"]
-    assert info.registered_console_ids == set()
-    assert info.owner_console_id is None
-    assert info.persist_session is True
-    assert info.instance is term
-    assert shiboken6.isValid(term)
-
-
-def test_new_bec_shell_claims_preserved_terminal(qtbot):
-    shell1 = BECShell(gui_id="bec_shell_first")
-    term = shell1.term
-    assert term is not None
-
-    shell1.close()
-    shell1.deleteLater()
-    process_deferred_deletes()
-
-    assert "bec_shell" in _bec_console_registry._terminal_registry
-    assert shiboken6.isValid(term)
-
-    shell2 = BECShell(gui_id="bec_shell_second")
-    qtbot.addWidget(shell2)
-    shell2.showEvent(QShowEvent())
-
-    assert shell2.term is term
-    assert shell2._mode == ConsoleMode.ACTIVE
-
-
-def test_persistent_bec_shell_sends_startup_command_once(qtbot, monkeypatch):
-    class RecordingTerminal(QWidget):
-        writes = []
-
-        def write(self, text: str, add_newline: bool = True):
-            self.writes.append((text, add_newline))
-
-    monkeypatch.setattr(bec_console_module, "_BecTermClass", RecordingTerminal)
-
-    shell1 = BECShell(gui_id="bec_shell_startup_first")
-    shell1.close()
-    shell1.deleteLater()
-    process_deferred_deletes()
-
-    shell2 = BECShell(gui_id="bec_shell_startup_second")
-    qtbot.addWidget(shell2)
-    shell2.showEvent(QShowEvent())
-
-    assert len(RecordingTerminal.writes) == 1
-    assert RecordingTerminal.writes[0][0].startswith("bec ")
-    assert RecordingTerminal.writes[0][1] is True
-
-
-def test_plain_console_terminal_removed_after_last_unregister(qtbot):
-    widget = BecConsole(client=mocked_client, gui_id="plain_console", terminal_id="plain_terminal")
-    qtbot.addWidget(widget)
-
-    assert "plain_terminal" in _bec_console_registry._terminal_registry
-    _bec_console_registry.unregister(widget)
-
-    assert "plain_terminal" not in _bec_console_registry._terminal_registry

tests/unit_tests/test_color_utils.py

@@ -4,12 +4,13 @@ from pydantic import ValidationError
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
-from bec_widgets.utils import Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import apply_theme
+from bec_widgets.utils.colors import Colors, apply_theme
 from bec_widgets.widgets.plots.waveform.curve import CurveConfig
-from tests.unit_tests.client_mocks import mocked_client
-from tests.unit_tests.conftest import create_widget
+
+from .client_mocks import mocked_client
+from .conftest import create_widget
 
 
 def test_color_validation_CSS():

tests/unit_tests/test_crosshair.py

@@ -4,11 +4,11 @@ import pytest
 from qtpy.QtCore import QPointF, Qt
 from qtpy.QtGui import QTransform
 
-from bec_widgets.utils import Crosshair
+from bec_widgets.utils.crosshair import Crosshair
 from bec_widgets.widgets.plots.image.image_item import ImageItem
 from bec_widgets.widgets.plots.waveform.waveform import Waveform
-from tests.unit_tests.client_mocks import mocked_client
 
+from .client_mocks import mocked_client
 from .conftest import create_widget
 
 # pylint: disable = redefined-outer-name
@@ -214,7 +214,7 @@ def test_crosshair_clicked_signal(qtbot, plot_widget_with_crosshair):
     pos_in_widget = graphics_view.mapFromScene(pos_in_scene)
 
     # Simulate mouse click
-    qtbot.mouseClick(graphics_view.viewport(), Qt.LeftButton, pos=pos_in_widget)
+    qtbot.mouseClick(graphics_view.viewport(), Qt.MouseButton.LeftButton, pos=pos_in_widget)
 
     x, y = emitted_positions[0]
 

tests/unit_tests/test_curve_settings.py

@@ -12,8 +12,9 @@ from bec_widgets.widgets.plots.waveform.settings.curve_settings.curve_tree impor
     ScanIndexValidator,
 )
 from bec_widgets.widgets.plots.waveform.waveform import Waveform
-from tests.unit_tests.client_mocks import dap_plugin_message, mocked_client, mocked_client_with_dap
-from tests.unit_tests.conftest import create_widget
+
+from .client_mocks import dap_plugin_message, mocked_client, mocked_client_with_dap
+from .conftest import create_widget
 
 ##################################################
 # CurveSetting

tests/unit_tests/test_device_browser.py

@@ -19,7 +19,7 @@ from .client_mocks import mocked_client
 if TYPE_CHECKING:  # pragma: no cover
     from qtpy.QtWidgets import QListWidgetItem
 
-    from bec_widgets.widgets.services.device_browser.device_item import DeviceItem
+    from bec_widgets.widgets.services.device_browser.device_item.device_item import DeviceItem
 
 
 # pylint: disable=no-member

tests/unit_tests/test_device_manager_components.py

@@ -16,8 +16,6 @@ from qtpy import QtCore, QtGui, QtWidgets
 
 from bec_widgets.utils.bec_list import BECList
 from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.widgets.control.device_manager import DeviceTable, DMConfigView, DocstringView
-from bec_widgets.widgets.control.device_manager.components import docstring_to_markdown
 from bec_widgets.widgets.control.device_manager.components.constants import HEADERS_HELP_MD
 from bec_widgets.widgets.control.device_manager.components.device_config_template.device_config_template import (
     DeviceConfigTemplate,
@@ -34,9 +32,17 @@ from bec_widgets.widgets.control.device_manager.components.device_config_templat
     ReadoutPriorityComboBox,
     _try_literal_eval,
 )
+from bec_widgets.widgets.control.device_manager.components.device_table.device_table import (
+    DeviceTable,
+)
 from bec_widgets.widgets.control.device_manager.components.device_table.device_table_row import (
     DeviceTableRow,
 )
+from bec_widgets.widgets.control.device_manager.components.dm_config_view import DMConfigView
+from bec_widgets.widgets.control.device_manager.components.dm_docstring_view import (
+    DocstringView,
+    docstring_to_markdown,
+)
 from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation import (
     DeviceTest,
     LegendLabel,