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

Delete removed device(s) at runtime in Plugwise #118460

Closed
wants to merge 9 commits into from

Conversation

bouwew
Copy link
Contributor

@bouwew bouwew commented May 30, 2024

Proposed change

Implement automatic removal during runtime for Plugwise: when removing a device from for instance an Adam, the device will automatically be removed from the integration in HA Core.

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

Hey there @CoMPaTech, @frenck, mind taking a look at this pull request as it has been labeled with an integration (plugwise) you are listed as a code owner for? Thanks!

Code owner commands

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

@bouwew bouwew marked this pull request as ready for review May 30, 2024 07:49
@bouwew bouwew requested a review from frenck as a code owner May 30, 2024 07:49
@bouwew
Copy link
Contributor Author

bouwew commented May 30, 2024

@coderabbitai review

Copy link

coderabbitai bot commented May 30, 2024

Walkthrough

The recent updates to the Plugwise component in Home Assistant focus on enhancing device management. A new constant GATEWAY_ID was added for better identification, and a new async function cleanup_device_and_entity_registry was introduced to efficiently remove deleted devices from the registries. Additionally, test cases were updated to verify the proper removal of device entries.

Changes

Files Changed Change Summary
homeassistant/components/plugwise/const.py Added a new constant GATEWAY_ID for identifying gateways.
homeassistant/components/plugwise/coordinator.py Introduced cleanup_device_and_entity_registry async function to manage the removal of deleted devices.
tests/components/plugwise/test_init.py Updated test cases to remove a device entry and verify the impact on device and entity registries.

Sequence Diagram(s) (Beta)

sequenceDiagram
    participant User
    participant HomeAssistant
    participant PlugwiseComponent
    participant DeviceRegistry
    participant EntityRegistry

    User->>HomeAssistant: Initiates device removal
    HomeAssistant->>PlugwiseComponent: Calls cleanup_device_and_entity_registry
    PlugwiseComponent->>DeviceRegistry: Removes device entry
    PlugwiseComponent->>EntityRegistry: Removes related entity entries
    PlugwiseComponent-->>HomeAssistant: Completion of cleanup
    HomeAssistant-->>User: Confirms device removal

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

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

What about the entities of those devices?

homeassistant/components/plugwise/coordinator.py Outdated Show resolved Hide resolved
homeassistant/components/plugwise/coordinator.py Outdated Show resolved Hide resolved
homeassistant/components/plugwise/coordinator.py Outdated Show resolved Hide resolved
@home-assistant home-assistant bot marked this pull request as draft June 11, 2024 17:02
@home-assistant
Copy link

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.

@bouwew
Copy link
Contributor Author

bouwew commented Jun 12, 2024

What about the entities of those devices?

As far as I can see in testing these are automatically removed alongside the removed device(s) .
I did add code for removing the corresponding entities but these line were always skipped in testing. See here for the code I tried: plugwise/plugwise-beta@05dc06e
Lines 89 and 90 were never executed during testing. From this I concluded that the entities I was trying to remove, were already gone. When I looked at the detailed test-logging, I could see that the entities were being removed automatically alongside the device(s) by only the device_registry-related code, which confirmed my suspicion.

@bouwew bouwew marked this pull request as ready for review June 12, 2024 11:20
@home-assistant home-assistant bot requested a review from frenck June 12, 2024 11:20
@bouwew bouwew marked this pull request as draft June 19, 2024 09:53
@bouwew
Copy link
Contributor Author

bouwew commented Jun 19, 2024

After discussing with @joostlek I will change this PR to implement the methods used in the Tedee integration.

@bouwew bouwew marked this pull request as ready for review June 24, 2024 08:12
@bouwew
Copy link
Contributor Author

bouwew commented Jun 24, 2024

Closed due to conflict.

@bouwew bouwew closed this Jun 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants