bec-ipython-client 3.64.5__py3-none-any.whl → 3.84.0__py3-none-any.whl

{bec_ipython_client-3.64.5.dist-info → bec_ipython_client-3.84.0.dist-info}/RECORD

@@ -1,21 +1,21 @@
-.gitignore,sha256=UmJ0gTRAPp4EI1A6tb9Pi-k5uxDIb_NWJU9ye6AW-8Y,3306
-PKG-INFO,sha256=qo7r0HIpMzJq-U5WmKnd8rO1XA4dUKt3MBlDckt3TXE,1052
-demo.py,sha256=TE-niyXPUEAP-GaL-QRBPgnaxfXqBmTsBiKUxl3F_VQ,7053
-pyproject.toml,sha256=7g-FvI5o2d2B6seUrSny-xZRM1amSbTBXleb1aQiCHo,1229
+.gitignore,sha256=XxC6jyyftTo2CLtm4K8axuNPYwA9Wgaz2R93WhX8bTQ,3364
+PKG-INFO,sha256=ijJpv2TMYSqXFg607-vZwabQv7Ib-B-cWeiu71D9-Xc,1052
+demo.py,sha256=AquJB-0Tu2bIEFpcJ0Q3RUBt1xldqS6GgU5CjOAg_ww,7083
+pyproject.toml,sha256=HuXmixsLCNg82K4Z_GDHOdRWAVHza_oeQ7Pe5fKipHU,1229
 bec_ipython_client/__init__.py,sha256=ihd_V8I7Qo0MWKMo7bcvPf-ZyUQqkcNf8IAWLJKiFJE,79
 bec_ipython_client/beamline_mixin.py,sha256=scMWIFbHJajyECzbwEVKyQUGjpqA9C_KiU2M6FuRH_Q,1067
 bec_ipython_client/bec_magics.py,sha256=Rz2aXkUCeAV_VxdXqLUNHh8T44kSH9ha83OiEtdptzI,2792
 bec_ipython_client/bec_startup.py,sha256=GGlHyxnSCQfYF5n-pYq2ic0pSyW5zvnT2PAlI5kY77w,1930
-bec_ipython_client/main.py,sha256=gD6RwT8y6bWxCV5RS1SlixfU7c477VxAEvrgLa0FWhE,11047
+bec_ipython_client/main.py,sha256=XxSaiRuvDPKRzM3yuPz3FW5I0wnfyL2SgEfEG3VrDJg,13543
 bec_ipython_client/prettytable.py,sha256=TnhGPGuU0XEvnIYJ1UfTEwadcowFW4rqJW8z_Sm0EDw,2534
 bec_ipython_client/progressbar.py,sha256=aDKYjzXmGSwa82ewm59V8WSuqVQz9GiZPx5G65fEwpk,11090
 bec_ipython_client/signals.py,sha256=mbThPo6h3mQ6RFRm9viETDMC_unFa7QxiymCdM_ZK7U,4194
 bec_ipython_client/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_ipython_client/callbacks/device_progress.py,sha256=y3GFSlCD-etOIrLJkX2ozxEyCNRMaRAaTdZmN8xOcjk,2385
-bec_ipython_client/callbacks/ipython_live_updates.py,sha256=2giQImMMaqRKnD7PW1xrDPmrxi-qy8MHdY_daWtJe-g,10290
-bec_ipython_client/callbacks/live_table.py,sha256=DifTdAsPUqiursmcHd49-UhBxqGhPpjbXCUP3LeIXKY,13209
-bec_ipython_client/callbacks/move_device.py,sha256=FXCztPGqKNmaSKs9Q13y7syZJs57IZo4mJH6GTOIbOU,5863
-bec_ipython_client/callbacks/utils.py,sha256=AEEzsfD9S2ZMuJA4yAxy9gMa1iPMCxQ3zr7ZDO01bHE,5702
+bec_ipython_client/callbacks/device_progress.py,sha256=NzWIO1oowxpN14hPXBne6RfZxOW82EhwDM3jHLnn3xI,2603
+bec_ipython_client/callbacks/ipython_live_updates.py,sha256=Cx62yJSzIcRvAA_lC86PSs8825hJtk22yBPhuJjgRPc,10520
+bec_ipython_client/callbacks/live_table.py,sha256=3qmwCEjqe-xFqo3Ez2dhKchawlr0cOmNgzpg857-gp0,13503
+bec_ipython_client/callbacks/move_device.py,sha256=TkbtKFBr1nuJ8THTSm70Y8D7_va2YQ57oBGGt0BavW4,8153
+bec_ipython_client/callbacks/utils.py,sha256=jS92ndZNU2t5n9FsLrSbulmUIeepHhwdQdfO60YjiJk,5702
 bec_ipython_client/high_level_interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_ipython_client/high_level_interfaces/bec_hli.py,sha256=G1eF-lbLEDuN2mr_AYSxhhGb4LT6P72g0a4sU9M9zgk,1221
 bec_ipython_client/high_level_interfaces/spec_hli.py,sha256=z7WtjiC4LtMfKJn12SbguHPCLqbAsZNfUDyiUW0LOiU,5818
