fix: Improve Home trait discovery process. #580
Merged
Conversation
This file contains hidden or 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
allenporter
force-pushed
the
home-data
branch
from
e504a08 to
c5cf8c2
Compare
This updates the Home trait to allow the current map to be refreshed even if initial discovery fails. The caller can invoke discovery at startup, but then after just invoke refresh and the right thing should happen. We now track discovery explicitly and only persist the cache when we have completed discovery to avoid persisting an incomplete view of all available maps.
allenporter
force-pushed
the
home-data
branch
from
e504a08 to
f6cd9a4
Compare
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the HomeTrait.refresh() behavior to handle scenarios where home discovery hasn't completed yet, particularly when the device is busy cleaning. The key improvement is allowing refresh to fall back to updating only the current map when full discovery cannot be performed.
- Modified
refresh()to attempt discovery when not completed, gracefully falling back to current map refresh when device is busy - Updated
_update_current_map()to conditionally update persistent cache based on discovery completion status - Removed obsolete test for error condition that no longer exists, added comprehensive test for refresh behavior during device busy state
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| roborock/devices/traits/v1/home.py | Added _discovery_completed flag to track discovery state; refactored refresh() to attempt discovery first and fall back to current map refresh; updated _update_current_map() to conditionally persist cache based on discovery status |
| tests/devices/traits/v1/test_home.py | Removed test for obsolete error condition; added verification of persistent cache updates in discovery test; expanded device busy test to cover refresh attempts during and after cleaning |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
21 tasks
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Removed redundant assertion for home_map_info length.
Lash-L
reviewed
Nov 10, 2025
| # then we'll fall through below to refresh the current map only. | ||
| try: | ||
| await self.discover_home() | ||
| return self |
Collaborator
There was a problem hiding this comment.
not against it but do we utilize anywhere the fact that this is returning self?
Contributor
Author
There was a problem hiding this comment.
Yes, agreed, we never use it and it only adds typing pain. I'll remove it in a followup PR.
Lash-L
approved these changes
Nov 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This updates the Home trait to allow the current map to be refreshed even if initial discovery fails. The caller can invoke discovery at startup, but then after just invoke refresh and the right thing should happen.
We now track discovery explicitly and only persist the cache when we have completed discovery to avoid persisting an incomplete view of all available maps.