bec-ipython-client 3.121.0__tar.gz → 3.122.0__tar.gz

{bec_ipython_client-3.121.0 → bec_ipython_client-3.122.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec_ipython_client
-Version: 3.121.0
+Version: 3.122.0
 Summary: BEC IPython client
 Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
 Project-URL: Homepage, https://github.com/bec-project/bec

{bec_ipython_client-3.121.0 → bec_ipython_client-3.122.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_ipython_client"
-version = "3.121.0"
+version = "3.122.0"
 description = "BEC IPython client"
 requires-python = ">=3.11"
 classifiers = [
@@ -46,6 +46,8 @@ Homepage = "https://github.com/bec-project/bec"
 
 
 
+
+
 [tool.hatch.build.targets.wheel]
 include = ["*"]
 

{bec_ipython_client-3.121.0 → bec_ipython_client-3.122.0}/tests/end-2-end/test_procedures_e2e.py

@@ -46,8 +46,10 @@ def client_logtool_and_manager(
     manager = ProcedureManager(
         f"{client.connector.host}:{client.connector.port}", ContainerProcedureWorker
     )
-    yield client, logtool, manager
-    manager.shutdown()
+    try:
+        yield client, logtool, manager
+    finally:
+        manager.shutdown()
 
 
 def _wait_while(cond: Callable[[], bool], timeout_s):

{bec_ipython_client-3.121.0 → bec_ipython_client-3.122.0}/tests/end-2-end/test_scans_v4_lib_e2e.py

@@ -1,10 +1,17 @@
 from __future__ import annotations
 
 import time
+import uuid
+from pathlib import Path
+from unittest.mock import patch
 
 import numpy as np
 import pytest
+from typer.testing import CliRunner
 
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.plugin_helper import plugin_repo_path
+from bec_lib.utils.plugin_manager import create as plugin_create
 from bec_server.scan_server.scans import position_generators
 
 
@@ -81,6 +88,38 @@ def _wait_for_queue_status(bec, queue_name: str, expected_status: str, timeout:
     raise TimeoutError(f"Timed out waiting for queue status {expected_status!r}.")
 
 
+def _plugin_scan_paths(scan_name: str) -> tuple[Path, Path]:
+    repo = Path(plugin_repo_path())
+    scans_dir = repo / repo.name / "scans"
+    return scans_dir / f"{scan_name}.py", scans_dir / "__init__.py"
+
+
+def _remove_scan_export(init_file: Path, scan_name: str):
+    import_line = (
+        f"from .{scan_name} import {''.join(part.capitalize() for part in scan_name.split('_'))}\n"
+    )
+    if not init_file.exists():
+        return
+    content = init_file.read_text(encoding="utf-8")
+    if import_line not in content:
+        return
+    init_file.write_text(content.replace(import_line, ""), encoding="utf-8")
+
+
+def _wait_for_v4_scan_registration(bec, scan_name: str, timeout: float = 60):
+    deadline = time.time() + timeout
+    while time.time() < deadline:
+        available_scans = bec.connector.get(MessageEndpoints.available_scans())
+        if available_scans and scan_name in available_scans.resource:
+            if hasattr(bec.scans, scan_name):
+                return getattr(bec.scans, scan_name)
+        time.sleep(1)
+    available_scans = dir(bec.scans)
+    raise TimeoutError(
+        f"Timed out waiting for scan {scan_name!r} to become available. Available scans: {available_scans}"
+    )
+
+
 @pytest.mark.timeout(120)
 @pytest.mark.parametrize(
     ("scan_name", "scan_args", "scan_kwargs", "expected_num_points", "expected_num_readouts"),
@@ -279,3 +318,47 @@ def test_v4_scan_lib_stop_resolves_cleanly(bec_client_lib):
     status.cancel()
 
     _wait_for_queue_status(bec, "primary", "RUNNING", timeout=15)
+
+
+@pytest.mark.timeout(180)
+def test_v4_generated_scan_e2e(bec_client_lib):
+    bec = bec_client_lib
+    scan_name = f"e2e_generated_scan_{uuid.uuid4().hex[:8]}"
+    try:
+        scan_file, init_file = _plugin_scan_paths(scan_name)
+    except ValueError as exc:
+        pytest.skip(f"Generated scan e2e requires an editable plugin install: {exc}")
+    runner = CliRunner()
+
+    try:
+        with (
+            patch("bec_lib.utils.plugin_manager.create.scan.run_formatters"),
+            patch(
+                "bec_lib.utils.plugin_manager.create.scan._select_option",
+                return_value="SOFTWARE_TRIGGERED",
+            ),
+        ):
+            result = runner.invoke(
+                plugin_create._app,
+                ["scan", scan_name],
+                input="E2E generated scan.\nE2E generated scan.\nn\nn\n",
+            )
+        assert result.exit_code == 0, result.output
+        assert scan_file.exists()
+
+        bec._request_scan_reload()
+        scan_runner = _wait_for_v4_scan_registration(bec, scan_name)
+
+        bec.metadata.update({"unit_test": "test_v4_generated_scan_e2e"})
+        status = scan_runner()
+        status.wait(timeout=60, num_points=False, file_written=True)
+
+        assert status.scan is not None
+        assert status.request is not None
+        assert status.request.request.content["scan_type"] == scan_name
+    finally:
+        if scan_file.exists():
+            scan_file.unlink()
+        _remove_scan_export(init_file, scan_name)
+        bec._request_scan_reload()
+        time.sleep(2)