From 1ad993a2d9d03752af365939ca11a04f0f942dba Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Sun, 22 Mar 2026 11:32:49 +0100 Subject: [PATCH 1/4] chore: remove bluesky emitter as it is not used anywhere --- .../scan_bundler/bluesky_emitter.py | 141 ------------------ .../bec_server/scan_bundler/scan_bundler.py | 8 +- .../test_bluesky_emitter.py | 78 ---------- .../tests_scan_bundler/test_scan_bundler.py | 7 +- 4 files changed, 2 insertions(+), 232 deletions(-) delete mode 100644 bec_server/bec_server/scan_bundler/bluesky_emitter.py delete mode 100644 bec_server/tests/tests_scan_bundler/test_bluesky_emitter.py diff --git a/bec_server/bec_server/scan_bundler/bluesky_emitter.py b/bec_server/bec_server/scan_bundler/bluesky_emitter.py deleted file mode 100644 index 18686e8dc..000000000 --- a/bec_server/bec_server/scan_bundler/bluesky_emitter.py +++ /dev/null @@ -1,141 +0,0 @@ -from __future__ import annotations - -import time -import uuid -from typing import TYPE_CHECKING - -import msgpack - -from bec_lib.endpoints import MessageEndpoints -from bec_lib.logger import bec_logger - -from .emitter import EmitterBase - -logger = bec_logger.logger - -if TYPE_CHECKING: - from .scan_bundler import ScanBundler - - -class BlueskyEmitter(EmitterBase): - def __init__(self, scan_bundler: ScanBundler) -> None: - super().__init__(scan_bundler.connector) - self.scan_bundler = scan_bundler - self.bluesky_metadata = {} - - def send_run_start_document(self, scan_id) -> None: - """Bluesky only: send run start documents.""" - logger.debug(f"sending run start doc for scan_id {scan_id}") - self.bluesky_metadata[scan_id] = {} - doc = self._get_run_start_document(scan_id) - self.bluesky_metadata[scan_id]["start"] = doc - self.connector.raw_send(MessageEndpoints.bluesky_events(), msgpack.dumps(("start", doc))) - self.send_descriptor_document(scan_id) - - def _get_run_start_document(self, scan_id) -> dict: - sb = self.scan_bundler - doc = { - "time": time.time(), - "uid": str(uuid.uuid4()), - "scan_id": scan_id, - "queue_id": sb.sync_storage[scan_id]["info"]["queue_id"], - "scan_id": sb.sync_storage[scan_id]["info"]["scan_number"], - "motors": tuple(dev.name for dev in sb.scan_motors[scan_id]), - } - return doc - - def _get_data_keys(self, scan_id): - sb = self.scan_bundler - signals = {} - for dev in sb.monitored_devices[scan_id]["devices"]: - # copied from bluesky/callbacks/stream.py: - signals[dev.name] = sb.device_manager.devices[dev.name]._info.get("describe", {}) - return signals - - def _get_descriptor_document(self, scan_id) -> dict: - sb = self.scan_bundler - doc = { - "run_start": self.bluesky_metadata[scan_id]["start"]["uid"], - "time": time.time(), - "data_keys": self._get_data_keys(scan_id), - "uid": str(uuid.uuid4()), - "configuration": {}, - "name": "primary", - "hints": {"samx": {"fields": ["samx"]}, "samy": {"fields": ["samy"]}}, - "object_keys": { - dev.name: [val for val in dev._info.get("signals", {})] - for dev in sb.monitored_devices[scan_id]["devices"] - }, - } - return doc - - def send_descriptor_document(self, scan_id) -> None: - """Bluesky only: send descriptor document""" - doc = self._get_descriptor_document(scan_id) - self.bluesky_metadata[scan_id]["descriptor"] = doc - self.connector.raw_send( - MessageEndpoints.bluesky_events(), msgpack.dumps(("descriptor", doc)) - ) - - def cleanup_storage(self, scan_id): - """remove old scan_ids to free memory""" - - for storage in ["bluesky_metadata"]: - try: - getattr(self, storage).pop(scan_id) - except KeyError: - logger.warning(f"Failed to remove {scan_id} from {storage}.") - - def send_bluesky_scan_point(self, scan_id, point_id) -> None: - self.connector.raw_send( - MessageEndpoints.bluesky_events(), - msgpack.dumps(("event", self._prepare_bluesky_event_data(scan_id, point_id))), - ) - - def _prepare_bluesky_event_data(self, scan_id, point_id) -> dict: - # event = { - # "descriptor": "5605e810-bb4e-4e40-b...d45279e3a4", - # "time": 1648468217.524021, - # "data": { - # "det": 1.0, - # "motor1": -10.0, - # "motor1_setpoint": -10.0, - # "motor2": -10.0, - # "motor2_setpoint": -10.0, - # }, - # "timestamps": { - # "det": 1648468209.868633, - # "motor1": 1648468209.862141, - # "motor1_setpoint": 1648468209.8607192, - # "motor2": 1648468209.864479, - # "motor2_setpoint": 1648468209.8629901, - # }, - # "seq_num": 1, - # "uid": "ea83a56e-6af2-4b94-9...44dcc36d4e", - # "filled": {}, - # } - sb = self.scan_bundler - metadata = self.bluesky_metadata[scan_id] - while not metadata.get("descriptor"): - time.sleep(0.01) - - bls_event = { - "descriptor": metadata["descriptor"].get("uid"), - "time": time.time(), - "seq_num": point_id, - "uid": str(uuid.uuid4()), - "filled": {}, - "data": {}, - "timestamps": {}, - } - for data_point in sb.sync_storage[scan_id][point_id].values(): - for key, val in data_point.items(): - bls_event["data"][key] = val["value"] - bls_event["timestamps"][key] = val["timestamp"] - return bls_event - - def on_cleanup(self, scan_id: str): - self.cleanup_storage(scan_id) - - def on_init(self, scan_id: str): - self.send_run_start_document(scan_id) diff --git a/bec_server/bec_server/scan_bundler/scan_bundler.py b/bec_server/bec_server/scan_bundler/scan_bundler.py index e1e63d5f0..5821122f5 100644 --- a/bec_server/bec_server/scan_bundler/scan_bundler.py +++ b/bec_server/bec_server/scan_bundler/scan_bundler.py @@ -15,7 +15,6 @@ from bec_lib.logger import bec_logger from .bec_emitter import BECEmitter -from .bluesky_emitter import BlueskyEmitter if TYPE_CHECKING: from bec_lib.redis_connector import RedisConnector @@ -46,7 +45,6 @@ def __init__(self, config, connector_cls: type[RedisConnector]) -> None: self.monitored_devices = {} self.baseline_devices = {} self.device_storage = {} - self.scan_motors = {} self.readout_priority = {} self.storage_initialized = set() self.executor = ThreadPoolExecutor(max_workers=4) @@ -58,7 +56,7 @@ def __init__(self, config, connector_cls: type[RedisConnector]) -> None: self.status = messages.BECStatus.RUNNING def _initialize_emitters(self): - self._emitter = [BECEmitter(self), BlueskyEmitter(self)] + self._emitter = [BECEmitter(self)] def run_emitter(self, emitter_method: Callable, *args, **kwargs): for emi in self._emitter: @@ -125,8 +123,6 @@ def _initialize_scan_container(self, scan_msg: messages.ScanStatusMessage): scan_id = scan_msg.content["scan_id"] scan_info = scan_msg.content["info"] - scan_motors = list(set(self.device_manager.devices[m] for m in scan_info["scan_motors"])) - self.scan_motors[scan_id] = scan_motors self.readout_priority[scan_id] = scan_info["readout_priority"] if scan_id not in self.storage_initialized: self.sync_storage[scan_id] = {"info": scan_info, "status": "open", "sent": set()} @@ -363,14 +359,12 @@ def cleanup_storage(self): "sync_storage", "monitored_devices", "baseline_devices", - "scan_motors", "readout_priority", ]: try: getattr(self, storage).pop(scan_id) except KeyError: logger.warning(f"Failed to remove {scan_id} from {storage}.") - # self.bluesky_emitter.cleanup_storage(scan_id) self.run_emitter("on_cleanup", scan_id) self.storage_initialized.remove(scan_id) diff --git a/bec_server/tests/tests_scan_bundler/test_bluesky_emitter.py b/bec_server/tests/tests_scan_bundler/test_bluesky_emitter.py deleted file mode 100644 index f14edbdbb..000000000 --- a/bec_server/tests/tests_scan_bundler/test_bluesky_emitter.py +++ /dev/null @@ -1,78 +0,0 @@ -from unittest import mock - -import msgpack -import pytest - -from bec_lib.endpoints import MessageEndpoints -from bec_server.scan_bundler.bluesky_emitter import BlueskyEmitter - - -@pytest.fixture -def bls_emitter(scan_bundler_mock): - emitter = BlueskyEmitter(scan_bundler_mock) - yield emitter - emitter.shutdown() - - -@pytest.mark.parametrize("scan_id", ["alskdj"]) -def test_run_start_document(bls_emitter, scan_id): - with mock.patch.object(bls_emitter.connector, "raw_send") as send: - with mock.patch.object(bls_emitter, "send_descriptor_document") as send_descr: - with mock.patch.object( - bls_emitter, "_get_run_start_document", return_value={} - ) as get_doc: - bls_emitter.send_run_start_document(scan_id) - get_doc.assert_called_once_with(scan_id) - send.assert_called_once_with( - MessageEndpoints.bluesky_events(), msgpack.dumps(("start", {})) - ) - send_descr.assert_called_once_with(scan_id) - - -def test_get_run_start_document(bls_emitter): - sb = bls_emitter.scan_bundler - scan_id = "lkajsdl" - sb.sync_storage[scan_id] = {"info": {"queue_id": "jdklj", "scan_number": 5}} - sb.scan_motors[scan_id] = [sb.device_manager.devices.samx, sb.device_manager.devices.samy] - - data = bls_emitter._get_run_start_document(scan_id) - - assert all(key in data for key in ["time", "uid", "scan_id", "queue_id", "scan_id", "motors"]) - assert data["motors"] == ("samx", "samy") - assert data["scan_id"] == 5 - - -def test_send_descriptor_document(bls_emitter): - scan_id = "lkajsdl" - bls_emitter.bluesky_metadata[scan_id] = {} - with mock.patch.object(bls_emitter.connector, "raw_send") as send: - with mock.patch.object( - bls_emitter, "_get_descriptor_document", return_value={} - ) as get_descr: - bls_emitter.send_descriptor_document(scan_id) - get_descr.assert_called_once_with(scan_id) - send.assert_called_once_with( - MessageEndpoints.bluesky_events(), msgpack.dumps(("descriptor", {})) - ) - - -def test_bls_cleanup_storage(bls_emitter): - scan_id = "lkajsdl" - bls_emitter.bluesky_metadata[scan_id] = {} - - bls_emitter.cleanup_storage(scan_id) - assert scan_id not in bls_emitter.bluesky_metadata - - -def test_bls_on_cleanup(bls_emitter): - scan_id = "lkajsdl" - with mock.patch.object(bls_emitter, "cleanup_storage") as cleanup: - bls_emitter.on_cleanup(scan_id) - cleanup.assert_called_once_with(scan_id) - - -def test_bls_on_init(bls_emitter): - scan_id = "lkajsdl" - with mock.patch.object(bls_emitter, "send_run_start_document") as start: - bls_emitter.on_init(scan_id) - start.assert_called_once_with(scan_id) diff --git a/bec_server/tests/tests_scan_bundler/test_scan_bundler.py b/bec_server/tests/tests_scan_bundler/test_scan_bundler.py index 88793c23e..13a6d6dae 100644 --- a/bec_server/tests/tests_scan_bundler/test_scan_bundler.py +++ b/bec_server/tests/tests_scan_bundler/test_scan_bundler.py @@ -390,18 +390,14 @@ def test_initialize_scan_container(scan_bundler_mock, scan_msg): sb = scan_bundler_mock scan_id = scan_msg.content["scan_id"] scan_info = scan_msg.content["info"] - scan_motors = list(set(sb.device_manager.devices[m] for m in scan_info["scan_motors"])) readout_priority = scan_info["readout_priority"] bl_devs = sb.device_manager.devices.baseline_devices(readout_priority=readout_priority) with mock.patch.object(sb, "run_emitter") as emitter_mock: - sb._initialize_scan_container( - scan_msg - ) # The sb.device_manager.devices[m] will crash if m is not a motor in devices + sb._initialize_scan_container(scan_msg) if scan_msg.content.get("status") != "open": return - assert sb.scan_motors[scan_id] == scan_motors assert sb.sync_storage[scan_id] == {"info": scan_info, "status": "open", "sent": set()} assert sb.monitored_devices[scan_id] == { "devices": sb.device_manager.devices.monitored_devices( @@ -573,7 +569,6 @@ def test_baseline_update(scan_bundler_mock, scan_id, device, signal): sb = scan_bundler_mock sb.baseline_devices[scan_id] = {"done": {device: False}} sb.sync_storage[scan_id] = {} - sb.scan_motors[scan_id] = [] sb.readout_priority[scan_id] = {} with mock.patch.object(sb, "run_emitter") as emitter: sb._baseline_update(scan_id, device, signal) From 97a5b439bbe53e65ec73e5571594f210078d2db9 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Sun, 22 Mar 2026 12:00:15 +0100 Subject: [PATCH 2/4] wip - chore: removing scan motors --- .../tests/client_tests/test_ipython_live_updates.py | 5 ----- bec_lib/bec_lib/messages.py | 2 -- bec_server/bec_server/scan_server/scan_queue.py | 4 ---- bec_server/bec_server/scan_server/scan_worker.py | 6 ------ 4 files changed, 17 deletions(-) diff --git a/bec_ipython_client/tests/client_tests/test_ipython_live_updates.py b/bec_ipython_client/tests/client_tests/test_ipython_live_updates.py index f26808044..33616eb38 100644 --- a/bec_ipython_client/tests/client_tests/test_ipython_live_updates.py +++ b/bec_ipython_client/tests/client_tests/test_ipython_live_updates.py @@ -30,7 +30,6 @@ def queue_elements(bec_client_mock): request_block = messages.RequestBlock( msg=request_msg, RID="req_id", - scan_motors=["samx"], report_instructions=[], readout_priority={"monitored": ["samx"]}, is_scan=True, @@ -63,7 +62,6 @@ def sample_request_block(sample_request_msg): return messages.RequestBlock( msg=sample_request_msg, RID="req_id", - scan_motors=["samx"], report_instructions=[], readout_priority={"monitored": ["samx"]}, is_scan=True, @@ -240,7 +238,6 @@ def test_available_req_blocks_multiple_blocks(bec_client_mock): request_block1 = messages.RequestBlock( msg=request_msg, RID="test_rid", - scan_motors=["samx"], report_instructions=[], readout_priority={"monitored": ["samx"]}, is_scan=True, @@ -251,7 +248,6 @@ def test_available_req_blocks_multiple_blocks(bec_client_mock): request_block2 = messages.RequestBlock( msg=request_msg, RID="test_rid", - scan_motors=["samy"], report_instructions=[], readout_priority={"monitored": ["samy"]}, is_scan=True, @@ -262,7 +258,6 @@ def test_available_req_blocks_multiple_blocks(bec_client_mock): request_block3 = messages.RequestBlock( msg=request_msg, RID="different_rid", - scan_motors=["samz"], report_instructions=[], readout_priority={"monitored": ["samz"]}, is_scan=True, diff --git a/bec_lib/bec_lib/messages.py b/bec_lib/bec_lib/messages.py index cd87a88d9..7383f94f8 100644 --- a/bec_lib/bec_lib/messages.py +++ b/bec_lib/bec_lib/messages.py @@ -334,7 +334,6 @@ class RequestBlock(BaseModel): Args: msg (ScanQueueMessage): The original scan queue message containing the request details RID (str): Request ID associated with the request - scan_motors (list[str]): List of motors involved in the scan readout_priority (dict[Literal["monitored", "baseline", "async", "continuous", "on_request"], list[str]]): Readout priority for the request is_scan (bool): True if the request is a scan, False if it is an rpc call scan_number (int | None): Scan number if applicable @@ -345,7 +344,6 @@ class RequestBlock(BaseModel): msg: ScanQueueMessage RID: str - scan_motors: list[str] readout_priority: dict[ Literal["monitored", "baseline", "async", "continuous", "on_request"], list[str] ] diff --git a/bec_server/bec_server/scan_server/scan_queue.py b/bec_server/bec_server/scan_server/scan_queue.py index 6f39e30c7..fd1ff92eb 100644 --- a/bec_server/bec_server/scan_server/scan_queue.py +++ b/bec_server/bec_server/scan_server/scan_queue.py @@ -913,7 +913,6 @@ def __init__( self, msg: messages.ScanQueueMessage, assembler: ScanAssembler, parent: RequestBlockQueue ) -> None: self.instructions = None - self.scan_motors = [] self.readout_priority: ReadoutPriorities = {} self.msg = msg self.RID = msg.metadata["RID"] @@ -931,8 +930,6 @@ def _assemble(self): self.scan_id = str(uuid.uuid4()) self.scan = self.scan_assembler.assemble_device_instructions(self.msg, self.scan_id) self.instructions = self.scan.run() - if self.scan.caller_args: - self.scan_motors = self.scan.scan_motors self.readout_priority = self.scan.readout_priority @property @@ -997,7 +994,6 @@ def describe(self) -> messages.RequestBlock: return messages.RequestBlock( msg=self.msg, RID=self.RID, - scan_motors=self.scan_motors, readout_priority=self.readout_priority, is_scan=self.is_scan, scan_number=self.scan_number, diff --git a/bec_server/bec_server/scan_server/scan_worker.py b/bec_server/bec_server/scan_server/scan_worker.py index 22b938862..d6132bf49 100644 --- a/bec_server/bec_server/scan_server/scan_worker.py +++ b/bec_server/bec_server/scan_server/scan_worker.py @@ -38,7 +38,6 @@ def __init__(self, *, parent: ScanServer, queue_name: str = "primary"): self.status = InstructionQueueStatus.IDLE self.signal_event = threading.Event() self.scan_id = None - self.scan_motors = [] self.readout_priority = {} self.scan_type = None self.current_scan_id: str = "" @@ -60,10 +59,6 @@ def open_scan(self, instr: messages.DeviceInstructionMessage) -> None: if not self.scan_id: self.scan_id = instr.metadata.get("scan_id") if instr.content["parameter"].get("scan_motors") is not None: - self.scan_motors = [ - self.device_manager.devices[dev] - for dev in instr.content["parameter"].get("scan_motors") - ] self.readout_priority = instr.content["parameter"].get("readout_priority", {}) self.scan_type = instr.content["parameter"].get("scan_type") @@ -536,7 +531,6 @@ def reset(self): self.scan_id = None self.interception_msg = None self.current_instruction_queue_item = None - self.scan_motors = [] def cleanup(self): """perform cleanup instructions""" From 3dddfa2df2c2c15d6f2e3b4bae0877bd0b7c096f Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Sun, 22 Mar 2026 12:19:24 +0100 Subject: [PATCH 3/4] f - wip --- bec_server/bec_server/scan_server/scan_stubs.py | 9 +++------ bec_server/bec_server/scan_server/scan_worker.py | 3 +-- bec_server/bec_server/scan_server/scans.py | 1 - bec_server/tests/tests_scan_server/test_scan_worker.py | 10 +--------- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/bec_server/bec_server/scan_server/scan_stubs.py b/bec_server/bec_server/scan_server/scan_stubs.py index 92e3a520d..f0f1400b7 100644 --- a/bec_server/bec_server/scan_server/scan_stubs.py +++ b/bec_server/bec_server/scan_server/scan_stubs.py @@ -432,7 +432,6 @@ def _get_result_from_status(self, status: ScanStubStatus) -> Any: def open_scan( self, *, - scan_motors: list, readout_priority: dict, num_pos: int, scan_name: str, @@ -443,7 +442,6 @@ def open_scan( """Open a new scan. This is typically not used directly but called by the underlying base class. Args: - scan_motors (list): List of scan motors. readout_priority (dict): Modification of the readout priority. num_pos (int): Number of positions within the scope of this scan. positions (list): List of positions for this scan. @@ -459,7 +457,6 @@ def open_scan( device=None, action="open_scan", parameter={ - "scan_motors": scan_motors, "readout_priority": readout_priority, "num_points": num_pos, "positions": positions, @@ -721,7 +718,7 @@ def read( *, device: list[str] | str | None = None, point_id: int | None = None, - group: Literal["scan_motor", "monitored", None] = None, + group: Literal["monitored", None] = None, wait: bool = True, ) -> Generator[messages.DeviceInstructionMessage, None, ScanStubStatus]: """ @@ -733,7 +730,7 @@ def read( device (list[str], str, optional): Device name. Can be a list of devices or a single device. Defaults to None. point_id (int, optional): point_id to assign this reading to point within the scan. If None, the read will simply update the cache without assigning the read to a specific point. Defaults to None. - group (Literal["scan_motor", "monitored", None], optional): Device group. Can be used instead of device. Defaults to None. + group (Literal["monitored", None], optional): Device group. Can be used instead of device. Defaults to None. wait (bool, optional): If True, the read command will wait for the completion of the read operation before returning. Defaults to True. Returns: @@ -751,7 +748,7 @@ def read( metadata = {"point_id": point_id, "device_instr_id": status._device_instr_id} self._exclude_nones(parameter) self._exclude_nones(metadata) - if device is None: + if device is None and group == "monitored": device = [ dev.root.name for dev in self._device_manager.devices.monitored_devices( diff --git a/bec_server/bec_server/scan_server/scan_worker.py b/bec_server/bec_server/scan_server/scan_worker.py index d6132bf49..ec661da4d 100644 --- a/bec_server/bec_server/scan_server/scan_worker.py +++ b/bec_server/bec_server/scan_server/scan_worker.py @@ -58,8 +58,7 @@ def open_scan(self, instr: messages.DeviceInstructionMessage) -> None: """ if not self.scan_id: self.scan_id = instr.metadata.get("scan_id") - if instr.content["parameter"].get("scan_motors") is not None: - self.readout_priority = instr.content["parameter"].get("readout_priority", {}) + self.readout_priority = instr.content["parameter"].get("readout_priority", {}) self.scan_type = instr.content["parameter"].get("scan_type") if not instr.metadata.get("scan_def_id"): diff --git a/bec_server/bec_server/scan_server/scans.py b/bec_server/bec_server/scan_server/scans.py index 1549429f0..1815ed8f6 100644 --- a/bec_server/bec_server/scan_server/scans.py +++ b/bec_server/bec_server/scan_server/scans.py @@ -562,7 +562,6 @@ def open_scan(self): """open the scan""" positions = self.positions if isinstance(self.positions, list) else self.positions.tolist() yield from self.stubs.open_scan( - scan_motors=self.scan_motors, readout_priority=self.readout_priority, num_pos=self.num_pos, positions=positions, diff --git a/bec_server/tests/tests_scan_server/test_scan_worker.py b/bec_server/tests/tests_scan_server/test_scan_worker.py index 46cf59370..797ebe8dd 100644 --- a/bec_server/tests/tests_scan_server/test_scan_worker.py +++ b/bec_server/tests/tests_scan_server/test_scan_worker.py @@ -137,7 +137,7 @@ def test_check_for_interruption(scan_worker_mock): messages.DeviceInstructionMessage( device=None, action="open_scan", - parameter={"num_points": 150, "scan_motors": ["samx", "samy"]}, + parameter={"num_points": 150}, metadata={ "readout_priority": "monitored", "DIID": 18, @@ -174,7 +174,6 @@ def test_open_scan(scan_worker_mock, instr, corr_num_points, scan_id): assert worker.scan_id == None else: worker.scan_id = 111 - worker.scan_motors = ["bpm4i"] if "point_id" in instr.metadata: worker.max_point_id = instr.metadata["point_id"] @@ -196,13 +195,8 @@ def test_open_scan(scan_worker_mock, instr, corr_num_points, scan_id): if not scan_id: assert worker.scan_id == instr.metadata.get("scan_id") - assert worker.scan_motors == [ - worker.device_manager.devices["samx"], - worker.device_manager.devices["samy"], - ] else: assert worker.scan_id == 111 - assert worker.scan_motors == ["bpm4i"] init_mock.assert_called_once_with(active_rb, instr, corr_num_points) assert active_rb.scan_report_instructions == [ {"scan_progress": {"points": corr_num_points, "show_table": True}} @@ -274,7 +268,6 @@ def test_initialize_scan_info(scan_worker_mock, msg): assert rb.metadata == msg.metadata with mock.patch.object(worker, "current_instruction_queue_item"): - worker.scan_motors = ["samx"] worker.readout_priority = { "monitored": ["samx"], "baseline": [], @@ -637,7 +630,6 @@ def test_reset(scan_worker_mock): assert worker.current_scan_info == {} assert worker.scan_id == None assert worker.interception_msg == None - assert worker.scan_motors == [] def test_cleanup(scan_worker_mock): From 0c20536af74222884e5e05e909d457235ef9c5c0 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Sun, 22 Mar 2026 12:26:13 +0100 Subject: [PATCH 4/4] f - wip --- bec_server/tests/tests_scan_bundler/test_scan_bundler.py | 4 ---- bec_server/tests/tests_scan_server/test_scan_worker.py | 1 - bec_server/tests/tests_scan_server/test_scans.py | 9 --------- .../tests/tests_scihub/test_atlas_metadata_handler.py | 1 - 4 files changed, 15 deletions(-) diff --git a/bec_server/tests/tests_scan_bundler/test_scan_bundler.py b/bec_server/tests/tests_scan_bundler/test_scan_bundler.py index 13a6d6dae..96d0d3158 100644 --- a/bec_server/tests/tests_scan_bundler/test_scan_bundler.py +++ b/bec_server/tests/tests_scan_bundler/test_scan_bundler.py @@ -47,7 +47,6 @@ def test_device_read_callback(scan_bundler_mock, dummy_signal_data): scan_id="adlk-jalskdjs", status="open", info={ - "scan_motors": ["samx"], "readout_priority": {"monitored": ["samx"], "baseline": [], "on_request": []}, "queue_id": "my-queue-ID", "scan_number": 5, @@ -62,7 +61,6 @@ def test_device_read_callback(scan_bundler_mock, dummy_signal_data): scan_id="adlk-jalskdjs", status="open", info={ - "scan_motors": ["samx"], "readout_priority": {"monitored": ["samx"], "baseline": [], "on_request": []}, "queue_id": "my-queue-ID", "scan_number": 5, @@ -357,7 +355,6 @@ def test_status_modification(scan_bundler_mock): "scan_id": "3ea07f69-b0ee-44fa-8451-b85824a37397", "queue_id": "84e5bc19-e2fc-4b03-b706-004420322813", "scan_number": 5, - "scan_motors": ["samx", "samy"], "readout_priority": { "monitored": ["samx", "samy"], "baseline": [], @@ -375,7 +372,6 @@ def test_status_modification(scan_bundler_mock): "scan_id": "3ea07f69-b0ee-44fa-8451-b85824a37397", "queue_id": "84e5bc19-e2fc-4b03-b706-004420322813", "scan_number": 5, - "scan_motors": ["samx", "samy", "eyex", "bpm3a"], "readout_priority": { "monitored": ["samx", "samy", "eyex", "bpm3a"], "baseline": [], diff --git a/bec_server/tests/tests_scan_server/test_scan_worker.py b/bec_server/tests/tests_scan_server/test_scan_worker.py index 797ebe8dd..74b16036b 100644 --- a/bec_server/tests/tests_scan_server/test_scan_worker.py +++ b/bec_server/tests/tests_scan_server/test_scan_worker.py @@ -622,7 +622,6 @@ def test_reset(scan_worker_mock): worker.current_scan_info = 1 worker.scan_id = 1 worker.interception_msg = 1 - worker.scan_motors = 1 worker.reset() diff --git a/bec_server/tests/tests_scan_server/test_scans.py b/bec_server/tests/tests_scan_server/test_scans.py index 72ce9045a..f4d4da1d4 100644 --- a/bec_server/tests/tests_scan_server/test_scans.py +++ b/bec_server/tests/tests_scan_server/test_scans.py @@ -337,7 +337,6 @@ def mock_rpc_func(*args, **kwargs): device=None, action="open_scan", parameter={ - "scan_motors": ["samx"], "readout_priority": { "monitored": ["samx"], "baseline": [], @@ -488,7 +487,6 @@ def offset_mock(): device=None, action="open_scan", parameter={ - "scan_motors": ["samx", "samy"], "readout_priority": { "monitored": ["samx", "samy"], "baseline": [], @@ -768,7 +766,6 @@ def offset_mock(): device=None, action="open_scan", parameter={ - "scan_motors": ["samx"], "readout_priority": { "monitored": ["samx"], "baseline": [], @@ -963,7 +960,6 @@ def test_device_rpc(scan_assembler): device=None, action="open_scan", parameter={ - "scan_motors": [], "readout_priority": { "monitored": [], "baseline": [], @@ -1593,7 +1589,6 @@ def test_list_scan_raises_for_different_lengths(): device=None, action="open_scan", parameter={ - "scan_motors": [], "readout_priority": { "monitored": [], "baseline": [], @@ -1714,7 +1709,6 @@ def test_time_scan(scan_msg, reference_scan_list, scan_assembler): device=None, action="open_scan", parameter={ - "scan_motors": [], "readout_priority": { "monitored": [], "baseline": [], @@ -1863,7 +1857,6 @@ def fake_set(*args, **kwargs): device=None, action="open_scan", parameter={ - "scan_motors": ["samx"], "readout_priority": { "monitored": ["samx"], "baseline": [], @@ -1948,7 +1941,6 @@ def test_OpenInteractiveScan(scan_assembler): device=None, action="open_scan", parameter={ - "scan_motors": ["samx"], "readout_priority": { "monitored": ["samx"], "baseline": [], @@ -2161,7 +2153,6 @@ def fake_set(*args, **kwargs): device=None, action="open_scan", parameter={ - "scan_motors": ["samx"], "readout_priority": { "monitored": ["samx"], "baseline": [], diff --git a/bec_server/tests/tests_scihub/test_atlas_metadata_handler.py b/bec_server/tests/tests_scihub/test_atlas_metadata_handler.py index e0bf9d576..49c36d178 100644 --- a/bec_server/tests/tests_scihub/test_atlas_metadata_handler.py +++ b/bec_server/tests/tests_scihub/test_atlas_metadata_handler.py @@ -63,7 +63,6 @@ def test_atlas_metadata_handler(atlas_connector): scan_id="adlk-jalskdjs", status="open", info={ - "scan_motors": ["samx"], "readout_priority": {"monitored": ["samx"], "baseline": [], "on_request": []}, "queue_id": "my-queue-ID", "scan_number": 5,