Merge pull request #26 from TheRealFalseReality/copilot/add-camera-visual-analysis-sensor

Add dedicated sensor for camera visual analysis when camera is configured

Author: TheRealFalseReality

custom_components/aquarium_ai/__init__.py

@@ -309,6 +309,10 @@ def _build_notification_message(notification_format, sensor_data, sensor_mapping
             if "water_change_recommendation" in ai_data:
                 message_parts.append(f"\n💧 Water Change:\n{ai_data['water_change_recommendation']}")
 
+            # Add camera visual analysis if available
+            if "camera_visual_notification_analysis" in ai_data:
+                message_parts.append(f"\n📷 Camera Analysis:\n{ai_data['camera_visual_notification_analysis']}")
+            
             # Add overall analysis
             if "overall_notification_analysis" in ai_data:
                 message_parts.append(f"\n🎯 Overall Assessment:\n{ai_data['overall_notification_analysis']}")
@@ -348,6 +352,10 @@ def _build_notification_message(notification_format, sensor_data, sensor_mapping
             if "water_change_recommendation" in ai_data:
                 message_parts.append(f"\n💧 Water Change: {ai_data['water_change_recommendation']}")
 
+            # Add camera visual analysis if available (brief version for condensed)
+            if "camera_visual_analysis" in ai_data:
+                message_parts.append(f"\n📷 Camera Analysis: {ai_data['camera_visual_analysis']}")
+            
             # Add overall brief analysis (same as used for sensors)
             if "overall_analysis" in ai_data:
                 message_parts.append(f"\n🎯 Overall Assessment: {ai_data['overall_analysis']}")
@@ -387,6 +395,10 @@ def _build_notification_message(notification_format, sensor_data, sensor_mapping
             if "water_change_recommendation" in ai_data:
                 message_parts.append(f"\n💧 Water Change:\n{ai_data['water_change_recommendation']}")
 
+            # Add camera visual analysis if available (detailed version)
+            if "camera_visual_notification_analysis" in ai_data:
+                message_parts.append(f"\n📷 Camera Analysis:\n{ai_data['camera_visual_notification_analysis']}")
+            
             # Add overall detailed analysis
             if "overall_notification_analysis" in ai_data:
                 message_parts.append(f"\n🎯 Overall Assessment:\n{ai_data['overall_notification_analysis']}")
@@ -521,6 +533,18 @@ async def send_ai_aquarium_analysis(now):
             # Prepare camera instructions if camera is configured
             camera_instructions = ""
             if camera:
+                # Add camera analysis fields to the structure
+                combined_analysis_structure["camera_visual_analysis"] = {
+                    "description": "Brief 1-2 sentence visual analysis of the aquarium from the camera image (under 200 characters). Focus on water clarity, fish/plant health, and any maintenance needs visible.",
+                    "required": True,
+                    "selector": {"text": None}
+                }
+                combined_analysis_structure["camera_visual_notification_analysis"] = {
+                    "description": "Detailed visual analysis of the aquarium from the camera image. Include observations about water clarity, fish identification and behavior, plant health, equipment condition, and any visible maintenance needs. Provide specific observations and recommendations based on what is visible in the image.",
+                    "required": True,
+                    "selector": {"text": None}
+                }
+                
                 camera_instructions = """
 
 If an aquarium camera image is provided:
@@ -533,7 +557,10 @@ async def send_ai_aquarium_analysis(now):
   * Any visible algae, debris, or maintenance needs
 - Focus only on aquarium-related observations that can be determined visually
 - Do not attempt to provide numerical measurements from the image
-- Integrate visual observations with sensor data when drawing conclusions"""
+- Integrate visual observations with sensor data when drawing conclusions
+
+For camera_visual_analysis: Provide a brief 1-2 sentence summary of visual observations (under 200 characters).
+For camera_visual_notification_analysis: Provide detailed visual analysis with specific observations and recommendations."""
 
             # Prepare AI Task data with separate instructions for sensor vs notification analysis
             ai_task_data = {
@@ -658,6 +685,13 @@ async def send_ai_aquarium_analysis(now):
                         water_change_rec = water_change_rec[:252] + "..."
                     sensor_analysis_data["water_change_recommended"] = water_change_rec
 
+                # Store camera visual analysis with brief version for sensors (if camera configured)
+                if "camera_visual_analysis" in ai_data:
+                    camera_analysis = ai_data["camera_visual_analysis"]
+                    if len(camera_analysis) > 255:
+                        camera_analysis = camera_analysis[:252] + "..."
+                    sensor_analysis_data["camera_visual_analysis"] = camera_analysis
+                
                 # Store the analysis data and sensor data in hass.data for sensors to access
                 hass.data[DOMAIN][entry.entry_id]["sensor_analysis"] = sensor_analysis_data
                 hass.data[DOMAIN][entry.entry_id]["sensor_data"] = sensor_data

custom_components/aquarium_ai/sensor.py

@@ -19,6 +19,7 @@
     CONF_DISSOLVED_OXYGEN_SENSOR,
     CONF_WATER_LEVEL_SENSOR,
     CONF_ORP_SENSOR,
+    CONF_CAMERA,
     CONF_UPDATE_FREQUENCY,
     CONF_AI_TASK,
     UPDATE_FREQUENCIES,
@@ -136,6 +137,22 @@ async def async_setup_entry(
         )
     )
 
+    # Create camera visual analysis sensor (only if camera is configured)
+    camera = config_entry.data.get(CONF_CAMERA)
+    if camera:
+        entities.append(
+            AquariumAICameraAnalysis(
+                hass,
+                config_entry,
+                tank_name,
+                aquarium_type,
+                camera,
+                ai_task,
+                frequency_minutes,
+                valid_sensor_mappings,
+            )
+        )
+    
     async_add_entities(entities)
 
 
@@ -696,4 +713,66 @@ async def async_update(self) -> None:
             _LOGGER.error("Error updating water change recommendation sensor: %s", err)
             self._state = "Analysis unavailable"
             self._available = False
+            self._attr_extra_state_attributes = {}
+
+
+class AquariumAICameraAnalysis(AquariumAIBaseSensor):
+    """Sensor for camera visual analysis."""
+    
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        tank_name: str,
+        aquarium_type: str,
+        camera: str,
+        ai_task: str,
+        frequency_minutes: Optional[int],
+        sensor_mappings: list,
+    ):
+        """Initialize the camera analysis sensor."""
+        super().__init__(hass, config_entry, tank_name, aquarium_type, frequency_minutes, sensor_mappings)
+        self._camera = camera
+        self._ai_task = ai_task
+        self._attr_name = f"{tank_name} Camera Analysis"
+        self._attr_unique_id = f"{config_entry.entry_id}_camera_analysis"
+        self._attr_icon = "mdi:camera"
+        self._attr_extra_state_attributes = {}
+    
+    @property
+    def extra_state_attributes(self):
+        """Return the state attributes."""
+        return self._attr_extra_state_attributes
+        
+    async def async_update(self) -> None:
+        """Update the sensor."""
+        try:
+            # Get shared analysis data
+            shared_data = self._get_shared_data()
+            sensor_analysis = shared_data["sensor_analysis"]
+            
+            if "camera_visual_analysis" in sensor_analysis and sensor_analysis["camera_visual_analysis"]:
+                # Use the brief camera analysis from the shared update
+                self._state = sensor_analysis["camera_visual_analysis"]
+                self._available = True
+                
+                # Add attributes
+                self._attr_extra_state_attributes = {
+                    "camera_entity": self._camera,
+                    "aquarium_type": self._aquarium_type,
+                    "last_updated": shared_data.get("last_update"),
+                    "ai_task": self._ai_task,
+                }
+            else:
+                # No analysis available yet
+                self._state = "No camera analysis available"
+                self._available = True
+                self._attr_extra_state_attributes = {
+                    "camera_entity": self._camera,
+                }
+                
+        except Exception as err:
+            _LOGGER.error("Error updating camera analysis sensor: %s", err)
+            self._state = "Analysis unavailable"
+            self._available = False
             self._attr_extra_state_attributes = {}