Merge pull request #657 from valentinfrlch/v1.7.0-beta

V1.7.0 beta

Author: valentinfrlch

.vscode/settings.json

@@ -4,5 +4,6 @@
         "tests"
     ],
     "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "python-envs.defaultEnvManager": "ms-python.python:system"
 }

README.md

@@ -7,7 +7,7 @@
 <p align=center>
 <img src=https://img.shields.io/badge/HACS-Default-orange.svg>
 <img src="https://img.shields.io/maintenance/yes/2026.svg">
-<img src=https://img.shields.io/badge/version-1.6.0-blue>
+<img src=https://img.shields.io/badge/version-1.7.0-blue>
 <img alt="Issues" src="https://img.shields.io/github/issues/valentinfrlch/ha-llmvision?color=0088ff">
 <img alt="Static Badge" src="https://img.shields.io/badge/support-buymeacoffee?logo=buymeacoffee&logoColor=black&color=%23FFDD00&link=https%3A%2F%2Fbuymeacoffee.com%2Fllmvision">
     <h2 align=center style="font-weight:bold">

custom_components/llmvision/__init__.py

@@ -10,6 +10,7 @@
 from homeassistant.core import SupportsResponse
 from homeassistant.exceptions import ServiceValidationError
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_send
 from .api import TimelineEventView, TimelineEventsView, TimelineEventCreateView
 
 import logging
@@ -74,6 +75,10 @@
     STRUCTURE,
     TITLE_FIELD,
     DESCRIPTION_FIELD,
+    SIGNAL_TIMELINE_UPDATED,
+    CONF_THINKING_BUDGET,
+    CONF_THINK,
+    CONF_REASONING_EFFORT,
 )
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
@@ -116,6 +121,10 @@ async def async_setup_entry(hass, entry):
         CONF_MEMORY_STRINGS: entry.data.get(CONF_MEMORY_STRINGS),
         CONF_SYSTEM_PROMPT: entry.data.get(CONF_SYSTEM_PROMPT),
         CONF_TITLE_PROMPT: entry.data.get(CONF_TITLE_PROMPT),
+        # Thinking/reasoning parameters
+        CONF_THINKING_BUDGET: entry.data.get(CONF_THINKING_BUDGET),
+        CONF_THINK: entry.data.get(CONF_THINK),
+        CONF_REASONING_EFFORT: entry.data.get(CONF_REASONING_EFFORT),
     }
 
     # Filter out None values
@@ -460,34 +469,47 @@ def __init__(self, data_call):
             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.description_field = data_call.data.get(DESCRIPTION_FIELD, "")
