diff --git a/bec_widgets/applications/launch_window.py b/bec_widgets/applications/launch_window.py index 9c92673c..82d81c99 100644 --- a/bec_widgets/applications/launch_window.py +++ b/bec_widgets/applications/launch_window.py @@ -20,13 +20,13 @@ from qtpy.QtWidgets import ( ) import bec_widgets -from bec_widgets.cli.rpc.rpc_register import RPCRegister from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets from bec_widgets.utils.container_utils import WidgetContainerUtils from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.utils.name_utils import pascal_to_snake from bec_widgets.utils.plugin_utils import get_plugin_auto_updates from bec_widgets.utils.round_frame import RoundedFrame +from bec_widgets.utils.rpc_register import RPCRegister from bec_widgets.utils.screen_utils import apply_window_geometry, centered_geometry_for_app from bec_widgets.utils.toolbars.toolbar import ModularToolBar from bec_widgets.utils.ui_loader import UILoader @@ -147,7 +147,8 @@ class LaunchTile(RoundedFrame): # Action button self.action_button = QPushButton("Open") - self.action_button.setStyleSheet(""" + self.action_button.setStyleSheet( + """ QPushButton { background-color: #007AFF; border: none; @@ -159,7 +160,8 @@ class LaunchTile(RoundedFrame): QPushButton:hover { background-color: #005BB5; } - """) + """ + ) self.layout.addWidget(self.action_button, alignment=Qt.AlignmentFlag.AlignCenter) def _fit_label_to_width(self, label: QLabel, max_width: int, min_pt: int = 10): diff --git a/bec_widgets/cli/client.py b/bec_widgets/cli/client.py index 3cb59560..83ff517a 100644 --- a/bec_widgets/cli/client.py +++ b/bec_widgets/cli/client.py @@ -12,7 +12,7 @@ from typing import Literal, Optional from bec_lib.logger import bec_logger -from bec_widgets.cli.rpc.rpc_base import RPCBase, rpc_call, rpc_timeout +from bec_widgets.cli.rpc_base import RPCBase, rpc_call, rpc_timeout from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets, get_plugin_client_module logger = bec_logger.logger diff --git a/bec_widgets/cli/client_utils.py b/bec_widgets/cli/client_utils.py index 4694ebc4..fac85eb0 100644 --- a/bec_widgets/cli/client_utils.py +++ b/bec_widgets/cli/client_utils.py @@ -18,7 +18,7 @@ from bec_lib.utils.import_utils import lazy_import, lazy_import_from from rich.console import Console from rich.table import Table -from bec_widgets.cli.rpc.rpc_base import RPCBase, RPCReference +from bec_widgets.cli.rpc_base import RPCBase, RPCReference from bec_widgets.utils.serialization import register_serializer_extension if TYPE_CHECKING: # pragma: no cover diff --git a/bec_widgets/cli/generate_cli.py b/bec_widgets/cli/generate_cli.py index 32ddb38c..b6470d55 100644 --- a/bec_widgets/cli/generate_cli.py +++ b/bec_widgets/cli/generate_cli.py @@ -53,7 +53,7 @@ from __future__ import annotations {base_imports} from bec_lib.logger import bec_logger -from bec_widgets.cli.rpc.rpc_base import RPCBase, rpc_call, rpc_timeout +from bec_widgets.cli.rpc_base import RPCBase, rpc_call, rpc_timeout {"from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets, get_plugin_client_module" if self._base else ""} logger = bec_logger.logger diff --git a/bec_widgets/cli/rpc/__init__.py b/bec_widgets/cli/rpc/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/bec_widgets/cli/rpc/rpc_base.py b/bec_widgets/cli/rpc_base.py similarity index 100% rename from bec_widgets/cli/rpc/rpc_base.py rename to bec_widgets/cli/rpc_base.py diff --git a/bec_widgets/cli/server.py b/bec_widgets/cli/server.py index d673490e..c1053ae3 100644 --- a/bec_widgets/cli/server.py +++ b/bec_widgets/cli/server.py @@ -19,7 +19,7 @@ from qtpy.QtWidgets import QApplication import bec_widgets from bec_widgets.applications.launch_window import LaunchWindow -from bec_widgets.cli.rpc.rpc_register import RPCRegister +from bec_widgets.utils.rpc_register import RPCRegister from bec_widgets.utils.bec_dispatcher import BECDispatcher logger = bec_logger.logger diff --git a/bec_widgets/utils/bec_connector.py b/bec_widgets/utils/bec_connector.py index 17ef7fad..7c3a82f9 100644 --- a/bec_widgets/utils/bec_connector.py +++ b/bec_widgets/utils/bec_connector.py @@ -15,7 +15,7 @@ from pydantic import BaseModel, Field, field_validator from qtpy.QtCore import Property, QObject, QRunnable, QThreadPool, Signal from qtpy.QtWidgets import QApplication -from bec_widgets.cli.rpc.rpc_register import RPCRegister +from bec_widgets.utils.rpc_register import RPCRegister from bec_widgets.utils.error_popups import ErrorPopupUtility, SafeSlot from bec_widgets.utils.name_utils import sanitize_namespace from bec_widgets.utils.widget_io import WidgetHierarchy diff --git a/bec_widgets/utils/bec_widget.py b/bec_widgets/utils/bec_widget.py index e091e0a2..e4f89711 100644 --- a/bec_widgets/utils/bec_widget.py +++ b/bec_widgets/utils/bec_widget.py @@ -10,7 +10,7 @@ from qtpy.QtGui import QFont, QPixmap from qtpy.QtWidgets import QApplication, QFileDialog, QLabel, QVBoxLayout, QWidget import bec_widgets.widgets.containers.qt_ads as QtAds -from bec_widgets.cli.rpc.rpc_register import RPCRegister +from bec_widgets.utils.rpc_register import RPCRegister from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig from bec_widgets.utils.busy_loader import install_busy_loader from bec_widgets.utils.error_popups import SafeConnect, SafeSlot diff --git a/bec_widgets/cli/rpc/rpc_register.py b/bec_widgets/utils/rpc_register.py similarity index 100% rename from bec_widgets/cli/rpc/rpc_register.py rename to bec_widgets/utils/rpc_register.py diff --git a/bec_widgets/utils/rpc_server.py b/bec_widgets/utils/rpc_server.py index d94f9c51..292a4529 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.cli.rpc.rpc_register import RPCRegister +from bec_widgets.utils.rpc_register import RPCRegister from bec_widgets.utils import BECDispatcher from bec_widgets.utils.bec_connector import BECConnector from bec_widgets.utils.container_utils import WidgetContainerUtils diff --git a/bec_widgets/widgets/services/device_browser/device_browser.py b/bec_widgets/widgets/services/device_browser/device_browser.py index 831f7e54..83724bdf 100644 --- a/bec_widgets/widgets/services/device_browser/device_browser.py +++ b/bec_widgets/widgets/services/device_browser/device_browser.py @@ -12,7 +12,7 @@ from pyqtgraph import SignalProxy from qtpy.QtCore import QThreadPool, Signal from qtpy.QtWidgets import QFileDialog, QListWidget, QToolButton, QVBoxLayout, QWidget -from bec_widgets.cli.rpc.rpc_register import RPCRegister +from bec_widgets.utils.rpc_register import RPCRegister 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 diff --git a/tests/end-2-end/test_bec_dock_rpc_e2e.py b/tests/end-2-end/test_bec_dock_rpc_e2e.py index 6bcc0dea..e764ea93 100644 --- a/tests/end-2-end/test_bec_dock_rpc_e2e.py +++ b/tests/end-2-end/test_bec_dock_rpc_e2e.py @@ -2,7 +2,7 @@ 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 +from bec_widgets.cli.rpc_base import RPCReference # pylint: disable=unused-argument # pylint: disable=redefined-outer-name diff --git a/tests/end-2-end/test_plotting_framework_e2e.py b/tests/end-2-end/test_plotting_framework_e2e.py index d42ba4f8..82b9d2eb 100644 --- a/tests/end-2-end/test_plotting_framework_e2e.py +++ b/tests/end-2-end/test_plotting_framework_e2e.py @@ -5,7 +5,7 @@ import pytest from bec_lib.endpoints import MessageEndpoints from bec_widgets.cli.client import Image, MotorMap, MultiWaveform, ScatterWaveform, Waveform -from bec_widgets.cli.rpc.rpc_base import RPCReference +from bec_widgets.cli.rpc_base import RPCReference from bec_widgets.tests.utils import check_remote_data_size diff --git a/tests/end-2-end/test_rpc_register_e2e.py b/tests/end-2-end/test_rpc_register_e2e.py index aeb42a02..6522bd47 100644 --- a/tests/end-2-end/test_rpc_register_e2e.py +++ b/tests/end-2-end/test_rpc_register_e2e.py @@ -1,7 +1,7 @@ import pytest from bec_widgets.cli.client import ImageItem -from bec_widgets.cli.rpc.rpc_base import RPCReference +from bec_widgets.cli.rpc_base import RPCReference # pylint: disable=unused-argument # pylint: disable=protected-access diff --git a/tests/end-2-end/test_rpc_widgets_e2e.py b/tests/end-2-end/test_rpc_widgets_e2e.py index 19e8109f..bdc44342 100644 --- a/tests/end-2-end/test_rpc_widgets_e2e.py +++ b/tests/end-2-end/test_rpc_widgets_e2e.py @@ -1,6 +1,6 @@ import pytest -from bec_widgets.cli.rpc.rpc_base import RPCBase, RPCReference +from bec_widgets.cli.rpc_base import RPCBase, RPCReference # pylint: disable=protected-access # pylint: disable=used-before-assignment diff --git a/tests/end-2-end/user_interaction/test_user_interaction_e2e.py b/tests/end-2-end/user_interaction/test_user_interaction_e2e.py index 9de38709..97718711 100644 --- a/tests/end-2-end/user_interaction/test_user_interaction_e2e.py +++ b/tests/end-2-end/user_interaction/test_user_interaction_e2e.py @@ -18,7 +18,7 @@ import numpy as np import pytest from bec_lib.endpoints import MessageEndpoints -from bec_widgets.cli.rpc.rpc_base import RPCBase, RPCReference +from bec_widgets.cli.rpc_base import RPCBase, RPCReference PYTEST_TIMEOUT = 50 diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py index 2f230bb5..75947146 100644 --- a/tests/unit_tests/conftest.py +++ b/tests/unit_tests/conftest.py @@ -23,7 +23,7 @@ from pytestqt.exceptions import TimeoutError as QtBotTimeoutError from qtpy.QtCore import QEvent, QEventLoop from qtpy.QtWidgets import QApplication, QMessageBox -from bec_widgets.cli.rpc.rpc_register import RPCRegister +from bec_widgets.utils.rpc_register import RPCRegister from bec_widgets.tests.utils import DEVICES, DMMock from bec_widgets.utils import bec_dispatcher as bec_dispatcher_module from bec_widgets.utils import error_popups diff --git a/tests/unit_tests/test_client_plugin_widgets.py b/tests/unit_tests/test_client_plugin_widgets.py index a863c58c..8358e918 100644 --- a/tests/unit_tests/test_client_plugin_widgets.py +++ b/tests/unit_tests/test_client_plugin_widgets.py @@ -5,7 +5,7 @@ from types import SimpleNamespace from unittest.mock import MagicMock, call, patch from bec_widgets.cli import client -from bec_widgets.cli.rpc.rpc_base import RPCBase +from bec_widgets.cli.rpc_base import RPCBase from bec_widgets.utils.plugin_utils import BECClassContainer, BECClassInfo diff --git a/tests/unit_tests/test_generate_cli_client.py b/tests/unit_tests/test_generate_cli_client.py index 1fa50ed0..87bf3cbf 100644 --- a/tests/unit_tests/test_generate_cli_client.py +++ b/tests/unit_tests/test_generate_cli_client.py @@ -103,7 +103,7 @@ def test_client_generator_with_black_formatting(): from bec_lib.logger import bec_logger - from bec_widgets.cli.rpc.rpc_base import RPCBase, rpc_call, rpc_timeout + from bec_widgets.cli.rpc_base import RPCBase, rpc_call, rpc_timeout from bec_widgets.utils.bec_plugin_helper import (get_all_plugin_widgets, get_plugin_client_module) diff --git a/tests/unit_tests/test_rpc_base.py b/tests/unit_tests/test_rpc_base.py index 3fddb4e7..bb18e6d4 100644 --- a/tests/unit_tests/test_rpc_base.py +++ b/tests/unit_tests/test_rpc_base.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock import pytest from bec_lib.device import DeviceBaseWithConfig, Signal -from bec_widgets.cli.rpc.rpc_base import ( +from bec_widgets.cli.rpc_base import ( DeletedWidgetError, RPCBase, RPCReference, diff --git a/tests/unit_tests/test_rpc_register.py b/tests/unit_tests/test_rpc_register.py index 574f11bb..5250d138 100644 --- a/tests/unit_tests/test_rpc_register.py +++ b/tests/unit_tests/test_rpc_register.py @@ -1,4 +1,4 @@ -from bec_widgets.cli.rpc.rpc_register import RPCRegister +from bec_widgets.utils.rpc_register import RPCRegister class FakeObject: