bec-widgets 0.102.0__py3-none-any.whl → 0.104.0__py3-none-any.whl

.gitlab-ci.yml

@@ -5,8 +5,12 @@ image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
 #commands to run in the Docker container before starting each job.
 variables:
   DOCKER_TLS_CERTDIR: ""
-  BEC_CORE_BRANCH: "main"
-  OPHYD_DEVICES_BRANCH: "main"
+  BEC_CORE_BRANCH:
+    description: bec branch
+    value: main
+  OPHYD_DEVICES_BRANCH:
+    description: ophyd_devices branch
+    value: main
   CHILD_PIPELINE_BRANCH: $CI_DEFAULT_BRANCH
 
 workflow:

CHANGELOG.md

@@ -1,5 +1,57 @@
 # CHANGELOG
 
+## v0.104.0 (2024-09-04)
+
+### Documentation
+
+* docs(scan_control): docs extended ([`730e25f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/730e25fd3a8be156603005982bfd2a2c2b16dff1))
+
+### Feature
+
+* feat(scan_control): scan control remember the previously set parameters and shares kwarg settings across scans ([`d28f9b0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d28f9b04c45385179353cc247221ec821dcaa29b))
+
+### Fix
+
+* fix(scan_control): SafeSlot applied to run_scan to avoid faulty scan requests ([`9047916`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/90479167fb5cae393c884e71a80fcfdb48a76427))
+
+* fix(scan_control): scan parameters can be loaded from the last executed scan from redis ([`ec3bc8b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ec3bc8b5194c680b847d3306c41eef4638ccfcc7))
+
+* fix(toggle): state can be determined with the widget initialisation ([`2cd9c7f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2cd9c7f5854f158468e53b5b29ec31b1ff1e00e6))
+
+### Refactor
+
+* refactor(scan_control): scan control layout adjusted ([`85dcbda`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/85dcbdaa88fe77aeea7012bfc16f10c4f873f75e))
+
+* refactor(scan_control): basic pydantic config added ([`fe8dc55`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fe8dc55eb102c51c34bf9606690914da53b5ac02))
+
+### Test
+
+* test(scan_control): tests extended for getting kwargs between scan switching and getting parameters from redis ([`b07e677`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b07e67715c9284e9bf36056ba4ba8068f60cbaf3))
+
+* test(conftest): only run cleanup checks if test passed ([`26920f8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/26920f8482bdb35ece46df37232af50ab9cab463))
+
+## v0.103.0 (2024-09-04)
+
+### Ci
+
+* ci: prefill variables for manual pipeline start ([`158c19e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/158c19eda771562a325fd59405f9fd4cb9a17ed6))
+
+### Feature
+
+* feat(vscode): open vscode on a free port ([`52da835`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/52da835803f2453096a8b7df23bee5fdf93ae2bb))
+
+* feat(website): added method to wait until the webpage is loaded ([`9be19d4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9be19d4abebad08c5fc6bea936dd97475fe8f628))
+
+### Fix
+
+* fix(theme): fixed segfault for webengineview for auto updates ([`9866075`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9866075100577948755b563dc7b7dc4cdc60d040))
+
+### Test
+
+* test(webview): fixed tests after refactoring ([`d5eb30c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d5eb30cd7df4cb0dc3275dd362768afc211eaf2d))
+
+* test(vscode): popen call does not have to be the only one ([`39f98ec`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/39f98ec223ba8b59e478ac788c08c59ffe886b4e))
+
 ## v0.102.0 (2024-09-04)
 
 ### Documentation
@@ -103,57 +155,3 @@
 ### Refactor
 
 * refactor(stop_button): stop button changed to QWidget and adapted for toolbar ([`097946f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/097946fd688b8faf770e7cc0e689ea668206bc7a))
-
-* refactor: added hide option for device selection button ([`cdd1752`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cdd175207e922904b2efbb2d9ecf7c556c617f2e))
-
-## v0.99.9 (2024-08-28)
-
-### Fix
-
-* fix: fixed build process and excluded docs and tests from tarballs and wheels ([`719254c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/719254cf0a48e1fc4bd541edba239570778bcfea))
-
-## v0.99.8 (2024-08-28)
-
-### Fix
-
-* fix(website): fixed designer integration for website widget ([`5f37e86`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5f37e862c95ac7173b6918ad39bcaef938dad698))
-
-### Refactor
-
-* refactor(website): changed inheritance of website widget to simple qwidget; closes #325 ([`9925bbd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9925bbdb48b55eacbbce9fd6a1555a21b84221f9))
-
-## v0.99.7 (2024-08-28)
-
-### Fix
-
-* fix(toolbar): material icons can accept color as kwarg ([`ffc871e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ffc871ebbd3b68abc3e151bb8f5849e6c50e775e))
-
-## v0.99.6 (2024-08-28)
-
-### Documentation
-
-* docs: various bugs fixed ([`c31e9a3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c31e9a3aff3ee8e984674dee0965ee7f1b6e2b8f))
-
-### Fix
-
-* fix(toolbar): use of native qt separators ([`09c6c93`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/09c6c93c397ce4a21c293f6c79106c74b2db65ca))
-
-## v0.99.5 (2024-08-28)
-
-### Documentation
-
-* docs(index): index page is centered ([`02239de`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/02239de0a36fcd6cbf97990b0dec1ddf7ecf6ba6))
-
-### Fix
-
-* fix(dock_area): dark button added ([`e6f204b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e6f204b6aa295747a68769f43af2e549149b401a))
-
-## v0.99.4 (2024-08-28)
-
-### Documentation
-
-* docs(buttons): added missing buttons docs ([`4e5520a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4e5520aee2115d2fc0cebb3865433478a5ec8253))
-
-### Fix
-
-* fix(theme): apply theme to all pyqtgraph widgets on manual updates ([`c550186`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c5501860e8e07a53f4bce144d44ed39eda6290ef))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.102.0
+Version: 0.104.0
 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

bec_widgets/utils/bec_widget.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import darkdetect
 from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QApplication, QWidget
 
@@ -40,12 +41,17 @@ class BECWidget(BECConnector):
         """
         if not isinstance(self, QWidget):
             raise RuntimeError(f"{repr(self)} is not a subclass of QWidget")
-        super().__init__(client, config, gui_id)
+        super().__init__(client=client, config=config, gui_id=gui_id)
 
         # Set the theme to auto if it is not set yet
         app = QApplication.instance()
         if not hasattr(app, "theme"):
-            set_theme("auto")
+            # DO NOT SET THE THEME TO AUTO! Otherwise, the qwebengineview will segfault
+            # Instead, we will set the theme to the system setting on startup
+            if darkdetect.isDark():
+                set_theme("dark")
+            else:
+                set_theme("light")
 
         if theme_update:
             self._connect_to_theme_change()

bec_widgets/widgets/scan_control/scan_control.py

@@ -1,21 +1,39 @@
+from collections import defaultdict
+from typing import Optional
+
 from bec_lib.endpoints import MessageEndpoints
+from pydantic import BaseModel, Field
 from qtpy.QtCore import Property, Signal, Slot
 from qtpy.QtWidgets import (
     QApplication,
     QComboBox,
-    QGridLayout,
     QGroupBox,
     QHBoxLayout,
+    QLabel,
     QPushButton,
     QSizePolicy,
     QVBoxLayout,
     QWidget,
 )
 
+from bec_widgets.qt_utils.error_popups import SafeSlot
+from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import apply_theme
 from bec_widgets.widgets.scan_control.scan_group_box import ScanGroupBox
 from bec_widgets.widgets.stop_button.stop_button import StopButton
+from bec_widgets.widgets.toggle.toggle import ToggleSwitch
+
+
+class ScanParameterConfig(BaseModel):
+    name: str
+    args: Optional[list] = Field(None)
+    kwargs: Optional[dict] = Field(None)
+
+
+class ScanControlConfig(ConnectionConfig):
+    default_scan: Optional[str] = Field(None)
+    allowed_scans: Optional[list] = Field(None)
+    scans: Optional[dict[str, ScanParameterConfig]] = defaultdict(dict)
 
 
 class ScanControl(BECWidget, QWidget):
@@ -26,9 +44,20 @@ class ScanControl(BECWidget, QWidget):
     scan_selected = Signal(str)
 
     def __init__(
-        self, parent=None, client=None, gui_id: str | None = None, allowed_scans: list | None = None
+        self,
+        parent=None,
+        client=None,
+        config: ScanControlConfig | dict | None = None,
+        gui_id: str | None = None,
+        allowed_scans: list | None = None,
+        default_scan: str | None = None,
     ):
-        super().__init__(client=client, gui_id=gui_id)
+
+        if config is None:
+            config = ScanControlConfig(
+                widget_class=self.__class__.__name__, allowed_scans=allowed_scans
+            )
+        super().__init__(client=client, gui_id=gui_id, config=config)
         QWidget.__init__(self, parent=parent)
 
         # Client from BEC + shortcuts to device manager and scans
@@ -36,12 +65,16 @@ class ScanControl(BECWidget, QWidget):
 
         # Main layout
         self.layout = QVBoxLayout(self)
+        self.layout.setContentsMargins(5, 5, 5, 5)
         self.arg_box = None
         self.kwarg_boxes = []
         self.expert_mode = False  # TODO implement in the future versions
+        self.previous_scan = None
+        self.last_scan_found = None
 
-        # Scan list - allowed scans for the GUI
-        self.allowed_scans = allowed_scans
+        # Widget Default Parameters
+        self.config.default_scan = default_scan
+        self.config.allowed_scans = allowed_scans
 
         # Create and set main layout
         self._init_UI()
@@ -56,7 +89,12 @@ class ScanControl(BECWidget, QWidget):
         self.scan_selection_group.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
         self.layout.addWidget(self.scan_selection_group)
 
+        # Default scan from config
+        if self.config.default_scan is not None:
+            self.comboBox_scan_selection.setCurrentText(self.config.default_scan)
+
         # Connect signals
+        self.comboBox_scan_selection.view().pressed.connect(self.save_current_scan_parameters)
         self.comboBox_scan_selection.currentIndexChanged.connect(self.on_scan_selection_changed)
         self.button_run_scan.clicked.connect(self.run_scan)
 
@@ -89,18 +127,35 @@ class ScanControl(BECWidget, QWidget):
         """
 
         scan_selection_group = QGroupBox("Scan Selection", self)
-        self.scan_selection_layout = QGridLayout(scan_selection_group)
+        self.scan_selection_layout = QVBoxLayout(scan_selection_group)
         self.comboBox_scan_selection = QComboBox(scan_selection_group)
 
-        # Run button
+        # Buttons
+        self.button_layout = QHBoxLayout()
+        ## Run button
         self.button_run_scan = QPushButton("Start", scan_selection_group)
         self.button_run_scan.setStyleSheet("background-color:  #559900; color: white")
-        # Stop button
+        ## Stop button
         self.button_stop_scan = StopButton(parent=scan_selection_group)
-
-        self.scan_selection_layout.addWidget(self.comboBox_scan_selection, 0, 0, 1, 2)
-        self.scan_selection_layout.addWidget(self.button_run_scan, 1, 0)
-        self.scan_selection_layout.addWidget(self.button_stop_scan, 1, 1)
+        ## Add buttons to layout
+        self.button_layout.addWidget(self.button_run_scan)
+        self.button_layout.addWidget(self.button_stop_scan)
+
+        # Label to reload the last scan parameters
+        self.toggle_layout = QHBoxLayout()
+        ## Label
+        self.last_scan_label = QLabel("Restore last scan parameters", scan_selection_group)
+        ## Switch toggle button
+        self.toggle = ToggleSwitch(parent=scan_selection_group, checked=False)
+        self.toggle.enabled.connect(self.request_last_executed_scan_parameters)
+        ## Add label and switch to layout
+        self.toggle_layout.addWidget(self.last_scan_label)
+        self.toggle_layout.addWidget(self.toggle)
+
+        # Add widgets to layout
+        self.scan_selection_layout.addWidget(self.comboBox_scan_selection)
+        self.scan_selection_layout.addLayout(self.button_layout)
+        self.scan_selection_layout.addLayout(self.toggle_layout)
 
         return scan_selection_group
 
@@ -109,7 +164,7 @@ class ScanControl(BECWidget, QWidget):
         self.available_scans = self.client.connector.get(
             MessageEndpoints.available_scans()
         ).resource
-        if self.allowed_scans is None:
+        if self.config.allowed_scans is None:
             supported_scans = ["ScanBase", "SyncFlyScanBase", "AsyncFlyScanBase"]
             allowed_scans = [
                 scan_name
@@ -118,13 +173,50 @@ class ScanControl(BECWidget, QWidget):
             ]
 
         else:
-            allowed_scans = self.allowed_scans
+            allowed_scans = self.config.allowed_scans
         self.comboBox_scan_selection.addItems(allowed_scans)
 
     def on_scan_selection_changed(self, index: int):
         """Callback for scan selection combo box"""
         selected_scan_name = self.comboBox_scan_selection.currentText()
         self.scan_selected.emit(selected_scan_name)
+        self.request_last_executed_scan_parameters()
+        self.restore_scan_parameters(selected_scan_name)
+
+    @Slot()
+    def request_last_executed_scan_parameters(self):
+        """
+        Requests the last executed scan parameters from BEC and restores them to the scan control widget.
+        """
+        enabled = self.toggle.checked
+        current_scan = self.comboBox_scan_selection.currentText()
+        if enabled:
+            history = self.client.connector.lrange(MessageEndpoints.scan_queue_history(), 0, -1)
+
+            for scan in history:
+                scan_name = scan.content["info"]["request_blocks"][-1]["msg"].content["scan_type"]
+                if scan_name == current_scan:
+                    args_dict = scan.content["info"]["request_blocks"][-1]["msg"].content[
+                        "parameter"
+                    ]["args"]
+                    args_list = []
+                    for key, value in args_dict.items():
+                        args_list.append(key)
+                        args_list.extend(value)
+                    if len(args_list) > 1 and self.arg_box is not None:
+                        self.arg_box.set_parameters(args_list)
+                    kwargs = scan.content["info"]["request_blocks"][-1]["msg"].content["parameter"][
+                        "kwargs"
+                    ]
+                    if kwargs and self.kwarg_boxes:
+                        for box in self.kwarg_boxes:
+                            box.set_parameters(kwargs)
+                    self.last_scan_found = True
+                    break
+                else:
+                    self.last_scan_found = False
+        else:
+            self.last_scan_found = False
 
     @Property(str)
     def current_scan(self):
@@ -151,6 +243,29 @@ class ScanControl(BECWidget, QWidget):
         """
         self.current_scan = scan_name
 
+    @Property(bool)
+    def hide_scan_remember_toggle(self):
+        """Property to hide the scan remember toggle."""
+        return not self.toggle.isVisible()
+
+    @hide_scan_remember_toggle.setter
+    def hide_scan_remember_toggle(self, hide: bool):
+        """Setter for the hide_scan_remember_toggle property.
+
+        Args:
+            hide(bool): Hide or show the scan remember toggle.
+        """
+        self.show_scan_remember_toggle(not hide)
+
+    @Slot(bool)
+    def show_scan_remember_toggle(self, show: bool):
+        """Shows or hides the scan control buttons."""
+        self.toggle.setVisible(show)
+        self.last_scan_label.setVisible(show)
+
+        show_group = show or self.button_run_scan.isVisible()
+        self.scan_selection_group.setVisible(show_group)
+
     @Property(bool)
     def hide_scan_control_buttons(self):
         """Property to hide the scan control buttons."""
@@ -294,17 +409,64 @@ class ScanControl(BECWidget, QWidget):
             box.deleteLater()
         self.kwarg_boxes = []
 
-    @Slot()
-    def run_scan(self):
-        """Starts the selected scan with the given parameters."""
-        self.scan_started.emit()
+    def get_scan_parameters(self, bec_object: bool = True):
+        """
+        Returns the scan parameters for the selected scan.
+
+        Args:
+            bec_object(bool): If True, returns the BEC object for the scan parameters such as device objects.
+        """
         args = []
         kwargs = {}
         if self.arg_box is not None:
-            args = self.arg_box.get_parameters()
+            args = self.arg_box.get_parameters(bec_object)
         for box in self.kwarg_boxes:
-            box_kwargs = box.get_parameters()
+            box_kwargs = box.get_parameters(bec_object)
             kwargs.update(box_kwargs)
+        return args, kwargs
+
+    def restore_scan_parameters(self, scan_name: str):
+        """
+        Restores the scan parameters for the given scan name
+
+        Args:
+            scan_name(str): Name of the scan to restore the parameters for.
+        """
+        if self.last_scan_found is True:
+            return
+        scan_params = self.config.scans.get(scan_name, None)
+        if scan_params is None and self.previous_scan is None:
+            return
+
+        if scan_params is None and self.previous_scan is not None:
+            previous_scan_params = self.config.scans.get(self.previous_scan, None)
+            self._restore_kwargs(previous_scan_params.kwargs)
+            return
+
+        if scan_params.args is not None and self.arg_box is not None:
+            self.arg_box.set_parameters(scan_params.args)
+
+        self._restore_kwargs(scan_params.kwargs)
+
+    def _restore_kwargs(self, scan_kwargs: dict):
+        """Restores the kwargs for the given scan parameters."""
+        if scan_kwargs is not None and self.kwarg_boxes is not None:
+            for box in self.kwarg_boxes:
+                box.set_parameters(scan_kwargs)
+
+    def save_current_scan_parameters(self):
+        """Saves the current scan parameters to the scan control config for further use."""
+        scan_name = self.comboBox_scan_selection.currentText()
+        self.previous_scan = scan_name
+        args, kwargs = self.get_scan_parameters(False)
+        scan_params = ScanParameterConfig(name=scan_name, args=args, kwargs=kwargs)
+        self.config.scans[scan_name] = scan_params
+
+    @SafeSlot(popup_error=True)
+    def run_scan(self):
+        """Starts the selected scan with the given parameters."""
+        self.scan_started.emit()
+        args, kwargs = self.get_scan_parameters()
         scan_function = getattr(self.scans, self.comboBox_scan_selection.currentText())
         if callable(scan_function):
             scan_function(*args, **kwargs)

bec_widgets/widgets/scan_control/scan_group_box.py

@@ -230,32 +230,35 @@ class ScanGroupBox(QGroupBox):
             widget.deleteLater()
         self.widgets = self.widgets[: -len(self.inputs)]
 
-    def get_parameters(self):
+    def get_parameters(self, device_object: bool = True):
         """
         Returns the parameters from the widgets in the scan control layout formated to run scan from BEC.
         """
         if self.box_type == "args":
-            return self._get_arg_parameterts()
+            return self._get_arg_parameterts(device_object=device_object)
         elif self.box_type == "kwargs":
-            return self._get_kwarg_parameters()
+            return self._get_kwarg_parameters(device_object=device_object)
 
-    def _get_arg_parameterts(self):
+    def _get_arg_parameterts(self, device_object: bool = True):
         args = []
         for i in range(1, self.layout.rowCount()):
             for j in range(self.layout.columnCount()):
-                widget = self.layout.itemAtPosition(i, j).widget()
-                if isinstance(widget, DeviceLineEdit):
-                    value = widget.get_device()
-                else:
-                    value = WidgetIO.get_value(widget)
-                args.append(value)
+                try:  # In case that the bundle size changes
+                    widget = self.layout.itemAtPosition(i, j).widget()
+                    if isinstance(widget, DeviceLineEdit) and device_object:
+                        value = widget.get_device()
+                    else:
+                        value = WidgetIO.get_value(widget)
+                    args.append(value)
+                except AttributeError:
+                    continue
         return args
 
-    def _get_kwarg_parameters(self):
+    def _get_kwarg_parameters(self, device_object: bool = True):
         kwargs = {}
         for i in range(self.layout.columnCount()):
             widget = self.layout.itemAtPosition(1, i).widget()
-            if isinstance(widget, DeviceLineEdit):
+            if isinstance(widget, DeviceLineEdit) and device_object:
                 value = widget.get_device()
             else:
                 value = WidgetIO.get_value(widget)
@@ -273,3 +276,22 @@ class ScanGroupBox(QGroupBox):
                         if isinstance(widget, DeviceLineEdit):
                             widget_rows += 1
         return widget_rows
+
+    def set_parameters(self, parameters: list | dict):
+        if self.box_type == "args":
+            self._set_arg_parameters(parameters)
+        elif self.box_type == "kwargs":
+            self._set_kwarg_parameters(parameters)
+
+    def _set_arg_parameters(self, parameters: list):
+        while len(parameters) != len(self.widgets):
+            self.add_widget_bundle()
+        for i, parameter in enumerate(parameters):
+            WidgetIO.set_value(self.widgets[i], parameter)
+
+    def _set_kwarg_parameters(self, parameters: dict):
+        for widget in self.widgets:
+            for key, value in parameters.items():
+                if widget.arg_name == key:
+                    WidgetIO.set_value(widget, value)
+                    break

bec_widgets/widgets/toggle/toggle.py

@@ -13,7 +13,7 @@ class ToggleSwitch(QWidget):
     enabled = Signal(bool)
     ICON_NAME = "toggle_on"
 
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, checked=True):
         super().__init__(parent)
         self.setFixedSize(40, 21)
 
@@ -23,14 +23,14 @@ class ToggleSwitch(QWidget):
         self._inactive_track_color = QColor(200, 200, 200)
         self._inactive_thumb_color = QColor(255, 255, 255)
 
-        self._checked = False
+        self._checked = checked
         self._track_color = self.inactive_track_color
         self._thumb_color = self.inactive_thumb_color
 
         self._animation = QPropertyAnimation(self, b"thumb_pos")
         self._animation.setDuration(200)
         self._animation.setEasingCurve(QEasingCurve.Type.OutBack)
-        self.setProperty("checked", True)
+        self.setProperty("checked", checked)
 
     @Property(bool)
     def checked(self):

bec_widgets/widgets/vscode/vscode.py

@@ -2,12 +2,27 @@ import os
 import select
 import shlex
 import signal
+import socket
 import subprocess
 import sys
 
 from bec_widgets.widgets.website.website import WebsiteWidget
 
 
+def get_free_port():
+    """
+    Get a free port on the local machine.
+
+    Returns:
+        int: The free port number
+    """
+    sock = socket.socket()
+    sock.bind(("", 0))
+    port = sock.getsockname()[1]
+    sock.close()
+    return port
+
+
 class VSCodeEditor(WebsiteWidget):
     """
     A widget to display the VSCode editor.
@@ -15,7 +30,6 @@ class VSCodeEditor(WebsiteWidget):
 
     token = "bec"
     host = "127.0.0.1"
-    port = 7000
 
     USER_ACCESS = []
     ICON_NAME = "developer_mode_tv"
@@ -23,6 +37,7 @@ class VSCodeEditor(WebsiteWidget):
     def __init__(self, parent=None, config=None, client=None, gui_id=None):
 
         self.process = None
+        self.port = get_free_port()
         self._url = f"http://{self.host}:{self.port}?tkn={self.token}"
         super().__init__(parent=parent, config=config, client=client, gui_id=gui_id)
         self.start_server()
@@ -49,6 +64,7 @@ class VSCodeEditor(WebsiteWidget):
                 if output and f"available at {self._url}" in output:
                     break
         self.set_url(self._url)
+        self.wait_until_loaded()
 
     def cleanup_vscode(self):
         """

bec_widgets/widgets/website/website.py

@@ -1,5 +1,5 @@
 from qtpy.QtCore import Property, QUrl, Slot, qInstallMessageHandler
-from qtpy.QtWebEngineWidgets import QWebEngineView
+from qtpy.QtWebEngineWidgets import QWebEngineSettings, QWebEngineView
 from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
 
 from bec_widgets.utils.bec_widget import BECWidget
@@ -32,6 +32,19 @@ class WebsiteWidget(BECWidget, QWidget):
         self.setLayout(layout)
         self.set_url(url)
 
+        self._loaded = False
+        self.website.loadFinished.connect(self._on_load_finished)
+
+    def wait_until_loaded(self):
+        while not self._loaded:
+            QApplication.processEvents()
+
+    def _on_load_finished(self):
+        """
+        Callback when the website has finished loading
+        """
+        self._loaded = True
+
     @Property(str)
     def url(self) -> str:
         """
@@ -64,6 +77,7 @@ class WebsiteWidget(BECWidget, QWidget):
             return
         if not isinstance(url, str):
             return
+        self._loaded = False
         self.website.setUrl(QUrl(url))
 
     def get_url(self) -> str:

