bec-widgets 0.117.0__py3-none-any.whl → 0.118.0__py3-none-any.whl

CHANGELOG.md

@@ -1,6 +1,30 @@
 # CHANGELOG
 
 
+## v0.118.0 (2024-10-13)
+
+### Documentation
+
+* docs(sphinx-build): adjusted pyside verion ([`b236951`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b23695167ab969f754a058ffdccca2b40f00a008))
+
+### Features
+
+* feat(image): image widget can take data from monitor_1d endpoint ([`9ef1d1c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9ef1d1c9ac2178d9fa2e655942208f8abbdf5c1b))
+
+
+## v0.117.1 (2024-10-11)
+
+### Fixes
+
+* fix(FPS): qtimer cleanup leaking ([`3a22392`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3a2239278075de7489ad10a58c31d7d89715e221))
+
+### Unknown
+
+* feature(vscode): added support for vscode instructions ([`f5f1f6c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f5f1f6c304b890dc162e8653005233bce4ea82e4))
+
+* feature(vscode): support for controlling vscode from widgets ([`9238679`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/923867947f62db026ac0378c30ef62c883596058))
+
+
 ## v0.117.0 (2024-10-11)
 
 ### Features
@@ -148,29 +172,3 @@ Fixes #361, do not try to change x axis when not permitted ([`efa2763`](https://
 
 
 ## v0.109.1 (2024-09-09)
-
-### Fixes
-
-* fix: refactor textbox widget, remove inheritance, adhere to bec style; closes #324 ([`b0d786b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b0d786b991677c0846a0c6ba3f2252d48d94ccaa))
-
-
-## v0.109.0 (2024-09-06)
-
-### Features
-
-* feat(accent colors): added helper function to get all accent colors ([`84a59f7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/84a59f70eed6d8a3c3aeeabc77a5f9ea4e864f61))
-
-### Fixes
-
-* fix(theme): fixed theme access for themecontainer ([`de303f0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/de303f0227fc9d3a74a0410f1e7999ac5132273c))
-
-
-## v0.108.0 (2024-09-06)
-
-### Documentation
-
-* docs(progressbar): added docs ([`7d07cea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7d07cea946f9c884477b01bebfb60b332ff09e0a))
-
-### Features
-
-* feat(progressbar): added bec progressbar ([`f6d1d0b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f6d1d0bbe3ba30a3b7291cd36a1f7f8e6bd5b895))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.117.0
+Version: 0.118.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/examples/jupyter_console/jupyter_console_window.py

@@ -164,7 +164,7 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
 
         self.d1 = self.dock.add_dock(name="dock_1", position="right")
         self.im = self.d1.add_widget("BECImageWidget")
-        self.im.image("eiger")
+        self.im.image("waveform", "1d")
 
         self.d2 = self.dock.add_dock(name="dock_2", position="bottom")
         self.wf = self.d2.add_widget("BECWaveformWidget", row=0, col=0)

bec_widgets/qt_utils/toolbar.py

@@ -7,9 +7,18 @@ from collections import defaultdict
 from typing import Literal
 
 from bec_qthemes._icon.material_icons import material_icon
-from qtpy.QtCore import QSize
+from qtpy.QtCore import QSize, Qt
 from qtpy.QtGui import QAction, QColor, QIcon
-from qtpy.QtWidgets import QHBoxLayout, QLabel, QMenu, QSizePolicy, QToolBar, QToolButton, QWidget
+from qtpy.QtWidgets import (
+    QComboBox,
+    QHBoxLayout,
+    QLabel,
+    QMenu,
+    QSizePolicy,
+    QToolBar,
+    QToolButton,
+    QWidget,
+)
 
 import bec_widgets
 
@@ -154,22 +163,52 @@ class WidgetAction(ToolBarAction):
 
     """
 
-    def __init__(self, label: str | None = None, widget: QWidget = None):
-        super().__init__()
+    def __init__(self, label: str | None = None, widget: QWidget = None, parent=None):
+        super().__init__(parent)
         self.label = label
         self.widget = widget
 
-    def add_to_toolbar(self, toolbar, target):
-        widget = QWidget()
-        layout = QHBoxLayout(widget)
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        container = QWidget()
+        layout = QHBoxLayout(container)
         layout.setContentsMargins(0, 0, 0, 0)
+        layout.setSpacing(5)
+
         if self.label is not None:
-            label = QLabel(f"{self.label}")
-            label.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
-            layout.addWidget(label)
-        self.widget.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
+            label_widget = QLabel(f"{self.label}")
+            label_widget.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
+            label_widget.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
+            layout.addWidget(label_widget)
+
+        if isinstance(self.widget, QComboBox):
+            self.widget.setSizeAdjustPolicy(QComboBox.AdjustToContents)
+
+            size_policy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+            self.widget.setSizePolicy(size_policy)
+
+            self.widget.setMinimumWidth(self.calculate_minimum_width(self.widget))
+
+        else:
+            self.widget.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
+
         layout.addWidget(self.widget)
-        toolbar.addWidget(widget)
+
+        toolbar.addWidget(container)
+
+    @staticmethod
+    def calculate_minimum_width(combo_box: QComboBox) -> int:
+        """
+        Calculate the minimum width required to display the longest item in the combo box.
+
+        Args:
+            combo_box (QComboBox): The combo box to calculate the width for.
+
+        Returns:
+            int: The calculated minimum width in pixels.
+        """
+        font_metrics = combo_box.fontMetrics()
+        max_width = max(font_metrics.width(combo_box.itemText(i)) for i in range(combo_box.count()))
+        return max_width + 60
 
 
 class ExpandableMenuAction(ToolBarAction):

bec_widgets/widgets/figure/figure.py

@@ -321,6 +321,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         self,
         image,
         monitor: str = None,
+        monitor_type: Literal["1d", "2d"] = "2d",
         color_bar: Literal["simple", "full"] = "full",
         color_map: str = "magma",
         data: np.ndarray = None,
@@ -337,7 +338,13 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
             data (np.ndarray): Custom data to display.
         """
         if monitor is not None and data is None:
-            image.image(monitor=monitor, color_map=color_map, vrange=vrange, color_bar=color_bar)
+            image.image(
+                monitor=monitor,
+                monitor_type=monitor_type,
+                color_map=color_map,
+                vrange=vrange,
+                color_bar=color_bar,
+            )
         elif data is not None and monitor is None:
             image.add_custom_image(
                 name="custom", data=data, color_map=color_map, vrange=vrange, color_bar=color_bar
@@ -355,6 +362,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
     def image(
         self,
         monitor: str = None,
+        monitor_type: Literal["1d", "2d"] = "2d",
         color_bar: Literal["simple", "full"] = "full",
         color_map: str = "magma",
         data: np.ndarray = None,
@@ -393,6 +401,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         image = self._init_image(
             image=image,
             monitor=monitor,
+            monitor_type=monitor_type,
             color_bar=color_bar,
             color_map=color_map,
             data=data,

bec_widgets/widgets/figure/plots/image/image.py

@@ -7,10 +7,10 @@ import numpy as np
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from pydantic import BaseModel, Field, ValidationError
-from qtpy.QtCore import QThread
+from qtpy.QtCore import QThread, Slot
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+# from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import EntryValidator
 from bec_widgets.widgets.figure.plots.image.image_item import BECImageItem, ImageItemConfig
 from bec_widgets.widgets.figure.plots.image.image_processor import (
@@ -80,6 +80,8 @@ class BECImageShow(BECPlotBase):
         )
         # Get bec shortcuts dev, scans, queue, scan_storage, dap
         self.single_image = single_image
+        self.image_type = "device_monitor_2d"
+        self.scan_id = None
         self.get_bec_shortcuts()
         self.entry_validator = EntryValidator(self.dev)
         self._images = defaultdict(dict)
@@ -105,7 +107,7 @@ class BECImageShow(BECPlotBase):
 
     def find_image_by_monitor(self, item_id: str) -> BECImageItem:
         """
-        Find the widget by its gui_id.
+        Find the image item by its gui_id.
 
         Args:
             item_id(str): The gui_id of the widget.
@@ -230,6 +232,7 @@ class BECImageShow(BECPlotBase):
     def image(
         self,
         monitor: str,
+        monitor_type: Literal["1d", "2d"] = "2d",
         color_map: Optional[str] = "magma",
         color_bar: Optional[Literal["simple", "full"]] = "full",
         downsample: Optional[bool] = True,
@@ -243,6 +246,7 @@ class BECImageShow(BECPlotBase):
 
         Args:
             monitor(str): The name of the monitor to display.
+            monitor_type(Literal["1d","2d"]): The type of monitor to display.
             color_bar(Literal["simple","full"]): The type of color bar to display.
             color_map(str): The color map to use for the image.
             data(np.ndarray): Custom data to display.
@@ -251,7 +255,12 @@ class BECImageShow(BECPlotBase):
         Returns:
             BECImageItem: The image item.
         """
-        image_source = "device_monitor_2d"
+        if monitor_type == "1d":
+            image_source = "device_monitor_1d"
+            self.image_type = "device_monitor_1d"
+        elif monitor_type == "2d":
+            image_source = "device_monitor_2d"
+            self.image_type = "device_monitor_2d"
 
         image_exits = self._check_image_id(monitor, self._images)
         if image_exits:
@@ -292,7 +301,6 @@ class BECImageShow(BECPlotBase):
         **kwargs,
     ):
         image_source = "custom"
-        # image_source = "device_monitor_2d"
 
         image_exits = self._check_image_id(name, self._images)
         if image_exits:
@@ -516,9 +524,58 @@ class BECImageShow(BECPlotBase):
         """
         data = msg["data"]
         device = msg["device"]
-        image = self._images["device_monitor_2d"][device]
-        image.raw_data = data
-        self.process_image(device, image, data)
+        if self.image_type == "device_monitor_1d":
+            image = self._images["device_monitor_1d"][device]
+            current_scan_id = metadata.get("scan_id", None)
+            if current_scan_id is None:
+                return
+            if current_scan_id != self.scan_id:
+                self.reset()
+                self.scan_id = current_scan_id
+                image.image_buffer_list = []
+                image.max_len = 0
+            image_buffer = self.adjust_image_buffer(image, data)
+            image.raw_data = image_buffer
+            self.process_image(device, image, image_buffer)
+        elif self.image_type == "device_monitor_2d":
+            image = self._images["device_monitor_2d"][device]
+            image.raw_data = data
+            self.process_image(device, image, data)
+
+    def adjust_image_buffer(self, image: BECImageItem, new_data: np.ndarray) -> np.ndarray:
+        """
+        Adjusts the image buffer to accommodate the new data, ensuring that all rows have the same length.
+
+        Args:
+            image: The image object (used to store buffer list and max_len).
+            new_data (np.ndarray): The new incoming 1D waveform data.
+
+        Returns:
+            np.ndarray: The updated image buffer with adjusted shapes.
+        """
+        new_len = new_data.shape[0]
+        if not hasattr(image, "image_buffer_list"):
+            image.image_buffer_list = []
+            image.max_len = 0
+
+        if new_len > image.max_len:
+            image.max_len = new_len
+            for i in range(len(image.image_buffer_list)):
+                wf = image.image_buffer_list[i]
+                pad_width = image.max_len - wf.shape[0]
+                if pad_width > 0:
+                    image.image_buffer_list[i] = np.pad(
+                        wf, (0, pad_width), mode="constant", constant_values=0
+                    )
+            image.image_buffer_list.append(new_data)
+        else:
+            pad_width = image.max_len - new_len
+            if pad_width > 0:
+                new_data = np.pad(new_data, (0, pad_width), mode="constant", constant_values=0)
+            image.image_buffer_list.append(new_data)
+
+        image_buffer = np.array(image.image_buffer_list)
+        return image_buffer
 
     @Slot(str, np.ndarray)
     def update_image(self, device: str, data: np.ndarray):
@@ -529,7 +586,7 @@ class BECImageShow(BECPlotBase):
             device(str): The name of the device.
             data(np.ndarray): The data to be updated.
         """
-        image_to_update = self._images["device_monitor_2d"][device]
+        image_to_update = self._images[self.image_type][device]
         image_to_update.updateImage(data, autoLevels=image_to_update.config.autorange)
 
     @Slot(str, ImageStats)
@@ -540,7 +597,7 @@ class BECImageShow(BECPlotBase):
         Args:
             stats(ImageStats): The statistics of the image.
         """
-        image_to_update = self._images["device_monitor_2d"][device]
+        image_to_update = self._images[self.image_type][device]
         if image_to_update.config.autorange:
             image_to_update.auto_update_vrange(stats)
 
@@ -553,7 +610,7 @@ class BECImageShow(BECPlotBase):
                 data = image.raw_data
                 self.process_image(image_id, image, data)
 
-    def _connect_device_monitor_2d(self, monitor: str):
+    def _connect_device_monitor(self, monitor: str):
         """
         Connect to the device monitor.
 
@@ -566,29 +623,36 @@ class BECImageShow(BECPlotBase):
         except AttributeError:
             previous_monitor = None
         if previous_monitor and image_item.connected is True:
+            self.bec_dispatcher.disconnect_slot(
+                self.on_image_update, MessageEndpoints.device_monitor_1d(previous_monitor)
+            )
             self.bec_dispatcher.disconnect_slot(
                 self.on_image_update, MessageEndpoints.device_monitor_2d(previous_monitor)
             )
             image_item.connected = False
         if monitor and image_item.connected is False:
             self.entry_validator.validate_monitor(monitor)
-            self.bec_dispatcher.connect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor_2d(monitor)
-            )
+            if self.image_type == "device_monitor_1d":
+                self.bec_dispatcher.connect_slot(
+                    self.on_image_update, MessageEndpoints.device_monitor_1d(monitor)
+                )
+            elif self.image_type == "device_monitor_2d":
+                self.bec_dispatcher.connect_slot(
+                    self.on_image_update, MessageEndpoints.device_monitor_2d(monitor)
+                )
             image_item.set_monitor(monitor)
             image_item.connected = True
 
     def _add_image_object(
         self, source: str, name: str, config: ImageItemConfig, data=None
-    ) -> BECImageItem:  # TODO fix types
+    ) -> BECImageItem:
         config.parent_id = self.gui_id
         if self.single_image is True and len(self.images) > 0:
             self.remove_image(0)
         image = BECImageItem(config=config, parent_image=self)
         self.plot_item.addItem(image)
         self._images[source][name] = image
-        if source == "device_monitor_2d":
-            self._connect_device_monitor_2d(config.monitor)
+        self._connect_device_monitor(config.monitor)
         self.config.images[name] = config
         if data is not None:
             image.setImage(data)
@@ -673,6 +737,9 @@ class BECImageShow(BECPlotBase):
         """
         image = self.find_image_by_monitor(image_id)
         if image:
+            self.bec_dispatcher.disconnect_slot(
+                self.on_image_update, MessageEndpoints.device_monitor_1d(image.config.monitor)
+            )
             self.bec_dispatcher.disconnect_slot(
                 self.on_image_update, MessageEndpoints.device_monitor_2d(image.config.monitor)
             )
@@ -681,9 +748,9 @@ class BECImageShow(BECPlotBase):
         """
         Clean up the widget.
         """
-        for monitor in self._images["device_monitor_2d"]:
+        for monitor in self._images[self.image_type]:
             self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor_2d(monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_1d(monitor)
             )
         self.images.clear()
 

bec_widgets/widgets/figure/plots/plot_base.py

@@ -452,13 +452,14 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
 
             self.fps_monitor.sigFpsUpdate.connect(self.update_fps_label)
 
-    def unhook_fps_monitor(self):
+    def unhook_fps_monitor(self, delete_label=True):
         """Unhook the FPS monitor from the plot."""
         if self.fps_monitor is not None:
             # Remove Monitor
             self.fps_monitor.cleanup()
             self.fps_monitor.deleteLater()
             self.fps_monitor = None
+        if self.fps_label is not None and delete_label:
             # Remove Label
             self.removeItem(self.fps_label)
             self.fps_label.deleteLater()
@@ -490,6 +491,7 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
     def cleanup_pyqtgraph(self):
         """Cleanup pyqtgraph items."""
         self.unhook_crosshair()
+        self.unhook_fps_monitor(delete_label=False)
         self.tick_item.cleanup()
         self.arrow_item.cleanup()
         item = self.plot_item

bec_widgets/widgets/image/image_widget.py

@@ -4,7 +4,7 @@ import sys
 from typing import Literal, Optional
 
 import pyqtgraph as pg
-from qtpy.QtWidgets import QVBoxLayout, QWidget
+from qtpy.QtWidgets import QComboBox, QVBoxLayout, QWidget
 
 from bec_widgets.qt_utils.error_popups import SafeSlot, WarningPopupUtility
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
@@ -13,6 +13,7 @@ from bec_widgets.qt_utils.toolbar import (
     MaterialIconAction,
     ModularToolBar,
     SeparatorAction,
+    WidgetAction,
 )
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
@@ -63,11 +64,14 @@ class BECImageWidget(BECWidget, QWidget):
         self.layout.setContentsMargins(0, 0, 0, 0)
 
         self.fig = BECFigure()
+        self.dim_combo_box = QComboBox()
+        self.dim_combo_box.addItems(["1d", "2d"])
         self.toolbar = ModularToolBar(
             actions={
                 "monitor": DeviceSelectionAction(
                     "Monitor:", DeviceComboBox(device_filter="Device")
                 ),
+                "monitor_type": WidgetAction(widget=self.dim_combo_box),
                 "connect": MaterialIconAction(icon_name="link", tooltip="Connect Device"),
                 "separator_0": SeparatorAction(),
                 "save": MaterialIconAction(icon_name="save", tooltip="Open Export Dialog"),
@@ -163,7 +167,8 @@ class BECImageWidget(BECWidget, QWidget):
     def _connect_action(self):
         monitor_combo = self.toolbar.widgets["monitor"].device_combobox
         monitor_name = monitor_combo.currentText()
-        self.image(monitor_name)
+        monitor_type = self.toolbar.widgets["monitor_type"].widget.currentText()
+        self.image(monitor=monitor_name, monitor_type=monitor_type)
         monitor_combo.setStyleSheet("QComboBox { background-color: " "; }")
 
     def show_axis_settings(self):
@@ -182,6 +187,7 @@ class BECImageWidget(BECWidget, QWidget):
     def image(
         self,
         monitor: str,
+        monitor_type: Optional[Literal["1d", "2d"]] = "2d",
         color_map: Optional[str] = "magma",
         color_bar: Optional[Literal["simple", "full"]] = "full",
         downsample: Optional[bool] = True,
@@ -195,8 +201,14 @@ class BECImageWidget(BECWidget, QWidget):
             self.toolbar.widgets["monitor"].device_combobox.setStyleSheet(
                 "QComboBox {{ background-color: " "; }}"
             )
+        if self.toolbar.widgets["monitor_type"].widget.currentText() != monitor_type:
+            self.toolbar.widgets["monitor_type"].widget.setCurrentText(monitor_type)
+            self.toolbar.widgets["monitor_type"].widget.setStyleSheet(
+                "QComboBox {{ background-color: " "; }}"
+            )
         return self._image.image(
             monitor=monitor,
+            monitor_type=monitor_type,
             color_map=color_map,
             color_bar=color_bar,
             downsample=downsample,
@@ -486,6 +498,7 @@ def main():  # pragma: no cover
 
     app = QApplication(sys.argv)
     widget = BECImageWidget()
+    widget.image("waveform", "1d")
     widget.show()
     sys.exit(app.exec_())
 

bec_widgets/widgets/vscode/vscode.py

@@ -5,10 +5,19 @@ import signal
 import socket
 import subprocess
 import sys
+from typing import Literal
+
+from pydantic import BaseModel
+from qtpy.QtCore import Signal, Slot
 
 from bec_widgets.widgets.website.website import WebsiteWidget
 
 
+class VSCodeInstructionMessage(BaseModel):
+    command: Literal["open", "write", "close", "zenMode", "save", "new", "setCursor"]
+    content: str = ""
+
+
 def get_free_port():
     """
     Get a free port on the local machine.
@@ -28,6 +37,8 @@ class VSCodeEditor(WebsiteWidget):
     A widget to display the VSCode editor.
     """
 
+    file_saved = Signal(str)
+
     token = "bec"
     host = "127.0.0.1"
 
@@ -41,6 +52,7 @@ class VSCodeEditor(WebsiteWidget):
         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()
+        self.bec_dispatcher.connect_slot(self.on_vscode_event, f"vscode-events/{self.gui_id}")
 
     def start_server(self):
         """
@@ -49,11 +61,19 @@ class VSCodeEditor(WebsiteWidget):
         This method starts the server for the VSCode editor in a subprocess.
         """
 
+        env = os.environ.copy()
+        env["BEC_Widgets_GUIID"] = self.gui_id
+        env["BEC_REDIS_HOST"] = self.client.connector.host
         cmd = shlex.split(
             f"code serve-web --port {self.port} --connection-token={self.token} --accept-server-license-terms"
         )
         self.process = subprocess.Popen(
-            cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, preexec_fn=os.setsid
+            cmd,
+            text=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.DEVNULL,
+            preexec_fn=os.setsid,
+            env=env,
         )
 
         os.set_blocking(self.process.stdout.fileno(), False)
@@ -66,6 +86,92 @@ class VSCodeEditor(WebsiteWidget):
         self.set_url(self._url)
         self.wait_until_loaded()
 
+    @Slot(str)
+    def open_file(self, file_path: str):
+        """
+        Open a file in the VSCode editor.
+
+        Args:
+            file_path: The file path to open
+        """
+        msg = VSCodeInstructionMessage(command="open", content=f"file://{file_path}")
+        self.client.connector.raw_send(f"vscode-instructions/{self.gui_id}", msg.model_dump_json())
+
+    @Slot(dict, dict)
+    def on_vscode_event(self, content, _metadata):
+        """
+        Handle the VSCode event. VSCode events are received as RawMessages.
+
+        Args:
+            content: The content of the event
+            metadata: The metadata of the event
+        """
+
+        # the message also contains the content but I think is fine for now to just emit the file path
+        if not isinstance(content["data"], dict):
+            return
+        if "uri" not in content["data"]:
+            return
+        if not content["data"]["uri"].startswith("file://"):
+            return
+        file_path = content["data"]["uri"].split("file://")[1]
+        self.file_saved.emit(file_path)
+
+    @Slot()
+    def save_file(self):
+        """
+        Save the file in the VSCode editor.
+        """
+        msg = VSCodeInstructionMessage(command="save")
+        self.client.connector.raw_send(f"vscode-instructions/{self.gui_id}", msg.model_dump_json())
+
+    @Slot()
+    def new_file(self):
+        """
+        Create a new file in the VSCode editor.
+        """
+        msg = VSCodeInstructionMessage(command="new")
+        self.client.connector.raw_send(f"vscode-instructions/{self.gui_id}", msg.model_dump_json())
+
+    @Slot()
+    def close_file(self):
+        """
+        Close the file in the VSCode editor.
+        """
+        msg = VSCodeInstructionMessage(command="close")
+        self.client.connector.raw_send(f"vscode-instructions/{self.gui_id}", msg.model_dump_json())
+
+    @Slot(str)
+    def write_file(self, content: str):
+        """
+        Write content to the file in the VSCode editor.
+
+        Args:
+            content: The content to write
+        """
+        msg = VSCodeInstructionMessage(command="write", content=content)
+        self.client.connector.raw_send(f"vscode-instructions/{self.gui_id}", msg.model_dump_json())
+
+    @Slot()
+    def zen_mode(self):
+        """
+        Toggle the Zen mode in the VSCode editor.
+        """
+        msg = VSCodeInstructionMessage(command="zenMode")
+        self.client.connector.raw_send(f"vscode-instructions/{self.gui_id}", msg.model_dump_json())
+
+    @Slot(int, int)
+    def set_cursor(self, line: int, column: int):
+        """
+        Set the cursor in the VSCode editor.
+
+        Args:
+            line: The line number
+            column: The column number
+        """
+        msg = VSCodeInstructionMessage(command="setCursor", content=f"{line},{column}")
+        self.client.connector.raw_send(f"vscode-instructions/{self.gui_id}", msg.model_dump_json())
+
     def cleanup_vscode(self):
         """
         Cleanup the VSCode editor.
@@ -79,6 +185,7 @@ class VSCodeEditor(WebsiteWidget):
         """
         Cleanup the widget. This method is called from the dock area when the widget is removed.
         """
+        self.bec_dispatcher.disconnect_slot(self.on_vscode_event, f"vscode-events/{self.gui_id}")
         self.cleanup_vscode()
         return super().cleanup()
 
@@ -89,7 +196,7 @@ if __name__ == "__main__":  # pragma: no cover
     from qtpy.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
-    widget = VSCodeEditor()
+    widget = VSCodeEditor(gui_id="unknown")
     widget.show()
     app.exec_()
     widget.bec_dispatcher.disconnect_all()

{bec_widgets-0.117.0.dist-info → bec_widgets-0.118.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.117.0
+Version: 0.118.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.117.0.dist-info → bec_widgets-0.118.0.dist-info}/RECORD

@@ -2,11 +2,11 @@
 .gitlab-ci.yml,sha256=Dc1iDjsc72UxdUtihx4uSZU0lrTQeR8hZwGx1MQBfKE,8432
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=P2FvQRmkrzZeRyx-2Okb6dqpPawiUEEua4eQjG0ffNI,7492
+CHANGELOG.md,sha256=HNKObLHRdn9EU6yqjOfIWmErsDeBt7ffe7yyRbZS3NA,7465
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=qzAx_QzNjl7iO4_f8Bz9YYq3XG9n3Lv2VGGKUY5X48M,1334
+PKG-INFO,sha256=hV96OUPMuSpWBtmpNtWNAb0beAY0hjUEDESVB7pQbAI,1334
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=kyGOtgZp4UfDCXDm7NnGWUox2z3FHW5lri9ZUU-g3Yg,2594
+pyproject.toml,sha256=4rIuf_3lQm4rURa8VikhNvgRpIszEI-2SDRmR_IFX0Y,2594
 .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
