Fix bad request during initial setup #574

Author: valentinfrlch

.gitignore

@@ -20,4 +20,5 @@ coverage.xml
 .venv/
 venv/
 ENV/
-env/
+env/
+.vscode/settings.json

custom_components/llmvision/__init__.py

@@ -430,14 +430,102 @@ async def async_migrate_entry(hass, config_entry: ConfigEntry) -> bool:
     return True
 
 
+class ServiceCallData:
+    """Store service call data and set default values"""
+
+    def __init__(self, data_call):
+        # This is the config entry id
+        self.provider = str(data_call.data.get(PROVIDER))
+        # If not set, the conf_default_model will be set in providers.py
+        self.model = data_call.data.get(MODEL)
+        self.message = str(data_call.data.get(MESSAGE, "")[0:2000])
+        self.store_in_timeline = data_call.data.get(STORE_IN_TIMELINE, False)
+        self.use_memory = data_call.data.get(USE_MEMORY, False)
+        self.image_paths = (
+            data_call.data.get(IMAGE_FILE, "").split("\n")
+            if data_call.data.get(IMAGE_FILE)
+            else None
+        )
+        self.image_entities = data_call.data.get(IMAGE_ENTITY)
+        self.video_paths = (
+            data_call.data.get(VIDEO_FILE, "").split("\n")
+            if data_call.data.get(VIDEO_FILE)
+            else None
+        )
+        self.event_id = (
+            data_call.data.get(EVENT_ID, "").split("\n")
+            if data_call.data.get(EVENT_ID)
+            else None
+        )
+        self.interval = int(data_call.data.get(INTERVAL, 2))
+        self.duration = int(data_call.data.get(DURATION, 10))
+        self.max_frames = int(data_call.data.get(MAX_FRAMES, 3))
+        self.target_width = data_call.data.get(TARGET_WIDTH, 3840)
+        self.temperature = float()
+        self.max_tokens = int(data_call.data.get(MAXTOKENS, 3000))
+        self.include_filename = data_call.data.get(INCLUDE_FILENAME, False)
+        self.expose_images = data_call.data.get(EXPOSE_IMAGES, False)
+        self.generate_title = data_call.data.get(GENERATE_TITLE, False)
+        self.sensor_entity = data_call.data.get(SENSOR_ENTITY, "")
+        self.response_format = data_call.data.get(RESPONSE_FORMAT, "text")
+        self.structure = data_call.data.get(STRUCTURE, None)
+        self.title_field = data_call.data.get(TITLE_FIELD, "")
+        self.memory: Memory | None = None
+
+        # ------------ Create Event ------------
+        self.title = data_call.data.get("title")
+        self.description = data_call.data.get("description")
+        self.start_time = data_call.data.get("start_time", dt_util.now())
+        self.start_time = self._convert_time_input_to_datetime(self.start_time)
+        self.end_time = data_call.data.get(
+            "end_time", self.start_time + timedelta(minutes=1)
+        )
+        self.end_time = self._convert_time_input_to_datetime(self.end_time)
+        self.image_path = data_call.data.get("image_path", "")
+        self.camera_entity = data_call.data.get("camera_entity", "")
+        self.label = data_call.data.get("label", "")
+
+        # ------------ Added during call ------------
+        # self.base64_images : List[str] = []
+        # self.filenames : List[str] = []
+
+    def _convert_time_input_to_datetime(self, time_input) -> datetime:
+        """Convert time input to datetime object"""
+
+        if isinstance(time_input, datetime):
+            return time_input
+        if isinstance(time_input, (int, float)):
+            # Assume it's a Unix timestamp (seconds since epoch)
+            return datetime.fromtimestamp(time_input)
+        if isinstance(time_input, str):
+            # Try parsing ISO format first
+            try:
+                return datetime.fromisoformat(time_input)
+            except ValueError:
+                pass
+            # Try parsing as timestamp string
+            try:
+                return datetime.fromtimestamp(float(time_input))
+            except Exception:
+                pass
+            raise ValueError(f"Unsupported date string format: {time_input}")
+        raise TypeError(f"Unsupported type for time_input: {type(time_input)}")
+
+    def get(self, key, default=None):
+        return getattr(self, key, default)
+
+    def get_service_call_data(self):
+        return self
+
+
 async def _create_event(
     hass,
-    call: dict,
+    call: ServiceCallData,
     start: datetime,
     response: dict,
     key_frame: str,
 ) -> None:
-    if call.store_in_timeline:
+    if call.get("store_in_timeline"):
         # Find timeline config
         config_entry = None
         for entry in hass.config_entries.async_entries(DOMAIN):
@@ -453,17 +541,17 @@ async def _create_event(
 
         timeline = Timeline(hass, config_entry)
 
-        if call.image_entities and len(call.image_entities) > 0:
-            camera_name = call.image_entities[0]
-        elif call.video_paths and len(call.video_paths) > 0:
-            camera_name = call.video_paths[0].split("/")[-1].replace(".mp4", "")
+        image_entities = call.get("image_entities") or []
+        video_paths = call.get("video_paths") or []
+        if len(image_entities) > 0:
+            camera_name = image_entities[0]
+        elif len(video_paths) > 0:
+            camera_name = video_paths[0].split("/")[-1].replace(".mp4", "")
         else:
             camera_name = ""
 
-        if "title" in response:
-            title = response.get("title")
-        else:
-            title = "Motion detected"
+        title = response.get("title") or "Motion detected"
+        title = str(title)
 
         await timeline.create_event(
             start=start,
@@ -479,7 +567,7 @@ async def _create_event(
 async def _update_sensor(hass, sensor_entity: str, value: str | int, type: str) -> None:
     """Update the value of a sensor entity."""
     # Attempt to parse the response
-    value = value.strip()
+    value = str(value).strip()
     if type == "boolean":
         if value.lower() in ["on", "off"]:
             new_value = value
@@ -533,90 +621,6 @@ async def _update_sensor(hass, sensor_entity: str, value: str | int, type: str)
         raise
 
 
-class ServiceCallData:
-    """Store service call data and set default values"""
-
-    def __init__(self, data_call):
-        # This is the config entry id
-        self.provider = str(data_call.data.get(PROVIDER))
-        # If not set, the conf_default_model will be set in providers.py
-        self.model = data_call.data.get(MODEL)
-        self.message = str(data_call.data.get(MESSAGE, "")[0:2000])
-        self.store_in_timeline = data_call.data.get(STORE_IN_TIMELINE, False)
-        self.use_memory = data_call.data.get(USE_MEMORY, False)
-        self.image_paths = (
-            data_call.data.get(IMAGE_FILE, "").split("\n")
-            if data_call.data.get(IMAGE_FILE)
-            else None
-        )
-        self.image_entities = data_call.data.get(IMAGE_ENTITY)
-        self.video_paths = (
-            data_call.data.get(VIDEO_FILE, "").split("\n")
-            if data_call.data.get(VIDEO_FILE)
-            else None
-        )
-        self.event_id = (
-            data_call.data.get(EVENT_ID, "").split("\n")
-            if data_call.data.get(EVENT_ID)
-            else None
-        )
-        self.interval = int(data_call.data.get(INTERVAL, 2))
-        self.duration = int(data_call.data.get(DURATION, 10))
-        self.max_frames = int(data_call.data.get(MAX_FRAMES, 3))
-        self.target_width = data_call.data.get(TARGET_WIDTH, 3840)
-        self.temperature = float()
-        self.max_tokens = int(data_call.data.get(MAXTOKENS, 3000))
-        self.include_filename = data_call.data.get(INCLUDE_FILENAME, False)
-        self.expose_images = data_call.data.get(EXPOSE_IMAGES, False)
-        self.generate_title = data_call.data.get(GENERATE_TITLE, False)
-        self.sensor_entity = data_call.data.get(SENSOR_ENTITY, "")
-        self.response_format = data_call.data.get(RESPONSE_FORMAT, "text")
-        self.structure = data_call.data.get(STRUCTURE, None)
-        self.title_field = data_call.data.get(TITLE_FIELD, "")
-
-        # ------------ Create Event ------------
-        self.title = data_call.data.get("title")
-        self.description = data_call.data.get("description")
-        self.start_time = data_call.data.get("start_time", dt_util.now())
-        self.start_time = self._convert_time_input_to_datetime(self.start_time)
-        self.end_time = data_call.data.get(
-            "end_time", self.start_time + timedelta(minutes=1)
-        )
-        self.end_time = self._convert_time_input_to_datetime(self.end_time)
-        self.image_path = data_call.data.get("image_path", "")
-        self.camera_entity = data_call.data.get("camera_entity", "")
-        self.label = data_call.data.get("label", "")
-
-        # ------------ Added during call ------------
-        # self.base64_images : List[str] = []
-        # self.filenames : List[str] = []
-
-    def _convert_time_input_to_datetime(self, time_input) -> datetime:
-        """Convert time input to datetime object"""
-
-        if isinstance(time_input, datetime):
-            return time_input
-        if isinstance(time_input, (int, float)):
-            # Assume it's a Unix timestamp (seconds since epoch)
-            return datetime.fromtimestamp(time_input)
-        if isinstance(time_input, str):
-            # Try parsing ISO format first
-            try:
-                return datetime.fromisoformat(time_input)
-            except ValueError:
-                pass
-            # Try parsing as timestamp string
-            try:
-                return datetime.fromtimestamp(float(time_input))
-            except Exception:
-                pass
-            raise ValueError(f"Unsupported date string format: {time_input}")
-        raise TypeError(f"Unsupported type for time_input: {type(time_input)}")
-
-    def get_service_call_data(self):
-        return self
-
-
 def setup(hass, config):
     async def image_analyzer(data_call):
         """Handle the service call to analyze an image with LLM Vision"""
@@ -660,7 +664,7 @@ async def image_analyzer(data_call):
 
         await _create_event(
             hass=hass,
-            call=call,
+            call=call,  # type: ignore
             start=start,
             response=response,
             key_frame=processor.key_frame,
@@ -698,7 +702,7 @@ async def video_analyzer(data_call):
 
         await _create_event(
             hass=hass,
-            call=call,
+            call=call,  # type: ignore
             start=start,
             response=response,
             key_frame=processor.key_frame,
@@ -739,7 +743,7 @@ async def stream_analyzer(data_call):
 
         await _create_event(
             hass=hass,
-            call=call,
+            call=call,  # type: ignore
             start=start,
             response=response,
             key_frame=processor.key_frame,
@@ -818,7 +822,7 @@ async def data_analyzer(data_call):
 
         await _create_event(
             hass=hass,
-            call=call,
+            call=call,  # type: ignore
             start=start,
             response=response,
             key_frame=processor.key_frame,

custom_components/llmvision/api.py

@@ -1,7 +1,8 @@
 import json
 import logging
 from datetime import datetime, timedelta
-from homeassistant.components.http import HomeAssistantView
+from typing import Any, Optional
+from homeassistant.helpers.http import HomeAssistantView
 from homeassistant.helpers.json import json_dumps
 from homeassistant.util import dt as dt_util
 from .calendar import Timeline
@@ -32,6 +33,8 @@ async def get(self, request):
         hass = request.app["hass"]
 
         settings_entry = await async_get_settings_entry(hass)
+        if settings_entry is None:
+            return self.json_message("Settings config entry not found", status_code=404)
         # Parse request params
         try:
             # Limit: minimum 1, maximum 100
@@ -170,7 +173,7 @@ async def get(self, request, event_id):
         if settings_entry is None:
             return self.json_message("Settings config entry not found", status_code=404)
         timeline = Timeline(hass, settings_entry)
-        event: dict = await timeline.get_event(event_id)
+        event: Optional[dict[str, Any]] = await timeline.get_event(event_id)
         if event is None:
             return self.json_message("Event not found", status_code=404)
         return self.json({"event": json.loads(json_dumps(event))})
@@ -265,7 +268,9 @@ def _parse_time(val):
             return self.json_message("Error updating event", status_code=500)
 
         try:
-            updated = await timeline.get_event_json(event_id)
+            updated = await timeline.get_event(event_id)
+            if updated is None:
+                return self.json({"event_id": event_id, "status": "updated"})
             return self.json({"event": json.loads(json_dumps(updated))})
         except Exception:
             return self.json({"event_id": event_id, "status": "updated"})

custom_components/llmvision/calendar.py

@@ -3,8 +3,8 @@
 from homeassistant.components.calendar import (
     CalendarEntity,
     CalendarEvent,
-    CalendarEntityFeature,
 )
+from homeassistant.components.calendar.const import CalendarEntityFeature
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.config_entries import ConfigEntry
 from .timeline import Timeline
@@ -27,7 +27,7 @@ def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry):
         self._attr_supported_features = CalendarEntityFeature.DELETE_EVENT
 
     @property
-    def icon(self) -> str:
+    def icon(self) -> str:  # type: ignore
         """Return the icon to use in the frontend"""
         return "mdi:timeline-outline"
 
@@ -47,17 +47,25 @@ def _ensure_datetime(self, dt):
     async def async_update(self) -> None:
         """Loads events from database"""
         events = await self.timeline.get_all_events()
-        self._events = [
-            CalendarEvent(
-                uid=event.uid,
-                summary=event.title,
-                start=event.start,
-                end=event.end,
-                description=event.description,
+        calendar_events: list[CalendarEvent] = []
+        for event in events:
+            if event.start is None or event.end is None:
+                continue
+            event_start = self._ensure_datetime(event.start)
+            event_end = self._ensure_datetime(event.end)
+            calendar_events.append(
+                CalendarEvent(
+                    uid=event.uid,
+                    summary=event.title,
+                    start=event_start,
+                    end=event_end,
+                    description=event.description,
+                )
             )
-            for event in events
-        ]
-        self._events.sort(key=lambda event: event.start, reverse=True)
+        calendar_events.sort(
+            key=lambda calendar_event: calendar_event.start, reverse=True
+        )
+        self._events = calendar_events
 
     async def async_get_events(
         self,
@@ -74,6 +82,8 @@ async def async_get_events(
         end_date = self._ensure_datetime(end_date)
 
         for event in timeline_events:
+            if event.start is None or event.end is None:
+                continue
             # Ensure event.end and event.start are datetime.datetime objects and timezone-aware
             event_end = self._ensure_datetime(event.end)
             event_start = self._ensure_datetime(event.start)
@@ -82,8 +92,8 @@ async def async_get_events(
                 calendar_event = CalendarEvent(
                     uid=event.uid,
                     summary=event.title,
-                    start=event.start,
-                    end=event.end,
+                    start=event_start,
+                    end=event_end,
                     description=event.description,
                 )
                 calendar_events.append(calendar_event)