refactor: move rpc_base back to cli/rpc to make the transition easier

bec_widgets/cli/__init__.py

@@ -0,0 +1 @@
+from bec_widgets.cli.rpc import rpc_base

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

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

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

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

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
 
 

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

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

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
 

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
 
 

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)
 

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,