Merge branch 'main' into main

intents.yaml

@@ -337,14 +337,6 @@ HassMediaPause:
     area:
       description: "Name of an area"
       required: false
-  slot_combinations:
-    name_only:
-      - "name"
-    area_only:
-      - "area"
-    area_name:
-      - "name"
-      - "area"
 
 HassMediaUnpause:
   supported: true
@@ -357,14 +349,6 @@ HassMediaUnpause:
     area:
       description: "Name of an area"
       required: false
-  slot_combinations:
-    name_only:
-      - "name"
-    area_only:
-      - "area"
-    area_name:
-      - "name"
-      - "area"
 
 HassMediaNext:
   supported: true
@@ -377,14 +361,6 @@ HassMediaNext:
     area:
       description: "Name of an area"
       required: false
-  slot_combinations:
-    name_only:
-      - "name"
-    area_only:
-      - "area"
-    area_name:
-      - "name"
-      - "area"
 
 HassSetVolume:
   supported: true
@@ -400,11 +376,187 @@ HassSetVolume:
     volume_level:
       description: "Volume level from 0 to 100"
       required: true
-  slot_combinations:
-    name_only:
-      - "name"
-    area_only:
-      - "area"
-    area_name:
-      - "name"
-      - "area"
+
+# -----------------------------------------------------------------------------
+# timers
+# -----------------------------------------------------------------------------
+
+HassStartTimer:
+  supported: true
+  domain: intent
+  description: "Starts a timer"
+  slots:
+    hours:
+      description: "Number of hours"
+      required: false
+    minutes:
+      description: "Number of minutes"
+      required: false
+    seconds:
+      description: "Number of seconds"
+      required: false
+    name:
+      description: "Name attached to the timer"
+      required: false
+    conversation_command:
+      description: "Command to execute when timer finishes"
+      required: false
+  slot_groups:
+    duration:
+      - "hours"
+      - "minutes"
+      - "seconds"
+
+HassCancelTimer:
+  supported: true
+  domain: intent
+  description: "Cancels a timer"
+  slots:
+    start_hours:
+      description: "Hours the timer was started with"
+      required: false
+    start_minutes:
+      description: "Minutes the timer was started with"
+      required: false
+    start_seconds:
+      description: "Seconds the timer was started with"
+      required: false
+    name:
+      description: "Name attached to the timer"
+      required: false
+    area:
+      description: "Area of the device used to start the timer"
+      required: false
+
+HassIncreaseTimer:
+  supported: true
+  domain: intent
+  description: "Adds time to a timer"
+  slots:
+    hours:
+      description: "Number of hours"
+      required: false
+    minutes:
+      description: "Number of minutes"
+      required: false
+    seconds:
+      description: "Number of seconds"
+      required: false
+    start_hours:
+      description: "Hours the timer was started with"
+      required: false
+    start_minutes:
+      description: "Minutes the timer was started with"
+      required: false
+    start_seconds:
+      description: "Seconds the timer was started with"
+      required: false
+    name:
+      description: "Name attached to the timer"
+      required: false
+    area:
+      description: "Area of the device used to start the timer"
+      required: false
+  slot_groups:
+    duration:
+      - "hours"
+      - "minutes"
+      - "seconds"
+
+HassDecreaseTimer:
+  supported: true
+  domain: intent
+  description: "Adds time to a timer"
+  slots:
+    hours:
+      description: "Number of hours"
+      required: false
+    minutes:
+      description: "Number of minutes"
+      required: false
+    seconds:
+      description: "Number of seconds"
+      required: false
+    start_hours:
+      description: "Hours the timer was started with"
+      required: false
+    start_minutes:
+      description: "Minutes the timer was started with"
+      required: false
+    start_seconds:
+      description: "Seconds the timer was started with"
+      required: false
+    name:
+      description: "Name attached to the timer"
+      required: false
+    area:
+      description: "Area of the device used to start the timer"
+      required: false
+  slot_groups:
+    duration:
+      - "hours"
+      - "minutes"
+      - "seconds"
+
+HassPauseTimer:
+  supported: true
+  domain: intent
+  description: "Pauses a running timer"
+  slots:
+    start_hours:
+      description: "Hours the timer was started with"
+      required: false
+    start_minutes:
+      description: "Minutes the timer was started with"
+      required: false
+    start_seconds:
+      description: "Seconds the timer was started with"
+      required: false
+    name:
+      description: "Name attached to the timer"
+      required: false
+    area:
+      description: "Area of the device used to start the timer"
+      required: false
+
+HassUnpauseTimer:
+  supported: true
+  domain: intent
+  description: "Resumes a paused timer"
+  slots:
+    start_hours:
+      description: "Hours the timer was started with"
+      required: false
+    start_minutes:
+      description: "Minutes the timer was started with"
+      required: false
+    start_seconds:
+      description: "Seconds the timer was started with"
+      required: false
+    name:
+      description: "Name attached to the timer"
+      required: false
+    area:
+      description: "Area of the device used to start the timer"
+      required: false
+
+HassTimerStatus:
+  supported: true
+  domain: intent
+  description: "Reports status of one or more timers"
+  slots:
+    start_hours:
+      description: "Hours the timer was started with"
+      required: false
+    start_minutes:
+      description: "Minutes the timer was started with"
+      required: false
+    start_seconds:
+      description: "Seconds the timer was started with"
+      required: false
+    name:
+      description: "Name attached to the timer"
+      required: false
+    area:
+      description: "Area of the device used to start the timer"
+      required: false

requirements.txt

@@ -1,12 +1,12 @@
-hassil==1.7.0
+hassil==1.7.1
 PyYAML==6.0.1
 voluptuous==0.13.1
-regex==2024.4.16
-jinja2==3.1.3
+regex==2024.5.15
+jinja2==3.1.4
 
-black==24.4.0
+black==24.4.2
 flake8==7.0.0
 isort==5.13.2
 mypy==1.10.0
-pylint==3.1.0
-pytest==8.2.0
+pylint==3.2.2
+pytest==8.2.1

responses/bg/HassListAddItem.yaml

@@ -0,0 +1,5 @@
+language: bg
+responses:
+  intents:
+    HassListAddItem:
+      item_added: "Добавих {{ slots.item }}"

responses/en/HassCancelTimer.yaml

@@ -0,0 +1,6 @@
+---
+language: en
+responses:
+  intents:
+    HassCancelTimer:
+      default: "Timer cancelled"

responses/en/HassDecreaseTimer.yaml

@@ -0,0 +1,6 @@
+---
+language: en
+responses:
+  intents:
+    HassDecreaseTimer:
+      default: "Timer updated"

responses/en/HassIncreaseTimer.yaml

@@ -0,0 +1,6 @@
+---
+language: en
+responses:
+  intents:
+    HassIncreaseTimer:
+      default: "Timer updated"

responses/en/HassMediaUnpause.yaml

@@ -2,4 +2,4 @@ language: en
 responses:
   intents:
     HassMediaUnpause:
-      default: "Unpaused"
+      default: "Resumed"

responses/en/HassPauseTimer.yaml

@@ -0,0 +1,6 @@
+---
+language: en
+responses:
+  intents:
+    HassPauseTimer:
+      default: "Timer paused"

responses/en/HassStartTimer.yaml

@@ -0,0 +1,7 @@
+---
+language: en
+responses:
+  intents:
+    HassStartTimer:
+      default: "Timer started"
+      command: "Command received"

responses/en/HassTimerStatus.yaml

