Fix #366

Author: valentinfrlch

blueprints/event_summary.yaml

@@ -1,6 +1,12 @@
+# Fix Group and Channel to First Camera Entity, user edits - DONE
+# Add time to notificaion title or message, with user choose between 12/24h - DONE
+# Take snapshot of triggered camera entity if using multiple cameras (? help needed)
+# Snooze blueprint or notifications
 blueprint:
-  name: AI Event Summary (v1.4.3)
+  name: AI Event Summary (v1.5.0)
   author: valentinfrlch
+  homeassistant:
+    min_version: 2024.10.0
   description: >
     AI-powered summaries for security camera events.
     Sends a notification with a preview to your phone that is updated dynamically when the AI summary is available.
@@ -75,9 +81,9 @@ blueprint:
       collapsed: true
       input:
         remember:
-          name: Remember
+          name: Store in Timeline
           description: Stores this event in the Timeline so you can ask about it. If important is enabled, only events classified as Normal or Critical will be saved.
-          default: false
+          default: true
           selector:
             boolean:
         use_memory:
@@ -120,16 +126,7 @@ blueprint:
           selector:
             number:
               min: 1
-              max: 100
-        temperature:
-          name: Temperature
-          description: Randomness. Lower is more accurate, higher is more creative.
-          default: 0.1
-          selector:
-            number:
-              min: 0.1
-              max: 1.0
-              step: 0.1
+              max: 300
     # Notificaion Section
     notification_section:
       name: Notification Settings
@@ -171,26 +168,39 @@ blueprint:
                 - Consolidated
         preview_mode:
           name: Preview Mode
-          description: "Choose between a live preview or a snapshot of the event. \n\n **Important:** Live Preview is only supported on iOS."
+          description: "Choose between a live preview or a snapshot of the event. The Snapshot of the last camera, if using multiple Camera Entities, will be used but the notification will be udated with the camera view that triggered the automation. \n\n **Important:** Live Preview is only supported on iOS."
           default: Snapshot
           selector:
             select:
               options:
                 - Snapshot
                 - Live Preview
+        notification_time:
+          name: Notification Time
+          description: "Add time to Notification Title and choose between 12-hour or 24-hour time format for the notification title."
+          default: ''
+          selector:
+            select:
+              options:
+                - label:  No Time Added
+                  value: ''
+                - label: 12 Hour
+                  value: 'at {{ now().strftime("%I:%M %p") }}'
+                - label: 24 Hour
+                  value: 'at {{ now().strftime("%H:%M") }}'
         file_path:
           name: File Path - To send snapshot in Dynamic Mode with Snapshot Preview Mode
-          description: "The file path to store the most current snapshot for the FIRST camera if using multiple camera entities.\n\nDefaults
-            to `/media/local/snapshots/{{ camera_file_path }}/last_motion.jpg` that references **/media/snapshots/<CAMERA_NAME>/last_motion.jpg** \n\n Try `/local/snapshots/{{ camera_file_path }}/last_motion.jpg` that references **/config/www/snapshots/{{ camera_file_path }}/last_motion.jpg** if you are having issues ***Note that this is unsecured and exposes the images to the web.***
-            \n\nYOU MUST ADD `/local` with the `/media` folder so -> `/media/local` or replace `/config/www` with `/local`."
-          default: Media Folder - Secured
+          description: "The file path to store the most current snapshot for the FIRST camera if using multiple camera entities. You can specifiy a custom location as well.\n\nDefaults
+            to `Media Folder - Secured` that references **/media/snapshots/<CAMERA_NAME>/last_motion.jpg** \n\n Try the `Public Folder - Unsecured` option that references **/config/www/snapshots/{{ camera_file_path }}/last_motion.jpg** if you are having issues ***Note that this is unsecured and exposes the images to the web.***"
+          default: '/media/snapshots/{{ camera_file_path }}/last_motion.jpg'
           selector:
             select:
               options:
                 - label: Media Folder - Secured
-                  value: /media/local/snapshots/{{ camera_file_path }}/last_motion.jpg
+                  value: '/media/snapshots/{{ camera_file_path }}/last_motion.jpg'
+
                 - label: Public Folder - Unsecured
