Addressed feedback

Author: ViViDboarder

sentences/en/_common.yaml

@@ -74,11 +74,11 @@ lists:
         out: "fahrenheit"
   brightness_level:
     values:
-      - in: (max|maximum|highest|full|all the way up|as (bright|light) as possible)
+      - in: ([the] (max|maximum|highest) [(level|value|setting|brightness)]|full [(brightness|light)]|all the way up|as (bright|light) as possible)
         out: 100
-      - in: (half|halfway|mid)
+      - in: "[the] (half|halfway|mid) [(level|setting|brightness|bright|light|lit)]"
         out: 50
-      - in: (min|minimum|lowest|all the way down|as (dim|dark) as possible)
+      - in: ([the] (min|minimum|lowest) [(level|value|setting|brightness)]|all the way down|as (dim|dark) as possible)
         out: 1
   on_off_states:
     values:
@@ -381,7 +381,7 @@ expansion_rules:
   any: "(any|some) [of <the>]"
   are_any: "[<are>] <any>"
   how_many: "how many [of <the>]"
-  brightness: "({brightness}[([ ]%)| percent]|[the] {brightness_level:brightness} [(level|value|setting)]) [(brightness|bright|light)]"
+  brightness: "({brightness}[([ ]%)| percent] [(brightness|bright|light|lit)]|{brightness_level:brightness})"
   light: "(light|lights|lighting|lamp|lamps)"
   turn: "(turn|switch|change|bring)"
   temp: "(temp|temperature)"
@@ -390,7 +390,7 @@ expansion_rules:
   close: "(close|shut|lower) [(up|down)]"
   set: "(set|make|change|turn|adjust)"
   numeric_value_set: "(set|change|turn [(up|down)]|increase|decrease|make|adjust)"
-  brightness_value_set: "(<numeric_value_set>|(brighten [up]|lighten [up]|brighten [up]|dim [down]|darken [down]))"
+  brightness_relative: "(brighten [up]|lighten [up]|dim [down]|darken [down])"
   in: "(in|on|at|of|across|around|throughout)"
   position: "{position}[([ ]%)| percent]"
   volume: "{volume:volume_level}[([ ]%)| percent]"

sentences/en/light_HassLightSet.yaml

@@ -8,34 +8,45 @@ intents:
 
       # Set device brightness
       - sentences:
-          - "[<brightness_value_set>] [<area_floor>] <name> [brightness] [to] <brightness>"
-          - "[<brightness_value_set>] <name> [brightness] [to] <brightness> <in_area_floor>"
-          - "[<brightness_value_set>] <name> <in_area_floor> [brightness] [to] <brightness>"
+          - "[<numeric_value_set>] [<area_floor>] <name> [brightness] [to] <brightness>"
+          - "[<numeric_value_set>] <name> [brightness] [to] <brightness> <in_area_floor>"
+          - "[<numeric_value_set>] <name> <in_area_floor> [brightness] [to] <brightness>"
 
-          - "[<brightness_value_set>] [the] brightness [of] [<area_floor>] <name> [to] <brightness>"
-          - "[<brightness_value_set>] [the] brightness [of] <name> [to] <brightness> <in_area_floor>"
-          - "[<brightness_value_set>] [the] brightness [of] <name> <in_area_floor> [to] <brightness>"
+          - "[<numeric_value_set>] [the] brightness [of] [<area_floor>] <name> [to] <brightness>"
+          - "[<numeric_value_set>] [the] brightness [of] <name> [to] <brightness> <in_area_floor>"
+          - "[<numeric_value_set>] [the] brightness [of] <name> <in_area_floor> [to] <brightness>"
+
+          - "[<brightness_relative>] [<area_floor>] <name> [to] <brightness>"
+          - "[<brightness_relative>] <name> [to] <brightness> <in_area_floor>"
+          - "[<brightness_relative>] <name> <in_area_floor> [to] <brightness>"
         response: "brightness"
         requires_context:
           domain: light
 
       # Set area/floor brightness
       - sentences:
-          - "[<brightness_value_set>] [(<all>|<the>)] <area_floor> [<light>] [brightness] [to] <brightness>"
-          - "[<brightness_value_set>] [[(<all>|<the>)] <light>] [brightness] [to] <brightness> <in_area_floor>"
-          - "[<brightness_value_set>] [(<all>|<the>)] <light> <in_area_floor> [brightness] [to] <brightness>"
+          - "[<numeric_value_set>] [(<all>|<the>)] <area_floor> [<light>] [brightness] [to] <brightness>"
+          - "[<numeric_value_set>] [[(<all>|<the>)] <light>] [brightness] [to] <brightness> <in_area_floor>"
+          - "[<numeric_value_set>] [(<all>|<the>)] <light> <in_area_floor> [brightness] [to] <brightness>"
+
+          - "[<numeric_value_set>] [the] brightness [of [(<all>|<the>)]] <in_area_floor> [<light>] [to] <brightness>"
+          - "[<numeric_value_set>] [the] brightness [of [(<all>|<the>)]] <light> [to] <brightness> <in_area_floor>"
+          - "[<numeric_value_set>] [the] brightness [of [(<all>|<the>)]] <light> <in_area_floor> [to] <brightness>"
 
-          - "[<brightness_value_set>] [the] brightness [of [(<all>|<the>)]] <in_area_floor> [<light>] [to] <brightness>"
-          - "[<brightness_value_set>] [the] brightness [of [(<all>|<the>)]] <light> [to] <brightness> <in_area_floor>"
-          - "[<brightness_value_set>] [the] brightness [of [(<all>|<the>)]] <light> <in_area_floor> [to] <brightness>"
+          - "[<brightness_relative>] [(<all>|<the>)] <area_floor> [<light>] [to] <brightness>"
+          - "[<brightness_relative>] [[(<all>|<the>)] <light>] [to] <brightness> <in_area_floor>"
+          - "[<brightness_relative>] [(<all>|<the>)] <light> <in_area_floor> [to] <brightness>"
         response: "brightness"
 
       # Set brightness in the current context
       - sentences:
-          - "[<brightness_value_set>] [the] brightness [of [(<all>|<the>)] <light>] [<here>] [to] <brightness>"
-          - "[<brightness_value_set>] [the] brightness [of [(<all>|<the>)] <light>] [to] <brightness> <here>"
-          - "[<brightness_value_set>] [(<all>|<the>)] <light> [brightness] [<here>] [to] <brightness>"
-          - "[<brightness_value_set>] [(<all>|<the>)] <light> [brightness] [to] <brightness> <here>"
+          - "[<numeric_value_set>] [the] brightness [of [(<all>|<the>)] <light>] [<here>] [to] <brightness>"
+          - "[<numeric_value_set>] [the] brightness [of [(<all>|<the>)] <light>] [to] <brightness> <here>"
+          - "[<numeric_value_set>] [(<all>|<the>)] <light> [brightness] [<here>] [to] <brightness>"
+          - "[<numeric_value_set>] [(<all>|<the>)] <light> [brightness] [to] <brightness> <here>"
+
+          - "[<brightness_relative>] [[(<all>|<the>)] <light>] [<here>] [to] <brightness>"
+          - "[<brightness_relative>] [[(<all>|<the>)] <light>] [to] <brightness> <here>"
         response: "brightness"
         requires_context:
           area:

tests/en/light_HassLightSet.yaml

@@ -36,6 +36,8 @@ tests:
       - "make the bedroom lights 50% bright"
       - "adjust bedroom lights to 50%"
       - "set all lights in the bedroom halfway"
+      - "brighten up the bedroom to 50%"
+      - "brighten up the bedroom lights to 50%"
     intent:
       name: HassLightSet
       slots: