From 86647b9b7e2fa111105ae483808883a624fa4cd6 Mon Sep 17 00:00:00 2001 From: appel_c Date: Wed, 16 Apr 2025 17:32:07 +0200 Subject: [PATCH] fix(rpc-base): deprecate widget_name in favor of object_name; closes #499 --- bec_widgets/cli/rpc/rpc_base.py | 9 +-------- tests/end-2-end/test_plotting_framework_e2e.py | 7 ------- tests/unit_tests/test_rpc_base.py | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/bec_widgets/cli/rpc/rpc_base.py b/bec_widgets/cli/rpc/rpc_base.py index 70e5464a..ea86027e 100644 --- a/bec_widgets/cli/rpc/rpc_base.py +++ b/bec_widgets/cli/rpc/rpc_base.py @@ -144,7 +144,7 @@ class RPCBase: def __repr__(self): type_ = type(self) qualname = type_.__qualname__ - return f"<{qualname} with name: {self.widget_name}>" + return f"<{qualname} with name: {self.object_name}>" def remove(self): """ @@ -152,13 +152,6 @@ class RPCBase: """ self._run_rpc("remove") - @property - def widget_name(self): - """ - Get the widget name. - """ - return self.object_name - @property def _root(self) -> BECGuiClient: """ diff --git a/tests/end-2-end/test_plotting_framework_e2e.py b/tests/end-2-end/test_plotting_framework_e2e.py index 6d2fc2dd..0efe7a73 100644 --- a/tests/end-2-end/test_plotting_framework_e2e.py +++ b/tests/end-2-end/test_plotting_framework_e2e.py @@ -148,13 +148,6 @@ def test_async_plotting(qtbot, bec_client_lib, connected_client_gui_obj): y_data, last_scan_data.devices.waveform.get("waveform_waveform", {}).read().get("value", []) ) - # Check displayed data - x_data_display, y_data_display = curve._get_displayed_data() - # Should be not more than 1% difference, actually be closer but this might be flaky - assert np.isclose(x_data_display[-1], x_data[-1], rtol=0.01) - # Downsampled data should be smaller than original data - assert len(y_data_display) < len(y_data) - def test_rpc_image(qtbot, bec_client_lib, connected_client_gui_obj): gui = connected_client_gui_obj diff --git a/tests/unit_tests/test_rpc_base.py b/tests/unit_tests/test_rpc_base.py index d842a9fe..95572e2a 100644 --- a/tests/unit_tests/test_rpc_base.py +++ b/tests/unit_tests/test_rpc_base.py @@ -14,7 +14,7 @@ def test_rpc_base(rpc_base): ref = RPCReference(registry, rpc_base._gui_id) assert ref._gui_id == rpc_base._gui_id - assert ref.widget_name == rpc_base.widget_name + assert ref.object_name == rpc_base.object_name assert ref.__str__() == rpc_base.__str__() assert ref.__repr__() == rpc_base.__repr__() @@ -25,4 +25,4 @@ def test_rpc_base(rpc_base): assert ref.__repr__() == f"" with pytest.raises(DeletedWidgetError): - ref.widget_name # Object no longer referenced in registry + ref._root # Object no longer referenced in registry