refactor(widgets): widget module structure reorganised

tests/end-2-end/conftest.py

@@ -6,10 +6,9 @@ import pytest
 from bec_lib.endpoints import MessageEndpoints
 
 from bec_widgets.cli.client_utils import _start_plot_process
-from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.utils import BECDispatcher
-from bec_widgets.widgets.dock import BECDockArea
-from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.containers.dock import BECDockArea
+from bec_widgets.widgets.containers.figure import BECFigure
 
 
 # make threads check in autouse, **will be executed at the end**; better than

tests/end-2-end/test_scan_control_e2e.py

@@ -3,7 +3,7 @@ import time
 import pytest
 
 from bec_widgets.utils.widget_io import WidgetIO
-from bec_widgets.widgets.scan_control import ScanControl
+from bec_widgets.widgets.control.scan_control import ScanControl
 
 
 @pytest.fixture(scope="function")

tests/unit_tests/test_abort_button.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from bec_widgets.widgets.button_abort.button_abort import AbortButton
+from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_bec_connector.py

@@ -5,7 +5,7 @@ import pytest
 from qtpy.QtWidgets import QApplication
 
 from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
-from bec_widgets.utils import BECConnector, ConnectionConfig
+from bec_widgets.utils import BECConnector
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_bec_dispatcher.py

@@ -5,9 +5,7 @@ from unittest import mock
 
 import pytest
 import redis
-from bec_lib.connector import MessageObject
 from bec_lib.messages import ScanMessage
-from bec_lib.redis_connector import RedisConnector
 from bec_lib.serialization import MsgpackSerialization
 
 from bec_widgets.utils.bec_dispatcher import QtRedisConnector

tests/unit_tests/test_bec_dock.py

@@ -1,11 +1,9 @@
 # pylint: disable=missing-function-docstring, missing-module-docstring, unused-import
-from unittest.mock import MagicMock, patch
 
 import pytest
 from bec_lib.endpoints import MessageEndpoints
-from bec_lib.messages import ScanQueueStatusMessage
 
-from bec_widgets.widgets.dock import BECDock, BECDockArea
+from bec_widgets.widgets.containers.dock import BECDockArea
 
 from .client_mocks import mocked_client
 from .test_bec_queue import bec_queue_msg_full

tests/unit_tests/test_bec_figure.py

@@ -3,11 +3,13 @@
 import numpy as np
 import pytest
 
-from bec_widgets.widgets.figure import BECFigure
-from bec_widgets.widgets.figure.plots.image.image import BECImageShow
-from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap
-from bec_widgets.widgets.figure.plots.multi_waveform.multi_waveform import BECMultiWaveform
-from bec_widgets.widgets.figure.plots.waveform.waveform import BECWaveform
+from bec_widgets.widgets.containers.figure import BECFigure
+from bec_widgets.widgets.containers.figure.plots.image.image import BECImageShow
+from bec_widgets.widgets.containers.figure.plots.motor_map.motor_map import BECMotorMap
+from bec_widgets.widgets.containers.figure.plots.multi_waveform.multi_waveform import (
+    BECMultiWaveform,
+)
+from bec_widgets.widgets.containers.figure.plots.waveform.waveform import BECWaveform
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_bec_image.py

@@ -1,12 +1,9 @@
 # pylint: disable=missing-function-docstring, missing-module-docstring, unused-import
-from unittest import mock
 
 import numpy as np
-import pytest
 from bec_lib import messages
-from qtpy.QtGui import QFontInfo
 
-from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.containers.figure import BECFigure
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_bec_image_widget.py

@@ -1,10 +1,10 @@
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock
 
 import pyqtgraph as pg
 import pytest
 
-from bec_widgets.widgets.base_classes.device_input_base import BECDeviceFilter
-from bec_widgets.widgets.image.image_widget import BECImageWidget
+from bec_widgets.widgets.control.device_input.base_classes.device_input_base import BECDeviceFilter
+from bec_widgets.widgets.plots.image.image_widget import BECImageWidget
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_bec_motor_map.py

