wip - chore: removing scan motors

Author: wakonig

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,

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]
     ]

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,

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"""