bec-ipython-client 3.119.0__tar.gz → 3.119.2__tar.gz

{bec_ipython_client-3.119.0 → bec_ipython_client-3.119.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec_ipython_client
-Version: 3.119.0
+Version: 3.119.2
 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.119.0 → bec_ipython_client-3.119.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_ipython_client"
-version = "3.119.0"
+version = "3.119.2"
 description = "BEC IPython client"
 requires-python = ">=3.11"
 classifiers = [

{bec_ipython_client-3.119.0 → bec_ipython_client-3.119.2}/tests/end-2-end/test_scans_v4_lib_e2e.py

@@ -21,9 +21,25 @@ def _run_v4_scan(
     return status
 
 
-def _assert_device_position(device, target: float):
-    current = device.read(cached=True)[device.full_name]["value"]
+def _assert_device_position(device, target: float, timeout: float | None = None):
     tolerance = device._config["deviceConfig"].get("tolerance", 0.05)
+
+    def _is_at_target():
+        current = device.read(cached=True)[device.full_name]["value"]
+        return current, np.isclose(current, target, atol=tolerance)
+
+    current, is_at_target = _is_at_target()
+    if timeout is None or is_at_target:
+        assert is_at_target
+        return
+
+    deadline = time.monotonic() + timeout
+    while time.monotonic() < deadline:
+        time.sleep(0.1)
+        current, is_at_target = _is_at_target()
+        if is_at_target:
+            return
+
     assert np.isclose(current, target, atol=tolerance)
 
 
@@ -192,8 +208,8 @@ def test_v4_mv_scan_lib(bec_client_lib):
     status = _run_v4_scan(bec, "mv", dev.samx, 1.5, dev.samy, -1.5, relative=False)
     status.wait(timeout=30)
 
-    _assert_device_position(dev.samx, 1.5)
-    _assert_device_position(dev.samy, -1.5)
+    _assert_device_position(dev.samx, 1.5, timeout=5)
+    _assert_device_position(dev.samy, -1.5, timeout=5)
 
 
 @pytest.mark.timeout(120)
@@ -204,8 +220,8 @@ def test_v4_umv_scan_lib(bec_client_lib):
     status = _run_v4_scan(bec, "umv", dev.samx, -1.0, dev.samy, 1.0, relative=False)
     status.wait(timeout=30)
 
-    _assert_device_position(dev.samx, -1.0)
-    _assert_device_position(dev.samy, 1.0)
+    _assert_device_position(dev.samx, -1.0, timeout=5)
+    _assert_device_position(dev.samy, 1.0, timeout=5)
 
 
 @pytest.mark.timeout(120)
@@ -230,9 +246,11 @@ def test_v4_cont_line_scan_lib(bec_client_lib):
 def test_v4_line_sweep_scan_lib(bec_client_lib):
     bec = bec_client_lib
     dev = bec.device_manager.devices
+    scans = bec.scans
     original_velocity = dev.samx.velocity.get()
     try:
-        dev.samx.velocity.set(1).wait()
+        scans.umv(dev.samx, -5.0, relative=False).wait()
+        dev.samx.velocity.set(5).wait()
         dev.samx.limits = [-50, 50]
         status = _run_v4_scan(
             bec,
@@ -240,7 +258,7 @@ def test_v4_line_sweep_scan_lib(bec_client_lib):
             dev.samx,
             -5.0,
             5.0,
-            min_update=0.01,
+            min_update=0.5,
             relative=False,
             wait_for_num_points=False,
         )
@@ -260,9 +278,4 @@ def test_v4_scan_lib_stop_resolves_cleanly(bec_client_lib):
     time.sleep(0.5)
     status.cancel()
 
-    _wait_for_scan_status(status, "STOPPED", timeout=15)
-    assert status.status == "STOPPED"
-    _wait_for_queue_status(bec, "primary", "PAUSED", timeout=15)
-
-    bec.queue.request_scan_continuation()
     _wait_for_queue_status(bec, "primary", "RUNNING", timeout=15)