fix: add request registration for early failures in device instructions handling

Author: wakonig

bec_server/bec_server/device_server/device_server.py

@@ -506,6 +506,18 @@ def _get_metadata_for_alarm(
             metadata["scan_number"] = msg.scan_number
         return metadata
 
+    def _ensure_request_registered(
+        self, instruction: messages.DeviceInstructionMessage | None
+    ) -> None:
+        """Register a placeholder request so early failures can still resolve."""
+        if instruction is None:
+            return
+        instr_id = instruction.metadata.get("device_instr_id")
+        if instr_id is None:
+            return
+        if self.requests_handler.get_request(instr_id) is None:
+            self.requests_handler.add_request(instruction, num_status_objects=0)
+
     def handle_device_instructions(self, msg: messages.DeviceInstructionMessage) -> None:
         """Parse a device instruction message and handle the requested action. Action
         types are set, read, rpc, kickoff or trigger.
@@ -555,6 +567,7 @@ def handle_device_instructions(self, msg: messages.DeviceInstructionMessage) ->
                 exception_type=limit_error.__class__.__name__,
                 device=self.get_device_from_exception(limit_error),
             )
+            self._ensure_request_registered(instructions)
             self.requests_handler.set_finished(
                 instructions.metadata["device_instr_id"], success=False, error_info=error_info
             )
@@ -569,8 +582,9 @@ def handle_device_instructions(self, msg: messages.DeviceInstructionMessage) ->
                 exception_type=exc.__class__.__name__,
                 device=self.get_device_from_exception(exc),
             )
+            self._ensure_request_registered(instructions)
             if action == "rpc":
-                self.rpc_handler._send_rpc_exception(exc, instructions)
+                self.rpc_handler.send_rpc_exception(exc, instructions)
             else:
                 logger.error(content)
             self.requests_handler.set_finished(

bec_server/tests/tests_device_server/test_device_server.py

@@ -390,10 +390,20 @@ def test_handle_device_instruction_disabled_device(device_server_mock, instructi
     """
     device_server = device_server_mock
     with mock.patch.object(device_server, "assert_device_is_enabled", side_effect=RuntimeError):
-        with mock.patch.object(device_server.requests_handler, "set_finished") as set_finished_mock:
+        with mock.patch.object(device_server.connector, "send") as send_mock:
             device_server.handle_device_instructions(instructions)
-            set_finished_mock.assert_called_once_with(
-                instructions.metadata["device_instr_id"], success=False, error_info=ANY
+            assert send_mock.call_count == 2
+            pending_msg = send_mock.call_args_list[0].args[1]
+            error_msg = send_mock.call_args_list[1].args[1]
+
+            assert pending_msg.instruction_id == instructions.metadata["device_instr_id"]
+            assert pending_msg.status == "running"
+            assert error_msg.instruction_id == instructions.metadata["device_instr_id"]
+            assert error_msg.status == "error"
+            assert error_msg.error_info is not None
+            assert (
+                device_server.requests_handler.get_request(instructions.metadata["device_instr_id"])
+                is None
             )