f

Author: wakonig

bec_server/bec_server/scan_server/scan_guard.py

@@ -238,7 +238,7 @@ def _direct_device_rpc(self, msg: messages.ScanQueueMessage):
         Args:
             msg: ScanQueueMessage containing the RPC request
         """
-        device = msg.content.get("parameter", {}).get("device")
+        device, _ = self._extract_device_rpc_target(msg)
         if not device:
             logger.error("No device specified for RPC request.")
             return

bec_server/tests/tests_scan_server/test_scan_guard.py

@@ -394,6 +394,13 @@ def test_handle_scan_request_bypassed_for_read(scan_guard_mock, msg):
                 sg._handle_scan_request(msg, username="default")
                 append.assert_not_called()
                 send.assert_called_once_with(MessageEndpoints.device_instructions(), mock.ANY)
+                sent_msg = send.call_args.args[1]
+                expected_device = (
+                    msg.parameter["kwargs"]["device"]
+                    if msg.scan_type == "_v4_device_rpc"
+                    else msg.parameter["device"]
+                )
+                assert sent_msg.device == expected_device
 
 
 def test_handle_scan_request_rejected(scan_guard_mock):