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

Fix Shelly missing Gen value for older devices #107294

Merged
merged 2 commits into from
Jan 5, 2024

Conversation

thecode
Copy link
Member

@thecode thecode commented Jan 5, 2024

Proposed change

Fix missing Gen value in older devices which don't have this value stored in config entry due to change introduced in #107019

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

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

home-assistant bot commented Jan 5, 2024

Hey there @balloob, @bieniu, @chemelli74, @bdraco, mind taking a look at this pull request as it has been labeled with an integration (shelly) you are listed as a code owner for? Thanks!

Code owner commands

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

@bdraco
Copy link
Member

bdraco commented Jan 5, 2024

Looks like a good fix to me. 🚀 Testing it now on my production

Copy link
Member

@bdraco bdraco left a comment

Choose a reason for hiding this comment

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

Thanks. LGTM

It would be nice to have a test that set up a config entry that was missing gen so we don't regress this in the future. I'm also happy to add it in a followup PR if you would perfer.

@thecode
Copy link
Member Author

thecode commented Jan 5, 2024

It would be nice to have a test that set up a config entry that was missing gen so we don't regress this in the future. I'm also happy to add it in a followup PR if you would perfer.

Added test to check we successfully init a Gen1 device in this case, I verified it by modifying the get_device_entry_gen and checking the test fails if this is changed in the future.

  File "/workspaces/core/homeassistant/components/shelly/utils.py", line 329, in get_device_entry_gen
    return entry.data[CONF_GEN]
           ~~~~~~~~~~^^^^^^^^^^
KeyError: 'gen'

Copy link
Contributor

@starkillerOG starkillerOG left a comment

Choose a reason for hiding this comment

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

Thank you very much for the quick fix and response

@Scope666
Copy link

Scope666 commented Jan 5, 2024

Just as another data point these changes work for me.

image

Copy link
Member

@bieniu bieniu left a comment

Choose a reason for hiding this comment

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

Thanks @thecode

@home-assistant home-assistant locked and limited conversation to collaborators Jan 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shelly 1, 2.5 and Dimmer cant be loaded with 2024.1.1
8 participants