[EN] Enhanced get state sentences for media_player
#2230
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ intents: | |
| excludes_context: | ||
| domain: | ||
| - cover | ||
| - media_player | ||
|
|
||
| - sentences: | ||
| - (is|are) [there] any {on_off_domains:domain} {on_off_states:state} [in <area>] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| language: en | ||
| intents: | ||
| HassGetState: | ||
| data: | ||
| - sentences: | ||
| - is [the ][state of ]<name> [turned ]on[ in <area>] | ||
| slots: | ||
| actual_state: "on" | ||
| alternate_state: | ||
| "on": "in an unknown state" | ||
| idle: "not playing" | ||
| standby: "in standby" | ||
|
Comment on lines
+8
to
+12
There was a problem hiding this comment. Maybe these should actually be |
||
| response: alternate_state | ||
| requires_context: | ||
| domain: media_player | ||
| excludes_context: | ||
| state: | ||
| - "playing" | ||
| - "off" | ||
|
|
||
| - sentences: | ||
| - is [the ][state of ]<name> [turned ]off[ in <area>] | ||
| slots: | ||
| state: | ||
| - "on" | ||
| - "idle" | ||
| - "paused" | ||
| - "standby" | ||
| - "buffering" | ||
| actual_state: "not off" | ||
| alternate_state: | ||
| "on": "in an unknown state" | ||
| idle: "not playing anything" | ||
| standby: "in standby" | ||
| response: alternate_state | ||
| requires_context: | ||
| domain: media_player | ||
|
|
||
| - sentences: | ||
| - is [the] [state of] <name> {media_player_states:state} [in <area>] | ||
| response: one_yesno | ||
| requires_context: | ||
| domain: media_player | ||
|
|
||
| - sentences: | ||
| - (is|are) [there] any <media_players> {media_player_states:state} [in <area>] | ||
| - (do you know|tell me) if there are any <media_players> {media_player_states:state} [in <area>] | ||
| slots: | ||
| domain: media_player | ||
| response: any | ||
| - sentences: | ||
| - (is|are) [there] any <media_players> {media_player_states:state} [in <area>] | ||
| - (do you know|tell me) if there are any <media_players> {media_player_states:state} [in <area>] | ||
| slots: | ||
| domain: media_player | ||
| response: any | ||
|
|
||
| - sentences: | ||
| - are all [the] <media_players> {media_player_states:state} [in <area>] | ||
| - are all [the] <media_players> in <area> {media_player_states:state} | ||
| slots: | ||
| domain: media_player | ||
| response: all | ||
|
|
||
| - sentences: | ||
| - "[do you know] (which|what) <media_players> (is|are) {media_player_states:state} [in <area>]" | ||
| slots: | ||
| domain: media_player | ||
| response: which | ||
|
|
||
| - sentences: | ||
| - "[tell me] how many <media_players> (is|are) {media_player_states:state} [in <area>]" | ||
| slots: | ||
| domain: media_player | ||
| response: how_many | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -117,7 +117,7 @@ def get_matched_states( | |
| if device_class_entity is not None: | ||
| device_class = device_class_entity.value | ||
|
|
||
| state_name: Optional[str | List[str]] = None | ||
| state_entity = result.entities.get("state") | ||
| if state_entity is not None: | ||
| state_name = state_entity.value | ||
|
|
@@ -163,7 +163,9 @@ def get_matched_states( | |
|
|
||
| if state_name is not None: | ||
| # Match state | ||
| if isinstance(state_name, str) and state.hass_state == state_name: | ||
| matched.append(state) | ||
| elif isinstance(state_name, list) and state.hass_state in state_name: | ||
| matched.append(state) | ||
| else: | ||
| unmatched.append(state) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| language: en | ||
|
Check failure on line 1 in tests/en/media_player_HassGetState.yaml
|
||
| tests: | ||
| - sentences: | ||
| - "is the TV on?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| name: "TV" | ||
| actual_state: "on" | ||
| alternate_state: | ||
| "on": "in an unknown state" | ||
| idle: "not playing" | ||
| standby: "in standby" | ||
| context: | ||
| domain: media_player | ||
| volume_level: "50" | ||
| response: "Tv is on, but it is not playing" | ||
|
|
||
| - sentences: | ||
| - "is the TV off?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| name: "TV" | ||
| state: | ||
| - "on" | ||
| - "idle" | ||
| - "paused" | ||
| - "standby" | ||
| - "buffering" | ||
| actual_state: "not off" | ||
| alternate_state: | ||
| "on": "in an unknown state" | ||
| idle: "not playing anything" | ||
| standby: "in standby" | ||
| context: | ||
| domain: media_player | ||
| volume_level: "50" | ||
| response: "Tv is not off, but it is not playing anything" | ||
|
|
||
| - sentences: | ||
| - "is the TV playing?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| name: "TV" | ||
| state: "playing" | ||
| context: | ||
| domain: media_player | ||
| volume_level: "50" | ||
| response: "No, idle" | ||
|
|
||
| - sentences: | ||
| - "is the TV standing by?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| name: "TV" | ||
| state: | ||
| - "on" | ||
| - "idle" | ||
| - "standby" | ||
| - "buffering" | ||
| context: | ||
| domain: media_player | ||
| volume_level: "50" | ||
| response: "Yes" | ||
|
|
||
| - sentences: | ||
| - "are any media players on in the kitchen?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| area: "Kitchen" | ||
| domain: "media_player" | ||
| state: "playing" | ||
| response: "No" | ||
|
|
||
| - sentences: | ||
| - "are all media players on?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| domain: "media_player" | ||
| state: "playing" | ||
| response: "No, TV is not on" | ||
|
|
||
| - sentences: | ||
| - "are all media players off?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| domain: "media_player" | ||
| state: "off" | ||
| response: "No, TV is not off" | ||
|
|
||
| - sentences: | ||
| - "which media players are on?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| domain: "media_player" | ||
| state: "playing" | ||
| response: "Not any" | ||
|
|
||
| - sentences: | ||
| - "how many media players are on?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| domain: "media_player" | ||
| state: "playing" | ||
| response: "0" | ||
|
|
||
| - sentences: | ||
| - "are all the media players on in the living room" | ||
| - "are all media players on in the living room?" | ||
| - "are all media players in the living room on?" | ||
| intent: | ||
| name: HassGetState | ||
| slots: | ||
| domain: "media_player" | ||
| state: "playing" | ||
| area: "Living Room" | ||
| response: "No, TV is not on" | ||
|
Comment on lines
+1
to
+125
There was a problem hiding this comment. The test scenarios are well-designed but there's an issue with the format of - alternate_state:
- "on": "in an unknown state"
- idle: "not playing"
- standby: "in standby"
+ alternate_state: "in an unknown state"
ToolsGitHub Check: build
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new
alternate_stateresponse template enhances descriptive accuracy but may have an issue with theactual_stateattribute.Committable suggestion
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a slot being passed from
sentences/en/media_player_HassGetState.yaml, so first of all it's not an attribute and second of all it is not a problem.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tetele Thank you for the clarification on the
actual_stateslot usage. I appreciate your insight and understanding of the implementation details. If there's anything else you need assistance with regarding this PR, feel free to let me know!