Prioritize entity names over area names in Assist matching #86982

synesthesiam · 2023-01-30T21:49:22Z

Breaking change

Proposed change

Matches entity names before area names if they are the same. For example, "turn on kitchen lights" will match the entity "kitchen lights" before turning on all lights in the kitchen.

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 Assist not working with lights as devices in areas #86912
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
The code has been formatted using Black (black --fast homeassistant tests)
Tests have been added to verify that the new code works.

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

Documentation added/updated for www.home-assistant.io

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:

I have reviewed two other open pull requests in this repository.

home-assistant · 2023-01-30T21:49:29Z

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 issue.
@home-assistant rename Awesome new title Change the title of the issue.
@home-assistant reopen Reopen the issue.
@home-assistant unassign conversation Removes the current integration label and assignees on the issue, add the integration domain after the command.

homeassistant/components/conversation/default_agent.py

homeassistant/helpers/intent.py

tests/components/conversation/test_init.py

balloob

Looks good! Can be merged when the changes to helpers/intent.py have been removed.

homeassistant/helpers/intent.py

* Refactor async_match_states * Check entity name after state, before aliases * Give entity name matches priority over area names * Don't force result to have area * Add area alias in tests * Move name/area list creation back * Clean up PR * More clean up

MartinHjelmare · 2023-01-31T12:54:22Z

tests/helpers/test_intent.py

@@ -68,6 +69,13 @@ async def test_async_match_states(hass):
        )
    )

+    # Test area alias
+    assert [state1] == list(


Our convention is to put the expected value last, on the right side, of the assert statement.

synesthesiam added 4 commits January 30, 2023 14:55

Refactor async_match_states

3a16c56

Check entity name after state, before aliases

3d6a0f1

Give entity name matches priority over area names

7097fec

Don't force result to have area

df7b460

synesthesiam requested a review from a team as a code owner January 30, 2023 21:49

home-assistant bot added bugfix cla-signed core has-tests integration: conversation Quality Scale: internal labels Jan 30, 2023

frenck added this to the 2023.2.0 milestone Jan 30, 2023

Add area alias in tests

09df520