@@ -1,10 +1,9 @@
 import numpy as np
-import pytest
 from bec_lib.messages import DeviceMessage
 
-from bec_widgets.widgets.figure import BECFigure
-from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap, MotorMapConfig
-from bec_widgets.widgets.figure.plots.waveform.waveform_curve import SignalData
+from bec_widgets.widgets.containers.figure import BECFigure
+from bec_widgets.widgets.containers.figure.plots.motor_map.motor_map import MotorMapConfig
+from bec_widgets.widgets.containers.figure.plots.waveform.waveform_curve import SignalData
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_bec_progressbar.py

@@ -1,7 +1,7 @@
 import numpy as np
 import pytest
 
-from bec_widgets.widgets.bec_progressbar.bec_progressbar import BECProgressBar
+from bec_widgets.widgets.progress.bec_progressbar.bec_progressbar import BECProgressBar
 
 
 @pytest.fixture

tests/unit_tests/test_bec_queue.py

@@ -1,7 +1,7 @@
 import pytest
 from bec_lib import messages
 
-from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
+from bec_widgets.widgets.services.bec_queue.bec_queue import BECQueue
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_bec_status_box.py

@@ -4,7 +4,10 @@ from unittest import mock
 import pytest
 from bec_lib.messages import BECStatus, ServiceMetricMessage, StatusMessage
 
-from bec_widgets.widgets.bec_status_box.bec_status_box import BECServiceInfoContainer, BECStatusBox
+from bec_widgets.widgets.services.bec_status_box.bec_status_box import (
+    BECServiceInfoContainer,
+    BECStatusBox,
+)
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_color_map_selector.py

@@ -1,7 +1,7 @@
 import pyqtgraph as pg
 import pytest
 
-from bec_widgets.widgets.colormap_selector.colormap_selector import ColormapSelector
+from bec_widgets.widgets.utility.visual.colormap_selector.colormap_selector import ColormapSelector
 
 
 @pytest.fixture

tests/unit_tests/test_color_validation.py

@@ -3,7 +3,7 @@ from pydantic import ValidationError
 from qtpy.QtGui import QColor
 
 from bec_widgets.utils import Colors
-from bec_widgets.widgets.figure.plots.waveform.waveform_curve import CurveConfig
+from bec_widgets.widgets.containers.figure.plots.waveform.waveform_curve import CurveConfig
 
 
 def test_color_validation_CSS():

tests/unit_tests/test_colormap_widget.py

@@ -1,7 +1,7 @@
 import pytest
 from pyqtgraph.widgets.ColorMapButton import ColorMapButton
 
-from bec_widgets.widgets.colormap_widget.colormap_widget import BECColorMapWidget
+from bec_widgets.widgets.utility.visual.colormap_widget.colormap_widget import BECColorMapWidget
 
 
 @pytest.fixture

tests/unit_tests/test_crosshair.py

@@ -1,10 +1,9 @@
 import numpy as np
-import pyqtgraph as pg
 import pytest
 from qtpy.QtCore import QPointF, Qt
 
-from bec_widgets.widgets.image.image_widget import BECImageWidget
-from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget
+from bec_widgets.widgets.plots.image.image_widget import BECImageWidget
+from bec_widgets.widgets.plots.waveform.waveform_widget import BECWaveformWidget
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_dap_combobox.py

@@ -1,8 +1,6 @@
-from unittest import mock
-
 import pytest
 
-from bec_widgets.widgets.dap_combo_box.dap_combo_box import DapComboBox
+from bec_widgets.widgets.dap.dap_combo_box.dap_combo_box import DapComboBox
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_dark_mode_button.py

@@ -5,7 +5,7 @@ from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QApplication
 
 from bec_widgets.utils.colors import set_theme
-from bec_widgets.widgets.dark_mode_button.dark_mode_button import DarkModeButton
+from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
 
 # pylint: disable=unused-import
 from .client_mocks import mocked_client
@@ -64,7 +64,7 @@ def test_dark_mode_button_changes_theme(dark_mode_button):
     Test that the dark mode button changes the theme correctly.
     """
     with mock.patch(
-        "bec_widgets.widgets.dark_mode_button.dark_mode_button.set_theme"
+        "bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button.set_theme"
     ) as mocked_set_theme:
         dark_mode_button.toggle_dark_mode()
         mocked_set_theme.assert_called_with("dark")

tests/unit_tests/test_device_browser.py

@@ -4,14 +4,14 @@ from unittest import mock
 import pytest
 from qtpy.QtCore import Qt
 
-from bec_widgets.widgets.device_browser.device_browser import DeviceBrowser
+from bec_widgets.widgets.services.device_browser.device_browser import DeviceBrowser
 
 from .client_mocks import mocked_client
 
 if TYPE_CHECKING:
     from qtpy.QtWidgets import QListWidgetItem
 
-    from bec_widgets.widgets.device_browser.device_item.device_item import DeviceItem
+    from bec_widgets.widgets.services.device_browser import DeviceItem
 
 
 @pytest.fixture

tests/unit_tests/test_device_input_base.py

@@ -4,8 +4,10 @@ import pytest
 from bec_lib.device import ReadoutPriority
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.tests.utils import FakePositioner
-from bec_widgets.widgets.base_classes.device_input_base import BECDeviceFilter, DeviceInputBase
+from bec_widgets.widgets.control.device_input.base_classes.device_input_base import (
+    BECDeviceFilter,
+    DeviceInputBase,
+)
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_device_input_widgets.py

@@ -1,9 +1,11 @@
 import pytest
 from bec_lib.device import ReadoutPriority
 
-from bec_widgets.widgets.base_classes.device_input_base import BECDeviceFilter
-from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
-from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
+from bec_widgets.widgets.control.device_input.base_classes.device_input_base import BECDeviceFilter
+from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox
+from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit import (
+    DeviceLineEdit,
+)
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_device_signal_input.py

@@ -4,11 +4,15 @@ import pytest
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.ophyd_kind_util import Kind
-from bec_widgets.widgets.base_classes.device_input_base import BECDeviceFilter
-from bec_widgets.widgets.base_classes.device_signal_input_base import DeviceSignalInputBase
-from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
-from bec_widgets.widgets.signal_combobox.signal_combobox import SignalComboBox
-from bec_widgets.widgets.signal_line_edit.signal_line_edit import SignalLineEdit
+from bec_widgets.widgets.control.device_input.base_classes.device_input_base import BECDeviceFilter
+from bec_widgets.widgets.control.device_input.base_classes.device_signal_input_base import (
+    DeviceSignalInputBase,
+)
+from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox
+from bec_widgets.widgets.control.device_input.signal_combobox.signal_combobox import SignalComboBox
+from bec_widgets.widgets.control.device_input.signal_line_edit.signal_line_edit import (
+    SignalLineEdit,
+)
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_filter_io.py

@@ -1,8 +1,10 @@
 import pytest
 
 from bec_widgets.utils.filter_io import FilterIO
-from bec_widgets.widgets.dap_combo_box.dap_combo_box import DapComboBox
-from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
+from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit import (
+    DeviceLineEdit,
+)
+from bec_widgets.widgets.dap.dap_combo_box.dap_combo_box import DapComboBox
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_lmfit_dialog.py

@@ -3,7 +3,7 @@ from unittest import mock
 import numpy as np
 import pytest
 
-from bec_widgets.widgets.lmfit_dialog.lmfit_dialog import LMFitDialog
+from bec_widgets.widgets.dap.lmfit_dialog.lmfit_dialog import LMFitDialog
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_motor_map_widget.py

@@ -2,9 +2,9 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from bec_widgets.widgets.base_classes.device_input_base import BECDeviceFilter
-from bec_widgets.widgets.motor_map.motor_map_dialog.motor_map_settings import MotorMapSettings
-from bec_widgets.widgets.motor_map.motor_map_widget import BECMotorMapWidget
+from bec_widgets.widgets.control.device_input.base_classes.device_input_base import BECDeviceFilter
+from bec_widgets.widgets.plots.motor_map.motor_map_dialog.motor_map_settings import MotorMapSettings
+from bec_widgets.widgets.plots.motor_map.motor_map_widget import BECMotorMapWidget
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_multi_waveform.py

@@ -5,7 +5,7 @@ import pytest
 from bec_lib.endpoints import messages
 
 from bec_widgets.utils import Colors
-from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.containers.figure import BECFigure
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_multi_waveform_widget.py

@@ -6,8 +6,8 @@ from qtpy.QtWidgets import QApplication
 
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.colors import apply_theme, get_theme_palette, set_theme
-from bec_widgets.widgets.figure.plots.axis_settings import AxisSettings
-from bec_widgets.widgets.multi_waveform.multi_waveform_widget import BECMultiWaveformWidget
+from bec_widgets.widgets.containers.figure.plots.axis_settings import AxisSettings
+from bec_widgets.widgets.plots.multi_waveform.multi_waveform_widget import BECMultiWaveformWidget
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_palette_viewer.py

@@ -2,7 +2,7 @@ import pytest
 from qtpy.QtCore import Qt
 
 from bec_widgets.qt_utils.palette_viewer import PaletteViewer
-from bec_widgets.widgets.dark_mode_button.dark_mode_button import DarkModeButton
+from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
 
 
 @pytest.fixture

tests/unit_tests/test_plot_base.py

@@ -2,9 +2,8 @@
 from unittest import mock
 
 import pytest
-from qtpy.QtGui import QFontInfo
 
-from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.containers.figure import BECFigure
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_plugin_utils.py

@@ -4,10 +4,9 @@ from bec_widgets.utils.plugin_utils import get_custom_classes
 def test_client_generator_classes():
     out = get_custom_classes("bec_widgets")
     connector_cls_names = [cls.__name__ for cls in out.connector_classes]
-    top_level_cls_names = [cls.__name__ for cls in out.top_level_classes]
+    plugins = [cls.__name__ for cls in out.plugins]
 
     assert "BECFigure" in connector_cls_names
     assert "BECWaveform" in connector_cls_names
-    assert "BECDockArea" in top_level_cls_names
-    assert "BECFigure" in top_level_cls_names
-    assert "BECWaveform" not in top_level_cls_names
+    assert "BECDockArea" in plugins
+    assert "BECWaveform" not in plugins

tests/unit_tests/test_position_indicator.py

@@ -1,6 +1,8 @@
 import pytest
 
-from bec_widgets.widgets.position_indicator.position_indicator import PositionIndicator
+from bec_widgets.widgets.control.device_control.position_indicator.position_indicator import (
+    PositionIndicator,
+)
 
 
 @pytest.fixture

tests/unit_tests/test_positioner_box.py

@@ -1,16 +1,19 @@
 from unittest import mock
 
 import pytest
-from bec_lib.device import Positioner
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.messages import ScanQueueMessage
 from qtpy.QtCore import Qt, QTimer
 from qtpy.QtGui import QValidator
 from qtpy.QtWidgets import QPushButton
 
-from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
-from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
-from bec_widgets.widgets.positioner_box.positioner_control_line import PositionerControlLine
+from bec_widgets.widgets.control.device_control.positioner_box.positioner_box import PositionerBox
+from bec_widgets.widgets.control.device_control.positioner_box.positioner_control_line import (
+    PositionerControlLine,
+)
+from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit import (
+    DeviceLineEdit,
+)
 
 from .client_mocks import mocked_client
 from .conftest import create_widget
@@ -19,10 +22,12 @@ from .conftest import create_widget
 @pytest.fixture
 def positioner_box(qtbot, mocked_client):
     """Fixture for PositionerBox widget"""
-    with mock.patch("bec_widgets.widgets.positioner_box.positioner_box.uuid.uuid4") as mock_uuid:
+    with mock.patch(
+        "bec_widgets.widgets.control.device_control.positioner_box.positioner_box.uuid.uuid4"
+    ) as mock_uuid:
         mock_uuid.return_value = "fake_uuid"
         with mock.patch(
-            "bec_widgets.widgets.positioner_box.positioner_box.PositionerBox._check_device_is_valid",
+            "bec_widgets.widgets.control.device_control.positioner_box.positioner_box.PositionerBox._check_device_is_valid",
             return_value=True,
         ):
             db = create_widget(qtbot, PositionerBox, device="samx", client=mocked_client)
@@ -120,10 +125,12 @@ def test_positioner_control_line(qtbot, mocked_client):
     """Test PositionerControlLine.
     Inherits from PositionerBox, but the layout is changed. Check dimensions only
     """
-    with mock.patch("bec_widgets.widgets.positioner_box.positioner_box.uuid.uuid4") as mock_uuid:
+    with mock.patch(
+        "bec_widgets.widgets.control.device_control.positioner_box.positioner_box.uuid.uuid4"
+    ) as mock_uuid:
         mock_uuid.return_value = "fake_uuid"
         with mock.patch(
-            "bec_widgets.widgets.positioner_box.positioner_box.PositionerBox._check_device_is_valid",
+            "bec_widgets.widgets.control.device_control.positioner_box.positioner_box.PositionerBox._check_device_is_valid",
             return_value=True,
         ):
             db = PositionerControlLine(device="samx", client=mocked_client)

tests/unit_tests/test_reset_button.py

@@ -5,7 +5,7 @@ from unittest.mock import patch
 import pytest
 from qtpy.QtWidgets import QMessageBox
 
-from bec_widgets.widgets.button_reset.button_reset import ResetButton
+from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_resume_button.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from bec_widgets.widgets.button_resume.button_resume import ResumeButton
+from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_ring_progress_bar.py

@@ -5,9 +5,9 @@ from bec_lib.endpoints import MessageEndpoints
 from pydantic import ValidationError
 
 from bec_widgets.utils import Colors
-from bec_widgets.widgets.ring_progress_bar import RingProgressBar
-from bec_widgets.widgets.ring_progress_bar.ring import ProgressbarConnections, RingConfig
-from bec_widgets.widgets.ring_progress_bar.ring_progress_bar import RingProgressBarConfig
+from bec_widgets.widgets.progress.ring_progress_bar import RingProgressBar
+from bec_widgets.widgets.progress.ring_progress_bar.ring import ProgressbarConnections, RingConfig
+from bec_widgets.widgets.progress.ring_progress_bar.ring_progress_bar import RingProgressBarConfig
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_rpc_server.py

@@ -1,10 +1,9 @@
 from unittest import mock
 
 import pytest
-from bec_lib.service_config import ServiceConfig
 
 from bec_widgets.cli.server import _start_server
-from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.containers.figure import BECFigure
 
 
 @pytest.fixture

tests/unit_tests/test_scan_control.py

@@ -5,7 +5,7 @@ import pytest
 from bec_lib.messages import AvailableResourceMessage, ScanQueueHistoryMessage, ScanQueueMessage
 
 from bec_widgets.utils.widget_io import WidgetIO
-from bec_widgets.widgets.scan_control import ScanControl
+from bec_widgets.widgets.control.scan_control import ScanControl
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_scan_control_group_box.py

@@ -1,8 +1,7 @@
 # pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
-import pytest
 
 from bec_widgets.utils.widget_io import WidgetIO
-from bec_widgets.widgets.scan_control.scan_group_box import ScanGroupBox
+from bec_widgets.widgets.control.scan_control.scan_group_box import ScanGroupBox
 
 
 def test_kwarg_box(qtbot):

tests/unit_tests/test_spinner.py

@@ -2,7 +2,7 @@ import pytest
 
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.reference_utils import snap_and_compare
-from bec_widgets.widgets.spinner.spinner import SpinnerWidget
+from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
 
 
 @pytest.fixture

tests/unit_tests/test_stop_button.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from bec_widgets.widgets.stop_button.stop_button import StopButton
+from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_text_box_widget.py

@@ -1,6 +1,6 @@
 import pytest
 
-from bec_widgets.widgets.text_box.text_box import DEFAULT_TEXT, TextBox
+from bec_widgets.widgets.editors.text_box.text_box import DEFAULT_TEXT, TextBox
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_toggle.py

@@ -1,7 +1,7 @@
 import pytest
 from qtpy.QtCore import QPointF, Qt
 
-from bec_widgets.widgets.toggle.toggle import ToggleSwitch
+from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch
 
 
 @pytest.fixture

tests/unit_tests/test_utils_bec_signal_proxy.py

@@ -4,7 +4,7 @@ import pyqtgraph as pg
 import pytest
 
 from bec_widgets.utils.bec_signal_proxy import BECSignalProxy
-from bec_widgets.widgets.dap_combo_box.dap_combo_box import DapComboBox
+from bec_widgets.widgets.dap.dap_combo_box.dap_combo_box import DapComboBox
 
 from .client_mocks import mocked_client
 from .conftest import create_widget
@@ -14,7 +14,7 @@ from .conftest import create_widget
 def dap_combo_box(qtbot, mocked_client):
     """Fixture for TextBox widget to test BECSignalProxy with a simple widget"""
     with mock.patch(
-        "bec_widgets.widgets.dap_combo_box.dap_combo_box.DapComboBox._validate_dap_model",
+        "bec_widgets.widgets.dap.dap_combo_box.dap_combo_box.DapComboBox._validate_dap_model",
         return_value=True,
     ):
         widget = create_widget(qtbot, DapComboBox, client=mocked_client)

tests/unit_tests/test_utils_plot_indicators.py

@@ -1,8 +1,7 @@
-import pyqtgraph as pg
 import pytest
 from qtpy.QtCore import QPointF
 
-from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget
+from bec_widgets.widgets.plots.waveform.waveform_widget import BECWaveformWidget
 
 from .client_mocks import mocked_client
 

tests/unit_tests/test_vscode_widget.py

@@ -5,14 +5,14 @@ from unittest import mock
 
 import pytest
 
-from bec_widgets.widgets.vscode.vscode import VSCodeEditor
+from bec_widgets.widgets.editors.vscode.vscode import VSCodeEditor
 
 from .client_mocks import mocked_client
 
 
 @pytest.fixture
 def vscode_widget(qtbot, mocked_client):
-    with mock.patch("bec_widgets.widgets.vscode.vscode.subprocess.Popen") as mock_popen:
+    with mock.patch("bec_widgets.widgets.editors.vscode.vscode.subprocess.Popen") as mock_popen:
         widget = VSCodeEditor(client=mocked_client)
         qtbot.addWidget(widget)
         qtbot.waitExposed(widget)
@@ -25,12 +25,16 @@ def test_vscode_widget(qtbot, vscode_widget):
 
 
 def test_start_server(qtbot, mocked_client):
-    with mock.patch("bec_widgets.widgets.vscode.vscode.os.killpg") as mock_killpg:
-        with mock.patch("bec_widgets.widgets.vscode.vscode.os.getpgid") as mock_getpgid:
-            with mock.patch("bec_widgets.widgets.vscode.vscode.subprocess.Popen") as mock_popen:
-                with mock.patch("bec_widgets.widgets.vscode.vscode.select.select") as mock_select:
+    with mock.patch("bec_widgets.widgets.editors.vscode.vscode.os.killpg") as mock_killpg:
+        with mock.patch("bec_widgets.widgets.editors.vscode.vscode.os.getpgid") as mock_getpgid:
+            with mock.patch(
+                "bec_widgets.widgets.editors.vscode.vscode.subprocess.Popen"
+            ) as mock_popen:
+                with mock.patch(
+                    "bec_widgets.widgets.editors.vscode.vscode.select.select"
+                ) as mock_select:
                     with mock.patch(
-                        "bec_widgets.widgets.vscode.vscode.get_free_port"
+                        "bec_widgets.widgets.editors.vscode.vscode.get_free_port"
                     ) as mock_get_free_port:
                         mock_get_free_port.return_value = 12345
                         mock_process = mock.Mock()
@@ -61,9 +65,9 @@ def test_start_server(qtbot, mocked_client):
 
 @pytest.fixture
 def patched_vscode_process(qtbot, vscode_widget):
-    with mock.patch("bec_widgets.widgets.vscode.vscode.os.killpg") as mock_killpg:
+    with mock.patch("bec_widgets.widgets.editors.vscode.vscode.os.killpg") as mock_killpg:
         mock_killpg.reset_mock()
-        with mock.patch("bec_widgets.widgets.vscode.vscode.os.getpgid") as mock_getpgid:
+        with mock.patch("bec_widgets.widgets.editors.vscode.vscode.os.getpgid") as mock_getpgid:
             mock_getpgid.return_value = 123
             vscode_widget.process = mock.Mock()
             yield vscode_widget, mock_killpg

tests/unit_tests/test_waveform1d.py

@@ -5,8 +5,12 @@ import numpy as np
 import pytest
 from bec_lib.scan_items import ScanItem
 
-from bec_widgets.widgets.figure import BECFigure
-from bec_widgets.widgets.figure.plots.waveform.waveform_curve import CurveConfig, Signal, SignalData
+from bec_widgets.widgets.containers.figure import BECFigure
+from bec_widgets.widgets.containers.figure.plots.waveform.waveform_curve import (
+    CurveConfig,
+    Signal,
+    SignalData,
+)
 
 from .client_mocks import mocked_client
 from .conftest import create_widget

tests/unit_tests/test_waveform_widget.py

@@ -8,12 +8,14 @@ from qtpy.QtWidgets import QApplication
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.colors import apply_theme, get_theme_palette, set_theme
 from bec_widgets.utils.linear_region_selector import LinearRegionWrapper
-from bec_widgets.widgets.figure.plots.axis_settings import AxisSettings
-from bec_widgets.widgets.waveform.waveform_popups.curve_dialog.curve_dialog import CurveSettings
-from bec_widgets.widgets.waveform.waveform_popups.dap_summary_dialog.dap_summary_dialog import (
+from bec_widgets.widgets.containers.figure.plots.axis_settings import AxisSettings
+from bec_widgets.widgets.plots.waveform.waveform_popups.curve_dialog.curve_dialog import (
+    CurveSettings,
+)
+from bec_widgets.widgets.plots.waveform.waveform_popups.dap_summary_dialog.dap_summary_dialog import (
     FitSummaryWidget,
 )
-from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget
+from bec_widgets.widgets.plots.waveform.waveform_widget import BECWaveformWidget
 
 from .client_mocks import mocked_client
 from .conftest import create_widget
@@ -252,16 +254,6 @@ def test_toolbar_auto_range_action_triggered(waveform_widget, mock_waveform, qtb
     waveform_widget.waveform.set_auto_range.assert_called_once_with(True, "xy")
 
 
-def test_toolbar_fit_params_action_triggered(qtbot, waveform_widget):
-    action = waveform_widget.toolbar.widgets["fit_params"].action
-    with patch(
-        "bec_widgets.widgets.waveform.waveform_widget.FitSummaryWidget"
-    ) as MockFitSummaryWidget:
-        mock_dialog_instance = MockFitSummaryWidget.return_value
-        action.trigger()
-        mock_dialog_instance.exec.assert_called_once()
-
-
 def test_enable_mouse_pan_mode(qtbot, waveform_widget):
     action_drag = waveform_widget.toolbar.widgets["drag_mode"].action
     action_rectangle = waveform_widget.toolbar.widgets["rectangle_mode"].action

tests/unit_tests/test_website_widget.py

@@ -1,7 +1,7 @@
 import pytest
 from qtpy.QtCore import QUrl
 
-from bec_widgets.widgets.website.website import WebsiteWidget
+from bec_widgets.widgets.editors.website.website import WebsiteWidget
 
 from .client_mocks import mocked_client