-                  value: /config/www/snapshots/{{ camera_file_path }}/last_motion.jpg
+                  value: '/config/www/snapshots/{{ camera_file_path }}/last_motion.jpg'
               custom_value: true
         tap_navigate:
           name: Tap Navigate
@@ -290,19 +300,20 @@ blueprint:
         notification_channel:
           name: Custom Notification Channel or Alarm Mode - Android Only
           description: Create a new channel for notifications to allow custom notification
-            sounds, vibration patterns, and override Do Not Disturb mode. Configured
+            sounds, vibration patterns, and override Do Not Disturb mode. Camera Name uses first Camera Entity if using multiple cameras. Configured
             directly on the Android device -> Home Assistant App Setting -> Notifications.
-            Use `Alarm` to use the device's loud alarm notification sound.
+            Use `Alarm` to use the device's loud alarm notification sound. You can also type in your own channel name.
             [Learn More](https://companion.home-assistant.io/docs/notifications/notification-commands/#volume-level)
-            (default = Camera Name == {{ camera }} Snapshot). 
+            (default = Camera Name == {{ camera_entity_snapshot }} Snapshot). 
           default: '{{ camera }} Snapshot'
           selector:
             select:
               options:
               - label: Camera Name
-                value: '{{ camera }} snapshot'
+                value: '{{ camera }} Snapshot'
               - label: Alarm
                 value: alarm_stream
+              custom_value: true
         # TTS Notification
         tts_notification:
           name: Use Text-to-Speech (TTS) on your device to speak the notification. Android Only
@@ -312,8 +323,8 @@ blueprint:
             boolean:
         tts_volume:
           name: TTS Volume
-          description: Set TTS volume to device's current alarm volume or Max volume. Android Only
-          default: 'alarm_stream'
+          description: Set TTS volume to device's current alarm volume or Max volume. ALARM VOLUME WILL IGNORE DO NOT DISTURB! Android Only
+          default: 'notification_stream'
           selector:
             select:
               options:
@@ -416,6 +427,8 @@ variables:
   notify: !input notify
   condition_notify: !input condition_notify
   delay_notification: !input delay_notification
+  # camera_snapshot: !input camera_snapshot
+  # camera_name: '{{ states[camera_snapshot].name.replace(" ", "_") }}'
   device_name_map: >
     {% set ns = namespace(device_names=[]) %}
     {% for device_id in notify_devices %}
@@ -433,20 +446,21 @@ variables:
     {% else %}
       {{ trigger.entity_id }}
     {% endif %}
-  camera_entity_snapshot: >
-    {{ camera_entities_list[0] }}
   tag: >
     {{ camera_entity + int(as_timestamp(now()))|string }}
-  group: >
-    {{ camera_entity }}
   label: Motion detected
   camera: >
-    {{ camera_entity.replace("camera.", "").replace("_", " ")|capitalize }}
+    {{ camera_entities_list[0].replace("camera.", "").replace("_", " ") | title }}
   importance_prompt: >
     Classify the security event based on this image. Choose from the following options: "passive" for unimportant events, "time-sensitive" for notable but non-critical events such as a person at the front door, and "critical" only for potential burglaries or highly suspicious activity. Respond with one of these options exactly, without additional explanation.
+  camera_entity_snapshot: >
+    {{ camera_entities_list[0] }}
   camera_file_path: >
     {{ camera_entity_snapshot.replace("camera.", "")}}
   file_path: !input file_path
+  snapshot_access_file_path: '{{ file_path | replace(''/config/www'',
+    ''/local'') | replace(''/media'', ''/media/local'') }}'
+  notification_time: !input notification_time
 
 max_exceeded: silent
 mode: single
@@ -481,7 +495,6 @@ action:
               include_filename: true
               target_width: 1280
               max_tokens: 3
-              temperature: 0.1
             response_variable: importance
 
   # Cancel automation if event not deemed important
@@ -516,26 +529,25 @@ action:
                         value_template: "{{ preview_mode=='Snapshot' }}"
                     sequence:
 
-                      # Save Camera Snapshot to file to send to Android devices for Dynamic Mode, perhaps make optional?
+                      # Save Camera Snapshot to file to send to Android devices for Dynamic Mode
                       - service: camera.snapshot
-                        target:
-                          entity_id: !input camera_entities
+                        entity_id: !input camera_entities
                         data:
                           filename: !input file_path
 
-                      - alias: "Send instant notification to notify devices"
+                      - alias: "Send instant notification snapshot to notify devices"
                         repeat:
                           for_each: "{{device_name_map}}"
                           sequence:
                             - action: "notify.{{ repeat.item }}"
                               data:
-                                title: "{{ label }}"
+                                title: "{{ label }} {{ notification_time }}"
                                 message: "{{camera}} has detected activity."
                                 data:
                                   url: !input tap_navigate #iOS
                                   clickAction: !input tap_navigate #Android
                                   tag: "{{tag}}"
-                                  group: "{{group}}"
+                                  group: !input notification_channel
                                   alert_once: true
                                   # Priority options
                                   ttl: 0
@@ -545,9 +557,11 @@ action:
                                   color: !input notification_color
                                   notification_icon: !input notification_icon
                                   sticky: !input notification_sticky
-                                  # Send a snapshot of the event to Android devices
-                                  image: "{{ file_path }}"
+                                  image: "{{ snapshot_access_file_path }}"
                                   # iOS only
+                                  attachment:
+                                    url: '{{ snapshot_access_file_path }}'
+                                    content_type: JPEG
                                   push:
                                     interruption-level: "{{importance.response_text|lower if importance is defined else 'active'}}"
                                     sound:
@@ -566,13 +580,13 @@ action:
                           sequence:
                             - action: "notify.{{ repeat.item }}"
                               data:
-                                title: "{{ label }}"
+                                title: "{{ label }} {{ notification_time }}"
                                 message: "{{camera}} has detected activity."
                                 data:
                                   entity_id: "{{camera_entity}}"
                                   url: !input tap_navigate
                                   tag: "{{tag}}"
-                                  group: "{{group}}"
+                                  group: !input notification_channel
                                   alert_once: true
                                   push:
                                     interruption-level: "{{importance.response_text|lower if importance is defined else 'active'}}"
@@ -600,7 +614,6 @@ action:
       max_frames: !input max_frames
       target_width: !input target_width
       max_tokens: !input max_tokens
-      temperature: !input temperature  
     response_variable: response
 
   - alias: "Update label with title"
@@ -626,14 +639,14 @@ action:
                   sequence:
                     - action: "notify.{{ repeat.item }}"
                       data:
-                        title: "{{ label }}"
+                        title: "{{ label }} {{ notification_time }}"
                         message: "{{response.response_text}}"
                         data:
                           image: "{{response.key_frame.replace('/config/www/','/local/') }}"
                           url: !input tap_navigate #iOS
                           clickAction: !input tap_navigate #Android
                           tag: "{{tag}}"
-                          group: "{{group}}"
+                          group: !input notification_channel
                           alert_once: true
                           # Priority options
                           ttl: 0
@@ -675,4 +688,5 @@ action:
   - choose: []
     default: !input additional_actions
 
-  - delay: !input cooldown
+  # - delay: '00:{{cooldown|int}}:00'
+  - delay: !input cooldown

custom_components/llmvision/config_flow.py

@@ -920,7 +920,8 @@ async def async_step_custom_openai(self, user_input=None):
             # Re-nest the flat config entry data into sections
             suggested = {
                 "connection_section": {
-                    CONF_API_KEY: self.init_info.get(CONF_API_KEY)
+                    CONF_API_KEY: self.init_info.get(CONF_API_KEY),
+                    CONF_CUSTOM_OPENAI_ENDPOINT: self.init_info.get(CONF_CUSTOM_OPENAI_ENDPOINT, "http://replace.with.your.host.com/v1/chat/completions"),
                 },
                 "model_section": {
                     CONF_DEFAULT_MODEL: self.init_info.get(CONF_DEFAULT_MODEL, DEFAULT_CUSTOM_OPENAI_MODEL),

custom_components/llmvision/providers.py

@@ -502,7 +502,7 @@ async def validate(self) -> None | ServiceValidationError:
         if self.api_key:
             headers = self._generate_headers()
             data = {
-                "model": DEFAULT_OPENAI_MODEL,
+                "model": self.model,
                 "messages": [{"role": "user", "content": [{"type": "text", "text": "Hi"}]}],
                 "max_completion_tokens": 1,
                 "temperature": 0.5