Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[en] Expand light_HassTurnOn and light_HassTurnOff with natural sentences #2455

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions sentences/en/_common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -377,14 +377,14 @@ expansion_rules:
how_many: "how many[ of the]"
brightness: "{brightness}[[ ]%| percent]"
light: "[the ](light|lights|lighting|lamp|lamps)"
turn: "(turn|switch|change)"
turn: "(turn|switch|change|bring)"
temp: "(temp|temperature)"
temperature: "{temperature}[([ ]°[ ][{temperature_unit}])|( degrees[ {temperature_unit}])]"
open: "(open|raise|lift)[ up]"
close: "(close|shut|lower)[ (up|down)]"
set: "(set|make|change|turn)"
numeric_value_set: "(set|change|turn[ (up|down)]|increase|decrease|make)"
in: "(in|on|at|of)"
in: "(in|on|at|of|across|around|throughout)"
ViViDboarder marked this conversation as resolved.
Show resolved Hide resolved
position: "{position}[[ ]%| percent]"
volume: "{volume:volume_level}[[ ]%| percent]"
currently: "(currently|presently|right now|at the moment)"
Expand All @@ -394,8 +394,8 @@ expansion_rules:
all: "(all[[ of] the]|every[ single]|each[ and every])"
are_all: "[<are> ]<all>"
home: "(home|house|appartment|flat)"
everywhere: "(everywhere|in (all|each)[[ of] the] room[s]|in every room[s]|in the <home>)"
here: "(here|in here|in this room|in the room)"
everywhere: "(everywhere|all over|[<in>] the [(entire|whole)] <home>|[<in>] <all> (room|area|floor)[s])"
here: "([in] here|[in] (this|the) (room|area|space))"

# Questions
what_is_the_class_of_name: "(<what_is> the <class> (of|in|from|(indicated|measured) by) <name> [in <area>]|<what_is> <name>['s] <class> [in <area>]|<what_is> <area> <name>['s] <class>)"
Expand All @@ -416,4 +416,9 @@ expansion_rules:
skip_words:
- "please"
- "can you"
- "could you"
- "would you"
- "for me"
- "i'd like"
ViViDboarder marked this conversation as resolved.
Show resolved Hide resolved
- "i'd like to"
- "i want"
102 changes: 58 additions & 44 deletions sentences/en/light_HassTurnOff.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,72 +2,86 @@ language: "en"
intents:
HassTurnOff:
data:
# Turn off a specific light
- sentences:
- "<turn> off (<area> <name> <light_devices>|<name> <light_devices> [in <area>])"
- "[<turn>] (<area> <name> <light_devices>|<name> <light_devices> [in <area>]) [to] off"
- "deactivate (<area> <name> <light_devices>|<name> <light_devices> [in <area>])"
expansion_rules:
light_devices: "(light[s]|[light] switch[es])"
- "<turn> off <area_floor> <name> <light>"
- "<turn> off <name> <light> [<in_area_floor>]"
- "[<turn>] <area_floor> <name> <light> [to] off"
- "[<turn>] <name> <light> [<in_area_floor>] [to] off"
- "deactivate <area_floor> <name> <light>"
- "deactivate <name> <light> [<in_area_floor>]"
requires_context:
domain: "light"

# Turn off all lights in an area
- sentences:
- "<turn> off [all] <light> in <area>"
- "<turn> off [all] <area> <light>"
- "[<turn>] [all] <area> <light> off"
- "[<turn>] [all] <light> [in] <area> off"
- "deactivate [all] <light> [in] <area>"
- "deactivate [all] <area> <light>"
- "<area> <light> (off|out)"
- "<light> (off|out) [in] <area>"
- "<turn> (off|out) [<all>] <area> <light>"
- "<turn> (off|out) [<all>] <light> <in> <area>"
- "[<turn>] [<all>] <area> <light> (off|out)"
- "[<turn>] [<all>] <light> <in> <area> (off|out)"
- "[<turn>] [<all>] <light> (off|out) <in> <area>"
- "deactivate [<all>] <area> <light>"
- "deactivate [<all>] <light> <in> <area>"
- "<turn> (off|out) [all] <light> in <area>"
- "<turn> (off|out) [all] <area> <light>"
- "[<turn>] [all] <area> <light> (off|out)"
- "[<turn>] [all] <light> [in] <area> (off|out)"
- "<light> (off|out) in <area>"
- "<area> <light> (off|out)"
slots:
domain: "light"
response: "lights_area"

