Changes

aneisch · Apr 6, 2024 · c39fc6d · c39fc6d
1 parent 65b6b97
commit c39fc6d
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -57,8 +57,8 @@ Also using Grafana/Influx for graphing, both running in Docker containers on NUC
 Description | value
 -- | --
 Lines of ESPHome YAML | 2801
-Lines of Home Assistant YAML | 8977
-[Integrations](https://www.home-assistant.io/integrations/) in use | 58
+Lines of Home Assistant YAML | 8974
+[Integrations](https://www.home-assistant.io/integrations/) in use | 59
 Zigbee devices in [`zha`](https://www.home-assistant.io/integrations/zha/) | 26
 Z-Wave devices in [`zwave_js`](https://www.home-assistant.io/integrations/zwave_js/) | 37
 
@@ -67,7 +67,7 @@ Description | value
 Entities in the [`automation`](https://www.home-assistant.io/components/automation) domain | 121
 Entities in the [`binary_sensor`](https://www.home-assistant.io/components/binary_sensor) domain | 145
 Entities in the [`button`](https://www.home-assistant.io/components/button) domain | 17
-Entities in the [`camera`](https://www.home-assistant.io/components/camera) domain | 13
+Entities in the [`camera`](https://www.home-assistant.io/components/camera) domain | 14
 Entities in the [`climate`](https://www.home-assistant.io/components/climate) domain | 1
 Entities in the [`counter`](https://www.home-assistant.io/components/counter) domain | 1
 Entities in the [`cover`](https://www.home-assistant.io/components/cover) domain | 13
@@ -77,7 +77,7 @@ Entities in the [`fan`](https://www.home-assistant.io/components/fan) domain | 3
 Entities in the [`group`](https://www.home-assistant.io/components/group) domain | 17
 Entities in the [`image`](https://www.home-assistant.io/components/image) domain | 8
 Entities in the [`input_boolean`](https://www.home-assistant.io/components/input_boolean) domain | 29
-Entities in the [`input_datetime`](https://www.home-assistant.io/components/input_datetime) domain | 34
+Entities in the [`input_datetime`](https://www.home-assistant.io/components/input_datetime) domain | 32
 Entities in the [`input_number`](https://www.home-assistant.io/components/input_number) domain | 6
 Entities in the [`input_select`](https://www.home-assistant.io/components/input_select) domain | 19
 Entities in the [`input_text`](https://www.home-assistant.io/components/input_text) domain | 15
@@ -90,7 +90,7 @@ Entities in the [`plant`](https://www.home-assistant.io/components/plant) domain
 Entities in the [`remote`](https://www.home-assistant.io/components/remote) domain | 1
 Entities in the [`script`](https://www.home-assistant.io/components/script) domain | 56
 Entities in the [`select`](https://www.home-assistant.io/components/select) domain | 3
-Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 442
+Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 443
 Entities in the [`siren`](https://www.home-assistant.io/components/siren) domain | 1
 Entities in the [`sun`](https://www.home-assistant.io/components/sun) domain | 1
 Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 166

diff --git a/automations.yaml b/automations.yaml
@@ -166,8 +166,8 @@
     hours: /12
   action:
   - service: alexa_media.clear_history
-- alias: Update 'Last' Datetimes
-  id: update_last_datetimes
+- id: update_last_datetimes
+  alias: Update 'Last' Datetimes
   trigger:
   - platform: state
     entity_id:
@@ -176,14 +176,14 @@
     - binary_sensor.garage_exterior_door
     - binary_sensor.garage_interior_door
     - binary_sensor.master_bedroom_exterior_door
-    - binary_sensor.garage_motion
     - input_boolean.kitchen_motion
     - binary_sensor.living_room_motion
     - binary_sensor.hallway_motion
+    - binary_sensor.garage_person_occupancy
     from: 'off'
     to: 'on'
   action:
-    service: input_datetime.set_datetime
+  - service: input_datetime.set_datetime
     data:
       entity_id: input_datetime.{{trigger.entity_id | regex_replace(find='binary_sensor.',
         replace='') | regex_replace(find='input_boolean.', replace='') | regex_replace(find='sensor.',

diff --git a/extras/Node-RED/flows.json b/extras/Node-RED/flows.json
diff --git a/extras/docker-compose/other/docker-compose.yml b/extras/docker-compose/other/docker-compose.yml
@@ -550,7 +550,7 @@ services:
         restart: always
         image: ghcr.io/blakeblackshear/frigate:stable
         #image: ghcr.io/blakeblackshear/frigate:0.13.0-beta7
-        shm_size: "128mb"
+        shm_size: "256mb"
         devices:
             - /dev/bus/usb:/dev/bus/usb
             - /dev/dri/renderD128
@@ -587,6 +587,13 @@ services:
             - traefik.http.routers.frigate_local.tls.domains[0].main=*.home.domain.com
             - traefik.http.routers.frigate_local.rule=Host(`frigate.home.domain.com`)
             - traefik.http.routers.frigate_local.service=frigate
+            # Go2rtc Local
+            - traefik.http.services.go2rtc.loadbalancer.server.port=1984
+            - traefik.http.routers.go2rtc_local.service=go2rtc
+            - traefik.http.routers.go2rtc_local.tls=true
+            - traefik.http.routers.go2rtc_local.tls.certResolver=le-home
+            - traefik.http.routers.go2rtc_local.tls.domains[0].main=*.home.domain.com
+            - traefik.http.routers.go2rtc_local.rule=Host(`go2rtc.home.domain.com`)
 
         environment:
             - PLUS_API_KEY=secret
@@ -600,7 +607,7 @@ services:
             - 32168:32168
         volumes:
             - /opt/codeproject/config:/etc/codeproject/ai
-            - /opt/codeproject/modules:/app/preinstalled-modules/ObjectDetectionYolo/custom-models/
+            #- /opt/codeproject/modules:/app/preinstalled-modules/ObjectDetectionYolo/custom-models/
             - /opt/codeproject/modules:/app/preinstalled-modules/ObjectDetectionYOLOv5-6.2/custom-models/
         labels:
             # HTTP Local Only

diff --git a/extras/docker-compose/unified/docker-compose.yml b/extras/docker-compose/unified/docker-compose.yml
@@ -780,7 +780,7 @@ services:
         restart: always
         image: ghcr.io/blakeblackshear/frigate:stable
         #image: ghcr.io/blakeblackshear/frigate:0.13.0-beta7
-        shm_size: "128mb"
+        shm_size: "256mb"
         devices:
             - /dev/bus/usb:/dev/bus/usb
             - /dev/dri/renderD128
@@ -817,6 +817,13 @@ services:
             - traefik.http.routers.frigate_local.tls.domains[0].main=*.home.domain.com
             - traefik.http.routers.frigate_local.rule=Host(`frigate.home.domain.com`)
             - traefik.http.routers.frigate_local.service=frigate
+            # Go2rtc Local
+            - traefik.http.services.go2rtc.loadbalancer.server.port=1984
+            - traefik.http.routers.go2rtc_local.service=go2rtc
+            - traefik.http.routers.go2rtc_local.tls=true
+            - traefik.http.routers.go2rtc_local.tls.certResolver=le-home
+            - traefik.http.routers.go2rtc_local.tls.domains[0].main=*.home.domain.com
+            - traefik.http.routers.go2rtc_local.rule=Host(`go2rtc.home.domain.com`)
 
         environment:
             - PLUS_API_KEY=secret
@@ -830,7 +837,7 @@ services:
             - 32168:32168
         volumes:
             - /opt/codeproject/config:/etc/codeproject/ai
-            - /opt/codeproject/modules:/app/preinstalled-modules/ObjectDetectionYolo/custom-models/
+            #- /opt/codeproject/modules:/app/preinstalled-modules/ObjectDetectionYolo/custom-models/
             - /opt/codeproject/modules:/app/preinstalled-modules/ObjectDetectionYOLOv5-6.2/custom-models/
         labels:
             # HTTP Local Only

diff --git a/github_action_secrets.yaml b/github_action_secrets.yaml
@@ -64,6 +64,7 @@ signal_group_bvst: "group.id"
 signal_group_bvst_ins: "group.id"
 signal_group_adsb: "group.id"
 signal_group_frigate: "group.id"
+signal_group_homeassistant: "group.id"
 tile_user: user
 tile_password: password
 pfsense_json_key: secret

diff --git a/images/nodered_1.png b/images/nodered_1.png
diff --git a/images/nodered_2.png b/images/nodered_2.png
diff --git a/input_boolean.yaml b/input_boolean.yaml
@@ -49,9 +49,6 @@ gate_alert:
 rack_fan_auto_off:
   name: Rack Fan Auto-Off (nodered)
 
-vacation_mode:
-  name: Vacation Mode
-
 # So we can track when we turn
 compost_turn:
   name: Compost Turn
diff --git a/packages/frigate.yaml b/packages/frigate.yaml
@@ -37,20 +37,20 @@ automation:
             data:
               filename: /config/media/images/front_door.jpg
             target:
-              entity_id: camera.front_door
-          # - service: google_generative_ai_conversation.generate_content
-          #   continue_on_error: true
-          #   data:
-          #     prompt: >-
-          #       Very briefly describe what you see in this image from my doorbell camera.
-          #       Your message needs to be short to fit in a phone notification. Don't
-          #       describe stationary objects or buildings.
-          #     image_filename: /config/media/images/front_door.jpg
-          #   response_variable: generated_content
+              entity_id: camera.front_door_fullres
+          - service: google_generative_ai_conversation.generate_content
+            continue_on_error: true
+            data:
+              prompt: >-
+                Very briefly describe what you see in this image from my doorbell camera.
+                Your message needs to be short to fit in a phone notification. Don't
+                describe stationary objects or buildings.
+              image_filename: /config/media/images/front_door.jpg
+            response_variable: generated_content
           - service: notify.signal_frigate
             data:
               message: >-
-                A person was detected
+                A person was detected {{ generated_content.text }}
 
 
                 Clip: https://secret/api/frigate/notifications/{{trigger.payload_json["after"]["id"]}}/clip.mp4
@@ -152,21 +152,20 @@ automation:
         data:
           filename: /config/media/images/doorbell.jpg
         target:
-          entity_id: camera.front_door
+          entity_id: camera.front_door_fullres
         continue_on_error: true
       - service: siren.turn_on
         entity_id: siren.garage_chime_siren
         continue_on_error: true
-      # Broken temporarily?
-      # - service: google_generative_ai_conversation.generate_content
-      #   continue_on_error: true
-      #   data:
-      #     prompt: >-
-      #       Very briefly describe what you see in this image from my doorbell camera.
-      #       Your message needs to be short to fit in a phone notification. Don't
-      #       describe stationary objects or buildings.
-      #     image_filename: /config/media/images/doorbell.jpg
-      #   response_variable: generated_content
+      - service: google_generative_ai_conversation.generate_content
+        continue_on_error: true
+        data:
+          prompt: >-
+            Very briefly describe what you see in this image from my doorbell camera.
+            Your message needs to be short to fit in a phone notification. Don't
+            describe stationary objects or buildings.
+          image_filename: /config/media/images/doorbell.jpg
+        response_variable: generated_content
       - service: notify.signal_frigate
         data:
           message: >-

diff --git a/packages/garage_door.yaml b/packages/garage_door.yaml
@@ -31,7 +31,7 @@ automation:
     id: "garge_lights_off"
     trigger:
       platform: state
-      entity_id: binary_sensor.garage_motion
+      entity_id: binary_sensor.garage_person_occupancy
       from: "on"
       to: "off"
       for: "00:10:00"