bec-widgets 0.57.1__py3-none-any.whl → 0.57.2__py3-none-any.whl

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 
 
+## v0.57.2 (2024-06-06)
+
+### Fix
+
+* fix(test/e2e): autoupdate e2e rewritten ([`e1af5ca`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e1af5ca60f0616835f9f41d84412f29dc298c644))
+
+* fix(test/e2e): spiral_progress_bar e2e tests rewritten to use config_dict ([`7fb31fc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7fb31fc4d762ff4ca839971b3092a084186f81b8))
+
+* fix(test/e2e): dockarea and dock e2e tests changed to check asserts against config_dict ([`5c6ba65`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5c6ba65469863ea1e6fc5abdc742650e20eba9b9))
+
+* fix: rpc_server_dock fixture now spawns the server process ([`cd9fc46`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cd9fc46ff8a947242c8c28adcd73d7de60b11c44))
+
+* fix: accept scalars or numpy arrays of 1 element ([`2a88e17`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2a88e17b23436c55d25b7d3449e4af3a7689661c))
+
+### Refactor
+
+* refactor: move _get_output and _start_plot_process at the module level ([`69f4371`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/69f4371007c66aee6b7521a6803054025adf8c92))
+
+
 ## v0.57.1 (2024-06-06)
 
 ### Documentation
@@ -146,30 +165,3 @@
 
 
 ## v0.53.0 (2024-05-09)
-
-### Ci
-
-* ci: use formatter config of toml file ([`5cc816d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5cc816d0af73e20c648e044a027c589704ab1625))
-
-### Documentation
-
-* docs: update install instructions ([`57ee735`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/57ee735e5c2436d45a285507cdc939daa20e8e8f))
-
-### Feature
-
-* feat: moved to pyproject.toml; closes #162 ([`c86ce30`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c86ce302a964d71ee631f0817609ab5aa0e3ab0f))
-
-### Fix
-
-* fix: fixed semver job and upgraded to v9 ([`32e1a9d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/32e1a9d8472eb1c25d30697d407a8ffecd04e75d))
-
-### Refactor
-
-* refactor: applied formatter ([`4117fd7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4117fd7b5b2090ff4fb7ad9e0d92cc87cd13ed5f))
-
-
-## v0.52.1 (2024-05-08)
-
-### Fix
-
-* fix(docstrings): docstrings formating fixed for sphinx to properly format readdocs ([`7f2f7cd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7f2f7cd07a14876617cd83cedde8c281fdc52c3a))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.57.1
+Version: 0.57.2
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets
@@ -27,6 +27,7 @@ Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: pytest-qt; extra == 'dev'
 Requires-Dist: pytest-random-order; extra == 'dev'
 Requires-Dist: pytest-timeout; extra == 'dev'
+Requires-Dist: pytest-xvfb; extra == 'dev'
 Provides-Extra: pyqt5
 Requires-Dist: pyqt5>=5.9; extra == 'pyqt5'
 Provides-Extra: pyqt6

bec_widgets/cli/client.py

@@ -1651,6 +1651,16 @@ class BECDockArea(RPCBase, BECGuiClientMixin):
         Get all registered RPC objects.
         """
 
+    @property
+    @rpc_call
+    def temp_areas(self) -> "list":
+        """
+        Get the temporary areas in the dock area.
+
+        Returns:
+            list: The temporary areas in the dock area.
+        """
+
 
 class SpiralProgressBar(RPCBase):
     @rpc_call

bec_widgets/cli/client_utils.py

@@ -61,10 +61,54 @@ def rpc_call(func):
     return wrapper
 
 
+def _get_output(process) -> None:
+    try:
+        os.set_blocking(process.stdout.fileno(), False)
+        os.set_blocking(process.stderr.fileno(), False)
+        while process.poll() is None:
+            readylist, _, _ = select.select([process.stdout, process.stderr], [], [], 1)
+            if process.stdout in readylist:
+                output = process.stdout.read(1024)
+                if output:
+                    print(output, end="")
+            if process.stderr in readylist:
+                error_output = process.stderr.read(1024)
+                if error_output:
+                    print(error_output, end="", file=sys.stderr)
+    except Exception as e:
+        print(f"Error reading process output: {str(e)}")
+
+
+def _start_plot_process(gui_id, gui_class, config) -> None:
+    """
+    Start the plot in a new process.
+    """
+    # pylint: disable=subprocess-run-check
+    monitor_module = importlib.import_module("bec_widgets.cli.server")
+    monitor_path = monitor_module.__file__
+
+    command = [
+        sys.executable,
+        "-u",
+        monitor_path,
+        "--id",
+        gui_id,
+        "--config",
+        config,
+        "--gui_class",
+        gui_class.__name__,
+    ]
+    process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    process_output_processing_thread = threading.Thread(target=_get_output, args=(process,))
+    process_output_processing_thread.start()
+    return process, process_output_processing_thread
+
+
 class BECGuiClientMixin:
     def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
         self._process = None
+        self._process_output_processing_thread = None
         self.auto_updates = self._get_update_script()
         self._target_endpoint = MessageEndpoints.scan_status()
         self._selected_device = None
@@ -118,7 +162,10 @@ class BECGuiClientMixin:
         Show the figure.
         """
         if self._process is None or self._process.poll() is not None:
-            self._start_plot_process()
+            self._start_update_script()
+            self._process, self._process_output_processing_thread = _start_plot_process(
+                self._gui_id, self.__class__, self._client._service_config.redis
+            )
         while not self.gui_is_alive():
             print("Waiting for GUI to start...")
             time.sleep(1)
@@ -138,34 +185,6 @@ class BECGuiClientMixin:
         self._process = None
         self._client.shutdown()
 
-    def _start_plot_process(self) -> None:
-        """
-        Start the plot in a new process.
-        """
-        self._start_update_script()
-        # pylint: disable=subprocess-run-check
-        config = self._client._service_config.redis
-        monitor_module = importlib.import_module("bec_widgets.cli.server")
-        monitor_path = monitor_module.__file__
-        gui_class = self.__class__.__name__
-
-        command = [
-            sys.executable,
-            "-u",
-            monitor_path,
-            "--id",
-            self._gui_id,
-            "--config",
-            config,
-            "--gui_class",
-            gui_class,
-        ]
-        self._process = subprocess.Popen(
-            command, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-        )
-        self._process_output_processing_thread = threading.Thread(target=self._get_output)
-        self._process_output_processing_thread.start()
-
     def print_log(self) -> None:
         """
         Print the log of the plot process.
@@ -176,26 +195,6 @@ class BECGuiClientMixin:
         # Flush list
         self.stderr_output.clear()
 
-    def _get_output(self) -> str:
-        try:
-            os.set_blocking(self._process.stdout.fileno(), False)
-            os.set_blocking(self._process.stderr.fileno(), False)
-            while self._process.poll() is None:
-                readylist, _, _ = select.select(
-                    [self._process.stdout, self._process.stderr], [], [], 1
-                )
-                if self._process.stdout in readylist:
-                    output = self._process.stdout.read(1024)
-                    if output:
-                        print(output, end="")
-                if self._process.stderr in readylist:
-                    error_output = self._process.stderr.read(1024)
-                    if error_output:
-                        print(error_output, end="", file=sys.stderr)
-                        self.stderr_output.append(error_output)
-        except Exception as e:
-            print(f"Error reading process output: {str(e)}")
-
 
 class RPCResponseTimeoutError(Exception):
     """Exception raised when an RPC response is not received within the expected time."""

bec_widgets/widgets/dock/dock_area.py

@@ -33,6 +33,7 @@ class BECDockArea(BECConnector, DockArea):
         "detach_dock",
         "attach_all",
         "get_all_rpc",
+        "temp_areas",
     ]
 
     def __init__(
@@ -70,9 +71,22 @@ class BECDockArea(BECConnector, DockArea):
 
     @panels.setter
     def panels(self, value: dict):
-
         self.docks = WeakValueDictionary(value)
 
+    @property
+    def temp_areas(self) -> list:
+        """
+        Get the temporary areas in the dock area.
+
+        Returns:
+            list: The temporary areas in the dock area.
+        """
+        return list(map(str, self.tempAreas))
+
+    @temp_areas.setter
+    def temp_areas(self, value: list):
+        self.tempAreas = list(map(str, value))
+
     def restore_state(
         self, state: dict = None, missing: Literal["ignore", "error"] = "ignore", extra="bottom"
     ):
@@ -107,6 +121,7 @@ class BECDockArea(BECConnector, DockArea):
             name(str): The name of the dock to remove.
         """
         dock = self.docks.pop(name, None)
+        self.config.docks.pop(name, None)
         if dock:
             dock.close()
             if len(self.docks) <= 1:
@@ -190,7 +205,7 @@ class BECDockArea(BECConnector, DockArea):
             BECDock: The undocked dock.
         """
         dock = self.docks[dock_name]
-        self.floatDock(dock)
+        dock.detach()
         return dock
 
     def attach_all(self):

bec_widgets/widgets/figure/plots/motor_map/motor_map.py

@@ -317,7 +317,7 @@ class BECMotorMap(BECPlotBase):
         Returns:
             float: Motor initial position.
         """
-        init_position = round(self.dev[name].read()[entry]["value"], precision)
+        init_position = round(float(self.dev[name].read()[entry]["value"]), precision)
         return init_position
 
     def _validate_signal_entries(
@@ -403,7 +403,7 @@ class BECMotorMap(BECPlotBase):
         # Update plot title
         precision = self.config.precision
         self.set_title(
-            f"Motor position: ({round(current_x,precision)}, {round(current_y,precision)})"
+            f"Motor position: ({round(float(current_x),precision)}, {round(float(current_y),precision)})"
         )
 
     @pyqtSlot(dict)

bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -577,7 +577,6 @@ class BECWaveform(BECPlotBase):
         Returns:
             dict | pd.DataFrame: Data of all curves in the specified format.
         """
-
         data = {}
         try:
             import pandas as pd

bec_widgets/widgets/spiral_progress_bar/ring.py

@@ -115,7 +115,8 @@ class Ring(BECConnector):
 
     def set_value(self, value: int | float):
         self.config.value = round(
-            max(self.config.min_value, min(self.config.max_value, value)), self.config.precision
+            float(max(self.config.min_value, min(self.config.max_value, value))),
+            self.config.precision,
         )
 
     def set_color(self, color: str | tuple):

{bec_widgets-0.57.1.dist-info → bec_widgets-0.57.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.57.1
+Version: 0.57.2
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets
@@ -27,6 +27,7 @@ Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: pytest-qt; extra == 'dev'
 Requires-Dist: pytest-random-order; extra == 'dev'
 Requires-Dist: pytest-timeout; extra == 'dev'
+Requires-Dist: pytest-xvfb; extra == 'dev'
 Provides-Extra: pyqt5
 Requires-Dist: pyqt5>=5.9; extra == 'pyqt5'
 Provides-Extra: pyqt6

{bec_widgets-0.57.1.dist-info → bec_widgets-0.57.2.dist-info}/RECORD

@@ -2,11 +2,11 @@
 .gitlab-ci.yml,sha256=RF2JeGh8tG09DyAOwEu991IZy3C8Vm6lI8O_4Dr9B9Q,12239
 .pylintrc,sha256=OstrgmEyP0smNFBKoIN5_26-UmNZgMHnbjvAWX0UrLs,18535
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=zxHMzEXHUbEgqxmsrAtt2A-iiShgClvqzI5lZKRqoX4,6824
+CHANGELOG.md,sha256=pG4sxxA4UKrOCZsHzC7nzYA5A7dwla6lFKnMujn04rQ,6889
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=3KI7EdkH96oYBSsLvSfLCot3XuI2m8AgiRHo3zXUrRo,1135
+PKG-INFO,sha256=VKjVy_MzeMyq50c2kmwfQ9hoe6abecAZIR6nSJcwVck,1178
 README.md,sha256=y4jB6wvArS7N8_iTbKWnSM_oRAqLA2GqgzUR-FMh5sU,2645
-pyproject.toml,sha256=-9xY8HWFrm3iGS29r-3dRMXdM-LJecifdKwnmvYoWPU,1803
+pyproject.toml,sha256=mYnyN3JxG1ULTqPhRsHj5xvuD0wUNtZydA6gaSddQSE,1822
 .git_hooks/pre-commit,sha256=n3RofIZHJl8zfJJIUomcMyYGFi_rwq4CC19z0snz3FI,286
 .gitlab/issue_templates/bug_report_template.md,sha256=gAuyEwl7XlnebBrkiJ9AqffSNOywmr8vygUFWKTuQeI,386
 .gitlab/issue_templates/documentation_update_template.md,sha256=FHLdb3TS_D9aL4CYZCjyXSulbaW5mrN2CmwTaeLPbNw,860
@@ -17,8 +17,8 @@ bec_widgets/assets/bec_widgets_icon.png,sha256=K8dgGwIjalDh9PRHUsSQBqgdX7a00nM3i
 bec_widgets/assets/terminal_icon.png,sha256=bJl7Tft4Fi2uxvuXI8o14uMHnI9eAWKSU2uftXCH9ws,3889
 bec_widgets/cli/__init__.py,sha256=tLD8HWgyURhMjYlKZ43pBu-qvGD1LI5o3n3rEieg-70,43
 bec_widgets/cli/auto_updates.py,sha256=8x4_SrD8Hh1RbrUWXLfisw6X5v8Mij2DiTfjvn9dkUw,4692
-bec_widgets/cli/client.py,sha256=_39klWIob_MdCJ8mxjXhJ_1z56qVCoyeMH0Ji2uEiik,52876
-bec_widgets/cli/client_utils.py,sha256=gxa9TpYCWa0a7jsrMaWv_FQOnfeqP-xht8PYbhcEgys,10802
+bec_widgets/cli/client.py,sha256=DaBkuNB38XhOdNuAmd7UPaEy4kEWCgOdWWfMsPBsWAI,53089
+bec_widgets/cli/client_utils.py,sha256=7u8P9EYgLPJuAcHxnFiZi-gCZohO3vAn0W7dqsSrs4M,10660
 bec_widgets/cli/generate_cli.py,sha256=tBt-F4Xccg9Pj2zuDEGHd0Ho1fKLfCf3PuSa8KmelQk,4431
 bec_widgets/cli/rpc_register.py,sha256=QxXUZu5XNg00Yf5O3UHWOXg3-f_pzKjjoZYMOa-MOJc,2216
 bec_widgets/cli/rpc_wigdet_handler.py,sha256=OXHoiDFJPzbQ5RO0bzIX5aUXeMMlJTwAiTmB0_7Chj4,913
@@ -49,7 +49,7 @@ bec_widgets/utils/yaml_dialog.py,sha256=cMVif-39SB9WjwGH5FWBJcFs4tnfFJFs5cacydRy
 bec_widgets/widgets/__init__.py,sha256=LKgIuY3CI-NHCa_bY9pThYhxLH0MHDo8iNEJDDVIVmw,172
 bec_widgets/widgets/dock/__init__.py,sha256=B7foHt02gnhM7mFksa7GJVwT7n0j_JvYDCt6wc6XR5g,61
 bec_widgets/widgets/dock/dock.py,sha256=kdX0ZbuUdx6XETZ1NUgzBWlee_Q7JcN3fXpARDAlre8,8955
-bec_widgets/widgets/dock/dock_area.py,sha256=MtuT6_LYCPQ0TnKBtO4_4ReA9L8tZZrroUjkzEQspdk,7322
+bec_widgets/widgets/dock/dock_area.py,sha256=Yj01iI5Lzh-Rf6D9Z4m48JItVHC-1954MJHfjYimEE8,7731
 bec_widgets/widgets/figure/__init__.py,sha256=3hGx_KOV7QHCYAV06aNuUgKq4QIYCjUTad-DrwkUaBM,44
 bec_widgets/widgets/figure/figure.py,sha256=OzeKZme89JnzMcKT1sACnyw951EtRoSUALl58upY6b4,29762
 bec_widgets/widgets/figure/plots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,9 +59,9 @@ bec_widgets/widgets/figure/plots/image/image.py,sha256=fdANm_lMzmKeddwCq3Arc1p48
 bec_widgets/widgets/figure/plots/image/image_item.py,sha256=1oytCY2IIgRbtS3GRrp9JV02KOif78O2-iaK0qYuHFU,9058
 bec_widgets/widgets/figure/plots/image/image_processor.py,sha256=59JwHMEBjLo72fmrAB7W1PFBT2oBe16heBaZfYM6MAk,4368
 bec_widgets/widgets/figure/plots/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=HKRbt8sD8fmzpYcEWD8-nYs1Mv7pLup1BfRAEVmKN3A,15246
+bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=Ff2WoNHxO_A3ggsbSd_AVUP1JeOWMuJs-0GLskxn-94,15267
 bec_widgets/widgets/figure/plots/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=k6Lh08V00N9gATppaLgaSaij4Husf8sYU_HXTvF3oB4,21664
+bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=U0d4Qdsej9AlHrAf7krgE4AFWEkK_Y-IAGjH-Tv9bT0,21663
 bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=9q7nJfyH8y9rWw_AIOd6tk7cbckoAGNLHv2oHEKCCyo,7229
 bec_widgets/widgets/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/jupyter_console/jupyter_console.py,sha256=ioLYJL31RdBoAOGFSS8PVSnUhkWPWmLC3tiKp7CouO8,2251
@@ -82,7 +82,7 @@ bec_widgets/widgets/motor_control/selection/selection.ui,sha256=vXXpvNWuL6xyHhW7
 bec_widgets/widgets/scan_control/__init__.py,sha256=IOfHl15vxb_uC6KN62-PeUzbBha_vQyqkkXbJ2HU674,38
 bec_widgets/widgets/scan_control/scan_control.py,sha256=B5n2U2iVtTCY3Tx93JyBqzGCDCmWhWwAOhbPelLI-bs,17168
 bec_widgets/widgets/spiral_progress_bar/__init__.py,sha256=4efbtcqCToMIw5bkQrTzy2TzuBCXvlhuUPh1bYC_Yzg,51
-bec_widgets/widgets/spiral_progress_bar/ring.py,sha256=_wUIZOZ_UZaI3U9-s-VS5v-yv5NBPB991WoXunNr1jI,7077
+bec_widgets/widgets/spiral_progress_bar/ring.py,sha256=WlS3L3mSxFQNtc8T_XEPM7IoVeXYnM2SE5ImjvX6kJU,7097
 bec_widgets/widgets/spiral_progress_bar/spiral_progress_bar.py,sha256=AjQsZDEqPlTn0kE4xkYKOj2ae5vJ9gW-k3yz1Y32vsY,22543
 bec_widgets/widgets/toolbar/__init__.py,sha256=d-TP4_cr_VbpwreMM4ePnfZ5YXsEPQ45ibEf75nuGoE,36
 bec_widgets/widgets/toolbar/toolbar.py,sha256=e0zCD_0q7K4NVhrzD8001Qvfxt-VhqHTgofchS9NgCM,5125
@@ -122,10 +122,10 @@ docs/user/widgets/w1D.gif,sha256=tuHbleJpl6bJFNNC2OdndF5LF7IyfvlkFCMGZajrQPs,622
 docs/user/widgets/widgets.md,sha256=NFdqTlLTHXueErLzvw4wHwTUrzRSEuRelb1fiT4PySg,352
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/end-2-end/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/end-2-end/conftest.py,sha256=b5Yebbj8C1-IcXq23XGbOnXF0kOZD_Po46Z-p4cBwfs,1346
-tests/end-2-end/test_bec_dock_rpc_e2e.py,sha256=5W1uczZV6AqzjY6rHMR8GJDQuGpImtz-BGqq_cdqjbE,9823
-tests/end-2-end/test_bec_figure_rpc_e2e.py,sha256=X8lQLx2NsB6-nU61IhVtAw1-pJ4A2qFgx5PxOWC0V7Q,5527
-tests/end-2-end/test_rpc_register_e2e.py,sha256=M7sSq3us2yQIW5tAIFOFfBULatZTQNLdt0frh1bINts,1595
+tests/end-2-end/conftest.py,sha256=taLqiYVzOhJjMre5ypgQjB7wzSXP4soKANW3XfAjems,1773
+tests/end-2-end/test_bec_dock_rpc_e2e.py,sha256=G-YBfOhJCyV6g74mxXuhAPA9E_BPQ6EUT6xS278aq34,8865
+tests/end-2-end/test_bec_figure_rpc_e2e.py,sha256=yIbGoDJRN22XVmNASCSh51MdcCMSan1d1qNW1QIXiVk,5082
+tests/end-2-end/test_rpc_register_e2e.py,sha256=yUt0-UzWZX1keyHO-dyK0zIevtTgBWLP47_zpcvBywI,1583
 tests/unit_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/client_mocks.py,sha256=ErrklY7446jXE2_XGKebs_a-2Pqif5ECOPvxVAKRZXY,4170
 tests/unit_tests/conftest.py,sha256=KrnktXPWmZhnKNue-xGWOLD1XGEvdz9Vf7V2eO3XQ3A,596
@@ -150,7 +150,7 @@ tests/unit_tests/test_configs/config_device_no_entry.yaml,sha256=hdvue9KLc_kfNzG
 tests/unit_tests/test_configs/config_scan.yaml,sha256=vo484BbWOjA_e-h6bTjSV9k7QaQHrlAvx-z8wtY-P4E,1915
 tests/unit_tests/test_msgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/test_msgs/available_scans_message.py,sha256=m_z97hIrjHXXMa2Ex-UvsPmTxOYXfjxyJaGkIY6StTY,46532
-bec_widgets-0.57.1.dist-info/METADATA,sha256=3KI7EdkH96oYBSsLvSfLCot3XuI2m8AgiRHo3zXUrRo,1135
-bec_widgets-0.57.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-bec_widgets-0.57.1.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.57.1.dist-info/RECORD,,
+bec_widgets-0.57.2.dist-info/METADATA,sha256=VKjVy_MzeMyq50c2kmwfQ9hoe6abecAZIR6nSJcwVck,1178
+bec_widgets-0.57.2.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+bec_widgets-0.57.2.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.57.2.dist-info/RECORD,,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.57.1"
+version = "0.57.2"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [
@@ -31,6 +31,7 @@ dev = [
     "pytest",
     "pytest-random-order",
     "pytest-timeout",
+    "pytest-xvfb",
     "coverage",
     "pytest-qt",
     "isort",

tests/end-2-end/conftest.py

@@ -1,40 +1,55 @@
+import random
+import time
+from contextlib import contextmanager
+
 import pytest
+from bec_lib.endpoints import MessageEndpoints
 
+from bec_widgets.cli.client_utils import _start_plot_process
 from bec_widgets.cli.rpc_register import RPCRegister
-from bec_widgets.cli.server import BECWidgetsCLIServer
 from bec_widgets.utils import BECDispatcher
 from bec_widgets.widgets import BECDockArea, BECFigure
 
 
+# make threads check in autouse, **will be executed at the end**; better than
+# having it in fixtures for each test, since it prevents from needing to
+# 'manually' shutdown bec_client_lib (for example) to make it happy, whereas
+# whereas in fact bec_client_lib makes its on cleanup
 @pytest.fixture(autouse=True)
-def rpc_register():
-    yield RPCRegister()
-    RPCRegister.reset_singleton()
+def threads_check_fixture(threads_check):
+    return
+
+
+@pytest.fixture
+def gui_id():
+    return f"figure_{random.randint(0,100)}"  # make a new gui id each time, to ensure no 'gui is alive' zombie key can perturbate
+
+
+@contextmanager
+def plot_server(gui_id, klass, client_lib):
+    dispatcher = BECDispatcher(client=client_lib)  # Has to init singleton with fixture client
+    process, output_thread = _start_plot_process(
+        gui_id, klass, client_lib._client._service_config.redis
+    )
+    try:
+        while client_lib._client.connector.get(MessageEndpoints.gui_heartbeat(gui_id)) is None:
+            time.sleep(0.3)
+        yield gui_id
+    finally:
+        process.terminate()
+        process.wait()
+        output_thread.join()
+        dispatcher.disconnect_all()
+        dispatcher.reset_singleton()
 
 
 @pytest.fixture
-def rpc_server_figure(qtbot, bec_client_lib, threads_check):
-    dispatcher = BECDispatcher(client=bec_client_lib)  # Has to init singleton with fixture client
-    server = BECWidgetsCLIServer(gui_id="figure", gui_class=BECFigure)
-    qtbot.addWidget(server.gui)
-    qtbot.waitExposed(server.gui)
-    qtbot.wait(1000)  # 1s long to wait until gui is ready
-    yield server
-    dispatcher.disconnect_all()
-    server.client.shutdown()
-    server.shutdown()
-    dispatcher.reset_singleton()
+def rpc_server_figure(gui_id, bec_client_lib):
+    with plot_server(gui_id, BECFigure, bec_client_lib) as server:
+        yield server
 
 
 @pytest.fixture
-def rpc_server_dock(qtbot, bec_client_lib, threads_check):
-    dispatcher = BECDispatcher(client=bec_client_lib)  # Has to init singleton with fixture client
-    server = BECWidgetsCLIServer(gui_id="figure", gui_class=BECDockArea)
-    qtbot.addWidget(server.gui)
-    qtbot.waitExposed(server.gui)
-    qtbot.wait(1000)  # 1s long to wait until gui is ready
-    yield server
-    dispatcher.disconnect_all()
-    server.client.shutdown()
-    server.shutdown()
-    dispatcher.reset_singleton()
+def rpc_server_dock(gui_id, bec_client_lib):
+    with plot_server(gui_id, BECDockArea, bec_client_lib) as server:
+        yield server

tests/end-2-end/test_bec_dock_rpc_e2e.py

@@ -1,3 +1,5 @@
+import time
+
 import numpy as np
 import pytest
 from bec_lib.client import BECClient
@@ -8,24 +10,10 @@ from bec_widgets.cli.client import BECDockArea, BECFigure, BECImageShow, BECMoto
 from bec_widgets.utils import Colors
 
 
-@pytest.fixture(name="bec_client")
-def cli_bec_client(rpc_server_dock):
-    """
-    Fixture to create a BECClient instance that is independent of the GUI.
-    """
-    # pylint: disable=protected-access
-    cli_client = BECClient(forced=True, config=rpc_server_dock.client._service_config)
-    cli_client.start()
-    yield cli_client
-    cli_client.shutdown()
-
-
-def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
-
+def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
     # BEC client shortcuts
-    client = rpc_server_dock.client
+    dock = BECDockArea(rpc_server_dock)
+    client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
     queue = client.queue
@@ -35,17 +23,18 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
     d1 = dock.add_dock("dock_1")
     d2 = dock.add_dock("dock_2")
 
-    assert len(dock_server.docks) == 3
-
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
     # Add 3 figures with some widgets
     fig0 = d0.add_widget("BECFigure")
     fig1 = d1.add_widget("BECFigure")
     fig2 = d2.add_widget("BECFigure")
 
-    assert len(dock_server.docks) == 3
-    assert len(dock_server.docks["dock_0"].widgets) == 1
-    assert len(dock_server.docks["dock_1"].widgets) == 1
-    assert len(dock_server.docks["dock_2"].widgets) == 1
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
+    assert len(dock_config["docks"]["dock_0"]["widgets"]) == 1
+    assert len(dock_config["docks"]["dock_1"]["widgets"]) == 1
+    assert len(dock_config["docks"]["dock_2"]["widgets"]) == 1
 
     assert fig1.__class__.__name__ == "BECFigure"
     assert fig1.__class__ == BECFigure
@@ -98,7 +87,7 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
 
     # wait for scan to finish
     while not status.status == "COMPLETED":
-        qtbot.wait(200)
+        time.sleep(0.2)
 
     # plot
     plt_last_scan_data = queue.scan_storage.storage[-1].data
@@ -110,7 +99,7 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
     last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
         "data"
     ].data
-    qtbot.wait(500)
+    time.sleep(0.5)
     last_image_plot = im.images[0].get_data()
     np.testing.assert_equal(last_image_device, last_image_plot)
 
@@ -129,40 +118,41 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
     )
 
 
-def test_dock_manipulations_e2e(rpc_server_dock, qtbot):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
+def test_dock_manipulations_e2e(rpc_server_dock):
+    dock = BECDockArea(rpc_server_dock)
 
     d0 = dock.add_dock("dock_0")
     d1 = dock.add_dock("dock_1")
     d2 = dock.add_dock("dock_2")
-    assert len(dock_server.docks) == 3
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
 
     d0.detach()
     dock.detach_dock("dock_2")
-    assert len(dock_server.docks) == 3
-    assert len(dock_server.tempAreas) == 2
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
+    assert len(dock.temp_areas) == 2
 
     d0.attach()
-    assert len(dock_server.docks) == 3
-    assert len(dock_server.tempAreas) == 1
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
+    assert len(dock.temp_areas) == 1
 
     d2.remove()
-    qtbot.wait(200)
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 2
 
-    assert len(dock_server.docks) == 2
-    docks_list = list(dict(dock_server.docks).keys())
-    assert ["dock_0", "dock_1"] == docks_list
+    assert ["dock_0", "dock_1"] == list(dock_config["docks"])
 
     dock.clear_all()
 
-    assert len(dock_server.docks) == 0
-    assert len(dock_server.tempAreas) == 0
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 0
+    assert len(dock.temp_areas) == 0
 
 
 def test_spiral_bar(rpc_server_dock):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
+    dock = BECDockArea(rpc_server_dock)
 
     d0 = dock.add_dock(name="dock_0")
 
@@ -173,49 +163,46 @@ def test_spiral_bar(rpc_server_dock):
     bar.set_colors_from_map("viridis")
     bar.set_value([10, 20, 30, 40, 50])
 
-    bar_server = dock_server.docks["dock_0"].widgets[0]
+    bar_config = bar.config_dict
 
-    expected_colors = Colors.golden_angle_color("viridis", 5, "RGB")
-    bar_colors = [ring.color.getRgb() for ring in bar_server.rings]
-    bar_values = [ring.config.value for ring in bar_server.rings]
+    expected_colors = [list(color) for color in Colors.golden_angle_color("viridis", 5, "RGB")]
+    bar_colors = [ring.config_dict["color"] for ring in bar.rings]
+    bar_values = [ring.config_dict["value"] for ring in bar.rings]
+    assert bar_config["num_bars"] == 5
     assert bar_values == [10, 20, 30, 40, 50]
     assert bar_colors == expected_colors
 
 
-def test_spiral_bar_scan_update(rpc_server_dock, qtbot):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
+def test_spiral_bar_scan_update(bec_client_lib, rpc_server_dock):
+    dock = BECDockArea(rpc_server_dock)
 
     d0 = dock.add_dock("dock_0")
 
-    d0.add_widget("SpiralProgressBar")
+    bar = d0.add_widget("SpiralProgressBar")
 
-    client = rpc_server_dock.client
+    client = bec_client_lib
     dev = client.device_manager.devices
+    dev.samx.tolerance.set(0)
+    dev.samy.tolerance.set(0)
     scans = client.scans
 
     status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
+    status.wait()
 
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
-
-    qtbot.wait(200)
-    bar_server = dock_server.docks["dock_0"].widgets[0]
-    assert bar_server.config.num_bars == 1
-    np.testing.assert_allclose(bar_server.rings[0].config.value, 10, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.min_value, 0, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.max_value, 10, atol=0.1)
+    bar_config = bar.config_dict
+    assert bar_config["num_bars"] == 1
+    assert bar_config["rings"][0]["value"] == 10
+    assert bar_config["rings"][0]["min_value"] == 0
+    assert bar_config["rings"][0]["max_value"] == 10
 
     status = scans.grid_scan(dev.samx, -5, 5, 4, dev.samy, -10, 10, 4, relative=True, exp_time=0.1)
+    status.wait()
 
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
-
-    qtbot.wait(200)
-    assert bar_server.config.num_bars == 1
-    np.testing.assert_allclose(bar_server.rings[0].config.value, 16, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.min_value, 0, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.max_value, 16, atol=0.1)
+    bar_config = bar.config_dict
+    assert bar_config["num_bars"] == 1
+    assert bar_config["rings"][0]["value"] == 16
+    assert bar_config["rings"][0]["min_value"] == 0
+    assert bar_config["rings"][0]["max_value"] == 16
 
     init_samx = dev.samx.read()["samx"]["value"]
     init_samy = dev.samy.read()["samy"]["value"]
@@ -226,23 +213,20 @@ def test_spiral_bar_scan_update(rpc_server_dock, qtbot):
     dev.samy.velocity.put(5)
 
     status = scans.umv(dev.samx, 5, dev.samy, 10, relative=True)
+    status.wait()
 
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
-
-    qtbot.wait(200)
-    assert bar_server.config.num_bars == 2
-    np.testing.assert_allclose(bar_server.rings[0].config.value, final_samx, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[1].config.value, final_samy, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.min_value, init_samx, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[1].config.min_value, init_samy, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.max_value, final_samx, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[1].config.max_value, final_samy, atol=0.1)
+    bar_config = bar.config_dict
+    assert bar_config["num_bars"] == 2
+    assert bar_config["rings"][0]["value"] == final_samx
+    assert bar_config["rings"][1]["value"] == final_samy
+    assert bar_config["rings"][0]["min_value"] == init_samx
+    assert bar_config["rings"][0]["max_value"] == final_samx
+    assert bar_config["rings"][1]["min_value"] == init_samy
+    assert bar_config["rings"][1]["max_value"] == final_samy
 
 
-def test_auto_update(rpc_server_dock, bec_client, qtbot):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock._client = bec_client
+def test_auto_update(bec_client_lib, rpc_server_dock):
+    dock = BECDockArea(rpc_server_dock)
 
     AutoUpdates.enabled = True
     AutoUpdates.create_default_dock = True
@@ -253,16 +237,13 @@ def test_auto_update(rpc_server_dock, bec_client, qtbot):
     # we need to start the update script manually; normally this is done when the GUI is started
     dock._start_update_script()
 
-    client = bec_client
+    client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
     queue = client.queue
 
     status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
+    status.wait()
 
     last_scan_data = queue.scan_storage.storage[-1].data
 
@@ -278,10 +259,7 @@ def test_auto_update(rpc_server_dock, bec_client, qtbot):
     status = scans.grid_scan(
         dev.samx, -10, 10, 5, dev.samy, -5, 5, 5, exp_time=0.05, relative=False
     )
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
+    status.wait()
 
     plt = dock.auto_updates.get_default_figure()
     widgets = plt.widget_list

tests/end-2-end/test_bec_figure_rpc_e2e.py

@@ -5,9 +5,8 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
 
 
-def test_rpc_waveform1d_custom_curve(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
+def test_rpc_waveform1d_custom_curve(rpc_server_figure):
+    fig = BECFigure(rpc_server_figure)
 
     ax = fig.add_plot()
     curve = ax.add_curve_custom([1, 2, 3], [1, 2, 3])
@@ -15,13 +14,12 @@ def test_rpc_waveform1d_custom_curve(rpc_server_figure, qtbot):
     curve = ax.curves[0]
     curve.set_color("blue")
 
-    assert len(fig_server.widgets) == 1
-    assert len(fig_server.widgets[ax.rpc_id].curves) == 1
+    assert len(fig.widgets) == 1
+    assert len(fig.widgets[ax.rpc_id].curves) == 1
 
 
 def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
+    fig = BECFigure(rpc_server_figure)
 
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
@@ -29,7 +27,7 @@ def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
     plt_z = fig.add_plot("samx", "samy", "bpm4i")
 
     # Checking if classes are correctly initialised
-    assert len(fig_server.widgets) == 4
+    assert len(fig.widgets) == 4
     assert plt.__class__.__name__ == "BECWaveform"
     assert plt.__class__ == BECWaveform
     assert im.__class__.__name__ == "BECImageShow"
@@ -75,24 +73,21 @@ def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
     }
 
 
-def test_rpc_waveform_scan(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
+def test_rpc_waveform_scan(rpc_server_figure, bec_client_lib):
+    fig = BECFigure(rpc_server_figure)
 
     # add 3 different curves to track
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     fig.plot(x_name="samx", y_name="bpm3a")
     fig.plot(x_name="samx", y_name="bpm4d")
 
-    client = rpc_server_figure.client
+    client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
     queue = client.queue
 
     status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
+    status.wait()
 
     last_scan_data = queue.scan_storage.storage[-1].data
 
@@ -108,38 +103,33 @@ def test_rpc_waveform_scan(rpc_server_figure, qtbot):
     assert plt_data["bpm4d-bpm4d"]["y"] == last_scan_data["bpm4d"]["bpm4d"].val
 
 
-def test_rpc_image(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
+def test_rpc_image(rpc_server_figure, bec_client_lib):
+    fig = BECFigure(rpc_server_figure)
 
     im = fig.image("eiger")
 
-    client = rpc_server_figure.client
+    client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
 
     status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
+    status.wait()
 
     last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
         "data"
     ].data
-    qtbot.wait(500)
     last_image_plot = im.images[0].get_data()
 
     # check plotted data
     np.testing.assert_equal(last_image_device, last_image_plot)
 
 
-def test_rpc_motor_map(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
+def test_rpc_motor_map(rpc_server_figure, bec_client_lib):
+    fig = BECFigure(rpc_server_figure)
 
     motor_map = fig.motor_map("samx", "samy")
 
-    client = rpc_server_figure.client
+    client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
 
@@ -147,10 +137,8 @@ def test_rpc_motor_map(rpc_server_figure, qtbot):
     initial_pos_y = dev.samy.read()["samy"]["value"]
 
     status = scans.mv(dev.samx, 1, dev.samy, 2, relative=True)
+    status.wait()
 
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
     final_pos_x = dev.samx.read()["samx"]["value"]
     final_pos_y = dev.samy.read()["samy"]["value"]
 

tests/end-2-end/test_rpc_register_e2e.py

@@ -3,40 +3,30 @@ import pytest
 from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
 
 
-def find_deepest_value(d: dict):
-    """
-    Recursively find the deepest value in a dictionary
-    Args:
-        d(dict): Dictionary to search
-
-    Returns:
-        The deepest value in the dictionary.
-    """
-    if isinstance(d, dict):
-        if d:
-            return find_deepest_value(next(iter(d.values())))
-    return d
-
-
-def test_rpc_register_list_connections(rpc_server_figure, rpc_register, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
+def test_rpc_register_list_connections(rpc_server_figure):
+    fig = BECFigure(rpc_server_figure)
 
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
     motor_map = fig.motor_map("samx", "samy")
     plt_z = fig.add_plot("samx", "samy", "bpm4i")
 
-    all_connections = rpc_register.list_all_connections()
+    # keep only class names from objects, since objects on server and client are different
+    # so the best we can do is to compare types (rpc register is unit-tested elsewhere)
+    all_connections = {obj_id: type(obj).__name__ for obj_id, obj in fig.get_all_rpc().items()}
 
-    # Construct dict of all rpc items manually
-    all_subwidgets_expected = dict(fig_server.widgets)
-    curve_1D = find_deepest_value(fig_server.widgets[plt.rpc_id]._curves_data)
-    curve_2D = find_deepest_value(fig_server.widgets[plt_z.rpc_id]._curves_data)
-    curves_expected = {curve_1D.rpc_id: curve_1D, curve_2D.rpc_id: curve_2D}
-    fig_expected = {fig.rpc_id: fig_server}
+    all_subwidgets_expected = {wid: type(widget).__name__ for wid, widget in fig.widgets.items()}
+    curve_1D = fig.widgets[plt.rpc_id]
+    curve_2D = fig.widgets[plt_z.rpc_id]
+    curves_expected = {
+        curve_1D.rpc_id: type(curve_1D).__name__,
+        curve_2D.rpc_id: type(curve_2D).__name__,
+    }
+    curves_expected.update({curve._gui_id: type(curve).__name__ for curve in curve_1D.curves})
+    curves_expected.update({curve._gui_id: type(curve).__name__ for curve in curve_2D.curves})
+    fig_expected = {fig.rpc_id: type(fig).__name__}
     image_item_expected = {
-        fig_server.widgets[im.rpc_id].images[0].rpc_id: fig_server.widgets[im.rpc_id].images[0]
+        fig.widgets[im.rpc_id].images[0].rpc_id: type(fig.widgets[im.rpc_id].images[0]).__name__
     }
 
     all_connections_expected = {