fix(robot-server): Harmonize error recovery camera field name (#20221)

Closes RQA-4807

To denote image capture on protocol error, the HTTP API uses the
`errorRecoveryCameraEnabled` field except for `GET /camera`, in which
case we use `errorRecoveryEnabled`. The JS code expects the shape of the
camera settings to conform to the pattern elsewhere. To keep the HTTP
API and the app consistent, let's update our one usage of
`errorRecoveryEnabled` to `errorRecoveryCameraEnabled`.

---------

Co-authored-by: Rhyann Clarke <[email protected]>

Author: mjhuff

api/src/opentrons/protocol_engine/execution/command_executor.py

@@ -248,7 +248,7 @@ async def capture_error_image(self, running_command: Command) -> None:
             # Only capture photos of errors if the setting to do so is enabled
             if (
                 camera_enablement.cameraEnabled
-                and camera_enablement.errorRecoveryEnabled
+                and camera_enablement.errorRecoveryCameraEnabled
             ):
                 # todo(chb, 2025-10-25): Eventually we will need to pass in client provided global settings here
                 image_data = await self._camera_provider.capture_image(

api/src/opentrons/protocol_engine/resources/camera_provider.py

@@ -27,7 +27,7 @@ class CameraSettings(BaseModel):
     liveStreamEnabled: bool = Field(
         ..., description="Enablement status for the Opentrons Live Stream service."
     )
-    errorRecoveryEnabled: bool = Field(
+    errorRecoveryCameraEnabled: bool = Field(
         ..., description="Enablement status for camera usage with Error Recovery."
     )
 
@@ -83,7 +83,7 @@ async def get_camera_settings(self) -> CameraSettings:
             return self._camera_settings_callback()
         # If we are in analysis or simulation, return as if the camera is enabled
         return CameraSettings(
-            cameraEnabled=True, liveStreamEnabled=True, errorRecoveryEnabled=True
+            cameraEnabled=True, liveStreamEnabled=True, errorRecoveryCameraEnabled=True
         )
 
     async def capture_image(

api/tests/opentrons/protocol_engine/commands/test_capture_image.py

@@ -136,7 +136,7 @@ async def test_raises_camera_disabled_error(
         CameraSettings(
             cameraEnabled=False,
             liveStreamEnabled=False,
-            errorRecoveryEnabled=False,
+            errorRecoveryCameraEnabled=False,
         )
     )
 

api/tests/opentrons/protocol_engine/execution/test_command_executor.py

@@ -566,7 +566,7 @@ class _TestCommand(
             CameraSettings(
                 cameraEnabled=True,
                 liveStreamEnabled=True,
-                errorRecoveryEnabled=True,
+                errorRecoveryCameraEnabled=True,
             )
         )
 
@@ -743,7 +743,7 @@ class _TestCommand(
             CameraSettings(
                 cameraEnabled=True,
                 liveStreamEnabled=True,
-                errorRecoveryEnabled=True,
+                errorRecoveryCameraEnabled=True,
             )
         )
 

api/tests/opentrons/protocol_engine/test_protocol_engine.py

@@ -1328,7 +1328,7 @@ def test_add_camera_settings(
 ) -> None:
     """It should dispatch an AddCameraSettingsAction action."""
     settings = CameraSettings(
-        cameraEnabled=True, liveStreamEnabled=True, errorRecoveryEnabled=True
+        cameraEnabled=True, liveStreamEnabled=True, errorRecoveryCameraEnabled=True
     )
     decoy.when(subject.state_view.camera.get_enablement_settings()).then_return(
         settings

robot-server/robot_server/camera/provider.py

@@ -35,7 +35,7 @@ def get_camera_settings(self) -> CameraSettings:
         return CameraSettings(
             cameraEnabled=self._camera_settings_store.get_camera_enabled(),
             liveStreamEnabled=self._camera_settings_store.get_live_stream_enabled(),
-            errorRecoveryEnabled=self._camera_settings_store.get_error_recovery_camera_enabled(),
+            errorRecoveryCameraEnabled=self._camera_settings_store.get_error_recovery_camera_enabled(),
         )
 
     async def process_image_capture(

robot-server/robot_server/runs/router/camera_router.py

@@ -86,7 +86,7 @@ async def add_camera_settings(
         liveStreamEnabled=request_body.data.liveStreamEnabled
         if request_body.data.liveStreamEnabled is not None
         else False,
-        errorRecoveryEnabled=request_body.data.errorRecoveryCameraEnabled
+        errorRecoveryCameraEnabled=request_body.data.errorRecoveryCameraEnabled
         if request_body.data.errorRecoveryCameraEnabled is not None
         else False,
     )
@@ -111,7 +111,7 @@ async def add_camera_settings(
             data=CameraEnable(
                 cameraEnabled=response_data.cameraEnabled,
                 liveStreamEnabled=response_data.liveStreamEnabled,
-                errorRecoveryCameraEnabled=response_data.errorRecoveryEnabled,
+                errorRecoveryCameraEnabled=response_data.errorRecoveryCameraEnabled,
             )
         ),
         status_code=status.HTTP_201_CREATED,