From 77d7d4bff499166b93568e1ce579e410fd5a4a97 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 17 Apr 2026 09:46:40 +0200 Subject: [PATCH] refactor: move rpc_base back to cli/rpc to make the transition easier --- bec_widgets/cli/__init__.py | 1 + bec_widgets/cli/client.py | 2 +- bec_widgets/cli/client_utils.py | 2 +- bec_widgets/cli/rpc/__init__.py | 0 bec_widgets/cli/{ => rpc}/rpc_base.py | 0 bec_widgets/utils/generate_cli.py | 2 +- tests/end-2-end/test_bec_dock_rpc_e2e.py | 2 +- tests/end-2-end/test_plotting_framework_e2e.py | 2 +- tests/end-2-end/test_rpc_register_e2e.py | 2 +- tests/end-2-end/test_rpc_widgets_e2e.py | 2 +- tests/end-2-end/user_interaction/test_user_interaction_e2e.py | 2 +- tests/unit_tests/test_client_plugin_widgets.py | 2 +- tests/unit_tests/test_generate_cli_client.py | 2 +- tests/unit_tests/test_rpc_base.py | 2 +- 14 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 bec_widgets/cli/rpc/__init__.py rename bec_widgets/cli/{ => rpc}/rpc_base.py (100%) diff --git a/bec_widgets/cli/__init__.py b/bec_widgets/cli/__init__.py index e69de29b..3d30d694 100644 --- a/bec_widgets/cli/__init__.py +++ b/bec_widgets/cli/__init__.py @@ -0,0 +1 @@ +from bec_widgets.cli.rpc import rpc_base diff --git a/bec_widgets/cli/client.py b/bec_widgets/cli/client.py index 83ff517a..3cb59560 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_base import RPCBase, rpc_call, rpc_timeout +from bec_widgets.cli.rpc.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 fac85eb0..4694ebc4 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_base import RPCBase, RPCReference +from bec_widgets.cli.rpc.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/rpc/__init__.py b/bec_widgets/cli/rpc/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/bec_widgets/cli/rpc_base.py b/bec_widgets/cli/rpc/rpc_base.py similarity index 100% rename from bec_widgets/cli/rpc_base.py rename to bec_widgets/cli/rpc/rpc_base.py diff --git a/bec_widgets/utils/generate_cli.py b/bec_widgets/utils/generate_cli.py index b6470d55..32ddb38c 100644 --- a/bec_widgets/utils/generate_cli.py +++ b/bec_widgets/utils/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_base import RPCBase, rpc_call, rpc_timeout +from bec_widgets.cli.rpc.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/tests/end-2-end/test_bec_dock_rpc_e2e.py b/tests/end-2-end/test_bec_dock_rpc_e2e.py index e764ea93..6bcc0dea 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_base import RPCReference +from bec_widgets.cli.rpc.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 82b9d2eb..d42ba4f8 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_base import RPCReference +from bec_widgets.cli.rpc.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 6522bd47..aeb42a02 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_base import RPCReference +from bec_widgets.cli.rpc.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 bdc44342..19e8109f 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_base import RPCBase, RPCReference +from bec_widgets.cli.rpc.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 97718711..9de38709 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_base import RPCBase, RPCReference +from bec_widgets.cli.rpc.rpc_base import RPCBase, RPCReference PYTEST_TIMEOUT = 50 diff --git a/tests/unit_tests/test_client_plugin_widgets.py b/tests/unit_tests/test_client_plugin_widgets.py index 8358e918..a863c58c 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_base import RPCBase +from bec_widgets.cli.rpc.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 be9e0396..7b9371cd 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_base import RPCBase, rpc_call, rpc_timeout + from bec_widgets.cli.rpc.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 bb18e6d4..3fddb4e7 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_base import ( +from bec_widgets.cli.rpc.rpc_base import ( DeletedWidgetError, RPCBase, RPCReference,