wip refactor 1

Author: wyzula-jan

bec_widgets/widgets/progress/progress_backend.py

@@ -282,20 +282,6 @@ def on_queue_update(self, msg_content: dict, metadata: dict):
         self.scan_number = active_request_block.scan_number
         self.source_changed.emit(self.current_snapshot(value=0, max_value=100, done=False))
 
-        report_instructions = active_request_block.report_instructions
-        if not report_instructions:
-            return
-
-        instruction = report_instructions[0]
-        if "scan_progress" in instruction:
-            self.set_progress_source(ProgressSource.SCAN_PROGRESS)
-        elif "device_progress" in instruction:
-            if not instruction["device_progress"]:
-                return
-            self.set_progress_source(
-                ProgressSource.DEVICE_PROGRESS, device=instruction["device_progress"][0]
-            )
-
     def _extract_active_queue_info(self, msg_content: dict):
         if "queue" not in msg_content:
             return None

tests/unit_tests/test_scan_progress_bar.py

@@ -542,9 +542,11 @@ def queue_msg(scan_id: str, scan_number: int):
     assert scan_progressbar._active_scan_id == "scan-2"
 
 
-def test_progressbar_queue_update_with_device(scan_progressbar, scan_message):
+def test_progressbar_queue_update_with_device_progress_uses_scan_progress(
+    scan_progressbar, scan_message
+):
     """
-    Test that a queue update with a device changes the progress source to DEVICE_PROGRESS.
+    Device-backed scan progress is normalized by scan_bundler and emitted as scan_progress.
     """
     request_block = messages.RequestBlock(
         msg=scan_message,
@@ -580,8 +582,8 @@ def test_progressbar_queue_update_with_device(scan_progressbar, scan_message):
         msg.content, msg.metadata, _override_slot_params={"verify_sender": False}
     )
 
-    assert scan_progressbar._progress_source == ProgressSource.DEVICE_PROGRESS
-    assert scan_progressbar._progress_device == "samx"
+    assert scan_progressbar._progress_source == ProgressSource.SCAN_PROGRESS
+    assert scan_progressbar._progress_device is None
     assert scan_progressbar.task is not None
     assert scan_progressbar.scan_number == 1