@@ -36,7 +36,7 @@ bec_widgets/examples/general_app/general_app.py,sha256=PoFCTuA_1yqrpgthASpYFgH7J
 bec_widgets/examples/general_app/general_app.ui,sha256=TsejkM3Z8znnixyqxoj4SwhIIpIzTAuGAMkGXSS1aT8,10479
 bec_widgets/examples/general_app/web_links.py,sha256=d5OgzgI9zb-NAC0pOGanOtJX3nZoe4x8QuQTw-_hK_8,434
 bec_widgets/examples/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/examples/jupyter_console/jupyter_console_window.py,sha256=C1GeB-RuL7Uo2IJS8DghNsPY41FJJi60EVXVJrwz3Do,6767
+bec_widgets/examples/jupyter_console/jupyter_console_window.py,sha256=ghtbw0rZjjLMq3Kn01PTPn7ubJ9O20Y0VFgIFlOkWXY,6776
 bec_widgets/examples/plugin_example_pyside/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/examples/plugin_example_pyside/main.py,sha256=zDP5wO7wb3BVsQ15HOCRT1nNmCujIVRvSXZ3Txje8L0,549
 bec_widgets/examples/plugin_example_pyside/registertictactoe.py,sha256=cVhBnP0qx5j9Jft-VeKvlTFE-bX58hbP45CX0f4r5pM,535
@@ -50,7 +50,7 @@ bec_widgets/qt_utils/error_popups.py,sha256=y9gKKWaafp468ioHr96nBhf02ZpEgjDc-BAV
 bec_widgets/qt_utils/palette_viewer.py,sha256=PGhJ-4XI0f7gNnC1djNgcIHYg6HDO6hPju4pfWj9rvg,6311
 bec_widgets/qt_utils/redis_message_waiter.py,sha256=fvL_QgC0cTDv_FPJdRyp5AKjf401EJU4z3r38p47ydY,1745
 bec_widgets/qt_utils/settings_dialog.py,sha256=NhtzTer_xzlB2lLLrGklkI1QYLJEWQpJoZbCz4o5daI,3645
-bec_widgets/qt_utils/toolbar.py,sha256=6D6GL0OjXEtuP9G83OiDxycyy6m8mqY2ChtPwinN9Ec,8735
+bec_widgets/qt_utils/toolbar.py,sha256=yR2WNPv7dD8jU12aHgUMAi5-FYyCKe2MNSsqMzsa5pg,9856
 bec_widgets/utils/__init__.py,sha256=1930ji1Jj6dVuY81Wd2kYBhHYNV-2R0bN_L4o9zBj1U,533
 bec_widgets/utils/bec_connector.py,sha256=I9M_4g-_-WaMmhyXzChFCGXAElelx0mG6E1g0KvtEQs,10059
 bec_widgets/utils/bec_designer.py,sha256=Z3MeMju-KmTz8POtm23VQfp4rvtD2sF6eIOKQkl2F7w,4729
@@ -160,13 +160,13 @@ bec_widgets/widgets/dock/dock_area.pyproject,sha256=URW0UrDXCnkzk80rbQmUMgF6Uqay
 bec_widgets/widgets/dock/dock_area_plugin.py,sha256=hfA1r13hmlXaDO6kzbk6vBlhVlGh2eSTXrnftjzZj0Q,1320
 bec_widgets/widgets/dock/register_dock_area.py,sha256=Yqd1mq6CcHwlxHZxX5EHKONy4P44nMm8pso-4X0tvJI,464
 bec_widgets/widgets/figure/__init__.py,sha256=3hGx_KOV7QHCYAV06aNuUgKq4QIYCjUTad-DrwkUaBM,44
-bec_widgets/widgets/figure/figure.py,sha256=IzQaV_9utjViJyjMydOa3-EJ9k-FVG2PTVm8_ENCbgY,28849
+bec_widgets/widgets/figure/figure.py,sha256=dHH27Fwr9dFBx4g6CXfDQr09LVAUi7xghxukhjoRND8,29110
 bec_widgets/widgets/figure/plots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/figure/plots/axis_settings.py,sha256=grgrX4t4eAzccW4jj4HYtMSxy8Wgcd9N9J1aU7UHtIs,3723
 bec_widgets/widgets/figure/plots/axis_settings.ui,sha256=ye-guaRU_jhu7sHZS-9AjBjLrCtA1msOD0dszu4o9x8,11785
-bec_widgets/widgets/figure/plots/plot_base.py,sha256=FIPvigIHenScR3T1NitRdlY_CXJmuAjCY8fv3GQzrRM,18053
+bec_widgets/widgets/figure/plots/plot_base.py,sha256=7c1HQaGwxsN2vQOFuF5Z68Gp-hbeHOI04C4wvWQs89w,18180
 bec_widgets/widgets/figure/plots/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/image/image.py,sha256=FmvVVKLtMOAvaRL1tF30KLO0yQVCZqxCqydQIesKgdc,25044
+bec_widgets/widgets/figure/plots/image/image.py,sha256=tTtBoAA5CRhSEMae0k8dElM-MznnhcgTg0flXIIduq0,28052
 bec_widgets/widgets/figure/plots/image/image_item.py,sha256=TwHo6FwCiQgJBdr-KKy_7Y_vYSB0pPjBl1AubuZSrE0,11002
 bec_widgets/widgets/figure/plots/image/image_processor.py,sha256=GeTtWjbldy6VejMwPGQgM-o3d6bmLglCjdoktu19xfA,5262
 bec_widgets/widgets/figure/plots/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -177,7 +177,7 @@ bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=RUo4GfXwlaCei
 bec_widgets/widgets/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/image/bec_image_widget.pyproject,sha256=PHisdBo5_5UCApd27GkizzqgfdjsDx2bFZa_p9LiSW8,30
 bec_widgets/widgets/image/bec_image_widget_plugin.py,sha256=3nOHJTukHsEkaCLAivPHIY4qdshAj86LUKb5fYF3C-Y,1369
-bec_widgets/widgets/image/image_widget.py,sha256=va8IwMWgKUhtmmig2npFjVWJgTnIdnGMFhqFHuoQvWo,17040
+bec_widgets/widgets/image/image_widget.py,sha256=o639hbSJVrCGwx2r0KV8JUJ-inaME-GWMR7YDmzFHhg,17796
 bec_widgets/widgets/image/register_bec_image_widget.py,sha256=01YLZQTMSSIXvH1TSL-1AYsRs1a4EbSwKLVAwh9AjeA,478
 bec_widgets/widgets/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/jupyter_console/jupyter_console.py,sha256=-e7HQOECeH5eDrJYh4BFIzRL78LDkooU4otabyN0aX4,2343
@@ -248,7 +248,7 @@ bec_widgets/widgets/vscode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 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=3HDWYJZPi4lNr7gW4IabTYyivMdhZGhq5ETGlJihqlc,2579
+bec_widgets/widgets/vscode/vscode.py,sha256=c4Uef-xp5gJqVJdw82nWJWF-iTWz4Zsx4HhgbsGhe-E,6181
 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
@@ -265,8 +265,8 @@ bec_widgets/widgets/website/register_website_widget.py,sha256=LIQJpV9uqcBiPR9cEA
 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.117.0.dist-info/METADATA,sha256=qzAx_QzNjl7iO4_f8Bz9YYq3XG9n3Lv2VGGKUY5X48M,1334
-bec_widgets-0.117.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.117.0.dist-info/entry_points.txt,sha256=dItMzmwA1wizJ1Itx15qnfJ0ZzKVYFLVJ1voxT7K7D4,214
-bec_widgets-0.117.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.117.0.dist-info/RECORD,,
+bec_widgets-0.118.0.dist-info/METADATA,sha256=hV96OUPMuSpWBtmpNtWNAb0beAY0hjUEDESVB7pQbAI,1334
+bec_widgets-0.118.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.118.0.dist-info/entry_points.txt,sha256=dItMzmwA1wizJ1Itx15qnfJ0ZzKVYFLVJ1voxT7K7D4,214
+bec_widgets-0.118.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.118.0.dist-info/RECORD,,

pyproject.toml

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