bec-widgets 0.102.0__tar.gz → 0.103.0__tar.gz

{bec_widgets-0.102.0 → bec_widgets-0.103.0}/.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:

{bec_widgets-0.102.0 → bec_widgets-0.103.0}/CHANGELOG.md

@@ -1,5 +1,27 @@
 # CHANGELOG
 
+## 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
@@ -130,30 +152,6 @@
 
 ## 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))

{bec_widgets-0.102.0 → bec_widgets-0.103.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.102.0
+Version: 0.103.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 → bec_widgets-0.103.0}/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
 
@@ -45,7 +46,12 @@ class BECWidget(BECConnector):
         # 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-0.102.0 → bec_widgets-0.103.0}/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-0.102.0 → bec_widgets-0.103.0}/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 → bec_widgets-0.103.0}/pyproject.toml

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