# Turn off all lights on a floor
- sentences:
- "<floor> <light> (off|out)"
- "<light> (off|out) [<in>] <floor>"
- "<turn> (off|out) [<all>] <floor> <light>"
- "<turn> (off|out) [<all>] <light> [<in>] <floor>"
- "[<turn>] [<all>] <floor> <light> (off|out)"
- "[<turn>] [<all>] <light> [<in>] <floor> (off|out)"
- "[<turn>] [<all>] <light> (off|out) [<in>] <floor>"
- "deactivate [<all>] <floor> <light>"
- "deactivate [<all>] <light> [<in>] <floor>"
response: "lights_floor"
slots:
domain: "light"

# Turn off all lights in the home
- sentences:
- "<turn> <light> off <everywhere>"
- "<turn> <all> <light> off <everywhere>"
- "<turn> <all> <light> off"
- "<turn> off <all> <light> <everywhere>"
- "<turn> off <light> <everywhere>"
- "<turn> off <all> <light>"
- "deactivate <all> <light> <everywhere>"
- "<turn> <all> <light> (off|out) [<everywhere>]"
- "<turn> <light> (off|out) <everywhere>"
- "<turn> (off|out) <all> <light> [<everywhere>]"
- "<turn> (off|out) <light> <everywhere>"
- "<turn> (off|out) [<all>] [the] <home> <light> <everywhere>"
- "deactivate <all> <light> [<everywhere>]"
- "deactivate <light> <everywhere>"
- "deactivate <all> <light>"
- "get every <light> (off|out) [<everywhere>]"
- "make sure <all> <light> <is> (off|out)"
response: "light_all"
slots:
domain: "light"

# Turn off lights in the same area as a satellite device
- sentences:
- "<turn> <all> <light> off <here>"
- "<turn> <all> <light> <here> off"
- "<turn> off <all> <light> <here>"
- "<turn> off <light> <here>"
- "<turn> off <light>"
- "<turn> <light> off <here>"
- "<turn> <light> <here> off"
- "<turn> <light> off"
- "deactivate <all> <light> <here>"
- "deactivate <light> <here>"
- "deactivate <light>"
- "<light> (off|out)"
# Explicit <here> optional all
- "<turn> [<all>] <light> (off|out) <here>"
- "<turn> [<all>] <light> <here> (off|out)"
- "<turn> (off|out) [<all>] <light> <here>"
- "deactivate [<all>] <light> <here>"
- "[<all>] <light> (off|out) <here>"

# Implicit <here> no all
- "<turn> <light> (off|out) [<here>]"
- "<turn> <light> [<here>] (off|out)"
- "<turn> (off|out) <light> [<here>]"
- "deactivate <light> [<here>]"
- "<light> (off|out) [<here>]"
response: "lights_area"
slots:
domain: "light"
requires_context:
area:
slot: true

# Turn off all lights on a floor
- sentences:
- "<turn> off <all> <light> (on|in) <floor>"
- "<turn> off <all> <light> <floor>"
- "<turn> off <all> <floor> <light>"
- "<turn> <floor> <light> off"
- "<floor> <light> off"
- "deactivate <all> <floor> <light>"
- "deactivate <all> <light> (on|in) <floor>"
response: "lights_floor"
slots:
domain: "light"
106 changes: 63 additions & 43 deletions sentences/en/light_HassTurnOn.yaml
Original file line number Diff line number Diff line change
@@ -1,72 +1,92 @@
---
language: "en"
intents:
HassTurnOn:
data:
# Turn on a specific light
- sentences:
- "<turn> on (<area> <name> <light_devices>|<name> <light_devices> [in <area>])"
- "[<turn>] (<area> <name> <light_devices>|<name> <light_devices> [in <area>]) [to] on"
- "activate (<area> <name> <light_devices>|<name> <light_devices> [in <area>])"
expansion_rules:
light_devices: "(light[s]|[light] switch[es])"
- "<turn> on <area_floor> <name> <light>"
- "<turn> on <name> <light> [<in_area_floor>]"
- "[<turn>] <area_floor> <name> <light> [to] on"
- "[<turn>] <name> <light> [<in_area_floor>] [to] on"
- "activate <area_floor> <name> <light>"
- "activate <name> <light> [<in_area_floor>]"
- "light up <area_floor> <name> <light>"
- "light up <name> <light> [<in_area_floor>]"
requires_context:
domain: "light"

ViViDboarder marked this conversation as resolved.
Show resolved Hide resolved
# Turn on all lights in an area
- sentences:
- "<turn> on [all] <light> in <area>"
- "<turn> on [all] <area> <light>"
- "[<turn>] [all] <area> <light> on"
- "[<turn>] [all] <light> [in] <area> on"
- "activate [all] <light> [in] <area>"
- "activate [all] <area> <light>"
- "<light> on in <area>"
- "(light up|illuminate) <area>"
- "<area> <light> on"
- "<light> on [in] <area>"
- "<turn> on [<all>] <area> <light>"
- "<turn> on [<all>] <light> <in> <area>"
- "[<turn>] [<all>] <area> <light> on"
- "[<turn>] [<all>] <light> <in> <area> on"
- "[<turn>] [<all>] <light> on <in> <area>"
- "activate [<all>] <area> <light>"
- "activate [<all>] <light> <in> <area>"
slots:
domain: "light"
response: "lights_area"

# Turn on all lights on a floor
- sentences:
- "(light up|illuminate) <floor>"
- "<floor> <light> on"
- "<light> on [<in>] <floor>"
- "<turn> on [<all>] <floor> <light>"
- "<turn> on [<all>] <light> [<in>] <floor>"
- "[<turn>] [<all>] <floor> <light> on"
- "[<turn>] [<all>] <light> [<in>] <floor> on"
- "[<turn>] [<all>] <light> on [<in>] <floor>"
- "activate [<all>] <floor> <light>"
- "activate [<all>] <light> [<in>] <floor>"
response: "lights_floor"
slots:
domain: "light"

# Turn on all lights in the home
- sentences:
- "<turn> <all> <light> on <everywhere>"
- "<turn> on <all> <light> <everywhere>"
- "activate <all> <light> <everywhere>"
- "(light up|activate|illuminate) <all> <light> <everywhere>"
- "(light up|illuminate) the (entire|whole) <home>"
- "(light up|illuminate) <everywhere> [<everywhere>]"
- "<turn> <all> <light> on [<everywhere>]"
- "<turn> <light> on <everywhere>"
- "<turn> on <all> <light> [<everywhere>]"
- "<turn> on <light> <everywhere>"
- "<turn> on [<all>] [the] <home> <light> <everywhere>"
- "activate <all> <light> [<everywhere>]"
- "activate <light> <everywhere>"
- "<turn> <all> <light> on"
- "<turn> on <all> <light>"
- "activate <all> <light>"
- "get every <light> on [<everywhere>]"
- "illuminate <all> areas [<everywhere>]"
- make sure <all> <light> <is> on
response: "light_all"
slots:
domain: "light"

# Turn on lights in the same area as a satellite device
- sentences:
- "<turn> <all> <light> on <here>"
- "<turn> <light> on <here>"
- "<turn> <all> <light> <here> on"
- "<turn> <light> <here> on"
- "<turn> on <all> <light> <here>"
- "<turn> on <light> <here>"
- "activate <all> <light> <here>"
- "activate <light> <here>"
- "<turn> <light> on"
- "<turn> on <light>"
- "activate <light>"
- "<light> on"
# Explicit <here> optional all
- "<turn> [<all>] <light> on <here>"
- "<turn> [<all>] <light> <here> on"
- "<turn> on [<all>] <light> <here>"
- "activate [<all>] <light> <here>"
- "[<all>] <light> on <here>"

# Implicit <here> no all
- "<turn> <light> on [<here>]"
- "<turn> <light> [<here>] on"
- "<turn> on <light> [<here>]"
- "activate <light> [<here>]"
- "<light> on [<here>]"
- "light (it|<here>) up"
- "light up [<here>]"
response: "lights_area"
slots:
domain: "light"
requires_context:
area:
slot: true

# Turn on all lights on a floor
- sentences:
- "<turn> on <all> <light> (on|in) <floor>"
- "<turn> on <all> <light> <floor>"
- "<turn> on <all> <floor> <light>"
- "<turn> <floor> <light> on"
- "<floor> <light> on"
- "activate <all> <floor> <light>"
- "activate <all> <light> (on|in) <floor>"
response: "lights_floor"
slots:
domain: "light"
Loading