bec-widgets 0.73.1__py3-none-any.whl → 0.73.2__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v0.73.2 (2024-06-25)
+
+### Fix
+
+* fix(vscode): only run terminate if the process is still alive ([`7120f3e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7120f3e93b054b788f15e2d5bcd688e3c140c1ce))
+
+* fix(rpc): trigger shutdown of server when gui is terminated ([`acc1318`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/acc13183e28030e3ca9af21bb081e1eed081622b))
+
+* fix(rpc): remove of calling "close" and waiting for gui_is_alive ([`f75fc19`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f75fc19c5b10022763252917ca473f404a25165a))
+
 ## v0.73.1 (2024-06-25)
 
 ### Fix
@@ -130,8 +140,6 @@
 
 * feat: bec-gui-server: redirect stdout and stderr (if any) as proper debug and error log entries ([`d1266a1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d1266a1ce148ff89557a039e3a182a87a3948f49))
 
-* feat: add logger for BEC GUI server ([`630616e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/630616ec729f60aa0b4d17a9e0379f9c6198eb96))
-
 ### Fix
 
 * fix: ignore GUI server output (any output will go to log file)
@@ -141,13 +149,3 @@ stderr streams will be redirected as log entries with levels DEBUG or ERROR
 in their parent process ([`ce37416`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ce374163cab87a92847409051739777bc505a77b))
 
 * fix: do not create 'BECClient' logger when instantiating BECDispatcher ([`f7d0b07`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f7d0b0768ace42a33e2556bb33611d4f02e5a6d9))
-
-## v0.67.0 (2024-06-21)
-
-### Documentation
-
-* docs: add widget to documentation ([`6fa1c06`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6fa1c06053131dabd084bb3cf13c853b5d3ce833))
-
-### Refactor
-
-* refactor: Change inheritance to QTreeWidget from QWidget ([`d2f2b20`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d2f2b206bb0eab60b8a9b0d0ac60a6b7887fa6fb))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.73.1
+Version: 0.73.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

bec_widgets/cli/client_utils.py

@@ -203,15 +203,12 @@ class BECGuiClientMixin:
         if self._process is None:
             return
 
-        self._run_rpc("close", (), wait_for_rpc_response=False)
-        while self.gui_is_alive():
-            time.sleep(0.2)
-
         self._client.shutdown()
         if self._process:
             self._process.terminate()
             if self._process_output_processing_thread:
                 self._process_output_processing_thread.join()
+            self._process.wait()
             self._process = None
 
 

bec_widgets/cli/server.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import inspect
 import signal
 import sys
@@ -29,7 +31,7 @@ class BECWidgetsCLIServer:
         dispatcher: BECDispatcher = None,
         client=None,
         config=None,
-        gui_class: Union["BECFigure", "BECDockArea"] = BECFigure,
+        gui_class: Union[BECFigure, BECDockArea] = BECFigure,
     ) -> None:
         self.dispatcher = BECDispatcher(config=config) if dispatcher is None else dispatcher
         self.client = self.dispatcher.client if client is None else client
@@ -118,6 +120,7 @@ class BECWidgetsCLIServer:
     def shutdown(self):  # TODO not sure if needed when cleanup is done at level of BECConnector
         self._shutdown_event = True
         self._heartbeat_timer.stop()
+        self.gui.close()
         self.client.shutdown()
 
 
@@ -207,6 +210,7 @@ def main():
                 app.quit()
 
             signal.signal(signal.SIGINT, sigint_handler)
+            signal.signal(signal.SIGTERM, sigint_handler)
 
             sys.exit(app.exec())
 

bec_widgets/widgets/vscode/vscode.py

@@ -60,7 +60,7 @@ class VSCodeEditor(WebsiteWidget):
         """
         Cleanup the VSCode editor.
         """
-        if not self.process:
+        if not self.process or self.process.poll() is not None:
             return
         os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
         self.process.wait()
@@ -72,6 +72,13 @@ class VSCodeEditor(WebsiteWidget):
         self.cleanup_vscode()
         return super().cleanup()
 
+    def close(self):
+        """
+        Close the widget.
+        """
+        self.cleanup_vscode()
+        return super().close()
+
 
 if __name__ == "__main__":  # pragma: no cover
     import sys

{bec_widgets-0.73.1.dist-info → bec_widgets-0.73.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.73.1
+Version: 0.73.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

{bec_widgets-0.73.1.dist-info → bec_widgets-0.73.2.dist-info}/RECORD

@@ -2,11 +2,11 @@
 .gitlab-ci.yml,sha256=RnYDz4zKXjlqltTryprlB1s5vLXxI2-seW-Vb70NNF0,8162
 .pylintrc,sha256=OstrgmEyP0smNFBKoIN5_26-UmNZgMHnbjvAWX0UrLs,18535
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=RztBU64vuCtXyt_8_nbRvIAnMC81FKJALYItO8vOvi8,7337
+CHANGELOG.md,sha256=1gxCAwPtBXbKQBu8qYGoa5nGPpVo9mCugMJxicel-5Q,7381
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=1zQTkIh2nsJNxm603O4yoxQiW4GJJtlNiUQikTGxl8M,1302
+PKG-INFO,sha256=j218s_gIgChSd6XQlMySe16wGrVOcS0MEPCZ7S4vU_g,1302
 README.md,sha256=y4jB6wvArS7N8_iTbKWnSM_oRAqLA2GqgzUR-FMh5sU,2645
-pyproject.toml,sha256=RQrSwufL9e_OH4NuztQaW2espiKYKti7czGesLMaH0M,2215
+pyproject.toml,sha256=f65NttBDHT4IZg0T5qIH5y4QGERQQggr_98iBUPQ5IM,2215
 .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
@@ -18,11 +18,11 @@ bec_widgets/assets/terminal_icon.png,sha256=bJl7Tft4Fi2uxvuXI8o14uMHnI9eAWKSU2uf
 bec_widgets/cli/__init__.py,sha256=d0Q6Fn44e7wFfLabDOBxpcJ1DPKWlFunGYDUBmO-4hA,22
 bec_widgets/cli/auto_updates.py,sha256=DyBV3HnjMSH-cvVkYNcDiYKVf0Xut4Qy2qGQqkW47Bw,4833
 bec_widgets/cli/client.py,sha256=faWHDMG9mwD1fB5ptuZ-_QWka0Lrv9iJ94QupwmqCmY,59358
-bec_widgets/cli/client_utils.py,sha256=tJwENsYTdWd4BKuoQ8fEkfp2JTuJqLJUImzRekd-Kos,12376
+bec_widgets/cli/client_utils.py,sha256=zq1gPW7t4n9Nsn4MLkdUeKwwl-9nUcf5UjuN8lZr9iY,12281
 bec_widgets/cli/generate_cli.py,sha256=InKBVYM7DRfAVLNJhRJbWWSSPBQBHI8Ek6v7NCsK0ME,4997
 bec_widgets/cli/rpc_register.py,sha256=QxXUZu5XNg00Yf5O3UHWOXg3-f_pzKjjoZYMOa-MOJc,2216
 bec_widgets/cli/rpc_wigdet_handler.py,sha256=1qQOGrM8rozaWLkoxAW8DTVLv_L_DZdZgUMDPy5MOek,1486
-bec_widgets/cli/server.py,sha256=3bFBPmtXKXFMjeja18d0hF3CO66Jo0-LEDtcF7lYb7k,7166
+bec_widgets/cli/server.py,sha256=2EJvkQDzrDTsZjRPs7g2v_iPTspGqxzY34tRAnvjxjY,7281
 bec_widgets/examples/__init__.py,sha256=WWQ0cu7m8sA4Ehy-DWdTIqSISjaHsbxhsNmNrMnhDZU,202
 bec_widgets/examples/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/examples/jupyter_console/jupyter_console_window.py,sha256=VdX3OwlIiUCD4b75MQS4YwLLaZGvsJ-z3QFPe2y9f78,5343
@@ -118,7 +118,7 @@ bec_widgets/widgets/text_box/text_box.py,sha256=kykQ_Zcxh8IGcPEP5-oGGQwoZEpY9vhx
 bec_widgets/widgets/toolbar/__init__.py,sha256=d-TP4_cr_VbpwreMM4ePnfZ5YXsEPQ45ibEf75nuGoE,36
 bec_widgets/widgets/toolbar/toolbar.py,sha256=e0zCD_0q7K4NVhrzD8001Qvfxt-VhqHTgofchS9NgCM,5125
 bec_widgets/widgets/vscode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/vscode/vscode.py,sha256=k4Y54zp9jGfeUKsFc482TnUJQd3pj-jdIb3i_dLiWUA,2376
+bec_widgets/widgets/vscode/vscode.py,sha256=ZyJJCJapYrGhqgudEt8JQn723DDqLdwjsXxXa5q3EkU,2544
 bec_widgets/widgets/website/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/website/website.py,sha256=Scvpl4I52qpL7s69tnNBRQSG6GcRI9jzoR3RsSTXfPE,1722
 docs/Makefile,sha256=i2WHuFlgfyAPEW4ssEP8NY4cOibDJrVjvzSEU8_Ggwc,634
@@ -201,7 +201,7 @@ tests/unit_tests/test_scan_control.py,sha256=Wr6KcE8av4sEIOx5VgYbzVCem3Jgb4Kzx_o
 tests/unit_tests/test_scan_control_group_box.py,sha256=HNqjP10B_NonikspNwKz9upJU-t7xf6hwBerNhbC-uo,5563
 tests/unit_tests/test_stop_button.py,sha256=2OH9dhs_-S5QovPPgU-5hJoViE1YKZa0gxisb4vOY28,712
 tests/unit_tests/test_text_box_widget.py,sha256=cT0uEHt_6d-FwST0A_wE9sFW9E3F_nJbKhuBAeU4yHg,1862
-tests/unit_tests/test_vscode_widget.py,sha256=sCVNAuWVMiPFinh9mDqz_ulBay_H3qwHyEwkHsbWh4c,2173
+tests/unit_tests/test_vscode_widget.py,sha256=NVB23ppLqIj-Opd8QnapqUJzDMz6mIZfm3wGPnFXyUE,2788
 tests/unit_tests/test_waveform1d.py,sha256=I3_pF0ieltcTWtweOBjICaOxJ8NCQ0-NWxpKg8Pas3E,15893
 tests/unit_tests/test_website_widget.py,sha256=fBADIJJBAHU4Ro7u95kdemFVNv196UOcuO9oLHuHt8A,761
 tests/unit_tests/test_widget_io.py,sha256=FeL3ZYSBQnRt6jxj8VGYw1cmcicRQyHKleahw7XIyR0,3475
@@ -211,8 +211,8 @@ 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.73.1.dist-info/METADATA,sha256=1zQTkIh2nsJNxm603O4yoxQiW4GJJtlNiUQikTGxl8M,1302
-bec_widgets-0.73.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.73.1.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.73.1.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.73.1.dist-info/RECORD,,
+bec_widgets-0.73.2.dist-info/METADATA,sha256=j218s_gIgChSd6XQlMySe16wGrVOcS0MEPCZ7S4vU_g,1302
+bec_widgets-0.73.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.73.2.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.73.2.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.73.2.dist-info/RECORD,,

pyproject.toml

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

tests/unit_tests/test_vscode_widget.py

@@ -46,7 +46,8 @@ def test_start_server(qtbot, mocked_client):
         )
 
 
-def test_close_event(qtbot, vscode_widget):
+@pytest.fixture
+def patched_vscode_process(qtbot, vscode_widget):
     with mock.patch("bec_widgets.widgets.vscode.vscode.os.killpg") as mock_killpg:
         with mock.patch("bec_widgets.widgets.vscode.vscode.os.getpgid") as mock_getpgid:
             with mock.patch(
@@ -54,8 +55,24 @@ def test_close_event(qtbot, vscode_widget):
             ) as mock_close_event:
                 mock_getpgid.return_value = 123
                 vscode_widget.process = mock.Mock()
-                vscode_widget.process.pid = 123
-                vscode_widget.closeEvent(None)
-                mock_killpg.assert_called_once_with(123, 15)
-                vscode_widget.process.wait.assert_called_once()
-                mock_close_event.assert_called_once()
+                yield vscode_widget, mock_killpg, mock_close_event
+
+
+def test_close_event(qtbot, patched_vscode_process):
+    vscode_patched, mock_killpg, mock_close_event = patched_vscode_process
+    vscode_patched.process.pid = 123
+    vscode_patched.process.poll.return_value = None
+    vscode_patched.closeEvent(None)
+    mock_killpg.assert_called_once_with(123, 15)
+    vscode_patched.process.wait.assert_called_once()
+    mock_close_event.assert_called_once()
+
+
+def test_close_event_on_terminated_code(qtbot, patched_vscode_process):
+    vscode_patched, mock_killpg, mock_close_event = patched_vscode_process
+    vscode_patched.process.pid = 123
+    vscode_patched.process.poll.return_value = 0
+    vscode_patched.closeEvent(None)
+    mock_killpg.assert_not_called()
+    vscode_patched.process.wait.assert_not_called()
+    mock_close_event.assert_called_once()