{bec_widgets-0.102.0.dist-info → bec_widgets-0.104.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.102.0
+Version: 0.104.0
 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

{bec_widgets-0.102.0.dist-info → bec_widgets-0.104.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 .gitignore,sha256=cMQ1MLmnoR88aMCCJwUyfoTnufzl4-ckmHtlFUqHcT4,3253
-.gitlab-ci.yml,sha256=HE_stq5wl-0wE5ZetfEmaaDbectk20jX7Z2cxwsBegg,8348
+.gitlab-ci.yml,sha256=Dc1iDjsc72UxdUtihx4uSZU0lrTQeR8hZwGx1MQBfKE,8432
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=kLNb6ReaOEE1uDs95RSaQ1aNG1zvaVd1PHFIFigfL6s,6700
+CHANGELOG.md,sha256=56BXszrhvVmZ-ko-vL6XvL-n404_pI3WPFat9QBsGKw,7391
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=Y_CcBGqNdoop95Gj0XARDh0Vg5-Ol70bj0qb8Gjg5Ok,1334
+PKG-INFO,sha256=5uieac1rLNLfxfbqXF9q2AyKsrEM34ZR7Mp_zjJOcLg,1334
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=TkhUO4NlPY__hCeNKJNhoE-JXSkqoli1Ici3Rlwn-dc,2544
+pyproject.toml,sha256=2KA4GlcKlp8NhsbCE5skdf7xye1F8SaNHRy11G7Ikfs,2544
 .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
@@ -52,7 +52,7 @@ bec_widgets/utils/bec_connector.py,sha256=SivHKXVyNVqeu3kCXYEPpbleTVw8g1cW0FKq1Q
 bec_widgets/utils/bec_designer.py,sha256=Z3MeMju-KmTz8POtm23VQfp4rvtD2sF6eIOKQkl2F7w,4729
 bec_widgets/utils/bec_dispatcher.py,sha256=NkObWO_gRO9Uobz-fy0gVTZqQsbFRaKj6fbjYZoErFI,6400
 bec_widgets/utils/bec_table.py,sha256=nA2b8ukSeUfquFMAxGrUVOqdrzMoDYD6O_4EYbOG2zk,717
-bec_widgets/utils/bec_widget.py,sha256=ANFx-Ll5mjOjmILniTH5jKBITDijUtfFLb1eoiXoFws,2881
+bec_widgets/utils/bec_widget.py,sha256=7KmIdWCa7skN1jTsQQkhOpu2PZmKMr98AMB1f_MZfv4,3179
 bec_widgets/utils/colors.py,sha256=N3GbVBpExfC1m_dnYFDoua-iRLM90E5kTKVOIkZVmDM,12372
 bec_widgets/utils/container_utils.py,sha256=0wr3ZfuMiAFKCrQHVjxjw-Vuk8wsHdridqcjy2eY840,1531
 bec_widgets/utils/crosshair.py,sha256=8lik9k69WI2WMj5FGLbrKtny9duxqXUJAhpX8tHoyp0,11543
@@ -199,10 +199,10 @@ bec_widgets/widgets/ring_progress_bar/ring_progress_bar.pyproject,sha256=ZNYDnKD
 bec_widgets/widgets/ring_progress_bar/ring_progress_bar_plugin.py,sha256=-rw9ZSThgAH0Ubbr3X-L5x-ZqMXUGnauyFb4OmfUvD4,1394
 bec_widgets/widgets/scan_control/__init__.py,sha256=IOfHl15vxb_uC6KN62-PeUzbBha_vQyqkkXbJ2HU674,38
 bec_widgets/widgets/scan_control/register_scan_control.py,sha256=xUX2yR0-MaIMg9_y9qe50yDDphzsh2x1b5PMrF90yPM,475
-bec_widgets/widgets/scan_control/scan_control.py,sha256=pQkc9mPfGxOCJaJPuPUudSStuBk9lqUZovbGdY1cx7M,11587
+bec_widgets/widgets/scan_control/scan_control.py,sha256=PVy_gqivO_Nut6ZxdOhgXfRyRPcQ92wSGOGY8duxXlE,18074
 bec_widgets/widgets/scan_control/scan_control.pyproject,sha256=eTgVDFKToIH8_BbJjM2RvbOLr7HnYoidX0SAHx640DM,30
 bec_widgets/widgets/scan_control/scan_control_plugin.py,sha256=7GaqmaRgbwIPjVoXcyKVDl8UpfqC2weViup-YFfzUsM,1270
-bec_widgets/widgets/scan_control/scan_group_box.py,sha256=BpX9ZphqOhdEbQnGzNeNlmuZsMS__U97CkBMical2FY,9300
+bec_widgets/widgets/scan_control/scan_group_box.py,sha256=ZGF5alvw4vK---6-zsVUzW-6dt7-V68EbzrGp5EL_RE,10377
 bec_widgets/widgets/spinner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/spinner/register_spinner_widget.py,sha256=_zCPjLh4M7NTSHP1Atdn6yu33zJ3LJkcBy3KOJ5eSVY,476
 bec_widgets/widgets/spinner/spinner.py,sha256=5LoRGuRvQmY1hUCt06P3DJjXqOVkFCszbNAXRmPzqlo,2628
@@ -220,14 +220,14 @@ bec_widgets/widgets/text_box/text_box.pyproject,sha256=XohO1BIe2hrpU-z_KHKRgjcUk
 bec_widgets/widgets/text_box/text_box_plugin.py,sha256=rjRxqqovggpiI3gfQrXU-uc7TEjugIameQBrFD6s9hY,1302
 bec_widgets/widgets/toggle/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/toggle/register_toggle_switch.py,sha256=8pVtkeEeiDOjV4OPoZq1I30F9JDzl4nQE7e7xoWyWBs,472
-bec_widgets/widgets/toggle/toggle.py,sha256=NNWjl2xfEFwlmvI7M68QkezS-KsbqBhFKrvY-tVY_q0,4479
+bec_widgets/widgets/toggle/toggle.py,sha256=cLKWXH5vLG6VcycN_EgwdFsMPS65EbqoS0dfKE1S5kk,4498
 bec_widgets/widgets/toggle/toggle_switch.pyproject,sha256=Msa-AS5H5XlqW65r8GlX2AxD8FnFnDyDgGnbKcXqKOw,24
 bec_widgets/widgets/toggle/toggle_switch_plugin.py,sha256=1snX-mKw_K3oPqUApGRPDnNRnLMZjqnmQOzuIJ9MOT4,1344
 bec_widgets/widgets/vscode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/vscode/register_vs_code_editor.py,sha256=JATKBkTEuReeQ2Jj402xasjgVRMFI8uUOAAwmnFOWRA,473
 bec_widgets/widgets/vscode/vs_code_editor.pyproject,sha256=bxx0jZlSfBo-Em7p15W1QIJ9lFr9jqTqGynUQG01ocU,24
 bec_widgets/widgets/vscode/vs_code_editor_plugin.py,sha256=exFR6HTVdLLPfn2U6BMDugPoxZaebcHTnHWMrX2n_d4,1338
-bec_widgets/widgets/vscode/vscode.py,sha256=KReXQ5y-Bs-F1Tc0-_1f6c0dC5_MlgkWPGhUgbOORO0,2267
+bec_widgets/widgets/vscode/vscode.py,sha256=3HDWYJZPi4lNr7gW4IabTYyivMdhZGhq5ETGlJihqlc,2579
 bec_widgets/widgets/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/waveform/bec_waveform_widget.pyproject,sha256=GLD8GN9dXx9wNbtnevrxqqcwk7vKV-Uv8QYSycdaoaI,33
 bec_widgets/widgets/waveform/bec_waveform_widget_plugin.py,sha256=qSQTeCzIUn8rgDkjIM47Rr3-fqg1uk8rDf_lCoY9gZw,1402
@@ -241,11 +241,11 @@ bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/__init__.py,sha2
 bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py,sha256=XOHppMcONwfhAYpqIc51VOrpunWmPSn50sT3I0MjW2c,1173
 bec_widgets/widgets/website/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/website/register_website_widget.py,sha256=LIQJpV9uqcBiPR9cEAiDjaUS_l7JroYVdsotnLpD9H0,476
-bec_widgets/widgets/website/website.py,sha256=kDlqjwtx0yft1ZNRhTdHnYh_5KZHfqT_ZGPOKT4C-yI,2619
+bec_widgets/widgets/website/website.py,sha256=42pncCc_zI2eqeMArIurVmPUukRo5bTxa2h1Skah-io,3012
 bec_widgets/widgets/website/website_widget.pyproject,sha256=scOiV3cV1_BjbzpPzy2N8rIJL5P2qIZz8ObTJ-Uvdtg,25
 bec_widgets/widgets/website/website_widget_plugin.py,sha256=pz38_C2cZ0yvPPS02wdIPcmhFo_yiwUhflsASocAPQQ,1341
-bec_widgets-0.102.0.dist-info/METADATA,sha256=Y_CcBGqNdoop95Gj0XARDh0Vg5-Ol70bj0qb8Gjg5Ok,1334
-bec_widgets-0.102.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.102.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.102.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.102.0.dist-info/RECORD,,
+bec_widgets-0.104.0.dist-info/METADATA,sha256=5uieac1rLNLfxfbqXF9q2AyKsrEM34ZR7Mp_zjJOcLg,1334
+bec_widgets-0.104.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.104.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.104.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.104.0.dist-info/RECORD,,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.102.0"
+version = "0.104.0"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [