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 c1a23b34f..b48dd60fd 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 5d8c10d5e..894ffe8b0 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_stubs.py b/bec_server/bec_server/scan_server/scan_stubs.py index e39877870..c4d4f1542 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 22b938862..ec661da4d 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 = "" @@ -59,12 +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.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.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"): @@ -536,7 +530,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""" diff --git a/bec_server/bec_server/scan_server/scans.py b/bec_server/bec_server/scan_server/scans.py index dff71a199..670d2ff69 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_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 46cf59370..74b16036b 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": [], @@ -629,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() @@ -637,7 +629,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): diff --git a/bec_server/tests/tests_scan_server/test_scans.py b/bec_server/tests/tests_scan_server/test_scans.py index 50c293983..e563b899e 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,