@@ -26,18 +26,19 @@ bec_ipython_client/plugins/XTreme/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 bec_ipython_client/plugins/XTreme/x-treme.py,sha256=ZKI_EEPYyWW-sdrK9DIllb81aeObc1O3fU1eWqipjTQ,3631
 bec_ipython_client/plugins/flomni/flomni_config.yaml,sha256=bCN1VKCzF6tw24HYeUE2b81kXMXzhEd69Ea8_q8Ywfk,6184
 tests/conftest.py,sha256=4yzGYqs8EVOxxY9Bu-yGbzmOpzG9dxs3cwSCzjmRziQ,233
+tests/client_tests/conftest.py,sha256=dUvYqvl6wogxN-kRCUuo_Uzna3P2uSYD7qGHyMGBlPY,413
 tests/client_tests/test_beamline_mixins.py,sha256=8Ws0bmzl2gSW0VuOVu80_JbYNb5Y-htchmrrptwjwDo,4611
-tests/client_tests/test_bec_client.py,sha256=JF7k0UiLRaBLW_vk_dGBLVQDyngIWxY79hbRK0t21Dw,7717
+tests/client_tests/test_bec_client.py,sha256=gks7IYoDDXpbkC_EGWQfKtH08Yig71PRZtleXFhkU8A,8903
 tests/client_tests/test_device_progress.py,sha256=GEw2g8MQZnv5mxABEZlxBmaMpxVS33wogaYohFolDEs,2353
 tests/client_tests/test_ipython_live_updates.py,sha256=HpA16Mx0WdseqlfP0FojlAd6VfvjnwAUReDkItZVYWs,6081
-tests/client_tests/test_live_table.py,sha256=Ll7h0eKSRmMxV-hvrUC9qDA49sDE9zi_w7AleOE4TmU,17576
-tests/client_tests/test_move_callback.py,sha256=e5c14pa9tUsMPgNhI9m7vrml5TKEAmMAQKLuiZPftDw,7026
+tests/client_tests/test_live_table.py,sha256=0EKgWOgDqpjN8fJEeAzoKNCwFneDEsUY2NfWQkxB6xc,18155
+tests/client_tests/test_move_callback.py,sha256=bUCcWoz_tc-yRAtwmEUMrKE_qKwatop_wReSugGGEIQ,8670
 tests/client_tests/test_pretty_table.py,sha256=uQ-KPb3RXoCFE_t1IrpkT6kZAoqW7pFXxbFc445sX0Y,469
