usov_i-org/bec
1
0
Fork 0
mirror of https://github.com/ivan-usov-org/bec.git synced 2025-04-21 10:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: renamed stream to readout_priority

Browse Source
This commit is contained in:
wakonig_k 2023-07-17 14:09:10 +02:00
parent 4e5d0da38b
commit 1802e29b3d
6 changed files with 237 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scan_bundler/scan_bundler/scan_bundler.py
View File

@ -293,8 +293,8 @@ class ScanBundler(BECService):
if not self.sync_storage[scanID]["info"].get("scan_type"): if not self.sync_storage[scanID]["info"].get("scan_type"):
return return
self.device_storage[device] = signal self.device_storage[device] = signal
stream = metadata.get("stream") readout_priority = metadata.get("readout_priority")
if stream == "primary": if readout_priority == "primary":
if self.sync_storage[scanID]["info"]["scan_type"] == "step": if self.sync_storage[scanID]["info"]["scan_type"] == "step":
self._step_scan_update(scanID, device, signal, metadata) self._step_scan_update(scanID, device, signal, metadata)
elif self.sync_storage[scanID]["info"]["scan_type"] == "fly": 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']}" f"Unknown scan type {self.sync_storage[scanID]['info']['scan_type']}"
) )
elif stream == "baseline": elif readout_priority == "baseline":
self._baseline_update(scanID, device, signal) self._baseline_update(scanID, device, signal)
def _update_monitor_signals(self, scanID, pointID) -> None: def _update_monitor_signals(self, scanID, pointID) -> None:

40
scan_bundler/tests/test_scan_bundler.py
View File

