A few small fixes

intents.yaml

@@ -365,32 +365,32 @@ HassMediaNext:
       description: "Name of an area"
       required: false
 
-HassSetVolume:
+HassMediaPrevious:
   supported: true
   domain: media_player
-  description: "Sets the volume of a media player"
+  description: "Skips a media player back to the previous item"
   slots:
     name:
       description: "Name of a device or entity"
       required: false
     area:
       description: "Name of an area"
       required: false
-    volume_level:
-      description: "Volume level from 0 to 100"
-      required: true
 
-HassMediaPrevious:
-  supported: false
+HassSetVolume:
+  supported: true
   domain: media_player
-  description: "Skips a media player back to the previous item"
+  description: "Sets the volume of a media player"
   slots:
     name:
       description: "Name of a device or entity"
       required: false
     area:
       description: "Name of an area"
       required: false
+    volume_level:
+      description: "Volume level from 0 to 100"
+      required: true
 
 # -----------------------------------------------------------------------------
 # timers

script/intentfest/parse.py

@@ -9,7 +9,7 @@
 
 import yaml
 from hassil.intents import Intents
-from hassil.recognize import recognize
+from hassil.recognize import recognize_all
 from hassil.util import merge_dict, normalize_whitespace
 
 from shared import (
@@ -49,6 +49,11 @@ def get_arguments() -> argparse.Namespace:
         metavar=("key", "value"),
         help="Add key/value pair to context",
     )
+    parser.add_argument(
+        "--all",
+        action="store_true",
+        help="List all possible matches instead of just the first one",
+    )
     return parser.parse_args()
 
 
@@ -81,28 +86,33 @@ def run() -> int:
 
     # Parse sentences
     for sentence in args.sentence:
-        result = recognize(
+        for result in recognize_all(
             sentence, intents, slot_lists=slot_lists, intent_context=intent_context
-        )
-        output_dict = {"text": sentence, "match": result is not None}
-        if result is not None:
-            output_dict["intent"] = result.intent.name
-            output_dict["slots"] = {
-                entity.name: entity.value for entity in result.entities_list
-            }
-            output_dict["context"] = result.context
-
-            # Response
-            matched, unmatched = get_matched_states(states, areas, result)
-            output_dict["response_key"] = result.response
-            response_template = responses.get(result.intent.name, {}).get(
-                result.response
-            )
-            output_dict["response"] = normalize_whitespace(
-                render_response(response_template, result, matched, unmatched)
-            ).strip()
-
-        json.dump(output_dict, sys.stdout, ensure_ascii=False, indent=2)
+        ):
+            output_dict = {"text": sentence, "match": result is not None}
+            if result is not None:
+                output_dict["intent"] = result.intent.name
+                output_dict["slots"] = {
+                    entity.name: entity.value for entity in result.entities_list
+                }
+                output_dict["context"] = result.context
+                output_dict["text_chunks_matched"] = result.text_chunks_matched
+
+                # Response
+                matched, unmatched = get_matched_states(states, areas, result)
+                output_dict["response_key"] = result.response
+                response_template = responses.get(result.intent.name, {}).get(
+                    result.response
+                )
+                output_dict["response"] = normalize_whitespace(
+                    render_response(response_template, result, matched, unmatched)
+                ).strip()
+
+            json.dump(output_dict, sys.stdout, ensure_ascii=False, indent=2)
+            print("")
+            if not args.all:
+                break
+
         print("")
 
     return 0

sentences/en/homeassistant_HassStartTimer.yaml

@@ -8,11 +8,11 @@ intents:
           - "timer for <timer_duration>"
           - "<timer_duration> timer for {timer_name:name}"
           - "timer for <timer_duration> (named|called) {timer_name:name}"
-          - "<timer_set>[ a] <timer_duration> timer"
-          - "<timer_set>[ a] timer for <timer_duration>"
-          - "<timer_set>[ a] <timer_duration> timer (named|called|for) {timer_name:name}"
-          - "<timer_set>[ a] timer (named|called) {timer_name:name} for <timer_duration>"
-          - "<timer_set>[ a] timer for <timer_duration> (named|called) {timer_name:name}"
+          - "<timer_set>[ a| the| my] <timer_duration> timer"
+          - "<timer_set>[ a| the| my] timer for <timer_duration>"
+          - "<timer_set>[ a| the| my] <timer_duration> timer (named|called|for) {timer_name:name}"
+          - "<timer_set>[ a| the| my] timer (named|called) {timer_name:name} for <timer_duration>"
+          - "<timer_set>[ a| the| my] timer for <timer_duration> (named|called) {timer_name:name}"
         requires_context:
           area:
             slot: false