-tests/end-2-end/_ensure_requirements_container.py,sha256=iAcTHqudgJMh7yS9kmfN1bqfqUgvj6ZG-LyuJVIfgFE,722
-tests/end-2-end/test_procedures_e2e.py,sha256=3CPzjW3VpsSU8GKVP814SSvLZ0c7bBtPB_VtX725TCY,4737
-tests/end-2-end/test_scans_e2e.py,sha256=CxlXjQrzDJebaoZObt_oYx41wbnHLuJLSjKlno4u2B4,30981
-tests/end-2-end/test_scans_lib_e2e.py,sha256=9_ofsT1soChV9DZ72hoUb9hAIHqZouvjPg11sh5a6lo,19128
-bec_ipython_client-3.64.5.dist-info/METADATA,sha256=qo7r0HIpMzJq-U5WmKnd8rO1XA4dUKt3MBlDckt3TXE,1052
-bec_ipython_client-3.64.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bec_ipython_client-3.64.5.dist-info/entry_points.txt,sha256=oQUXYY0jjD9ZvKPHwaGn2wkUIWpDZM8L4ixDA3RlBWE,53
-bec_ipython_client-3.64.5.dist-info/RECORD,,
+tests/end-2-end/_ensure_requirements_container.py,sha256=RT2a5cUZnXtMjJRlPImGzgyX-KJPLiav5WSp_l3wzv8,725
+tests/end-2-end/test_procedures_e2e.py,sha256=xjczbB33Cf5pDLe1KWcalRRBrSxOQ3cbV3s3w3GsC_A,4922
+tests/end-2-end/test_scans_e2e.py,sha256=GMStotxqu24794TxIFc55PCtOjuG2qbkmibcUj7r-DI,31069
+tests/end-2-end/test_scans_lib_e2e.py,sha256=dqs0ojkyQWStIQbqABq9mQrjqQyE43gr37VPhxvQ8b8,19427
+bec_ipython_client-3.84.0.dist-info/METADATA,sha256=ijJpv2TMYSqXFg607-vZwabQv7Ib-B-cWeiu71D9-Xc,1052
+bec_ipython_client-3.84.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+bec_ipython_client-3.84.0.dist-info/entry_points.txt,sha256=oQUXYY0jjD9ZvKPHwaGn2wkUIWpDZM8L4ixDA3RlBWE,53
+bec_ipython_client-3.84.0.dist-info/RECORD,,

{bec_ipython_client-3.64.5.dist-info → bec_ipython_client-3.84.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

demo.py

@@ -23,7 +23,7 @@ scans = bec.scans
 
 
 logger.success("Started BECClient")
-scans.umv(dev.samx, 5, relative=True)
+scans.umv(dev.samx, 5, dev.samy, 20, relative=False)
 
 # with scans.interactive_scan() as scan:
 #     for ii in range(10):
@@ -226,4 +226,5 @@ scans.umv(dev.samx, 5, relative=True)
 # event = threading.Event()
 # event.wait()
 print("eos")
+bec.shutdown()
 # p.join()

pyproject.toml

@@ -4,9 +4,9 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_ipython_client"
-version = "3.64.5"
+version = "3.84.0"
 description = "BEC IPython client"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Programming Language :: Python :: 3",

tests/client_tests/conftest.py

@@ -0,0 +1,19 @@
+import fakeredis
+import pytest
+
+from bec_lib.redis_connector import RedisConnector
+
+
+def fake_redis_server(host, port, **kwargs):
+    redis = fakeredis.FakeRedis()
+    return redis
+
+
+@pytest.fixture
+def connected_connector():
+    connector = RedisConnector("localhost:1", redis_cls=fake_redis_server)
+    connector._redis_conn.flushall()
+    try:
+        yield connector
+    finally:
+        connector.shutdown()

tests/client_tests/test_bec_client.py

@@ -7,6 +7,7 @@ import pytest
 
 from bec_ipython_client import BECIPythonClient, main
 from bec_lib import messages
+from bec_lib.alarm_handler import AlarmBase, AlarmHandler, Alarms
 from bec_lib.redis_connector import RedisConnector
 from bec_lib.service_config import ServiceConfig
 
@@ -204,10 +205,40 @@ def test_bec_ipython_client_property_access(ipython_client):
                 client.start()
 
                 with mock.patch.object(client._client, "connector") as mock_connector:
-                    mock_connector.get.return_value = messages.VariableMessage(value="account")
+                    mock_connector.get_last.return_value = messages.VariableMessage(value="account")
                     assert client._client.active_account == "account"
 
                     with pytest.raises(AttributeError):
                         client.active_account = "account"
                     with pytest.raises(AttributeError):
                         client._client.active_account = "account"
+
+
+def test_bec_ipython_client_show_last_alarm(ipython_client, capsys):
+    client = ipython_client
+    error_info = messages.ErrorInfo(
+        error_message="This is a test alarm",
+        compact_error_message="Test alarm",
+        exception_type="TestAlarm",
+        device=None,
+    )
+    alarm_msg = messages.AlarmMessage(severity=Alarms.MAJOR, info=error_info)
+    client.alarm_handler = AlarmHandler(connector=mock.MagicMock())
+    client.alarm_handler.add_alarm(alarm_msg)
+    client._alarm_history.append(
+        (AlarmBase, client.alarm_handler.get_unhandled_alarms()[0], None, None)
+    )
+    client.show_last_alarm()
+    captured = capsys.readouterr()
+    assert "Alarm Raised" in captured.out
+    assert "Severity: MAJOR" in captured.out
+    assert "Type: TestAlarm" in captured.out
+    assert "This is a test alarm" in captured.out
+
+
+def test_bec_ipython_client_show_last_no_alarm(ipython_client, capsys):
+    client = ipython_client
+    client._alarm_history = []
+    client.show_last_alarm()
+    captured = capsys.readouterr()
+    assert "No alarm has been raised in this session." in captured.out

tests/client_tests/test_live_table.py

@@ -107,11 +107,12 @@ class TestLiveTable:
     )
     def test_get_devices_from_scan_data(self, bec_client_mock, request_msg, scan_report_devices):
         client = bec_client_mock
-        client.start()
         data = messages.ScanMessage(
             point_id=0, scan_id="", data={}, metadata={"scan_report_devices": scan_report_devices}
         )
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         devices = live_update.get_devices_from_scan_data(data)
         assert devices[0 : len(scan_report_devices)] == scan_report_devices
 
@@ -123,7 +124,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         with mock.patch.object(client.queue.queue_storage, "find_queue_item_by_requestID"):
             live_update.wait_for_request_acceptance()
 
@@ -138,7 +141,9 @@ class TestLiveTable:
         client = bec_client_mock
         client.start()
         data = messages.ScanMessage(point_id=0, scan_id="", data={}, metadata={})
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.scan_item = scan_item
         scan_item.num_points = 2
         scan_item.live_data = {0: data}
@@ -163,7 +168,9 @@ class TestLiveTable:
         client = bec_client_mock
         client.start()
         data = messages.ScanMessage(point_id=0, scan_id="", data={}, metadata={})
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.scan_item = scan_item
         scan_item.num_points = 2
         scan_item.live_data = {0: data}
@@ -193,7 +200,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.point_data = messages.ScanMessage(
             point_id=0,
             scan_id="",
@@ -212,7 +221,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.point_data = messages.ScanMessage(
             point_id=0,
             scan_id="",
@@ -231,7 +242,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         client.device_manager.devices["samx"]._info["hints"] = {"fields": ["samx_hint"]}
         client.device_manager.devices["samx"].precision = 3
         live_update.point_data = messages.ScanMessage(
@@ -263,7 +276,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         client.device_manager.devices["samx"]._info["hints"] = {"fields": ["samx_hint"]}
         client.device_manager.devices["samx"].precision = prec
         live_update.point_data = messages.ScanMessage(
@@ -312,7 +327,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         live_update.point_data = messages.ScanMessage(
             point_id=0,
             scan_id="",
@@ -355,7 +372,9 @@ class TestLiveTable:
             "find_queue_item_by_requestID",
             return_value=mock_queue_item,
         ):
-            live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+            live_update = LiveUpdatesTable(
+                client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+            )
             live_update.wait_for_request_acceptance()
             result = StringIO()
             with redirect_stdout(result):
@@ -376,7 +395,9 @@ class TestLiveTable:
         )
         client.queue.request_storage.update_with_request(request_msg)
         client.queue.request_storage.update_with_response(response_msg)
-        live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
+        live_update = LiveUpdatesTable(
+            client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
+        )
         client.device_manager.devices["samx"]._info["hints"] = {"fields": ["samx_hint"]}
         client.device_manager.devices["samx"].precision = prec
         live_update.point_data = messages.ScanMessage(

tests/client_tests/test_move_callback.py

@@ -1,20 +1,23 @@
 import collections
+import time
 from unittest import mock
 
 import pytest
 
 from bec_ipython_client.callbacks.move_device import (
     LiveUpdatesReadbackProgressbar,
-    ReadbackDataMixin,
+    ReadbackDataHandler,
 )
 from bec_lib import messages
 from bec_lib.endpoints import MessageEndpoints
 
 
 @pytest.fixture
-def readback_data_mixin(bec_client_mock):
-    with mock.patch.object(bec_client_mock.device_manager, "connector"):
-        yield ReadbackDataMixin(bec_client_mock.device_manager, ["samx", "samy"])
+def readback_data_handler(bec_client_mock, connected_connector):
+    with mock.patch.object(bec_client_mock.device_manager, "connector", connected_connector):
+        yield ReadbackDataHandler(
+            bec_client_mock.device_manager, ["samx", "samy"], request_id="something"
+        )
 
 
 def test_move_callback(bec_client_mock):
@@ -33,30 +36,25 @@ def test_move_callback(bec_client_mock):
         return readback[0]
 
     req_done = collections.deque()
-    msg_acc = messages.DeviceReqStatusMessage(
-        device="samx", success=True, metadata={"RID": "something"}
-    )
-    req_done.extend([[None], [None], [None], [msg_acc]])
+    req_done.extend([{"samx": (False, False)}, {"samx": (False, False)}, {"samx": (True, True)}])
 
     def mock_req_msg(*args):
         if len(req_done) > 1:
             return req_done.popleft()
         return req_done[0]
 
-    with mock.patch("bec_ipython_client.callbacks.move_device.check_alarms") as check_alarms_mock:
-        with mock.patch.object(ReadbackDataMixin, "wait_for_RID"):
-            with mock.patch.object(LiveUpdatesReadbackProgressbar, "wait_for_request_acceptance"):
+    with mock.patch("bec_ipython_client.callbacks.move_device.check_alarms"):
+        with mock.patch.object(LiveUpdatesReadbackProgressbar, "wait_for_request_acceptance"):
+            with mock.patch.object(
+                LiveUpdatesReadbackProgressbar, "_print_client_msgs_asap"
+            ) as mock_client_msgs:
                 with mock.patch.object(
-                    LiveUpdatesReadbackProgressbar, "_print_client_msgs_asap"
-                ) as mock_client_msgs:
-                    with mock.patch.object(
-                        LiveUpdatesReadbackProgressbar, "_print_client_msgs_all"
-                    ) as mock_client_msgs_all:
-                        with mock.patch.object(
-                            ReadbackDataMixin, "get_device_values", mock_readback
-                        ):
+                    LiveUpdatesReadbackProgressbar, "_print_client_msgs_all"
+                ) as mock_client_msgs_all:
+                    with mock.patch.object(ReadbackDataHandler, "get_device_values", mock_readback):
+                        with mock.patch.object(ReadbackDataHandler, "device_states", mock_req_msg):
                             with mock.patch.object(
-                                ReadbackDataMixin, "get_request_done_msgs", mock_req_msg
+                                ReadbackDataHandler, "done", side_effect=[False, False, True]
                             ):
                                 LiveUpdatesReadbackProgressbar(bec=client, request=request).run()
                                 assert mock_client_msgs.called is True
@@ -82,28 +80,21 @@ def test_move_callback_with_report_instruction(bec_client_mock):
         return readback[0]
 
     req_done = collections.deque()
-    msg_acc = messages.DeviceReqStatusMessage(
-        device="samx", success=True, metadata={"RID": "something"}
-    )
-    req_done.extend([[None], [None], [None], [msg_acc]])
+    req_done.extend([{"samx": (False, False)}, {"samx": (False, False)}, {"samx": (True, True)}])
 
     def mock_req_msg(*args):
         if len(req_done) > 1:
             return req_done.popleft()
         return req_done[0]
 
-    with mock.patch("bec_ipython_client.callbacks.move_device.check_alarms") as check_alarms_mock:
-        with mock.patch.object(ReadbackDataMixin, "wait_for_RID"):
-            with mock.patch.object(LiveUpdatesReadbackProgressbar, "wait_for_request_acceptance"):
-                with mock.patch.object(LiveUpdatesReadbackProgressbar, "_print_client_msgs_asap"):
-                    with mock.patch.object(
-                        LiveUpdatesReadbackProgressbar, "_print_client_msgs_all"
-                    ):
-                        with mock.patch.object(
-                            ReadbackDataMixin, "get_device_values", mock_readback
-                        ):
+    with mock.patch("bec_ipython_client.callbacks.move_device.check_alarms"):
+        with mock.patch.object(LiveUpdatesReadbackProgressbar, "wait_for_request_acceptance"):
+            with mock.patch.object(LiveUpdatesReadbackProgressbar, "_print_client_msgs_asap"):
+                with mock.patch.object(LiveUpdatesReadbackProgressbar, "_print_client_msgs_all"):
+                    with mock.patch.object(ReadbackDataHandler, "get_device_values", mock_readback):
+                        with mock.patch.object(ReadbackDataHandler, "device_states", mock_req_msg):
                             with mock.patch.object(
-                                ReadbackDataMixin, "get_request_done_msgs", mock_req_msg
+                                ReadbackDataHandler, "done", side_effect=[False, False, False, True]
                             ):
                                 LiveUpdatesReadbackProgressbar(
                                     bec=client,
@@ -112,70 +103,121 @@ def test_move_callback_with_report_instruction(bec_client_mock):
                                 ).run()
 
 
-def test_readback_data_mixin(readback_data_mixin):
-    readback_data_mixin.device_manager.connector.get.side_effect = [
-        messages.DeviceMessage(
+def test_readback_data_handler(readback_data_handler):
+    readback_data_handler.data = {
+        "samx": messages.DeviceMessage(
             signals={"samx": {"value": 10}, "samx_setpoint": {"value": 20}},
             metadata={"device": "samx"},
         ),
-        messages.DeviceMessage(
+        "samy": messages.DeviceMessage(
             signals={"samy": {"value": 10}, "samy_setpoint": {"value": 20}},
             metadata={"device": "samy"},
         ),
-    ]
-    res = readback_data_mixin.get_device_values()
+    }
+
+    res = readback_data_handler.get_device_values()
     assert res == [10, 10]
 
 
-def test_readback_data_mixin_multiple_hints(readback_data_mixin):
-    readback_data_mixin.device_manager.devices.samx._info["hints"]["fields"] = [
+def test_readback_data_handler_multiple_hints(readback_data_handler):
+    readback_data_handler.device_manager.devices.samx._info["hints"]["fields"] = [
         "samx_setpoint",
         "samx",
     ]
-    readback_data_mixin.device_manager.connector.get.side_effect = [
-        messages.DeviceMessage(
+    readback_data_handler.data = {
+        "samx": messages.DeviceMessage(
             signals={"samx": {"value": 10}, "samx_setpoint": {"value": 20}},
             metadata={"device": "samx"},
         ),
-        messages.DeviceMessage(
+        "samy": messages.DeviceMessage(
             signals={"samy": {"value": 10}, "samy_setpoint": {"value": 20}},
             metadata={"device": "samy"},
         ),
-    ]
-    res = readback_data_mixin.get_device_values()
+    }
+    res = readback_data_handler.get_device_values()
     assert res == [20, 10]
 
 
-def test_readback_data_mixin_multiple_no_hints(readback_data_mixin):
-    readback_data_mixin.device_manager.devices.samx._info["hints"]["fields"] = []
-    readback_data_mixin.device_manager.connector.get.side_effect = [
-        messages.DeviceMessage(
+def test_readback_data_handler_multiple_no_hints(readback_data_handler):
+    readback_data_handler.device_manager.devices.samx._info["hints"]["fields"] = []
+    readback_data_handler.data = {
+        "samx": messages.DeviceMessage(
             signals={"samx": {"value": 10}, "samx_setpoint": {"value": 20}},
             metadata={"device": "samx"},
         ),
-        messages.DeviceMessage(
+        "samy": messages.DeviceMessage(
             signals={"samy": {"value": 10}, "samy_setpoint": {"value": 20}},
             metadata={"device": "samy"},
         ),
-    ]
-    res = readback_data_mixin.get_device_values()
+    }
+    res = readback_data_handler.get_device_values()
     assert res == [10, 10]
 
 
-def test_get_request_done_msgs(readback_data_mixin):
-    res = readback_data_mixin.get_request_done_msgs()
-    readback_data_mixin.device_manager.connector.pipeline.assert_called_once()
-    assert (
-        mock.call(
-            MessageEndpoints.device_req_status("samx"),
-            readback_data_mixin.device_manager.connector.pipeline.return_value,
-        )
-        in readback_data_mixin.device_manager.connector.get.call_args_list
+def test_readback_data_handler_init(readback_data_handler):
+    """
+    Test that the ReadbackDataHandler is initialized correctly.
+    """
+
+    # Initial state
+    assert readback_data_handler._devices_done_state == {
+        "samx": (False, False),
+        "samy": (False, False),
+    }
+    assert readback_data_handler._devices_received == {"samx": False, "samy": False}
+    assert readback_data_handler.data == {}
+
+
+def test_readback_data_handler_readback_callbacks(readback_data_handler):
+    """
+    Test that the readback callback properly updates the readback data.
+    """
+
+    # Submit readback for samx
+    msg = messages.DeviceMessage(
+        signals={"samx": {"value": 15}}, metadata={"device": "samx", "RID": "something"}
     )
-    assert (
-        mock.call(
-            MessageEndpoints.device_req_status("samy"),
-            readback_data_mixin.device_manager.connector.pipeline.return_value,
-        )
-        in readback_data_mixin.device_manager.connector.get.call_args_list
+    readback_data_handler.connector.set_and_publish(MessageEndpoints.device_readback("samx"), msg)
+
+    msg_old = messages.DeviceMessage(
+        signals={"samy": {"value": 10}}, metadata={"device": "samx", "RID": "something_else"}
+    )
+    readback_data_handler.connector.set_and_publish(
+        MessageEndpoints.device_readback("samy"), msg_old
+    )
+    while (
+        not readback_data_handler._devices_received["samx"]
+        or "samx" not in readback_data_handler.data
+    ):
+        time.sleep(0.01)
+    assert readback_data_handler.data["samx"].signals["samx"]["value"] == 15
+    dev_data = readback_data_handler.get_device_values()
+    assert dev_data[0] == 15
+    assert dev_data[1] == 10  # samy remains unchanged
+
+
+def test_readback_data_handler_request_done_callbacks(readback_data_handler):
+    """
+    Test that the request done callback properly updates the device done state.
+    """
+
+    # Submit request done for samx
+    msg = messages.DeviceReqStatusMessage(device="samx", success=True, request_id="something")
+    readback_data_handler.connector.xadd(
+        MessageEndpoints.device_req_status("something"), {"data": msg}
+    )
+    while not readback_data_handler._devices_done_state["samx"][0]:
+        time.sleep(0.01)
+    assert readback_data_handler._devices_done_state["samx"] == (True, True)
+
+    assert readback_data_handler.done() is False
+
+    # Submit request done for samy
+    msg = messages.DeviceReqStatusMessage(device="samy", success=False, request_id="something")
+    readback_data_handler.connector.xadd(
+        MessageEndpoints.device_req_status("something"), {"data": msg}
     )
+    while not readback_data_handler._devices_done_state["samy"][0]:
+        time.sleep(0.01)
+    assert readback_data_handler._devices_done_state["samy"] == (True, False)
+    assert readback_data_handler.done() is True

tests/end-2-end/_ensure_requirements_container.py

@@ -8,14 +8,14 @@ image_name = (
 )
 podman = PodmanCliUtils()
 
-for i in range(1, 4):
+for i in range(1, 6):
     try:
         output = podman._run_and_capture_error("podman", "pull", image_name)
         print("successfully pulled requirements image for current version")
         exit(0)
     except ProcedureWorkerError as e:
         print(e)
-        print("retrying in 2 minutes...")
-        sleep(120)
+        print("retrying in 5 minutes...")
+        sleep(5 * 60)
 print(f"No more retries. Check if {image_name} actually exists!")
 exit(1)