@ -3,14 +3,14 @@ import time
from concurrent.futures import wait from concurrent.futures import wait
from unittest import mock from unittest import mock
import bec_lib.core
import pytest import pytest
import yaml import yaml
import bec_lib.core
from bec_lib.core import BECMessage from bec_lib.core import BECMessage
from bec_lib.core import DeviceManagerBase as DeviceManager from bec_lib.core import DeviceManagerBase as DeviceManager
from bec_lib.core import MessageEndpoints, ServiceConfig from bec_lib.core import MessageEndpoints, ServiceConfig
from bec_lib.core.tests.utils import ConnectorMock, create_session_from_config from bec_lib.core.tests.utils import ConnectorMock, create_session_from_config
from scan_bundler import ScanBundler from scan_bundler import ScanBundler
from scan_bundler.emitter import EmitterBase from scan_bundler.emitter import EmitterBase
@ -57,7 +57,7 @@ def test_device_read_callback():
msg = MessageMock() msg = MessageMock()
dev_msg = BECMessage.DeviceMessage( dev_msg = BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, 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.value = dev_msg.dumps()
msg.topic = MessageEndpoints.device_read("samx").encode() 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(): def test_add_device_to_storage_returns_without_scanID():
msg = BECMessage.DeviceMessage( msg = BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}},
metadata={"stream": "primary"}, metadata={"readout_priority": "primary"},
) )
sb = load_ScanBundlerMock() sb = load_ScanBundlerMock()
sb._add_device_to_storage([msg], "samx", timeout_time=1) 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(): def test_add_device_to_storage_returns_without_signal():
msg = BECMessage.DeviceMessage( msg = BECMessage.DeviceMessage(
signals={}, signals={},
metadata={"scanID": "scanID", "stream": "primary"}, metadata={"scanID": "scanID", "readout_priority": "primary"},
) )
sb = load_ScanBundlerMock() sb = load_ScanBundlerMock()
sb._add_device_to_storage([msg], "samx", timeout_time=1) 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(): def test_add_device_to_storage_returns_on_timeout():
msg = BECMessage.DeviceMessage( msg = BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, 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 = load_ScanBundlerMock()
sb._add_device_to_storage([msg], "samx", timeout_time=1) 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): def test_add_device_to_storage_returns_without_scan_info(scan_status):
msg = BECMessage.DeviceMessage( msg = BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, 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 = load_ScanBundlerMock()
sb.sync_storage["scanID"] = {"info": {}} sb.sync_storage["scanID"] = {"info": {}}
@ -195,21 +195,21 @@ def test_add_device_to_storage_returns_without_scan_info(scan_status):
( (
BECMessage.DeviceMessage( BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}},
metadata={"scanID": "scanID", "stream": "primary"}, metadata={"scanID": "scanID", "readout_priority": "primary"},
), ),
"step", "step",
), ),
( (
BECMessage.DeviceMessage( BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}},
metadata={"scanID": "scanID", "stream": "primary"}, metadata={"scanID": "scanID", "readout_priority": "primary"},
), ),
"fly", "fly",
), ),
( (
BECMessage.DeviceMessage( BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}},
metadata={"scanID": "scanID", "stream": "primary"}, metadata={"scanID": "scanID", "readout_priority": "primary"},
), ),
"wrong", "wrong",
), ),
@ -244,7 +244,7 @@ def test_add_device_to_storage_primary(msg, scan_type):
( (
BECMessage.DeviceMessage( BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}},
metadata={"scanID": "scanID", "stream": "baseline"}, metadata={"scanID": "scanID", "readout_priority": "baseline"},
), ),
"step", "step",
), ),
@ -325,7 +325,7 @@ def test_scan_queue_callback(queue_msg):
scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803",
status="closed", status="closed",
info={ info={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"RID": "a53538b4-79f3-4132-91b5-d044e438f460", "RID": "a53538b4-79f3-4132-91b5-d044e438f460",
"scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397",
@ -354,7 +354,7 @@ def test_scan_status_callback(scan_msg):
scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803",
status="closed", status="closed",
info={ info={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"RID": "a53538b4-79f3-4132-91b5-d044e438f460", "RID": "a53538b4-79f3-4132-91b5-d044e438f460",
"scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397",
@ -370,7 +370,7 @@ def test_scan_status_callback(scan_msg):
scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803",
status="open", status="open",
info={ info={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"RID": "a53538b4-79f3-4132-91b5-d044e438f460", "RID": "a53538b4-79f3-4132-91b5-d044e438f460",
"scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397",
@ -443,7 +443,7 @@ def test_status_modification():
scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803",
status="closed", status="closed",
info={ info={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"RID": "a53538b4-79f3-4132-91b5-d044e438f460", "RID": "a53538b4-79f3-4132-91b5-d044e438f460",
"scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397",
@ -458,7 +458,7 @@ def test_status_modification():
scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803", scanID="6ff7a89a-79e5-43ad-828b-c1e1aeed5803",
status="open", status="open",
info={ info={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"RID": "a53538b4-79f3-4132-91b5-d044e438f460", "RID": "a53538b4-79f3-4132-91b5-d044e438f460",
"scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397", "scanID": "3ea07f69-b0ee-44fa-8451-b85824a37397",
@ -515,7 +515,7 @@ def test_initialize_scan_container(scan_msg):
[ [
BECMessage.DeviceMessage( BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, 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, 23,
True, True,
@ -523,7 +523,7 @@ def test_initialize_scan_container(scan_msg):
[ [
BECMessage.DeviceMessage( BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, 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, 23,
False, False,
@ -531,7 +531,7 @@ def test_initialize_scan_container(scan_msg):
[ [
BECMessage.DeviceMessage( BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, 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, 23,
False, False,
@ -691,7 +691,7 @@ def test_get_last_device_readback():
sb = load_ScanBundlerMock() sb = load_ScanBundlerMock()
dev_msg = BECMessage.DeviceMessage( dev_msg = BECMessage.DeviceMessage(
signals={"samx": {"samx": 0.51, "setpoint": 0.5, "motor_is_moving": 0}}, 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: with mock.patch.object(sb, "producer") as producer_mock:
producer_mock.pipeline().execute.return_value = [dev_msg.dumps()] producer_mock.pipeline().execute.return_value = [dev_msg.dumps()]

2
scan_server/scan_server/scan_stubs.py
View File

@ -241,7 +241,7 @@ class ScanStubs:
device=None, device=None,
action="baseline_reading", action="baseline_reading",
parameter={}, parameter={},
metadata={"stream": "baseline"}, metadata={"readout_priority": "baseline"},
) )
def wait( def wait(

2
scan_server/scan_server/scans.py
View File

@ -226,7 +226,7 @@ class RequestBase(ABC):
self._scan_report_devices = devices self._scan_report_devices = devices
def device_msg_metadata(self): 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} metadata = {**default_metadata, **self.metadata}
self.DIID += 1 self.DIID += 1
return metadata return metadata

120
scan_server/tests/test_scan_worker.py
View File

@ -2,9 +2,9 @@ import uuid
from unittest import mock from unittest import mock
import pytest import pytest
from bec_lib.core import BECMessage, MessageEndpoints
from utils import load_ScanServerMock from utils import load_ScanServerMock
from bec_lib.core import BECMessage, MessageEndpoints
from scan_server.errors import DeviceMessageError, ScanAbortion from scan_server.errors import DeviceMessageError, ScanAbortion
from scan_server.scan_assembler import ScanAssembler from scan_server.scan_assembler import ScanAssembler
from scan_server.scan_queue import ( from scan_server.scan_queue import (
@ -80,7 +80,7 @@ class InstructionQueueMock(InstructionQueueItem):
"group": "scan_motor", "group": "scan_motor",
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
), ),
["samy"], ["samy"],
), ),
@ -93,7 +93,7 @@ class InstructionQueueMock(InstructionQueueItem):
"group": "scan_motor", "group": "scan_motor",
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
), ),
["samx", "samy"], ["samx", "samy"],
), ),
@ -106,7 +106,7 @@ class InstructionQueueMock(InstructionQueueItem):
"group": "scan_motor", "group": "scan_motor",
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
), ),
["samx", "samy"], ["samx", "samy"],
), ),
@ -119,7 +119,7 @@ class InstructionQueueMock(InstructionQueueItem):
"group": "primary", "group": "primary",
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
), ),
["samx", "samy"], ["samx", "samy"],
), ),
@ -132,7 +132,7 @@ class InstructionQueueMock(InstructionQueueItem):
"group": "nogroup", "group": "nogroup",
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
), ),
["samx", "samy"], ["samx", "samy"],
), ),
@ -167,14 +167,14 @@ def test_get_devices_from_instruction(instruction, devices):
device="samx", device="samx",
action="set", action="set",
parameter={"value": 10, "wait_group": "scan_motor"}, parameter={"value": 10, "wait_group": "scan_motor"},
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
) )
), ),
BECMessage.DeviceInstructionMessage( BECMessage.DeviceInstructionMessage(
device="samx", device="samx",
action="set", action="set",
parameter={"value": 10, "wait_group": "scan_motor"}, 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", device="samx",
action="set", action="set",
parameter={"value": 10, "wait_group": "scan_motor"}, parameter={"value": 10, "wait_group": "scan_motor"},
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
) )
instr2 = BECMessage.DeviceInstructionMessage( instr2 = BECMessage.DeviceInstructionMessage(
device="samx", device="samx",
action="set", action="set",
parameter={"value": 10, "wait_group": "scan_motor"}, parameter={"value": 10, "wait_group": "scan_motor"},
metadata={"stream": "primary", "DIID": 4}, metadata={"readout_priority": "primary", "DIID": 4},
) )
worker = get_scan_worker() worker = get_scan_worker()
worker._add_wait_group(instr1) worker._add_wait_group(instr1)
@ -225,7 +225,7 @@ def test_add_wait_group_to_existing_wait_group():
"group": "scan_motor", "group": "scan_motor",
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
), ),
"move", "move",
), ),
@ -238,7 +238,7 @@ def test_add_wait_group_to_existing_wait_group():
"group": "scan_motor", "group": "scan_motor",
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
), ),
"read", "read",
), ),
@ -251,7 +251,7 @@ def test_add_wait_group_to_existing_wait_group():
"group": "scan_motor", "group": "scan_motor",
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
), ),
"trigger", "trigger",
), ),
@ -264,7 +264,7 @@ def test_add_wait_group_to_existing_wait_group():
"group": "scan_motor", "group": "scan_motor",
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 3}, metadata={"readout_priority": "primary", "DIID": 3},
), ),
None, None,
), ),
@ -300,7 +300,7 @@ def test_wait_for_devices(instructions, wait_type):
device="samx", device="samx",
success=True, success=True,
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -313,7 +313,7 @@ def test_wait_for_devices(instructions, wait_type):
action="wait", action="wait",
parameter={"type": "move", "wait_group": "scan_motor"}, parameter={"type": "move", "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -327,7 +327,7 @@ def test_wait_for_devices(instructions, wait_type):
device="samx", device="samx",
success=False, success=False,
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "request", "RID": "request",
@ -340,7 +340,7 @@ def test_wait_for_devices(instructions, wait_type):
action="wait", action="wait",
parameter={"type": "move", "wait_group": "scan_motor"}, parameter={"type": "move", "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -354,7 +354,7 @@ def test_wait_for_devices(instructions, wait_type):
device="samx", device="samx",
success=False, success=False,
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -367,7 +367,7 @@ def test_wait_for_devices(instructions, wait_type):
action="wait", action="wait",
parameter={"type": "move", "wait_group": "scan_motor"}, parameter={"type": "move", "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -381,7 +381,7 @@ def test_wait_for_devices(instructions, wait_type):
device="samx", device="samx",
success=False, success=False,
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -394,7 +394,7 @@ def test_wait_for_devices(instructions, wait_type):
action="wait", action="wait",
parameter={"type": "move", "wait_group": "scan_motor"}, parameter={"type": "move", "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -425,7 +425,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort):
action="set", action="set",
parameter={"value": 10, "wait_group": "scan_motor"}, parameter={"value": 10, "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -436,7 +436,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort):
action="wait", action="wait",
parameter={"type": "move", "wait_group": "scan_motor"}, parameter={"type": "move", "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -446,7 +446,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort):
device="samx", device="samx",
success=False, success=False,
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -459,7 +459,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort):
action="set", action="set",
parameter={"value": 10, "wait_group": "scan_motor"}, parameter={"value": 10, "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -470,7 +470,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort):
action="wait", action="wait",
parameter={"type": "move", "wait_group": "scan_motor"}, parameter={"type": "move", "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -480,7 +480,7 @@ def test_check_for_failed_movements(device_status, devices, instr, abort):
device="samx", device="samx",
success=True, success=True,
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -517,7 +517,7 @@ def test_wait_for_idle(msg1, msg2, req_msg: BECMessage.DeviceReqStatusMessage):
action="set", action="set",
parameter={"value": 10, "wait_group": "scan_motor"}, parameter={"value": 10, "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -528,7 +528,7 @@ def test_wait_for_idle(msg1, msg2, req_msg: BECMessage.DeviceReqStatusMessage):
action="wait", action="wait",
parameter={"type": "move", "wait_group": "scan_motor"}, parameter={"type": "move", "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -538,7 +538,7 @@ def test_wait_for_idle(msg1, msg2, req_msg: BECMessage.DeviceReqStatusMessage):
device="samx", device="samx",
status=0, status=0,
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -575,7 +575,7 @@ def test_wait_for_read(msg1, msg2, req_msg: BECMessage.DeviceReqStatusMessage):
action="set", action="set",
parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, parameter={"value": 10, "wait_group": "scan_motor", "time": 30},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -618,7 +618,7 @@ def test_wait_for_device_server():
action="set", action="set",
parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, parameter={"value": 10, "wait_group": "scan_motor", "time": 30},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -643,7 +643,7 @@ def test_set_devices(instr):
action="trigger", action="trigger",
parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, parameter={"value": 10, "wait_group": "scan_motor", "time": 30},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -665,7 +665,7 @@ def test_trigger_devices(instr):
action="trigger", action="trigger",
parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, parameter={"value": 10, "wait_group": "scan_motor", "time": 30},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -683,7 +683,7 @@ def test_trigger_devices(instr):
action="trigger", action="trigger",
parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, parameter={"value": 10, "wait_group": "scan_motor", "time": 30},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -708,7 +708,7 @@ def test_send_rpc(instr):
action="read", action="read",
parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, parameter={"value": 10, "wait_group": "scan_motor", "time": 30},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -721,7 +721,7 @@ def test_send_rpc(instr):
action="read", action="read",
parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, parameter={"value": 10, "wait_group": "scan_motor", "time": 30},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -771,7 +771,7 @@ def test_read_devices(instr):
action="trigger", action="trigger",
parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, parameter={"value": 10, "wait_group": "scan_motor", "time": 30},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -779,7 +779,7 @@ def test_read_devices(instr):
), ),
["samx"], ["samx"],
{"value": 10, "wait_group": "scan_motor", "time": 30}, {"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", action="trigger",
parameter={"value": 10, "wait_group": "scan_motor", "time": 30}, parameter={"value": 10, "wait_group": "scan_motor", "time": 30},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -855,7 +855,7 @@ def test_publish_data_as_read():
action="publish_data_as_read", action="publish_data_as_read",
parameter={"data": {}}, parameter={"data": {}},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -881,7 +881,7 @@ def test_publish_data_as_read_multiple():
action="publish_data_as_read", action="publish_data_as_read",
parameter={"data": data}, parameter={"data": data},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 3, "DIID": 3,
"scanID": "scanID", "scanID": "scanID",
"RID": "requestID", "RID": "requestID",
@ -915,7 +915,7 @@ def test_check_for_interruption():
action="open_scan", action="open_scan",
parameter={"num_points": 150, "scan_motors": ["samx", "samy"]}, parameter={"num_points": 150, "scan_motors": ["samx", "samy"]},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 18, "DIID": 18,
"scanID": "12345", "scanID": "12345",
"scan_def_id": 100, "scan_def_id": 100,
@ -931,7 +931,7 @@ def test_check_for_interruption():
device=None, device=None,
action="open_scan", action="open_scan",
parameter={"num_points": 150}, parameter={"num_points": 150},
metadata={"stream": "primary", "DIID": 18, "scanID": "12345", "RID": 11}, metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345", "RID": 11},
), ),
150, 150,
True, True,
@ -1019,7 +1019,7 @@ def test_initialize_scan_info(msg):
device=None, device=None,
action="close_scan", action="close_scan",
parameter={}, parameter={},
metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"},
), ),
"12345", "12345",
19, 19,
@ -1030,7 +1030,7 @@ def test_initialize_scan_info(msg):
device=None, device=None,
action="close_scan", action="close_scan",
parameter={}, parameter={},
metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"},
), ),
"0987", "0987",
200, 200,
@ -1061,7 +1061,7 @@ def test_close_scan(msg, scan_id, max_point_id, exp_num_points):
device=None, device=None,
action="close_scan", action="close_scan",
parameter={}, 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, device=None,
action="close_scan", action="close_scan",
parameter={"parameter": "param"}, parameter={"parameter": "param"},
metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"},
), ),
["samx"], ["samx"],
{"parameter": "param"}, {"parameter": "param"},
{"stream": "primary", "DIID": 18, "scanID": "12345"}, {"readout_priority": "primary", "DIID": 18, "scanID": "12345"},
False, False,
), ),
(None, None, {}, {}, False), (None, None, {}, {}, False),
@ -1217,7 +1217,7 @@ def test_process_instructions(abortion):
device=None, device=None,
action="open_scan", action="open_scan",
parameter={"readout_priority": {"monitored": [], "baseline": [], "ignored": []}}, parameter={"readout_priority": {"monitored": [], "baseline": [], "ignored": []}},
metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"},
), ),
"_open_scan", "_open_scan",
), ),
@ -1226,7 +1226,7 @@ def test_process_instructions(abortion):
device=None, device=None,
action="close_scan", action="close_scan",
parameter={}, parameter={},
metadata={"stream": "primary", "DIID": 18, "scanID": "12345"}, metadata={"readout_priority": "primary", "DIID": 18, "scanID": "12345"},
), ),
"_close_scan", "_close_scan",
), ),
@ -1236,7 +1236,7 @@ def test_process_instructions(abortion):
action="wait", action="wait",
parameter={"type": "move", "wait_group": "scan_motor"}, parameter={"type": "move", "wait_group": "scan_motor"},
metadata={ metadata={
"stream": "primary", "readout_priority": "primary",
"DIID": 4, "DIID": 4,
"scanID": "12345", "scanID": "12345",
"RID": "123456", "RID": "123456",
@ -1249,7 +1249,7 @@ def test_process_instructions(abortion):
device=None, device=None,
action="trigger", action="trigger",
parameter={"group": "trigger"}, parameter={"group": "trigger"},
metadata={"stream": "primary", "DIID": 20, "pointID": 0}, metadata={"readout_priority": "primary", "DIID": 20, "pointID": 0},
), ),
"_trigger_devices", "_trigger_devices",
), ),
@ -1261,7 +1261,7 @@ def test_process_instructions(abortion):
"value": 1.3681828686580249, "value": 1.3681828686580249,
"wait_group": "scan_motor", "wait_group": "scan_motor",
}, },
metadata={"stream": "primary", "DIID": 24}, metadata={"readout_priority": "primary", "DIID": 24},
), ),
"_set_devices", "_set_devices",
), ),
@ -1273,7 +1273,7 @@ def test_process_instructions(abortion):
"group": "primary", "group": "primary",
"wait_group": "readout_primary", "wait_group": "readout_primary",
}, },
metadata={"stream": "primary", "DIID": 30, "pointID": 1}, metadata={"readout_priority": "primary", "DIID": 30, "pointID": 1},
), ),
"_read_devices", "_read_devices",
), ),
@ -1282,7 +1282,7 @@ def test_process_instructions(abortion):
device=None, device=None,
action="stage", action="stage",
parameter={}, parameter={},
metadata={"stream": "primary", "DIID": 17}, metadata={"readout_priority": "primary", "DIID": 17},
), ),
"_stage_devices", "_stage_devices",
), ),
@ -1291,7 +1291,7 @@ def test_process_instructions(abortion):
device=None, device=None,
action="unstage", action="unstage",
parameter={}, parameter={},
metadata={"stream": "primary", "DIID": 17}, metadata={"readout_priority": "primary", "DIID": 17},
), ),
"_unstage_devices", "_unstage_devices",
), ),
@ -1306,7 +1306,7 @@ def test_process_instructions(abortion):
"args": [], "args": [],
"kwargs": {}, "kwargs": {},
}, },
metadata={"stream": "primary", "DIID": 9}, metadata={"readout_priority": "primary", "DIID": 9},
), ),
"_send_rpc", "_send_rpc",
), ),
@ -1321,7 +1321,7 @@ def test_process_instructions(abortion):
device=None, device=None,
action="baseline_reading", action="baseline_reading",
parameter={}, parameter={},
metadata={"stream": "baseline", "DIID": 15}, metadata={"readout_priority": "baseline", "DIID": 15},
), ),
"_baseline_reading", "_baseline_reading",
), ),

304
scan_server/tests/test_scans.py
View File

File diff suppressed because it is too large Load Diff