+        self.interval: int = int(data_call.data.get(INTERVAL, 2))
+        self.duration: int = int(data_call.data.get(DURATION, 10))
+        self.max_frames: int = int(data_call.data.get(MAX_FRAMES, 3))
+        self.target_width: int = data_call.data.get(TARGET_WIDTH, 3840)
+        self.temperature: float = float()
+        self.max_tokens: int = int(data_call.data.get(MAXTOKENS, 3000))
+        self.include_filename: bool = data_call.data.get(INCLUDE_FILENAME, False)
+        self.expose_images: bool = data_call.data.get(EXPOSE_IMAGES, False)
+        self.generate_title: bool = data_call.data.get(GENERATE_TITLE, False)
+        self.sensor_entity: str = data_call.data.get(SENSOR_ENTITY, "")
+        self.response_format: str = data_call.data.get(RESPONSE_FORMAT, "text")
+        self.structure: dict | None = data_call.data.get(STRUCTURE, None)
+        self.title_field: str = data_call.data.get(TITLE_FIELD, "")
+        self.description_field: str = data_call.data.get(DESCRIPTION_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.title: str = data_call.data.get("title")
+        self.description: str = data_call.data.get("description")
+        self.start_time: datetime = 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(
+        self.end_time: datetime = 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", "")
+        self.image_path: str = data_call.data.get("image_path", "")
+        self.camera_entity: str = data_call.data.get("camera_entity", "")
+        self.label: str = data_call.data.get("label", "")
+
+        # ------------- Get Events --------------
+        self.start: datetime = data_call.data.get(
+            "start", dt_util.now() - timedelta(days=7)
+        )
+        self.start = self._convert_time_input_to_datetime(self.start)
+        self.end: datetime = data_call.data.get("end", dt_util.now())
+        self.end = self._convert_time_input_to_datetime(self.end)
+        self.cameras: list = data_call.data.get("cameras", "")
+        self.categories: list = data_call.data.get("categories", "")
+        self.labels: list = data_call.data.get("labels", "")
+        self.limit: int = int(data_call.data.get("limit", 100))
+        self.include_no_activity: bool = data_call.data.get("include_no_activity", True)
 
         # ------------ Added during call ------------
         # self.base64_images : List[str] = []
@@ -521,6 +543,10 @@ def get(self, key, default=None):
     def get_service_call_data(self):
         return self
 
+    def model_is_glimpse(self) -> bool:
+        """Check if model is Glimpse-v1 like based on model name"""
+        return bool(self.model and "glimpse-v1" in self.model.lower())
+
 
 async def _create_event(
     hass,
@@ -579,6 +605,7 @@ async def _create_event(
             camera_name=camera_name,
             label="",
         )
+        async_dispatcher_send(hass, SIGNAL_TIMELINE_UPDATED)
 
 
 async def _update_sensor(hass, sensor_entity: str, value: str | int, type: str) -> None:
@@ -850,7 +877,7 @@ async def data_analyzer(data_call):
         await _update_sensor(hass, sensor_entity, response["response_text"], type)
         return response
 
-    async def create_event(data_call):
+    async def create_event(data_call) -> None:
         """Handle the service call to create an event"""
         start = dt_util.now()
         call = ServiceCallData(data_call).get_service_call_data()
@@ -868,7 +895,7 @@ async def create_event(data_call):
                 f"Config entry not found. Please create the 'Settings' config entry first."
             )
 
-        timeline = Timeline(hass, config_entry)
+        timeline: Timeline = Timeline(hass, config_entry)
 
         await timeline.create_event(
             start=call.start_time,
@@ -879,6 +906,34 @@ async def create_event(data_call):
             camera_name=call.camera_entity,
             label=call.label.lower(),
         )
+        async_dispatcher_send(hass, SIGNAL_TIMELINE_UPDATED)
+
+    async def get_events(data_call) -> dict | None:
+        """Handle the service call to get events"""
+        # Find timeline config
+        config_entry = None
+        for entry in hass.config_entries.async_entries(DOMAIN):
+            # Check if the config entry is empty
+            if entry.data[CONF_PROVIDER] == "Settings":
+                config_entry = entry
+                break
+
+        if config_entry is None:
+            raise ServiceValidationError(
+                f"Config entry not found. Please create the 'Settings' config entry first."
+            )
+
+        timeline: Timeline = Timeline(hass, config_entry)
+        events: list[dict] | None = await timeline.get_events_json(
+            start=data_call.data.get("start"),
+            end=data_call.data.get("end"),
+            cameras=[camera.lower() for camera in data_call.data.get("cameras", [])],
+            categories=[category.lower() for category in data_call.data.get("categories", [])],
+            labels=[label.lower() for label in data_call.data.get("labels", [])],
+            limit=data_call.data.get("limit"),
+            include_no_activity=data_call.data.get("include_no_activity", True),
+        )
+        return {"events": events or []}
 
     # Register actions
     hass.services.register(
@@ -907,6 +962,12 @@ async def create_event(data_call):
         "create_event",
         create_event,
     )
+    hass.services.register(
+        DOMAIN,
+        "get_events",
+        get_events,
+        supports_response=SupportsResponse.ONLY,
+    )
     hass.http.register_view(TimelineEventsView)
     hass.http.register_view(TimelineEventView)
     hass.http.register_view(TimelineEventCreateView)

custom_components/llmvision/api.py

@@ -2,11 +2,12 @@
 import logging
 from datetime import datetime, timedelta
 from typing import Any, Optional
+from homeassistant.helpers.dispatcher import async_dispatcher_send
 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
-from .const import DOMAIN, CONF_PROVIDER
+from .const import DOMAIN, CONF_PROVIDER, SIGNAL_TIMELINE_UPDATED
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -37,14 +38,17 @@ async def get(self, request):
             return self.json_message("Settings config entry not found", status_code=404)
         # Parse request params
         try:
-            # Limit: minimum 1, maximum 100
-            limit = max(1, min(int(request.query.get("limit", 10)), 100))
+            # Limit: minimum 1, maximum 10000
+            limit = max(1, min(int(request.query.get("limit", 10)), 10000))
         except ValueError:
             limit = 10
 
         cameras = request.query.get("cameras", None)
         categories = request.query.get("categories", None)
         days = request.query.get("days", None)
+        hours = request.query.get("hours", None)
+        include_no_activity_raw = request.query.get("include_no_activity", "false")
+        include_no_activity = include_no_activity_raw.lower() in ("1", "true", "yes")
 
         def _parse_list_param(val):
             if val is None:
@@ -60,20 +64,42 @@ def _parse_list_param(val):
 
         cameras = _parse_list_param(cameras)
         categories = _parse_list_param(categories)
-        start = None
-        end = None
 
-        # If days is provided, calculate start and end dates
-        if days is not None:
-            try:
-                days = int(days)
-                end_date = dt_util.now()
-                start_date = end_date - timedelta(days=days)
+        # Parse start/end params (ISO datetime strings)
+        start = request.query.get("start", None)
+        end = request.query.get("end", None)
+
+        if start is not None:
+            parsed_start = dt_util.parse_datetime(start)
+            if parsed_start is None:
+                return self.json_message("Invalid 'start' datetime", status_code=400)
+            start = parsed_start.isoformat()
+        if end is not None:
+            parsed_end = dt_util.parse_datetime(end)
+            if parsed_end is None:
+                return self.json_message("Invalid 'end' datetime", status_code=400)
+            end = parsed_end.isoformat()
+
+        # If start/end aren't provided, preserve the legacy days/hours behavior.
+        if days is not None and start is None and end is None:
+            end_date = dt_util.now()
+            start_date = None
+
+            if hours is not None:
+                try:
+                    start_date = end_date - timedelta(hours=int(hours))
+                except (TypeError, ValueError):
+                    start_date = None
+
+            if start_date is None:
+                try:
+                    start_date = end_date - timedelta(days=int(days))
+                except (TypeError, ValueError):
+                    start_date = None
+
+            if start_date is not None:
                 start = start_date.isoformat()
                 end = end_date.isoformat()
-            except ValueError:
-                start = None
-                end = None
 
         timeline = Timeline(hass, settings_entry)
         events = await timeline.get_events_json(
@@ -82,6 +108,7 @@ def _parse_list_param(val):
             categories=categories,
             start=start,
             end=end,
+            include_no_activity=include_no_activity,
         )
         return self.json({"events": json.loads(json_dumps(events))})
 
@@ -148,6 +175,7 @@ def _parse_time(val):
             _LOGGER.error(f"Error creating timeline event: {e}")
             return self.json_message("Error creating event", status_code=500)
 
+        async_dispatcher_send(hass, SIGNAL_TIMELINE_UPDATED)
         payload = {"status": "created"}
 
         return self.json(payload)
@@ -189,6 +217,7 @@ async def delete(self, request, event_id):
         except Exception as e:
             _LOGGER.error(f"Error deleting event {event_id}: {e}")
             return self.json_message("Error deleting event", status_code=500)
+        async_dispatcher_send(hass, SIGNAL_TIMELINE_UPDATED)
         return self.json({"event_id": event_id, "status": "deleted"})
 
     async def post(self, request, event_id):
@@ -267,6 +296,8 @@ def _parse_time(val):
             _LOGGER.error(f"Error updating event {event_id}: {e}")
             return self.json_message("Error updating event", status_code=500)
 
+        async_dispatcher_send(hass, SIGNAL_TIMELINE_UPDATED)
+
         try:
             updated = await timeline.get_event(event_id)
             if updated is None: