bec-lib 3.167.0__tar.gz → 3.167.2__tar.gz

{bec_lib-3.167.0 → bec_lib-3.167.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bec_lib
-Version: 3.167.0
+Version: 3.167.2
 Summary: BEC library
 Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
 Project-URL: Homepage, https://github.com/bec-project/bec

{bec_lib-3.167.0 → bec_lib-3.167.2}/bec_lib/scan_report.py

@@ -238,8 +238,11 @@ class ScanReport:
         def conditions_are_met() -> bool:
             """Check if the conditions are met"""
             if not self.scan and self.status == "COMPLETED":
-                # If it is not a scan, just return True when completed
-                return True
+                if not self._request_expects_scan_item():
+                    return True
+                # If the scan item is not available yet, only return for callers
+                # that do not need scan-derived completion checks.
+                return not num_points and not file_written
             if num_points and not self._num_points_reached():
                 return False
             if file_written and not self._file_written():
@@ -259,6 +262,14 @@ class ScanReport:
         # final poll to ensure all callbacks are processed
         self._client.callbacks.poll()
 
+    def _request_expects_scan_item(self) -> bool:
+        """Return whether the request should eventually have a scan item."""
+        queue_item = self.request.queue or self.queue_item
+        for request_block in getattr(queue_item, "request_blocks", []) or []:
+            if request_block.RID == self.request.requestID:
+                return request_block.is_scan
+        return True
+
     def _file_written(self) -> bool:
         """
         Check if the master file was written

{bec_lib-3.167.0 → bec_lib-3.167.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_lib"
-version = "3.167.0"
+version = "3.167.2"
 description = "BEC library"
 requires-python = ">=3.11"
 classifiers = [

{bec_lib-3.167.0 → bec_lib-3.167.2}/tests/test_scan_report.py

@@ -92,6 +92,59 @@ def test_scan_report_wait_for_scan_file_pending(scan_report):
             assert file_written.call_count == 3
 
 
+def test_scan_report_wait_for_non_scan_without_scan_item(scan_report):
+    scan_report.request.request = messages.ScanQueueMessage(scan_type="umv", parameter={})
+    scan_report.request.requestID = "request-id"
+    scan_report.queue_item.status = "COMPLETED"
+    scan_report.request.queue.request_blocks = [mock.MagicMock(RID="request-id", is_scan=False)]
+
+    with (
+        mock.patch.object(ScanReport, "scan", new_callable=mock.PropertyMock) as scan,
+        mock.patch("time.sleep") as sleep,
+    ):
+        scan.return_value = None
+        scan_report._wait_scan(None, 0.1, num_points=False, file_written=True)
+
+    sleep.assert_not_called()
+
+
+def test_scan_report_wait_for_non_scan_uses_cached_queue_item(scan_report):
+    scan_report.request.request = messages.ScanQueueMessage(scan_type="umv", parameter={})
+    scan_report.request.requestID = "request-id"
+    scan_report.queue_item.status = "COMPLETED"
+    scan_report.queue_item.request_blocks = [mock.MagicMock(RID="request-id", is_scan=False)]
+    scan_report.request.queue = None
+
+    with (
+        mock.patch.object(ScanReport, "scan", new_callable=mock.PropertyMock) as scan,
+        mock.patch("time.sleep") as sleep,
+    ):
+        scan.return_value = None
+        scan_report._wait_scan(None, 0.1, num_points=False, file_written=True)
+
+    sleep.assert_not_called()
+
+
+def test_scan_report_wait_for_scan_num_points_waits_for_scan_item(scan_report):
+    scan_report.request.request = messages.ScanQueueMessage(scan_type="line_scan", parameter={})
+    scan_report.queue_item.status = "COMPLETED"
+
+    missing_scan = None
+    incomplete_scan = mock.MagicMock(num_monitored_readouts=3, live_data={"0": "msg"})
+    complete_scan = mock.MagicMock(
+        num_monitored_readouts=3, live_data={"0": "msg", "1": "msg", "2": "msg"}
+    )
+
+    with (
+        mock.patch.object(ScanReport, "scan", new_callable=mock.PropertyMock) as scan,
+        mock.patch("time.sleep"),
+    ):
+        scan.side_effect = [missing_scan, *([incomplete_scan] * 4), *([complete_scan] * 4)]
+        scan_report._wait_scan(None, 0.1, num_points=True, file_written=False)
+
+    assert scan_report._client.callbacks.poll.call_count == 3
+
+
 def test_scan_report_wait_for_scan_raises(scan_report):
     scan_report.request.request = messages.ScanQueueMessage(scan_type="mv", parameter={})
     with mock.patch.object(scan_report, "_get_mv_status") as get_mv_status: