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 Twinkly raise on progress #133601

Merged
merged 2 commits into from
Dec 19, 2024

Conversation

joostlek
Copy link
Member

@joostlek joostlek commented Dec 19, 2024

Proposed change

Fix Twinkly raise on progress

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.

To help with the load of incoming pull requests:

@home-assistant
Copy link

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

Code owner commands

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

@Olen
Copy link
Contributor

Olen commented Dec 19, 2024

Isn't the main problem here that the integration believes it is the same device that is being set up twice?

@joostlek
Copy link
Member Author

Yes, @zweckj actually caught me on that so I removed the link to the issue

@@ -45,7 +45,9 @@ async def async_step_user(
except (TimeoutError, ClientError):
errors[CONF_HOST] = "cannot_connect"
else:
await self.async_set_unique_id(device_info[DEV_ID])
await self.async_set_unique_id(
device_info[DEV_ID], raise_on_progress=False
Copy link
Member

@bdraco bdraco Dec 19, 2024

Choose a reason for hiding this comment

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

Probably could use a test for a competing discovery

@joostlek
Copy link
Member Author

Oh lol, looking at the diagnostics, both lihgts have the same UUID

@joostlek
Copy link
Member Author

Any reason we pick the uuid over the mac address for the unique id?

@joostlek joostlek merged commit 61e5f10 into home-assistant:dev Dec 19, 2024
30 checks passed
@joostlek joostlek deleted the twinkly-raise-on-progress branch December 19, 2024 19:27
frenck pushed a commit that referenced this pull request Dec 20, 2024
@frenck frenck mentioned this pull request Dec 20, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Dec 21, 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.

4 participants