Fix device sync to Google Assistant if Matter integration is active

[marcelveldt]

Proposed change

To deduplicate devices on Google Home if both HA and Google Home have the same device in their Matter fabric, some logic was added to Home Assistant to pass Matter specific id's to Google Assistant.

This logic was however called for non-Matter devices as well and instead of returning None if a device was non-existing, the Matter integration was (unexpectedly) raising a ValueError. Result was that non-matter devices would no longer be synced with Google Assistant if a user has the Matter integration installed.

This patches this issue for now, while we think of a more robust callback-like solution in the future;

• Prevent the Google Assistant integration from calling the function inside the Matter integration to get the special id's if a device is not Matter.
• Return None in the matter integration lookup helper if the device doe snot exist instead of raising ValueError.

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 Google Home/Assistant exposed devices in HA are not actually exposed to Google Home #104761
• 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:

• 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]

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

Code owner commands

Code owners of google_assistant 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 google_assistant 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.

[home-assistant]

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

Code owner commands

Code owners of matter 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 matter 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.

[MartinHjelmare]

Noticed that we need to update this test too:

core/tests/components/matter/test_helpers.py

Lines 64 to 73 in 1ab9357

	await get_node_from_device_entry(hass, other_device_entry)
	assert f"Device {other_device_entry.id} is not a Matter device" in str(
	value_error.value
	)
	matter_client.server_info = None
	with pytest.raises(RuntimeError) as runtime_error:
	node_from_device_entry = await get_node_from_device_entry(hass, device_entry)

The function isn't a coroutine function anymore since a while. And it doesn't raise ValueError now.

[home-assistant]

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

Comment addressed