From d6d976747e5877bb3e620aa01c726911f66cc1ca Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Thu, 16 Apr 2026 20:58:04 +0200 Subject: [PATCH] chore: remove import from utils init --- bec_widgets/utils/__init__.py | 12 ------------ bec_widgets/utils/plugin_utils.py | 2 +- bec_widgets/utils/rpc_server.py | 2 +- bec_widgets/utils/widget_io.py | 12 ++++++------ .../widgets/containers/dock_area/dock_area.py | 2 +- .../notification_center/notification_banner.py | 2 +- .../widgets/containers/main_window/main_window.py | 2 +- .../positioner_box/positioner_box/positioner_box.py | 2 +- .../positioner_box_2d/positioner_box_2d.py | 2 +- .../device_input/base_classes/device_input_base.py | 2 +- .../base_classes/device_signal_input_base.py | 2 +- .../widgets/control/scan_control/scan_control.py | 2 +- bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py | 2 +- bec_widgets/widgets/plots/heatmap/heatmap.py | 2 +- .../plots/heatmap/settings/heatmap_setting.py | 2 +- bec_widgets/widgets/plots/image/image.py | 2 +- bec_widgets/widgets/plots/image/image_base.py | 2 +- bec_widgets/widgets/plots/image/image_item.py | 3 ++- .../plots/image/setting_widgets/image_roi_tree.py | 3 ++- bec_widgets/widgets/plots/motor_map/motor_map.py | 3 ++- .../plots/motor_map/settings/motor_map_settings.py | 2 +- .../widgets/plots/multi_waveform/multi_waveform.py | 3 ++- .../plots/multi_waveform/settings/control_panel.py | 2 +- bec_widgets/widgets/plots/plot_base.py | 4 +++- bec_widgets/widgets/plots/roi/image_roi.py | 2 +- .../widgets/plots/scatter_waveform/scatter_curve.py | 3 ++- .../plots/scatter_waveform/scatter_waveform.py | 3 ++- .../settings/scatter_curve_setting.py | 2 +- .../widgets/plots/setting_menus/axis_settings.py | 2 +- bec_widgets/widgets/plots/waveform/curve.py | 3 ++- .../waveform/settings/curve_settings/curve_tree.py | 3 ++- bec_widgets/widgets/plots/waveform/waveform.py | 2 +- .../progress/ring_progress_bar/ring_progress_bar.py | 2 +- .../ring_progress_settings_cards.py | 2 +- .../visual/colormap_widget/colormap_widget.py | 2 +- .../widget_hierarchy_tree/widget_hierarchy_tree.py | 2 +- tests/unit_tests/test_bec_connector.py | 2 +- tests/unit_tests/test_color_utils.py | 3 ++- tests/unit_tests/test_crosshair.py | 2 +- tests/unit_tests/test_ring_progress_bar.py | 2 +- 40 files changed, 55 insertions(+), 56 deletions(-) diff --git a/bec_widgets/utils/__init__.py b/bec_widgets/utils/__init__.py index 9d584849..8b137891 100644 --- a/bec_widgets/utils/__init__.py +++ b/bec_widgets/utils/__init__.py @@ -1,13 +1 @@ -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 diff --git a/bec_widgets/utils/plugin_utils.py b/bec_widgets/utils/plugin_utils.py index 32ac9c9d..c9c367ae 100644 --- a/bec_widgets/utils/plugin_utils.py +++ b/bec_widgets/utils/plugin_utils.py @@ -9,7 +9,7 @@ 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_connector import BECConnector from bec_widgets.utils.bec_widget import BECWidget if TYPE_CHECKING: # pragma: no cover diff --git a/bec_widgets/utils/rpc_server.py b/bec_widgets/utils/rpc_server.py index 237b5878..7c0217f1 100644 --- a/bec_widgets/utils/rpc_server.py +++ b/bec_widgets/utils/rpc_server.py @@ -14,7 +14,7 @@ from qtpy.QtCore import Qt, QTimer from qtpy.QtWidgets import QWidget from redis.exceptions import RedisError -from bec_widgets.utils import BECDispatcher +from bec_widgets.utils.bec_dispatcher import BECDispatcher from bec_widgets.utils.bec_connector import BECConnector from bec_widgets.utils.container_utils import WidgetContainerUtils from bec_widgets.utils.error_popups import ErrorPopupUtility diff --git a/bec_widgets/utils/widget_io.py b/bec_widgets/utils/widget_io.py index 9a454861..aab7f29e 100644 --- a/bec_widgets/utils/widget_io.py +++ b/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): diff --git a/bec_widgets/widgets/containers/dock_area/dock_area.py b/bec_widgets/widgets/containers/dock_area/dock_area.py index dccaa2ad..e1fb273f 100644 --- a/bec_widgets/widgets/containers/dock_area/dock_area.py +++ b/bec_widgets/widgets/containers/dock_area/dock_area.py @@ -20,7 +20,7 @@ from qtpy.QtWidgets import ( 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.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.rpc_widget_handler import widget_handler diff --git a/bec_widgets/widgets/containers/main_window/addons/notification_center/notification_banner.py b/bec_widgets/widgets/containers/main_window/addons/notification_center/notification_banner.py index 4b99a48f..53f7a204 100644 --- a/bec_widgets/widgets/containers/main_window/addons/notification_center/notification_banner.py +++ b/bec_widgets/widgets/containers/main_window/addons/notification_center/notification_banner.py @@ -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 diff --git a/bec_widgets/widgets/containers/main_window/main_window.py b/bec_widgets/widgets/containers/main_window/main_window.py index e0f84a08..acc2f5b1 100644 --- a/bec_widgets/widgets/containers/main_window/main_window.py +++ b/bec_widgets/widgets/containers/main_window/main_window.py @@ -18,7 +18,7 @@ from qtpy.QtWidgets import ( ) import bec_widgets -from bec_widgets.utils import UILoader +from bec_widgets.utils.ui_loader 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 diff --git a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py index 8e8239dd..1fb5e757 100644 --- a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py +++ b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py @@ -11,7 +11,7 @@ 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.ui_loader 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.widgets.control.device_control.positioner_box.positioner_box_base import ( diff --git a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py index b7396b0c..b77beb4d 100644 --- a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py +++ b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py @@ -12,7 +12,7 @@ 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.ui_loader import UILoader from bec_widgets.utils.colors import apply_theme from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import ( diff --git a/bec_widgets/widgets/control/device_input/base_classes/device_input_base.py b/bec_widgets/widgets/control/device_input/base_classes/device_input_base.py index 8db1a14a..a9a488bb 100644 --- a/bec_widgets/widgets/control/device_input/base_classes/device_input_base.py +++ b/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 diff --git a/bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py b/bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py index cc03c9a3..788dea83 100644 --- a/bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py +++ b/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 diff --git a/bec_widgets/widgets/control/scan_control/scan_control.py b/bec_widgets/widgets/control/scan_control/scan_control.py index c0bc1e24..b5cb4722 100644 --- a/bec_widgets/widgets/control/scan_control/scan_control.py +++ b/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 diff --git a/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py b/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py index 2b5be14d..956c068b 100644 --- a/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py +++ b/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py @@ -5,7 +5,7 @@ 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.ui_loader 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 diff --git a/bec_widgets/widgets/plots/heatmap/heatmap.py b/bec_widgets/widgets/plots/heatmap/heatmap.py index 22287ca3..e22cedf5 100644 --- a/bec_widgets/widgets/plots/heatmap/heatmap.py +++ b/bec_widgets/widgets/plots/heatmap/heatmap.py @@ -19,7 +19,7 @@ from scipy.interpolate import ( from scipy.spatial import cKDTree from toolz import partition -from bec_widgets.utils import Colors +from bec_widgets.utils.colors import Colors from bec_widgets.utils.bec_connector import ConnectionConfig from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils.settings_dialog import SettingsDialog diff --git a/bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py b/bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py index 8238caa7..5fd26353 100644 --- a/bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py +++ b/bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py @@ -4,7 +4,7 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout -from bec_widgets.utils import UILoader +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget diff --git a/bec_widgets/widgets/plots/image/image.py b/bec_widgets/widgets/plots/image/image.py index d2ed8e39..14429080 100644 --- a/bec_widgets/widgets/plots/image/image.py +++ b/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 diff --git a/bec_widgets/widgets/plots/image/image_base.py b/bec_widgets/widgets/plots/image/image_base.py index 8a0bcaae..57bbf95c 100644 --- a/bec_widgets/widgets/plots/image/image_base.py +++ b/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 diff --git a/bec_widgets/widgets/plots/image/image_item.py b/bec_widgets/widgets/plots/image/image_item.py index 6f24ca3b..66ee0926 100644 --- a/bec_widgets/widgets/plots/image/image_item.py +++ b/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, diff --git a/bec_widgets/widgets/plots/image/setting_widgets/image_roi_tree.py b/bec_widgets/widgets/plots/image/setting_widgets/image_roi_tree.py index 91ed3dcb..8c9d7b5b 100644 --- a/bec_widgets/widgets/plots/image/setting_widgets/image_roi_tree.py +++ b/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 diff --git a/bec_widgets/widgets/plots/motor_map/motor_map.py b/bec_widgets/widgets/plots/motor_map/motor_map.py index d2f01486..248434fe 100644 --- a/bec_widgets/widgets/plots/motor_map/motor_map.py +++ b/bec_widgets/widgets/plots/motor_map/motor_map.py @@ -10,7 +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.bec_connector import ConnectionConfig +from bec_widgets.utils.colors import Colors from bec_widgets.utils.colors import apply_theme from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils.settings_dialog import SettingsDialog diff --git a/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py b/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py index 0cab9d3a..284e2815 100644 --- a/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py +++ b/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py @@ -2,7 +2,7 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget -from bec_widgets.utils import UILoader +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget from bec_widgets.utils.widget_io import WidgetIO diff --git a/bec_widgets/widgets/plots/multi_waveform/multi_waveform.py b/bec_widgets/widgets/plots/multi_waveform/multi_waveform.py index e0e214db..291a15cc 100644 --- a/bec_widgets/widgets/plots/multi_waveform/multi_waveform.py +++ b/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 diff --git a/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py b/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py index 5ab4278b..399bcc2c 100644 --- a/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py +++ b/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py @@ -2,7 +2,7 @@ import os from qtpy.QtWidgets import QVBoxLayout, QWidget -from bec_widgets.utils import UILoader +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget from bec_widgets.utils.widget_io import WidgetIO diff --git a/bec_widgets/widgets/plots/plot_base.py b/bec_widgets/widgets/plots/plot_base.py index 88c23482..b90e95c4 100644 --- a/bec_widgets/widgets/plots/plot_base.py +++ b/bec_widgets/widgets/plots/plot_base.py @@ -8,7 +8,9 @@ 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.crosshair import Crosshair +from bec_widgets.utils.entry_validator import EntryValidator from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils.fps_counter import FPSCounter diff --git a/bec_widgets/widgets/plots/roi/image_roi.py b/bec_widgets/widgets/plots/roi/image_roi.py index 9c22f7bc..d6a45dba 100644 --- a/bec_widgets/widgets/plots/roi/image_roi.py +++ b/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: diff --git a/bec_widgets/widgets/plots/scatter_waveform/scatter_curve.py b/bec_widgets/widgets/plots/scatter_waveform/scatter_curve.py index 4624e50c..5ca0e660 100644 --- a/bec_widgets/widgets/plots/scatter_waveform/scatter_curve.py +++ b/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 diff --git a/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py index 94fb063f..dcd90598 100644 --- a/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py +++ b/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 diff --git a/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py b/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py index 46f211f5..82d0d295 100644 --- a/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py +++ b/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py @@ -2,7 +2,7 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout -from bec_widgets.utils import UILoader +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget diff --git a/bec_widgets/widgets/plots/setting_menus/axis_settings.py b/bec_widgets/widgets/plots/setting_menus/axis_settings.py index 68f4ba7b..f2adee32 100644 --- a/bec_widgets/widgets/plots/setting_menus/axis_settings.py +++ b/bec_widgets/widgets/plots/setting_menus/axis_settings.py @@ -2,7 +2,7 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget -from bec_widgets.utils import UILoader +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget from bec_widgets.utils.widget_io import WidgetIO diff --git a/bec_widgets/widgets/plots/waveform/curve.py b/bec_widgets/widgets/plots/waveform/curve.py index a4dca716..f5bd030c 100644 --- a/bec_widgets/widgets/plots/waveform/curve.py +++ b/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 diff --git a/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py index 10c78b46..d11f1094 100644 --- a/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py +++ b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py @@ -50,7 +50,8 @@ 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.entry_validator import EntryValidator from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.colors import Colors from bec_widgets.utils.toolbars.actions import WidgetAction diff --git a/bec_widgets/widgets/plots/waveform/waveform.py b/bec_widgets/widgets/plots/waveform/waveform.py index 95a96fb4..ee9a90fc 100644 --- a/bec_widgets/widgets/plots/waveform/waveform.py +++ b/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 diff --git a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar.py b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar.py index 78627680..e17e2578 100644 --- a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar.py +++ b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar.py @@ -6,7 +6,7 @@ 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.colors import Colors from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.error_popups import SafeProperty from bec_widgets.utils.settings_dialog import SettingsDialog diff --git a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py index 20d90164..9e072239 100644 --- a/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py +++ b/bec_widgets/widgets/progress/ring_progress_bar/ring_progress_settings_cards.py @@ -19,7 +19,7 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.utils import UILoader +from bec_widgets.utils.ui_loader import UILoader from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.settings_dialog import SettingWidget from bec_widgets.widgets.progress.ring_progress_bar.ring import Ring diff --git a/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py b/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py index 5317843c..161e2e95 100644 --- a/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py +++ b/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py @@ -3,7 +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.colors import Colors from bec_widgets.utils.bec_widget import BECWidget diff --git a/bec_widgets/widgets/utility/widget_hierarchy_tree/widget_hierarchy_tree.py b/bec_widgets/widgets/utility/widget_hierarchy_tree/widget_hierarchy_tree.py index c3ec0266..a77e8232 100644 --- a/bec_widgets/widgets/utility/widget_hierarchy_tree/widget_hierarchy_tree.py +++ b/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 diff --git a/tests/unit_tests/test_bec_connector.py b/tests/unit_tests/test_bec_connector.py index 55773232..04be4659 100644 --- a/tests/unit_tests/test_bec_connector.py +++ b/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 diff --git a/tests/unit_tests/test_color_utils.py b/tests/unit_tests/test_color_utils.py index 39c46473..0e1e5751 100644 --- a/tests/unit_tests/test_color_utils.py +++ b/tests/unit_tests/test_color_utils.py @@ -4,7 +4,8 @@ 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.colors import Colors from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.colors import apply_theme from bec_widgets.widgets.plots.waveform.curve import CurveConfig diff --git a/tests/unit_tests/test_crosshair.py b/tests/unit_tests/test_crosshair.py index 28662a27..0012c9d4 100644 --- a/tests/unit_tests/test_crosshair.py +++ b/tests/unit_tests/test_crosshair.py @@ -4,7 +4,7 @@ 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 diff --git a/tests/unit_tests/test_ring_progress_bar.py b/tests/unit_tests/test_ring_progress_bar.py index e00f0fc6..5abf7bb7 100644 --- a/tests/unit_tests/test_ring_progress_bar.py +++ b/tests/unit_tests/test_ring_progress_bar.py @@ -8,7 +8,7 @@ from qtpy.QtCore import QEvent, QPoint, QPointF, Qt from qtpy.QtGui import QColor, QMouseEvent from qtpy.QtWidgets import QApplication -from bec_widgets.utils import Colors +from bec_widgets.utils.colors import Colors from bec_widgets.widgets.progress.ring_progress_bar.ring_progress_bar import ( RingProgressBar, RingProgressContainerWidget,