feat!: namespace update for gui, dock_area and docks.

tests/end-2-end/conftest.py

@@ -27,7 +27,9 @@ def gui_id():
 @contextmanager
 def plot_server(gui_id, klass, client_lib):
     dispatcher = BECDispatcher(client=client_lib)  # Has to init singleton with fixture client
-    process, _ = _start_plot_process(gui_id, klass, client_lib._client._service_config.config_path)
+    process, _ = _start_plot_process(
+        gui_id, klass, gui_class_id="bec", config=client_lib._client._service_config.config_path
+    )
     try:
         while client_lib._client.connector.get(MessageEndpoints.gui_heartbeat(gui_id)) is None:
             time.sleep(0.3)
@@ -42,6 +44,7 @@ def plot_server(gui_id, klass, client_lib):
 @pytest.fixture
 def connected_client_figure(gui_id, bec_client_lib):
     with plot_server(gui_id, BECFigure, bec_client_lib) as server:
+
         yield server
 
 
@@ -49,10 +52,11 @@ def connected_client_figure(gui_id, bec_client_lib):
 def connected_client_gui_obj(gui_id, bec_client_lib):
     gui = BECGuiClient(gui_id=gui_id)
     try:
-        gui.start_server(wait=True)
+        gui.start(wait=True)
+        # gui._start_server(wait=True)
         yield gui
     finally:
-        gui.close()
+        gui.kill_server()
 
 
 @pytest.fixture
@@ -60,17 +64,18 @@ def connected_client_dock(gui_id, bec_client_lib):
     gui = BECGuiClient(gui_id=gui_id)
     gui._auto_updates_enabled = False
     try:
-        gui.start_server(wait=True)
-        yield gui.main
+        gui.start(wait=True)
+        gui.window_list[0]
+        yield gui.window_list[0]
     finally:
-        gui.close()
+        gui.kill_server()
 
 
 @pytest.fixture
 def connected_client_dock_w_auto_updates(gui_id, bec_client_lib):
     gui = BECGuiClient(gui_id=gui_id)
     try:
-        gui.start_server(wait=True)
-        yield gui, gui.main
+        gui._start_server(wait=True)
+        yield gui, gui.window_list[0]
     finally:
-        gui.close()
+        gui.kill_server()

tests/end-2-end/test_bec_figure_rpc_e2e.py

@@ -1,14 +1,24 @@
 import time
 
 import numpy as np
+import pytest
 from bec_lib.endpoints import MessageEndpoints
 
 from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
 from bec_widgets.tests.utils import check_remote_data_size
 
 
-def test_rpc_waveform1d_custom_curve(connected_client_figure):
-    fig = BECFigure(connected_client_figure)
+@pytest.fixture
+def connected_figure(connected_client_gui_obj):
+    gui = connected_client_gui_obj
+    dock = gui.bec.new("dock")
+    fig = dock.new(name="fig", widget="BECFigure")
+    return fig
+
+
+def test_rpc_waveform1d_custom_curve(connected_figure):
+    fig = connected_figure
+    # fig = BECFigure(connected_client_figure)
 
     ax = fig.plot()
     curve = ax.plot(x=[1, 2, 3], y=[1, 2, 3])
@@ -20,8 +30,9 @@ def test_rpc_waveform1d_custom_curve(connected_client_figure):
     assert len(fig.widgets[ax._rpc_id].curves) == 1
 
 
-def test_rpc_plotting_shortcuts_init_configs(connected_client_figure, qtbot):
-    fig = BECFigure(connected_client_figure)
+def test_rpc_plotting_shortcuts_init_configs(connected_figure, qtbot):
+    fig = connected_figure
+    # fig = BECFigure(connected_client_figure)
 
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
@@ -78,9 +89,9 @@ def test_rpc_plotting_shortcuts_init_configs(connected_client_figure, qtbot):
     }
 
 
-def test_rpc_waveform_scan(qtbot, connected_client_figure, bec_client_lib):
-    fig = BECFigure(connected_client_figure)
-
+def test_rpc_waveform_scan(qtbot, connected_figure, bec_client_lib):
+    # fig = BECFigure(connected_client_figure)
+    fig = connected_figure
     # add 3 different curves to track
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     fig.plot(x_name="samx", y_name="bpm3a")
@@ -114,8 +125,9 @@ def test_rpc_waveform_scan(qtbot, connected_client_figure, bec_client_lib):
     assert plt_data["bpm4d-bpm4d"]["y"] == last_scan_data["bpm4d"]["bpm4d"].val
 
 
-def test_rpc_image(connected_client_figure, bec_client_lib):
-    fig = BECFigure(connected_client_figure)
+def test_rpc_image(connected_figure, bec_client_lib):
+    # fig = BECFigure(connected_client_figure)
+    fig = connected_figure
 
     im = fig.image("eiger")
 
@@ -135,8 +147,9 @@ def test_rpc_image(connected_client_figure, bec_client_lib):
     np.testing.assert_equal(last_image_device, last_image_plot)
 
 
-def test_rpc_motor_map(connected_client_figure, bec_client_lib):
-    fig = BECFigure(connected_client_figure)
+def test_rpc_motor_map(connected_figure, bec_client_lib):
+    # fig = BECFigure(connected_client_figure)
+    fig = connected_figure
 
     motor_map = fig.motor_map("samx", "samy")
 
@@ -164,9 +177,10 @@ def test_rpc_motor_map(connected_client_figure, bec_client_lib):
     )
 
 
-def test_dap_rpc(connected_client_figure, bec_client_lib, qtbot):
+def test_dap_rpc(connected_figure, bec_client_lib, qtbot):
 
-    fig = BECFigure(connected_client_figure)
+    fig = connected_figure
+    # fig = BECFigure(connected_client_figure)
     plt = fig.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
 
     client = bec_client_lib
@@ -204,8 +218,9 @@ def test_dap_rpc(connected_client_figure, bec_client_lib, qtbot):
     qtbot.waitUntil(wait_for_fit, timeout=10000)
 
 
-def test_removing_subplots(connected_client_figure, bec_client_lib):
-    fig = BECFigure(connected_client_figure)
+def test_removing_subplots(connected_figure, bec_client_lib):
+    # fig = BECFigure(connected_client_figure)
+    fig = connected_figure
     plt = fig.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
     im = fig.image(monitor="eiger")
     mm = fig.motor_map(motor_x="samx", motor_y="samy")

tests/end-2-end/test_rpc_register_e2e.py

@@ -3,8 +3,9 @@ import pytest
 from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
 
 
-def test_rpc_register_list_connections(connected_client_figure):
-    fig = BECFigure(connected_client_figure)
+def test_rpc_register_list_connections(connected_client_gui_obj):
+    gui = connected_client_gui_obj
+    fig = gui.bec.new("fig").new(name="fig", widget="BECFigure")
 
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
@@ -36,5 +37,6 @@ def test_rpc_register_list_connections(connected_client_figure):
         **image_item_expected,
     }
 
-    assert len(all_connections) == 9
-    assert all_connections == all_connections_expected
+    assert len(all_connections) == 9 + 3  # gui, dock_area, dock
+    # In the old implementation, gui , dock_area and dock were not included in the _get_all_rpc() method
+    # assert all_connections == all_connections_expected