"feat-camera-use-esphome-camera-entity-for-real-preview"

reachy_mini_ha_voice/entity.py

@@ -172,6 +172,7 @@ class TextSensorEntity(ESPHomeEntity):
         name: str,
         object_id: str,
         icon: str = "",
+        entity_category: int = 0,  # 0 = none, 1 = config, 2 = diagnostic
         value_getter: Optional[Callable[[], str]] = None,
     ) -> None:
         ESPHomeEntity.__init__(self, server)
@@ -179,6 +180,7 @@ class TextSensorEntity(ESPHomeEntity):
         self.name = name
         self.object_id = object_id
         self.icon = icon
+        self.entity_category = entity_category
         self._value_getter = value_getter
         self._value = ""
 
@@ -199,6 +201,7 @@ class TextSensorEntity(ESPHomeEntity):
                 key=self.key,
                 name=self.name,
                 icon=self.icon,
+                entity_category=self.entity_category,
             )
         elif isinstance(msg, (SubscribeHomeAssistantStatesRequest, SubscribeStatesRequest)):
             yield self._get_state_message()

reachy_mini_ha_voice/entity_extensions.py

@@ -49,6 +49,7 @@ class SensorEntity(ESPHomeEntity):
         accuracy_decimals: int = 2,
         device_class: str = "",
         state_class: int = SensorStateClass.NONE,
+        entity_category: int = 0,  # 0 = none, 1 = config, 2 = diagnostic
         value_getter: Optional[Callable[[], float]] = None,
     ) -> None:
         ESPHomeEntity.__init__(self, server)
@@ -59,6 +60,7 @@ class SensorEntity(ESPHomeEntity):
         self.unit_of_measurement = unit_of_measurement
         self.accuracy_decimals = accuracy_decimals
         self.device_class = device_class
+        self.entity_category = entity_category
         # Convert string state_class to int if needed (for backward compatibility)
         if isinstance(state_class, str):
             state_class_map = {
@@ -94,6 +96,7 @@ class SensorEntity(ESPHomeEntity):
                 accuracy_decimals=self.accuracy_decimals,
                 device_class=self.device_class,
                 state_class=self.state_class,
+                entity_category=self.entity_category,
             )
         elif isinstance(msg, (SubscribeHomeAssistantStatesRequest, SubscribeStatesRequest)):
             yield self._get_state_message()
@@ -186,6 +189,7 @@ class SelectEntity(ESPHomeEntity):
         object_id: str,
         options: List[str],
         icon: str = "",
+        entity_category: int = 0,  # 0 = none, 1 = config, 2 = diagnostic
         value_getter: Optional[Callable[[], str]] = None,
         value_setter: Optional[Callable[[str], None]] = None,
     ) -> None:
@@ -195,6 +199,7 @@ class SelectEntity(ESPHomeEntity):
         self.object_id = object_id
         self.options = options
         self.icon = icon
+        self.entity_category = entity_category
         self._value_getter = value_getter
         self._value_setter = value_setter
         self._value = options[0] if options else ""
@@ -222,6 +227,7 @@ class SelectEntity(ESPHomeEntity):
                 name=self.name,
                 icon=self.icon,
                 options=self.options,
+                entity_category=self.entity_category,
             )
         elif isinstance(msg, (SubscribeHomeAssistantStatesRequest, SubscribeStatesRequest)):
             yield self._get_state_message()
@@ -252,6 +258,7 @@ class ButtonEntity(ESPHomeEntity):
         object_id: str,
         icon: str = "",
         device_class: str = "",
+        entity_category: int = 0,  # 0 = none, 1 = config, 2 = diagnostic
         on_press: Optional[Callable[[], None]] = None,
     ) -> None:
         ESPHomeEntity.__init__(self, server)
@@ -260,6 +267,7 @@ class ButtonEntity(ESPHomeEntity):
         self.object_id = object_id
         self.icon = icon
         self.device_class = device_class
+        self.entity_category = entity_category
         self._on_press = on_press
 
     def handle_message(self, msg: message.Message) -> Iterable[message.Message]:
@@ -270,6 +278,7 @@ class ButtonEntity(ESPHomeEntity):
                 name=self.name,
                 icon=self.icon,
                 device_class=self.device_class,
+                entity_category=self.entity_category,
             )
         elif isinstance(msg, ButtonCommandRequest) and msg.key == self.key:
             if self._on_press:

reachy_mini_ha_voice/satellite.py

@@ -111,8 +111,9 @@ class VoiceSatelliteProtocol(APIServer):
         "emotion": 800,
         # Phase 9: Audio controls
         "microphone_volume": 900,
-        # Phase 10: Camera URL
-        "camera_url": 1000,
+        # Phase 10: Camera
+        "camera_url": 1000,  # Keep for backward compatibility
+        "camera": 1001,      # New camera entity
         # Phase 11: LED control (disabled - not visible)
         # "led_brightness": 1100,
         # "led_effect": 1101,
@@ -1227,29 +1228,27 @@ class VoiceSatelliteProtocol(APIServer):
         _LOGGER.info("Phase 9 entities registered: microphone_volume")
 
     def _setup_phase10_entities(self) -> None:
-        """Setup Phase 10 entities: Camera URL for Generic Camera integration."""
+        """Setup Phase 10 entities: Camera for Home Assistant integration."""
 
-        # Camera stream URL - users can use this with Generic Camera in HA
-        def get_camera_url() -> str:
-            """Get camera stream URL."""
+        # Camera image getter - returns JPEG bytes from camera server
+        def get_camera_image() -> Optional[bytes]:
+            """Get camera snapshot as JPEG bytes."""
             if self.camera_server:
-                # Get WLAN IP from reachy controller
-                wlan_ip = self.reachy_controller.get_wlan_ip()
-                if wlan_ip and wlan_ip != "N/A":
-                    return f"http://{wlan_ip}:{self.camera_server.port}/stream"
-            return "N/A"
+                return self.camera_server.get_snapshot()
+            return None
 
-        camera_url = TextSensorEntity(
+        # Real camera entity - shows preview in Home Assistant
+        camera_entity = CameraEntity(
             server=self,
-            key=self._get_entity_key("camera_url"),
-            name="Camera Stream URL",
-            object_id="camera_url",
+            key=self._get_entity_key("camera"),  # Use new camera key
+            name="Camera",
+            object_id="camera",
             icon="mdi:camera",
-            value_getter=get_camera_url,
+            image_getter=get_camera_image,
         )
-        self.state.entities.append(camera_url)
+        self.state.entities.append(camera_entity)
 
-        _LOGGER.info("Phase 10 entities registered: camera_url (use with Generic Camera in HA)")
+        _LOGGER.info("Phase 10 entities registered: camera (ESPHome Camera entity)")
 
     def _setup_phase11_entities(self) -> None:
         """Setup Phase 11 entities: LED control (via local SDK)."""