"feat-replace-camera-status-with-camera-entity"

reachy_mini_ha_voice/entity.py

@@ -9,6 +9,7 @@ import logging
 from aioesphomeapi.api_pb2 import (  # type: ignore[attr-defined]
     ListEntitiesBinarySensorResponse,
     ListEntitiesButtonResponse,
+    ListEntitiesCameraResponse,
     ListEntitiesMediaPlayerResponse,
     ListEntitiesNumberResponse,
     ListEntitiesRequest,
@@ -18,6 +19,8 @@ from aioesphomeapi.api_pb2 import (  # type: ignore[attr-defined]
     ListEntitiesTextSensorResponse,
     BinarySensorStateResponse,
     ButtonCommandRequest,
+    CameraImageRequest,
+    CameraImageResponse,
     MediaPlayerCommandRequest,
     MediaPlayerStateResponse,
     NumberCommandRequest,
@@ -343,3 +346,55 @@ class NumberEntity(ESPHomeEntity):
     def update_state(self) -> None:
         """Send state update to Home Assistant."""
         self.server.send_messages([self._get_state_message()])
+
+
+class CameraEntity(ESPHomeEntity):
+    """Camera entity for ESPHome (provides image snapshots)."""
+
+    def __init__(
+        self,
+        server: APIServer,
+        key: int,
+        name: str,
+        object_id: str,
+        icon: str = "mdi:camera",
+        image_getter: Optional[Callable[[], Optional[bytes]]] = None,
+    ) -> None:
+        ESPHomeEntity.__init__(self, server)
+        self.key = key
+        self.name = name
+        self.object_id = object_id
+        self.icon = icon
+        self._image_getter = image_getter
+
+    def get_image(self) -> Optional[bytes]:
+        """Get the current camera image as JPEG bytes."""
+        if self._image_getter:
+            return self._image_getter()
+        return None
+
+    def handle_message(self, msg: message.Message) -> Iterable[message.Message]:
+        if isinstance(msg, ListEntitiesRequest):
+            yield ListEntitiesCameraResponse(
+                object_id=self.object_id,
+                key=self.key,
+                name=self.name,
+                icon=self.icon,
+            )
+        elif isinstance(msg, CameraImageRequest) and msg.key == self.key:
+            # Return camera image
+            image_data = self.get_image()
+            if image_data:
+                yield CameraImageResponse(
+                    key=self.key,
+                    data=image_data,
+                    done=True,
+                )
+            else:
+                # Return empty response if no image available
+                yield CameraImageResponse(
+                    key=self.key,
+                    data=b"",
+                    done=True,
+                )
+

reachy_mini_ha_voice/reachy_controller.py

@@ -756,45 +756,6 @@ class ReachyController:
             logger.error(f"Error getting IMU temperature: {e}")
             return 0.0
 
-    # ========== Phase 10: Camera Status ==========
-
-    def get_camera_streaming(self) -> bool:
-        """Check if camera is streaming."""
-        if not self.is_available:
-            return False
-        try:
-            # Check if media manager has camera initialized
-            if self.reachy.media and self.reachy.media.camera:
-                return True
-            return False
-        except Exception as e:
-            logger.debug(f"Error checking camera streaming: {e}")
-            return False
-
-    def get_camera_fps(self) -> float:
-        """Get camera FPS."""
-        if not self.is_available:
-            return 0.0
-        try:
-            if self.reachy.media and self.reachy.media.camera:
-                return float(self.reachy.media.camera.framerate)
-            return 0.0
-        except Exception as e:
-            logger.debug(f"Error getting camera FPS: {e}")
-            return 0.0
-
-    def get_camera_url(self) -> str:
-        """Get camera stream URL."""
-        if not self.is_available:
-            return "N/A"
-        try:
-            status = self.reachy.client.get_status(wait=False)
-            wlan_ip = status.get('wlan_ip', 'localhost')
-            return f"http://{wlan_ip}:8081/stream"
-        except Exception as e:
-            logger.debug(f"Error getting camera URL: {e}")
-            return "N/A"
-
     # ========== Phase 11: LED Control (via local SDK) ==========
 
     def _get_respeaker(self):

reachy_mini_ha_voice/satellite.py

@@ -48,7 +48,7 @@ from pymicro_wakeword import MicroWakeWord
 from pyopen_wakeword import OpenWakeWord
 
 from .api_server import APIServer
-from .entity import BinarySensorEntity, MediaPlayerEntity, NumberEntity, TextSensorEntity
+from .entity import BinarySensorEntity, CameraEntity, MediaPlayerEntity, NumberEntity, TextSensorEntity
 from .entity_extensions import SensorEntity, SwitchEntity, SelectEntity, ButtonEntity
 from .models import AvailableWakeWord, ServerState, WakeWordType
 from .util import call_all
@@ -116,10 +116,8 @@ class VoiceSatelliteProtocol(APIServer):
         "emotion_disgust": 805,
         # Phase 9: Audio controls
         "microphone_volume": 900,
-        # Phase 10: Camera status
-        "camera_streaming": 1000,
-        "camera_fps": 1001,
-        "camera_url": 1002,
+        # Phase 10: Camera
+        "camera": 1000,
         # Phase 11: LED control
         "led_brightness": 1100,
         "led_effect": 1101,
@@ -1269,46 +1267,28 @@ class VoiceSatelliteProtocol(APIServer):
         _LOGGER.info("Phase 9 entities registered: microphone_volume")
 
     def _setup_phase10_entities(self) -> None:
-        """Setup Phase 10 entities: Camera status."""
-
-        # Camera streaming status
-        camera_streaming = BinarySensorEntity(
+        """Setup Phase 10 entities: Camera."""
+
+        # Camera entity - provides actual camera image in Home Assistant
+        def get_camera_image() -> bytes:
+            """Get camera snapshot from camera server."""
+            if self.camera_server:
+                image = self.camera_server.get_snapshot()
+                if image:
+                    return image
+            return b""
+
+        camera = CameraEntity(
             server=self,
-            key=self._get_entity_key("camera_streaming"),
-            name="Camera Streaming",
-            object_id="camera_streaming",
+            key=self._get_entity_key("camera"),
+            name="Camera",
+            object_id="camera",
             icon="mdi:camera",
-            device_class="running",
-            value_getter=self.reachy_controller.get_camera_streaming,
-        )
-        self.state.entities.append(camera_streaming)
-
-        # Camera FPS
-        camera_fps = SensorEntity(
-            server=self,
-            key=self._get_entity_key("camera_fps"),
-            name="Camera FPS",
-            object_id="camera_fps",
-            icon="mdi:camera-timer",
-            unit_of_measurement="fps",
-            accuracy_decimals=0,
-            state_class="measurement",
-            value_getter=self.reachy_controller.get_camera_fps,
-        )
-        self.state.entities.append(camera_fps)
-
-        # Camera URL
-        camera_url = TextSensorEntity(
-            server=self,
-            key=self._get_entity_key("camera_url"),
-            name="Camera URL",
-            object_id="camera_url",
-            icon="mdi:link",
-            value_getter=self.reachy_controller.get_camera_url,
+            image_getter=get_camera_image,
         )
-        self.state.entities.append(camera_url)
+        self.state.entities.append(camera)
 
-        _LOGGER.info("Phase 10 entities registered: camera_streaming, camera_fps, camera_url")
+        _LOGGER.info("Phase 10 entities registered: camera")
 
     def _setup_phase11_entities(self) -> None:
         """Setup Phase 11 entities: LED control (via local SDK)."""