@@ -0,0 +1,91 @@
+---
+language: en
+responses:
+  intents:
+    HassTimerStatus:
+      default: |
+        {% set num_timers = slots.timers | length %}
+        {% set active_timers = slots.timers | selectattr('is_active') | list %}
+        {% set num_active_timers = active_timers | length %}
+        {% set paused_timers = slots.timers | rejectattr('is_active') | list %}
+        {% set num_paused_timers = paused_timers | length %}
+        {% set next_timer = None %}
+
+        {% if num_timers == 0: %}
+          No timers.
+        {% elif num_active_timers == 0: %}
+          {# No active timers #}
+          {% if num_paused_timers == 1: %}
+            {% set next_timer = paused_timers[0] %}
+            Timer is paused.
+          {% else: %}
+            {{ num_paused_timers }} paused timers.
+          {% endif %}
+        {% else: %}
+          {# At least one active timer #}
+          {% if num_active_timers == 1: %}
+            {% set next_timer = active_timers[0] %}
+          {% else: %}
+            {# Get active timer that will finish soonest #}
+            {% set sorted_timers = active_timers | sort(attribute='total_seconds_left') %}
+            {% set next_timer = sorted_timers[0] %}
+            {{ num_active_timers }} running timers.
+          {% endif %}
+
+          {% if num_paused_timers == 1: %}
+            1 paused timer.
+          {% elif num_paused_timers > 0: %}
+            {{ num_paused_timers }} paused timers.
+          {% endif %}
+        {% endif %}
+
+        {% if next_timer: %}
+          {# At least one active timer #}
+          {% if (next_timer.rounded_hours_left == 1) and (next_timer.rounded_minutes_left > 0): %}
+            1 hour and {{ next_timer.rounded_minutes_left }} minutes
+          {% elif (next_timer.rounded_hours_left == 1): %}
+            1 hour
+          {% elif (next_timer.rounded_hours_left > 1) and (next_timer.rounded_minutes_left > 0): %}
+            {{ next_timer.rounded_hours_left }} hours and {{ next_timer.rounded_minutes_left }} minutes
+          {% elif (next_timer.rounded_hours_left > 1): %}
+            {{ next_timer.rounded_hours_left }} hours
+          {% elif (next_timer.rounded_minutes_left == 1) and (next_timer.rounded_seconds_left > 0): %}
+            1 minute and {{ next_timer.rounded_seconds_left }} seconds
+          {% elif (next_timer.rounded_minutes_left == 1): %}
+            1 minute
+          {% elif (next_timer.rounded_minutes_left > 1) and (next_timer.rounded_seconds_left > 0): %}
+            {{ next_timer.rounded_minutes_left }} minutes and {{ next_timer.rounded_seconds_left }} seconds
+          {% elif (next_timer.rounded_minutes_left > 1): %}
+            {{ next_timer.rounded_minutes_left }} minutes
+          {% elif (next_timer.rounded_seconds_left == 1): %}
+            1 second
+          {% elif (next_timer.rounded_seconds_left > 1): %}
+            {{ next_timer.rounded_seconds_left }} seconds
+          {% endif %}
+
+          {% if num_timers > 1: %}
+            {# Give some extra information to disambiguate #}
+            left on
+            {% if (next_timer.start_hours > 0) and (next_timer.start_minutes > 0): %}
+              {{ next_timer.start_hours }} hour and {{ next_timer.start_minutes }} minute
+            {% elif (next_timer.start_hours > 0): %}
+              {{ next_timer.start_hours }} hour
+            {% elif (next_timer.start_minutes > 0) and (next_timer.start_seconds > 0): %}
+              {{ next_timer.start_minutes }} minute and {{ next_timer.start_seconds }} second
+            {% elif (next_timer.start_minutes > 0): %}
+              {{ next_timer.start_minutes }} minute
+            {% elif (next_timer.start_seconds > 0): %}
+              {{ next_timer.start_seconds }} second
+            {% endif %}
+
+            {% if next_timer.name: %}
+              {{ next_timer.name }}
+            {% elif next_timer.area: %}
+              {{ next_timer.area }}
+            {% endif %}
+
+            timer.
+          {% else: %}
+            left.
+          {% endif %}
+        {% endif %}