Ignore attribute reports when considering ZCL command/response matching #1707
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
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev #1707 +/- ##
=======================================
Coverage 99.31% 99.31%
=======================================
Files 63 63
Lines 12184 12186 +2
=======================================
+ Hits 12100 12102 +2
Misses 84 84 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Pull Request Overview
This PR adds logic to prevent attribute reports from being incorrectly matched with pending ZCL command/response pairs, addressing a collision issue where attribute reports with matching TSNs could interfere with request-response matching.
- Adds an
isinstancecheck in_maybe_match_responseto filter outReport_Attributescommands from response matching - Includes comprehensive test coverage to verify attribute reports don't resolve pending requests
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| zigpy/device.py | Added check in _maybe_match_response method to prevent Report_Attributes commands from matching with pending requests |
| tests/test_device.py | Added test case test_attribute_report_not_matched_with_request to verify attribute reports don't incorrectly resolve pending command requests |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 is an independent fix that complements #1636. It should be a safer fix for home-assistant/core#150589.
The vast majority of commands sent by devices to zigpy are attribute reports. These should never match up to commands.