diff --git a/scan_bundler/scan_bundler/scan_bundler.py b/scan_bundler/scan_bundler/scan_bundler.py index 58196aca..a2eec907 100644 --- a/scan_bundler/scan_bundler/scan_bundler.py +++ b/scan_bundler/scan_bundler/scan_bundler.py @@ -293,8 +293,8 @@ class ScanBundler(BECService): if not self.sync_storage[scanID]["info"].get("scan_type"): return self.device_storage[device] = signal - stream = metadata.get("stream") - if stream == "primary": + readout_priority = metadata.get("readout_priority") + if readout_priority == "primary": if self.sync_storage[scanID]["info"]["scan_type"] == "step": self._step_scan_update(scanID, device, signal, metadata) elif self.sync_storage[scanID]["info"]["scan_type"] == "fly": @@ -304,7 +304,7 @@ class ScanBundler(BECService): f"Unknown scan type {self.sync_storage[scanID]['info']['scan_type']}" ) - elif stream == "baseline": + elif readout_priority == "baseline": self._baseline_update(scanID, device, signal) def _update_monitor_signals(self, scanID, pointID) -> None: diff --git a/scan_bundler/tests/test_scan_bundler.py b/scan_bundler/tests/test_scan_bundler.py index ee645d57..0d71f9a4 100644 --- a/scan_bundler/tests/test_scan_bundler.py +++ b/scan_bundler/tests/test_scan_bundler.py @@ -3,14 +3,14 @@ import time from concurrent.futures import wait from unittest import mock +import bec_lib.core import pytest import yaml - -import bec_lib.core from bec_lib.core import BECMessage from bec_lib.core import DeviceManagerBase as DeviceManager from bec_lib.core import MessageEndpoints, ServiceConfig from bec_lib.core.tests.utils import ConnectorMock, create_session_from_config + from scan_bundler import ScanBundler from scan_bundler.emitter import EmitterBase @@ -57,7 +57,7 @@ def test_device_read_callback(): msg = MessageMock() dev_msg = BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "laksjd", "stream": "primary"}, + metadata={"scanID": "laksjd", "readout_priority": "primary"}, ) msg.value = dev_msg.dumps() msg.topic = MessageEndpoints.device_read("samx").encode() @@ -149,7 +149,7 @@ def test_get_scan_status_history(msgs): def test_add_device_to_storage_returns_without_scanID(): msg = BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"stream": "primary"}, + metadata={"readout_priority": "primary"}, ) sb = load_ScanBundlerMock() sb._add_device_to_storage([msg], "samx", timeout_time=1) @@ -159,7 +159,7 @@ def test_add_device_to_storage_returns_without_scanID(): def test_add_device_to_storage_returns_without_signal(): msg = BECMessage.DeviceMessage( signals={}, - metadata={"scanID": "scanID", "stream": "primary"}, + metadata={"scanID": "scanID", "readout_priority": "primary"}, ) sb = load_ScanBundlerMock() sb._add_device_to_storage([msg], "samx", timeout_time=1) @@ -169,7 +169,7 @@ def test_add_device_to_storage_returns_without_signal(): def test_add_device_to_storage_returns_on_timeout(): msg = BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "scanID", "stream": "primary"}, + metadata={"scanID": "scanID", "readout_priority": "primary"}, ) sb = load_ScanBundlerMock() sb._add_device_to_storage([msg], "samx", timeout_time=1) @@ -180,7 +180,7 @@ def test_add_device_to_storage_returns_on_timeout(): def test_add_device_to_storage_returns_without_scan_info(scan_status): msg = BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "scanID", "stream": "primary"}, + metadata={"scanID": "scanID", "readout_priority": "primary"}, ) sb = load_ScanBundlerMock() sb.sync_storage["scanID"] = {"info": {}} @@ -195,21 +195,21 @@ def test_add_device_to_storage_returns_without_scan_info(scan_status): ( BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "scanID", "stream": "primary"}, + metadata={"scanID": "scanID", "readout_priority": "primary"}, ), "step", ), ( BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "scanID", "stream": "primary"}, + metadata={"scanID": "scanID", "readout_priority": "primary"}, ), "fly", ), ( BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "scanID", "stream": "primary"}, + metadata={"scanID": "scanID", "readout_priority": "primary"}, ), "wrong", ), @@ -244,7 +244,7 @@ def test_add_device_to_storage_primary(msg, scan_type): ( BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "scanID", "stream": "baseline"}, + metadata={"scanID": "scanID", "readout_priority": "baseline"}, ), "step", ), @@ -325,7 +325,7 @@ def test_scan_queue_callback(queue_msg): scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", status="closed", info={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "RID": "a53538b4-79f3-4132-91b5-d044e438f460", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", @@ -354,7 +354,7 @@ def test_scan_status_callback(scan_msg): scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", status="closed", info={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "RID": "a53538b4-79f3-4132-91b5-d044e438f460", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", @@ -370,7 +370,7 @@ def test_scan_status_callback(scan_msg): scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", status="open", info={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "RID": "a53538b4-79f3-4132-91b5-d044e438f460", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", @@ -443,7 +443,7 @@ def test_status_modification(): scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", status="closed", info={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "RID": "a53538b4-79f3-4132-91b5-d044e438f460", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", @@ -458,7 +458,7 @@ def test_status_modification(): scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", status="open", info={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "RID": "a53538b4-79f3-4132-91b5-d044e438f460", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", @@ -515,7 +515,7 @@ def test_initialize_scan_container(scan_msg): [ BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "adlk-jalskdja", "stream": "primary", "pointID": 23}, + metadata={"scanID": "adlk-jalskdja", "readout_priority": "primary", "pointID": 23}, ), 23, True, @@ -523,7 +523,7 @@ def test_initialize_scan_container(scan_msg): [ BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "adlk-jalskdjb", "stream": "primary", "pointID": 23}, + metadata={"scanID": "adlk-jalskdjb", "readout_priority": "primary", "pointID": 23}, ), 23, False, @@ -531,7 +531,7 @@ def test_initialize_scan_container(scan_msg): [ BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "adlk-jalskdjc", "stream": "primary"}, + metadata={"scanID": "adlk-jalskdjc", "readout_priority": "primary"}, ), 23, False, @@ -691,7 +691,7 @@ def test_get_last_device_readback(): sb = load_ScanBundlerMock() dev_msg = BECMessage.DeviceMessage( signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, - metadata={"scanID": "laksjd", "stream": "primary"}, + metadata={"scanID": "laksjd", "readout_priority": "primary"}, ) with mock.patch.object(sb, "producer") as producer_mock: producer_mock.pipeline().execute.return_value = [dev_msg.dumps()] diff --git a/scan_server/scan_server/scan_stubs.py b/scan_server/scan_server/scan_stubs.py index a645af36..b4ce3532 100644 --- a/scan_server/scan_server/scan_stubs.py +++ b/scan_server/scan_server/scan_stubs.py @@ -241,7 +241,7 @@ class ScanStubs: device=None, action="baseline_reading", parameter={}, - metadata={"stream": "baseline"}, + metadata={"readout_priority": "baseline"}, ) def wait( diff --git a/scan_server/scan_server/scans.py b/scan_server/scan_server/scans.py index f6dd7d51..31e06f11 100644 --- a/scan_server/scan_server/scans.py +++ b/scan_server/scan_server/scans.py @@ -226,7 +226,7 @@ class RequestBase(ABC): self._scan_report_devices = devices def device_msg_metadata(self): - default_metadata = {"stream": "primary", "DIID": self.DIID} + default_metadata = {"readout_priority": "primary", "DIID": self.DIID} metadata = {**default_metadata, **self.metadata} self.DIID += 1 return metadata diff --git a/scan_server/tests/test_scan_worker.py b/scan_server/tests/test_scan_worker.py index 216be92e..a5a52ec0 100644 --- a/scan_server/tests/test_scan_worker.py +++ b/scan_server/tests/test_scan_worker.py @@ -2,9 +2,9 @@ import uuid from unittest import mock import pytest +from bec_lib.core import BECMessage, MessageEndpoints from utils import load_ScanServerMock -from bec_lib.core import BECMessage, MessageEndpoints from scan_server.errors import DeviceMessageError, ScanAbortion from scan_server.scan_assembler import ScanAssembler from scan_server.scan_queue import ( @@ -80,7 +80,7 @@ class InstructionQueueMock(InstructionQueueItem): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), ["samy"], ), @@ -93,7 +93,7 @@ class InstructionQueueMock(InstructionQueueItem): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), ["samx", "samy"], ), @@ -106,7 +106,7 @@ class InstructionQueueMock(InstructionQueueItem): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), ["samx", "samy"], ), @@ -119,7 +119,7 @@ class InstructionQueueMock(InstructionQueueItem): "group": "primary", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), ["samx", "samy"], ), @@ -132,7 +132,7 @@ class InstructionQueueMock(InstructionQueueItem): "group": "nogroup", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), ["samx", "samy"], ), @@ -167,14 +167,14 @@ def test_get_devices_from_instruction(instruction, devices): device="samx", action="set", parameter={"value": 10, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ) ), BECMessage.DeviceInstructionMessage( device="samx", action="set", parameter={"value": 10, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": None}, + metadata={"readout_priority": "primary", "DIID": None}, ), ], ) @@ -199,13 +199,13 @@ def test_add_wait_group_to_existing_wait_group(): device="samx", action="set", parameter={"value": 10, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ) instr2 = BECMessage.DeviceInstructionMessage( device="samx", action="set", parameter={"value": 10, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 4}, + metadata={"readout_priority": "primary", "DIID": 4}, ) worker = get_scan_worker() worker._add_wait_group(instr1) @@ -225,7 +225,7 @@ def test_add_wait_group_to_existing_wait_group(): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), "move", ), @@ -238,7 +238,7 @@ def test_add_wait_group_to_existing_wait_group(): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), "read", ), @@ -251,7 +251,7 @@ def test_add_wait_group_to_existing_wait_group(): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), "trigger", ), @@ -264,7 +264,7 @@ def test_add_wait_group_to_existing_wait_group(): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), None, ), @@ -300,7 +300,7 @@ def test_wait_for_devices(instructions, wait_type): device="samx", success=True, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -313,7 +313,7 @@ def test_wait_for_devices(instructions, wait_type): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "scanID": "scanID", "RID": "requestID", @@ -327,7 +327,7 @@ def test_wait_for_devices(instructions, wait_type): device="samx", success=False, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "request", @@ -340,7 +340,7 @@ def test_wait_for_devices(instructions, wait_type): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "scanID": "scanID", "RID": "requestID", @@ -354,7 +354,7 @@ def test_wait_for_devices(instructions, wait_type): device="samx", success=False, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "scanID": "scanID", "RID": "requestID", @@ -367,7 +367,7 @@ def test_wait_for_devices(instructions, wait_type): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "scanID": "scanID", "RID": "requestID", @@ -381,7 +381,7 @@ def test_wait_for_devices(instructions, wait_type): device="samx", success=False, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -394,7 +394,7 @@ def test_wait_for_devices(instructions, wait_type): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "scanID": "scanID", "RID": "requestID", @@ -425,7 +425,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort): action="set", parameter={"value": 10, "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -436,7 +436,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "scanID": "scanID", "RID": "requestID", @@ -446,7 +446,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort): device="samx", success=False, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -459,7 +459,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort): action="set", parameter={"value": 10, "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -470,7 +470,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "scanID": "scanID", "RID": "requestID", @@ -480,7 +480,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort): device="samx", success=True, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -517,7 +517,7 @@ def test_wait_for_idle(msg1, msg2, req_msg: BECMessage.DeviceReqStatusMessage): action="set", parameter={"value": 10, "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -528,7 +528,7 @@ def test_wait_for_idle(msg1, msg2, req_msg: BECMessage.DeviceReqStatusMessage): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "scanID": "scanID", "RID": "requestID", @@ -538,7 +538,7 @@ def test_wait_for_idle(msg1, msg2, req_msg: BECMessage.DeviceReqStatusMessage): device="samx", status=0, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -575,7 +575,7 @@ def test_wait_for_read(msg1, msg2, req_msg: BECMessage.DeviceReqStatusMessage): action="set", parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -618,7 +618,7 @@ def test_wait_for_device_server(): action="set", parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -643,7 +643,7 @@ def test_set_devices(instr): action="trigger", parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -665,7 +665,7 @@ def test_trigger_devices(instr): action="trigger", parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -683,7 +683,7 @@ def test_trigger_devices(instr): action="trigger", parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -708,7 +708,7 @@ def test_send_rpc(instr): action="read", parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -721,7 +721,7 @@ def test_send_rpc(instr): action="read", parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -771,7 +771,7 @@ def test_read_devices(instr): action="trigger", parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -779,7 +779,7 @@ def test_read_devices(instr): ), ["samx"], {"value": 10, "wait_group": "scan_motor", "time": 30}, - {"stream": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID"}, + {"readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID"}, ), ], ) @@ -807,7 +807,7 @@ def test_kickoff_devices(instr, devices, parameter, metadata): action="trigger", parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -855,7 +855,7 @@ def test_publish_data_as_read(): action="publish_data_as_read", parameter={"data": {}}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -881,7 +881,7 @@ def test_publish_data_as_read_multiple(): action="publish_data_as_read", parameter={"data": data}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "scanID": "scanID", "RID": "requestID", @@ -915,7 +915,7 @@ def test_check_for_interruption(): action="open_scan", parameter={"num_points": 150, "scan_motors": ["samx", "samy"]}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 18, "scanID": "12345", "scan_def_id": 100, @@ -931,7 +931,7 @@ def test_check_for_interruption(): device=None, action="open_scan", parameter={"num_points": 150}, - metadata={"stream": "primary", "DIID": 18, "scanID": "12345", "RID": 11}, + metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345", "RID": 11}, ), 150, True, @@ -1019,7 +1019,7 @@ def test_initialize_scan_info(msg): device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, + metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"}, ), "12345", 19, @@ -1030,7 +1030,7 @@ def test_initialize_scan_info(msg): device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, + metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"}, ), "0987", 200, @@ -1061,7 +1061,7 @@ def test_close_scan(msg, scan_id, max_point_id, exp_num_points): device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, + metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"}, ), ], ) @@ -1098,11 +1098,11 @@ def test_stage_device(msg): device=None, action="close_scan", parameter={"parameter": "param"}, - metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, + metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"}, ), ["samx"], {"parameter": "param"}, - {"stream": "primary", "DIID": 18, "scanID": "12345"}, + {"readout_priority": "primary", "DIID": 18, "scanID": "12345"}, False, ), (None, None, {}, {}, False), @@ -1217,7 +1217,7 @@ def test_process_instructions(abortion): device=None, action="open_scan", parameter={"readout_priority": {"monitored": [], "baseline": [], "ignored": []}}, - metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, + metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"}, ), "_open_scan", ), @@ -1226,7 +1226,7 @@ def test_process_instructions(abortion): device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, + metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"}, ), "_close_scan", ), @@ -1236,7 +1236,7 @@ def test_process_instructions(abortion): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "scanID": "12345", "RID": "123456", @@ -1249,7 +1249,7 @@ def test_process_instructions(abortion): device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"stream": "primary", "DIID": 20, "pointID": 0}, + metadata={"readout_priority": "primary", "DIID": 20, "pointID": 0}, ), "_trigger_devices", ), @@ -1261,7 +1261,7 @@ def test_process_instructions(abortion): "value": 1.3681828686580249, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 24}, + metadata={"readout_priority": "primary", "DIID": 24}, ), "_set_devices", ), @@ -1273,7 +1273,7 @@ def test_process_instructions(abortion): "group": "primary", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 30, "pointID": 1}, + metadata={"readout_priority": "primary", "DIID": 30, "pointID": 1}, ), "_read_devices", ), @@ -1282,7 +1282,7 @@ def test_process_instructions(abortion): device=None, action="stage", parameter={}, - metadata={"stream": "primary", "DIID": 17}, + metadata={"readout_priority": "primary", "DIID": 17}, ), "_stage_devices", ), @@ -1291,7 +1291,7 @@ def test_process_instructions(abortion): device=None, action="unstage", parameter={}, - metadata={"stream": "primary", "DIID": 17}, + metadata={"readout_priority": "primary", "DIID": 17}, ), "_unstage_devices", ), @@ -1306,7 +1306,7 @@ def test_process_instructions(abortion): "args": [], "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 9}, + metadata={"readout_priority": "primary", "DIID": 9}, ), "_send_rpc", ), @@ -1321,7 +1321,7 @@ def test_process_instructions(abortion): device=None, action="baseline_reading", parameter={}, - metadata={"stream": "baseline", "DIID": 15}, + metadata={"readout_priority": "baseline", "DIID": 15}, ), "_baseline_reading", ), diff --git a/scan_server/tests/test_scans.py b/scan_server/tests/test_scans.py index 0e404144..79332b30 100644 --- a/scan_server/tests/test_scans.py +++ b/scan_server/tests/test_scans.py @@ -113,13 +113,13 @@ def test_unpack_scan_args_valid_input(): device="samx", action="set", parameter={"value": 1, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 0, "response": True}, + metadata={"readout_priority": "primary", "DIID": 0, "response": True}, ), BMessage.DeviceInstructionMessage( device="samy", action="set", parameter={"value": 2, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 1, "response": True}, + metadata={"readout_priority": "primary", "DIID": 1, "response": True}, ), ], ), @@ -137,19 +137,19 @@ def test_unpack_scan_args_valid_input(): device="samx", action="set", parameter={"value": 1, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 0, "response": True}, + metadata={"readout_priority": "primary", "DIID": 0, "response": True}, ), BMessage.DeviceInstructionMessage( device="samy", action="set", parameter={"value": 2, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 1, "response": True}, + metadata={"readout_priority": "primary", "DIID": 1, "response": True}, ), BMessage.DeviceInstructionMessage( device="samz", action="set", parameter={"value": 3, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 2, "response": True}, + metadata={"readout_priority": "primary", "DIID": 2, "response": True}, ), ], ), @@ -164,7 +164,7 @@ def test_unpack_scan_args_valid_input(): device="samx", action="set", parameter={"value": 1, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 0, "response": True}, + metadata={"readout_priority": "primary", "DIID": 0, "response": True}, ), ], ), @@ -212,7 +212,7 @@ def test_scan_move(mv_msg, reference_msg_list): } }, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 0, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -222,7 +222,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="set", parameter={"value": 1.0, "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 1, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -232,7 +232,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="set", parameter={"value": 2.0, "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 2, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -242,7 +242,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -252,7 +252,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -282,7 +282,7 @@ def test_scan_move(mv_msg, reference_msg_list): } }, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 0, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -292,7 +292,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="set", parameter={"value": 1.0, "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 1, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -302,7 +302,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="set", parameter={"value": 2.0, "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 2, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -312,7 +312,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="set", parameter={"value": 3.0, "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 3, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -322,7 +322,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 4, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -332,7 +332,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 5, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -342,7 +342,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 6, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -369,7 +369,7 @@ def test_scan_move(mv_msg, reference_msg_list): } }, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 0, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -379,7 +379,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="set", parameter={"value": 1.0, "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 1, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -389,7 +389,7 @@ def test_scan_move(mv_msg, reference_msg_list): action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 2, "RID": "0bab7ee3-b384-4571-b...0fff984c05", }, @@ -437,7 +437,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): parameter={ "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), BMessage.DeviceInstructionMessage( device=["samx"], @@ -446,7 +446,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "type": "read", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 4}, + metadata={"readout_priority": "primary", "DIID": 4}, ), BMessage.DeviceInstructionMessage( device=None, @@ -459,19 +459,19 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "scan_name": "grid_scan", "scan_type": "step", }, - metadata={"stream": "primary", "DIID": 0}, + metadata={"readout_priority": "primary", "DIID": 0}, ), BMessage.DeviceInstructionMessage( device=None, action="stage", parameter={}, - metadata={"stream": "primary", "DIID": 1}, + metadata={"readout_priority": "primary", "DIID": 1}, ), BMessage.DeviceInstructionMessage( device=None, action="baseline_reading", parameter={}, - metadata={"stream": "baseline", "DIID": 1}, + metadata={"readout_priority": "baseline", "DIID": 1}, ), BMessage.DeviceInstructionMessage( device="samx", @@ -480,7 +480,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "value": -5.0, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 1}, + metadata={"readout_priority": "primary", "DIID": 1}, ), BMessage.DeviceInstructionMessage( device=None, @@ -490,19 +490,19 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 2}, + metadata={"readout_priority": "primary", "DIID": 2}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"pointID": 0, "stream": "primary", "DIID": 3}, + metadata={"pointID": 0, "readout_priority": "primary", "DIID": 3}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "group": "trigger", "time": 0}, - metadata={"stream": "primary", "DIID": 4}, + metadata={"readout_priority": "primary", "DIID": 4}, ), BMessage.DeviceInstructionMessage( device=None, @@ -511,7 +511,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "primary", "wait_group": "readout_primary", }, - metadata={"pointID": 0, "stream": "primary", "DIID": 5}, + metadata={"pointID": 0, "readout_priority": "primary", "DIID": 5}, ), BMessage.DeviceInstructionMessage( device=None, @@ -521,7 +521,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "scan_motor", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 6}, + metadata={"readout_priority": "primary", "DIID": 6}, ), BMessage.DeviceInstructionMessage( device="samx", @@ -530,7 +530,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "value": 0.0, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 7}, + metadata={"readout_priority": "primary", "DIID": 7}, ), BMessage.DeviceInstructionMessage( device=None, @@ -540,7 +540,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 8}, + metadata={"readout_priority": "primary", "DIID": 8}, ), BMessage.DeviceInstructionMessage( device=None, @@ -550,19 +550,19 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "primary", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 9}, + metadata={"readout_priority": "primary", "DIID": 9}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"pointID": 1, "stream": "primary", "DIID": 10}, + metadata={"pointID": 1, "readout_priority": "primary", "DIID": 10}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "group": "trigger", "time": 0}, - metadata={"stream": "primary", "DIID": 11}, + metadata={"readout_priority": "primary", "DIID": 11}, ), BMessage.DeviceInstructionMessage( device=None, @@ -571,7 +571,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "primary", "wait_group": "readout_primary", }, - metadata={"pointID": 1, "stream": "primary", "DIID": 12}, + metadata={"pointID": 1, "readout_priority": "primary", "DIID": 12}, ), BMessage.DeviceInstructionMessage( device=None, @@ -581,7 +581,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "scan_motor", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 13}, + metadata={"readout_priority": "primary", "DIID": 13}, ), BMessage.DeviceInstructionMessage( device="samx", @@ -590,7 +590,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "value": 5.0, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 14}, + metadata={"readout_priority": "primary", "DIID": 14}, ), BMessage.DeviceInstructionMessage( device=None, @@ -600,7 +600,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 15}, + metadata={"readout_priority": "primary", "DIID": 15}, ), BMessage.DeviceInstructionMessage( device=None, @@ -610,13 +610,13 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "primary", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 16}, + metadata={"readout_priority": "primary", "DIID": 16}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"pointID": 2, "stream": "primary", "DIID": 17}, + metadata={"pointID": 2, "readout_priority": "primary", "DIID": 17}, ), BMessage.DeviceInstructionMessage( device=None, @@ -626,7 +626,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "trigger", "time": 0, }, - metadata={"stream": "primary", "DIID": 18}, + metadata={"readout_priority": "primary", "DIID": 18}, ), BMessage.DeviceInstructionMessage( device=None, @@ -635,7 +635,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "primary", "wait_group": "readout_primary", }, - metadata={"pointID": 2, "stream": "primary", "DIID": 19}, + metadata={"pointID": 2, "readout_priority": "primary", "DIID": 19}, ), BMessage.DeviceInstructionMessage( device=None, @@ -645,7 +645,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "scan_motor", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 20}, + metadata={"readout_priority": "primary", "DIID": 20}, ), BMessage.DeviceInstructionMessage( device="samx", @@ -654,7 +654,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "value": 0.0, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 21}, + metadata={"readout_priority": "primary", "DIID": 21}, ), BMessage.DeviceInstructionMessage( device=None, @@ -664,7 +664,7 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 22}, + metadata={"readout_priority": "primary", "DIID": 22}, ), BMessage.DeviceInstructionMessage( device=None, @@ -674,19 +674,19 @@ def test_scan_updated_move(mv_msg, reference_msg_list): "group": "primary", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 23}, + metadata={"readout_priority": "primary", "DIID": 23}, ), BMessage.DeviceInstructionMessage( device=None, action="unstage", parameter={}, - metadata={"stream": "primary", "DIID": 24}, + metadata={"readout_priority": "primary", "DIID": 24}, ), BMessage.DeviceInstructionMessage( device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 25}, + metadata={"readout_priority": "primary", "DIID": 25}, ), ], ) @@ -803,7 +803,7 @@ def test_fermat_scan(scan_msg, reference_scan_list): parameter={ "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), BMessage.DeviceInstructionMessage( device=["samx"], @@ -812,7 +812,7 @@ def test_fermat_scan(scan_msg, reference_scan_list): "type": "read", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 4}, + metadata={"readout_priority": "primary", "DIID": 4}, ), BMessage.DeviceInstructionMessage( device=None, @@ -825,19 +825,19 @@ def test_fermat_scan(scan_msg, reference_scan_list): "scan_name": "cont_line_scan", "scan_type": "step", }, - metadata={"stream": "primary", "DIID": 0}, + metadata={"readout_priority": "primary", "DIID": 0}, ), BMessage.DeviceInstructionMessage( device=None, action="stage", parameter={}, - metadata={"stream": "primary", "DIID": 1}, + metadata={"readout_priority": "primary", "DIID": 1}, ), BMessage.DeviceInstructionMessage( device=None, action="baseline_reading", parameter={}, - metadata={"stream": "baseline", "DIID": 1}, + metadata={"readout_priority": "baseline", "DIID": 1}, ), BMessage.DeviceInstructionMessage( device="samx", @@ -846,7 +846,7 @@ def test_fermat_scan(scan_msg, reference_scan_list): "value": -105.0, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 1}, + metadata={"readout_priority": "primary", "DIID": 1}, ), BMessage.DeviceInstructionMessage( device=None, @@ -856,7 +856,7 @@ def test_fermat_scan(scan_msg, reference_scan_list): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 2}, + metadata={"readout_priority": "primary", "DIID": 2}, ), BMessage.DeviceInstructionMessage( device="samx", @@ -865,13 +865,13 @@ def test_fermat_scan(scan_msg, reference_scan_list): "value": 5.0, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 7}, + metadata={"readout_priority": "primary", "DIID": 7}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"pointID": 0, "stream": "primary", "DIID": 8}, + metadata={"pointID": 0, "readout_priority": "primary", "DIID": 8}, ), BMessage.DeviceInstructionMessage( device=None, @@ -880,13 +880,13 @@ def test_fermat_scan(scan_msg, reference_scan_list): "group": "primary", "wait_group": "primary", }, - metadata={"pointID": 0, "stream": "primary", "DIID": 9}, + metadata={"pointID": 0, "readout_priority": "primary", "DIID": 9}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"pointID": 1, "stream": "primary", "DIID": 10}, + metadata={"pointID": 1, "readout_priority": "primary", "DIID": 10}, ), BMessage.DeviceInstructionMessage( device=None, @@ -895,13 +895,13 @@ def test_fermat_scan(scan_msg, reference_scan_list): "group": "primary", "wait_group": "primary", }, - metadata={"pointID": 1, "stream": "primary", "DIID": 11}, + metadata={"pointID": 1, "readout_priority": "primary", "DIID": 11}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"pointID": 2, "stream": "primary", "DIID": 12}, + metadata={"pointID": 2, "readout_priority": "primary", "DIID": 12}, ), BMessage.DeviceInstructionMessage( device=None, @@ -910,7 +910,7 @@ def test_fermat_scan(scan_msg, reference_scan_list): "group": "primary", "wait_group": "primary", }, - metadata={"pointID": 2, "stream": "primary", "DIID": 13}, + metadata={"pointID": 2, "readout_priority": "primary", "DIID": 13}, ), BMessage.DeviceInstructionMessage( device="samx", @@ -919,7 +919,7 @@ def test_fermat_scan(scan_msg, reference_scan_list): "value": 0.0, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 14}, + metadata={"readout_priority": "primary", "DIID": 14}, ), BMessage.DeviceInstructionMessage( device=None, @@ -929,7 +929,7 @@ def test_fermat_scan(scan_msg, reference_scan_list): "group": "scan_motor", "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 15}, + metadata={"readout_priority": "primary", "DIID": 15}, ), BMessage.DeviceInstructionMessage( device=None, @@ -939,19 +939,19 @@ def test_fermat_scan(scan_msg, reference_scan_list): "group": "primary", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 16}, + metadata={"readout_priority": "primary", "DIID": 16}, ), BMessage.DeviceInstructionMessage( device=None, action="unstage", parameter={}, - metadata={"stream": "primary", "DIID": 17}, + metadata={"readout_priority": "primary", "DIID": 17}, ), BMessage.DeviceInstructionMessage( device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 18}, + metadata={"readout_priority": "primary", "DIID": 18}, ), ], ) @@ -1009,7 +1009,7 @@ def test_device_rpc(): device="samx", action="rpc", parameter=parameter, - metadata={"stream": "primary", "DIID": 0}, + metadata={"readout_priority": "primary", "DIID": 0}, ) ] @@ -1035,31 +1035,31 @@ def test_device_rpc(): "scan_name": "acquire", "scan_type": "step", }, - metadata={"stream": "primary", "DIID": 0}, + metadata={"readout_priority": "primary", "DIID": 0}, ), BMessage.DeviceInstructionMessage( device=None, action="stage", parameter={}, - metadata={"stream": "primary", "DIID": 1}, + metadata={"readout_priority": "primary", "DIID": 1}, ), BMessage.DeviceInstructionMessage( device=None, action="baseline_reading", parameter={}, - metadata={"stream": "baseline", "DIID": 2}, + metadata={"readout_priority": "baseline", "DIID": 2}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"pointID": 0, "stream": "primary", "DIID": 3}, + metadata={"pointID": 0, "readout_priority": "primary", "DIID": 3}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "group": "trigger", "time": 1}, - metadata={"stream": "primary", "DIID": 4}, + metadata={"readout_priority": "primary", "DIID": 4}, ), BMessage.DeviceInstructionMessage( device=None, @@ -1068,25 +1068,25 @@ def test_device_rpc(): "group": "primary", "wait_group": "readout_primary", }, - metadata={"pointID": 0, "stream": "primary", "DIID": 5}, + metadata={"pointID": 0, "readout_priority": "primary", "DIID": 5}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 6}, + metadata={"readout_priority": "primary", "DIID": 6}, ), BMessage.DeviceInstructionMessage( device=None, action="unstage", parameter={}, - metadata={"stream": "primary", "DIID": 17}, + metadata={"readout_priority": "primary", "DIID": 17}, ), BMessage.DeviceInstructionMessage( device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 18}, + metadata={"readout_priority": "primary", "DIID": 18}, ), ], ) @@ -1452,13 +1452,13 @@ def test_scan_base_set_position_offset(): device=["rtx", "rty"], action="read", parameter={"wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 0}, + metadata={"readout_priority": "primary", "DIID": 0}, ), BMessage.DeviceInstructionMessage( device=["rtx", "rty"], action="wait", parameter={"type": "read", "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 1}, + metadata={"readout_priority": "primary", "DIID": 1}, ), BMessage.DeviceInstructionMessage( device="rtx", @@ -1470,7 +1470,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 2, "response": True}, + metadata={"readout_priority": "primary", "DIID": 2, "response": True}, ), BMessage.DeviceInstructionMessage( device="lsamrot", @@ -1482,7 +1482,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 2, "response": True}, + metadata={"readout_priority": "primary", "DIID": 2, "response": True}, ), BMessage.DeviceInstructionMessage( device=None, @@ -1496,7 +1496,7 @@ def test_scan_base_set_position_offset(): } }, metadata={ - "stream": "primary", + "readout_priority": "primary", "DIID": 0, }, ), @@ -1504,13 +1504,13 @@ def test_scan_base_set_position_offset(): device="lsamrot", action="set", parameter={"value": 10, "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), BMessage.DeviceInstructionMessage( device=["lsamrot"], action="wait", parameter={"type": "move", "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 4}, + metadata={"readout_priority": "primary", "DIID": 4}, ), BMessage.DeviceInstructionMessage( device="rtx", @@ -1522,7 +1522,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 5, "response": True}, + metadata={"readout_priority": "primary", "DIID": 5, "response": True}, ), BMessage.DeviceInstructionMessage( device="rtx", @@ -1534,7 +1534,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 6, "response": True}, + metadata={"readout_priority": "primary", "DIID": 6, "response": True}, ), BMessage.DeviceInstructionMessage( device="rty", @@ -1546,7 +1546,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 7, "response": True}, + metadata={"readout_priority": "primary", "DIID": 7, "response": True}, ), BMessage.DeviceInstructionMessage( device="lsamx", @@ -1558,7 +1558,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 8, "response": True}, + metadata={"readout_priority": "primary", "DIID": 8, "response": True}, ), BMessage.DeviceInstructionMessage( device="lsamy", @@ -1570,7 +1570,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 9, "response": True}, + metadata={"readout_priority": "primary", "DIID": 9, "response": True}, ), BMessage.DeviceInstructionMessage( device="rtx", @@ -1582,7 +1582,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 10, "response": True}, + metadata={"readout_priority": "primary", "DIID": 10, "response": True}, ), BMessage.DeviceInstructionMessage( device="rty", @@ -1594,7 +1594,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 11, "response": True}, + metadata={"readout_priority": "primary", "DIID": 11, "response": True}, ), BMessage.DeviceInstructionMessage( device="rtx", @@ -1606,7 +1606,7 @@ def test_scan_base_set_position_offset(): "args": (), "kwargs": {}, }, - metadata={"stream": "primary", "DIID": 12, "response": True}, + metadata={"readout_priority": "primary", "DIID": 12, "response": True}, ), BMessage.DeviceInstructionMessage( device=None, @@ -1626,19 +1626,19 @@ def test_scan_base_set_position_offset(): "scan_name": "lamni_fermat_scan", "scan_type": "step", }, - metadata={"stream": "primary", "DIID": 13}, + metadata={"readout_priority": "primary", "DIID": 13}, ), BMessage.DeviceInstructionMessage( device=None, action="stage", parameter={}, - metadata={"stream": "primary", "DIID": 14}, + metadata={"readout_priority": "primary", "DIID": 14}, ), BMessage.DeviceInstructionMessage( device=None, action="baseline_reading", parameter={}, - metadata={"stream": "baseline", "DIID": 15}, + metadata={"readout_priority": "baseline", "DIID": 15}, ), BMessage.DeviceInstructionMessage( device="rtx", @@ -1647,7 +1647,7 @@ def test_scan_base_set_position_offset(): "value": 1.3681828686580249, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 17}, + metadata={"readout_priority": "primary", "DIID": 17}, ), BMessage.DeviceInstructionMessage( device="rty", @@ -1656,25 +1656,25 @@ def test_scan_base_set_position_offset(): "value": 2.1508313829565298, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 18}, + metadata={"readout_priority": "primary", "DIID": 18}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "move", "group": "scan_motor", "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 19}, + metadata={"readout_priority": "primary", "DIID": 19}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"stream": "primary", "DIID": 20, "pointID": 0}, + metadata={"readout_priority": "primary", "DIID": 20, "pointID": 0}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "group": "trigger", "time": 0.1}, - metadata={"stream": "primary", "DIID": 21}, + metadata={"readout_priority": "primary", "DIID": 21}, ), BMessage.DeviceInstructionMessage( device=None, @@ -1683,7 +1683,7 @@ def test_scan_base_set_position_offset(): "group": "primary", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 22, "pointID": 0}, + metadata={"readout_priority": "primary", "DIID": 22, "pointID": 0}, ), BMessage.DeviceInstructionMessage( device=None, @@ -1693,7 +1693,7 @@ def test_scan_base_set_position_offset(): "group": "scan_motor", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 23}, + metadata={"readout_priority": "primary", "DIID": 23}, ), BMessage.DeviceInstructionMessage( device="rtx", @@ -1702,7 +1702,7 @@ def test_scan_base_set_position_offset(): "value": -0.7700589354581364, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 24}, + metadata={"readout_priority": "primary", "DIID": 24}, ), BMessage.DeviceInstructionMessage( device="rty", @@ -1711,31 +1711,31 @@ def test_scan_base_set_position_offset(): "value": -0.8406005210092851, "wait_group": "scan_motor", }, - metadata={"stream": "primary", "DIID": 25}, + metadata={"readout_priority": "primary", "DIID": 25}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "move", "group": "scan_motor", "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 26}, + metadata={"readout_priority": "primary", "DIID": 26}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 27}, + metadata={"readout_priority": "primary", "DIID": 27}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"stream": "primary", "DIID": 28, "pointID": 1}, + metadata={"readout_priority": "primary", "DIID": 28, "pointID": 1}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "group": "trigger", "time": 0.1}, - metadata={"stream": "primary", "DIID": 29}, + metadata={"readout_priority": "primary", "DIID": 29}, ), BMessage.DeviceInstructionMessage( device=None, @@ -1744,7 +1744,7 @@ def test_scan_base_set_position_offset(): "group": "primary", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 30, "pointID": 1}, + metadata={"readout_priority": "primary", "DIID": 30, "pointID": 1}, ), BMessage.DeviceInstructionMessage( device=None, @@ -1754,25 +1754,25 @@ def test_scan_base_set_position_offset(): "group": "scan_motor", "wait_group": "readout_primary", }, - metadata={"stream": "primary", "DIID": 31}, + metadata={"readout_priority": "primary", "DIID": 31}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 16}, + metadata={"readout_priority": "primary", "DIID": 16}, ), BMessage.DeviceInstructionMessage( device=None, action="unstage", parameter={}, - metadata={"stream": "primary", "DIID": 17}, + metadata={"readout_priority": "primary", "DIID": 17}, ), BMessage.DeviceInstructionMessage( device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 18}, + metadata={"readout_priority": "primary", "DIID": 18}, ), ], ) @@ -1956,7 +1956,7 @@ def test_round_scan_fly_sim_scan_core(in_args, reference_positions): "configure": {"num_pos": None, "positions": reference_positions, "exp_time": 0}, "wait_group": "kickoff", }, - metadata={"stream": "primary", "DIID": 0}, + metadata={"readout_priority": "primary", "DIID": 0}, ) @@ -2062,13 +2062,13 @@ def test_list_scan_raises_for_different_lengths(): device=[], action="read", parameter={"wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 0}, + metadata={"readout_priority": "primary", "DIID": 0}, ), BMessage.DeviceInstructionMessage( device=[], action="wait", parameter={"type": "read", "wait_group": "scan_motor"}, - metadata={"stream": "primary", "DIID": 1}, + metadata={"readout_priority": "primary", "DIID": 1}, ), None, BMessage.DeviceInstructionMessage( @@ -2082,121 +2082,121 @@ def test_list_scan_raises_for_different_lengths(): "scan_name": "time_scan", "scan_type": "step", }, - metadata={"stream": "primary", "DIID": 2}, + metadata={"readout_priority": "primary", "DIID": 2}, ), BMessage.DeviceInstructionMessage( device=None, action="stage", parameter={}, - metadata={"stream": "primary", "DIID": 3}, + metadata={"readout_priority": "primary", "DIID": 3}, ), BMessage.DeviceInstructionMessage( device=None, action="baseline_reading", parameter={}, - metadata={"stream": "baseline", "DIID": 4}, + metadata={"readout_priority": "baseline", "DIID": 4}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"stream": "primary", "DIID": 5, "pointID": 0}, + metadata={"readout_priority": "primary", "DIID": 5, "pointID": 0}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "time": 0.1, "group": "trigger"}, - metadata={"stream": "primary", "DIID": 6}, + metadata={"readout_priority": "primary", "DIID": 6}, ), BMessage.DeviceInstructionMessage( device=None, action="read", parameter={"group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 7, "pointID": 0}, + metadata={"readout_priority": "primary", "DIID": 7, "pointID": 0}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "time": 0.9, "group": "trigger"}, - metadata={"stream": "primary", "DIID": 8}, + metadata={"readout_priority": "primary", "DIID": 8}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 9}, + metadata={"readout_priority": "primary", "DIID": 9}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"stream": "primary", "DIID": 10, "pointID": 1}, + metadata={"readout_priority": "primary", "DIID": 10, "pointID": 1}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "time": 0.1, "group": "trigger"}, - metadata={"stream": "primary", "DIID": 11}, + metadata={"readout_priority": "primary", "DIID": 11}, ), BMessage.DeviceInstructionMessage( device=None, action="read", parameter={"group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 12, "pointID": 1}, + metadata={"readout_priority": "primary", "DIID": 12, "pointID": 1}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "time": 0.9, "group": "trigger"}, - metadata={"stream": "primary", "DIID": 13}, + metadata={"readout_priority": "primary", "DIID": 13}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 14}, + metadata={"readout_priority": "primary", "DIID": 14}, ), BMessage.DeviceInstructionMessage( device=None, action="trigger", parameter={"group": "trigger"}, - metadata={"stream": "primary", "DIID": 15, "pointID": 2}, + metadata={"readout_priority": "primary", "DIID": 15, "pointID": 2}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "time": 0.1, "group": "trigger"}, - metadata={"stream": "primary", "DIID": 16}, + metadata={"readout_priority": "primary", "DIID": 16}, ), BMessage.DeviceInstructionMessage( device=None, action="read", parameter={"group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 17, "pointID": 2}, + metadata={"readout_priority": "primary", "DIID": 17, "pointID": 2}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "trigger", "time": 0.9, "group": "trigger"}, - metadata={"stream": "primary", "DIID": 18}, + metadata={"readout_priority": "primary", "DIID": 18}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 19}, + metadata={"readout_priority": "primary", "DIID": 19}, ), BMessage.DeviceInstructionMessage( device=None, action="unstage", parameter={}, - metadata={"stream": "primary", "DIID": 20}, + metadata={"readout_priority": "primary", "DIID": 20}, ), BMessage.DeviceInstructionMessage( device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 21}, + metadata={"readout_priority": "primary", "DIID": 21}, ), ], ) @@ -2240,31 +2240,31 @@ def test_time_scan(scan_msg, reference_scan_list): "scan_name": "otf_scan", "scan_type": "fly", }, - metadata={"stream": "primary", "DIID": 0, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 0, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device=None, action="stage", parameter={}, - metadata={"stream": "primary", "DIID": 1, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 1, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device=None, action="baseline_reading", parameter={}, - metadata={"stream": "baseline", "DIID": 2, "RID": "1234"}, + metadata={"readout_priority": "baseline", "DIID": 2, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device="mono", action="set", parameter={"value": 700, "wait_group": "flyer"}, - metadata={"stream": "primary", "DIID": 3, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 3, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device=["mono"], action="wait", parameter={"type": "move", "wait_group": "flyer"}, - metadata={"stream": "primary", "DIID": 4, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 4, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device="otf", @@ -2273,49 +2273,49 @@ def test_time_scan(scan_msg, reference_scan_list): "configure": {"e1": 700, "e2": 740, "time": 4}, "wait_group": "kickoff", }, - metadata={"stream": "primary", "DIID": 5, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 5, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device=["otf"], action="wait", parameter={"type": "move", "wait_group": "kickoff"}, - metadata={"stream": "primary", "DIID": 6, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 6, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device="otf", action="complete", parameter={}, - metadata={"stream": "primary", "DIID": 7, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 7, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device=None, action="read", parameter={"group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 8, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 8, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 9, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 9, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device=None, action="wait", parameter={"type": "read", "group": "primary", "wait_group": "readout_primary"}, - metadata={"stream": "primary", "DIID": 10, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 10, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device=None, action="unstage", parameter={}, - metadata={"stream": "primary", "DIID": 11, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 11, "RID": "1234"}, ), BMessage.DeviceInstructionMessage( device=None, action="close_scan", parameter={}, - metadata={"stream": "primary", "DIID": 12, "RID": "1234"}, + metadata={"readout_priority": "primary", "DIID": 12, "RID": "1234"}, ), ], )