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

Specific Assist errors for domain/device class #107302

Merged
merged 5 commits into from Jan 8, 2024

Conversation

synesthesiam
Copy link
Contributor

Breaking change

Proposed change

Use specific Assist errors for domain/device class. For example, "turn on kitchen lights" will now respond with "kitchen does not contain a light" instead of "Sorry, I couldn't understand that". Likewise, "close bedroom windows" will respond "bedroom does not contain a window".

To make this work, the ServiceIntentHandler was modified to raise a new NoStatesMatchedError, which is bubbled up by intent.async_handle to the default agent. This error must be raised inside the intent handler because it is only after filtering entities based on the constraints that we know nothing matches [1]. The error must be bubbled up because only the default agent knows how to produce the correct translated responses.

[1] Additionally, other intent handlers may not care if nothing matches. GetStateIntentHandler is one of these, which would just respond "0" to "how many lights are in the kitchen" if there are no lights instead of raising an error.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

@home-assistant
Copy link

home-assistant bot commented Jan 5, 2024

Hey there @home-assistant/core, mind taking a look at this pull request as it has been labeled with an integration (conversation) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of conversation can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign conversation Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@synesthesiam synesthesiam marked this pull request as ready for review January 5, 2024 20:40
@synesthesiam synesthesiam requested a review from a team as a code owner January 5, 2024 20:40
Comment on lines 887 to 908
if no_states_error.area:
# Check device classes first, since it's more specific than domain
if no_states_error.device_classes:
# No exposed entities of a particular class in an area.
# Example: "close the bedroom windows"
error_response_type = ResponseType.NO_DEVICE_CLASS
error_response_args["area"] = no_states_error.area

# Only use the first device class for the error message
error_response_args["device_class"] = next(
iter(no_states_error.device_classes)
)
elif no_states_error.domains:
# No exposed entities of a domain in an area.
# Example: "turn on lights in kitchen"
error_response_type = ResponseType.NO_DOMAIN
error_response_args["area"] = no_states_error.area

# Only use the first domain for the error message
error_response_args["domain"] = next(iter(no_states_error.domains))

return error_response_type, error_response_args
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if no_states_error.area:
# Check device classes first, since it's more specific than domain
if no_states_error.device_classes:
# No exposed entities of a particular class in an area.
# Example: "close the bedroom windows"
error_response_type = ResponseType.NO_DEVICE_CLASS
error_response_args["area"] = no_states_error.area
# Only use the first device class for the error message
error_response_args["device_class"] = next(
iter(no_states_error.device_classes)
)
elif no_states_error.domains:
# No exposed entities of a domain in an area.
# Example: "turn on lights in kitchen"
error_response_type = ResponseType.NO_DOMAIN
error_response_args["area"] = no_states_error.area
# Only use the first domain for the error message
error_response_args["domain"] = next(iter(no_states_error.domains))
return error_response_type, error_response_args
if not no_states_error.area:
return error_response_type, error_response_args
# Check device classes first, since it's more specific than domain
if no_states_error.device_classes:
# No exposed entities of a particular class in an area.
# Example: "close the bedroom windows"
error_response_type = ResponseType.NO_DEVICE_CLASS
error_response_args["area"] = no_states_error.area
# Only use the first device class for the error message
error_response_args["device_class"] = next(
iter(no_states_error.device_classes)
)
return error_response_type, error_response_args
# No exposed entities of a domain in an area.
# Example: "turn on lights in kitchen"
error_response_type = ResponseType.NO_DOMAIN
error_response_args["area"] = no_states_error.area
# Only use the first domain for the error message
error_response_args["domain"] = next(iter(no_states_error.domains))
return error_response_type, error_response_args

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I refactored the top guard clause to exit early if there isn't an area as well as at least one domain/device class.
Otherwise, this suggestion could fail on next(iter(no_states_error.domains))

@frenck frenck marked this pull request as draft January 8, 2024 08:41
@frenck
Copy link
Member

frenck commented Jan 8, 2024

I've marked this PR, as changes are requested that need to be processed.
Please un-draft it once it is ready for review again by clicking the "Ready for review" button.

Thanks! 👍

../Frenck

Learn more about our pull request process.

@synesthesiam synesthesiam marked this pull request as ready for review January 8, 2024 15:49
@synesthesiam synesthesiam merged commit 4bb2a3a into dev Jan 8, 2024
53 checks passed
@synesthesiam synesthesiam deleted the synesthesiam-20240105-domain-device-class-errors branch January 8, 2024 18:23
@github-actions github-actions bot locked and limited conversation to collaborators Jan 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants