Skip to content

Bump python-roborock to 5.14.1 and revert defensive aiohttp catch#172745

Merged
justanotherariel merged 1 commit into
home-assistant:devfrom
TheMerinoWolf:roborock-bump-5.14.1-revert-defensive-catch
Jun 1, 2026
Merged

Bump python-roborock to 5.14.1 and revert defensive aiohttp catch#172745
justanotherariel merged 1 commit into
home-assistant:devfrom
TheMerinoWolf:roborock-bump-5.14.1-revert-defensive-catch

Conversation

@TheMerinoWolf

@TheMerinoWolf TheMerinoWolf commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

Proposed change

Bump python-roborock from 5.12.0 to 5.14.1 and revert the defensive aiohttp.ClientError/TimeoutError catch added in #172492.

The library v5.14.1 (via Python-roborock/python-roborock#835) now wraps network exceptions at the HTTP chokepoint (PreparedRequest.request) so they emerge as RoborockException. The integration's existing except RoborockException handler in async_setup_entry already catches that and raises ConfigEntryNotReady. The HA-side defensive catch is now redundant and is reverted per @allenporter's review comment on #172492.

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

Sequence:

  1. Upstream fix merged: fix: wrap aiohttp network errors in RoborockException Python-roborock/python-roborock#835 (2026-06-01)
  2. Library v5.14.1 released: 2026-06-01
  3. This PR bumps + reverts.

Library diff: v5.12.0...v5.14.1

Checklist

  • I understand the code I am submitting and can explain how it works.
  • 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][dev-checklist]
  • I have followed the [perfect PR recommendations][perfect-pr]
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.
  • Any generated code has been carefully reviewed for correctness and compliance with project standards.

If the code communicates with devices, web services, or third-party tools:

  • The [manifest file][manifest-docs] 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 diff between library versions and ideally a link to the changelog/release notes is added to the PR description.

The library v5.14.1 (Python-roborock/python-roborock#835) wraps network
exceptions in RoborockException at the HTTP chokepoint. The integration's
existing `except RoborockException` handler in async_setup_entry now
catches network failures and raises ConfigEntryNotReady, making the
defensive aiohttp.ClientError / TimeoutError catch added in home-assistant#172492
redundant.

Paired in one commit so users never have a window without coverage.

Per @allenporter's review on home-assistant#172492:
home-assistant#172492 (comment)

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings June 1, 2026 12:55
@home-assistant home-assistant Bot added bugfix cla-signed has-tests integration: roborock small-pr PRs with less than 30 lines. Top 100 Integration is ranked within the top 100 by usage Top 200 Integration is ranked within the top 200 by usage labels Jun 1, 2026
@home-assistant

home-assistant Bot commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

Hey there @Lash-L, @allenporter, mind taking a look at this pull request as it has been labeled with an integration (roborock) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of roborock can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant mark-draft Mark the pull request as draft.
  • @home-assistant ready-for-review Remove the draft status from the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign roborock Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant update-branch Update the pull request branch with the base branch.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) on the pull request.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Updates the Roborock integration to use a newer python-roborock version and removes the dedicated “network_error” setup-retry handling (and its related test/translation).

Changes:

  • Bump python-roborock from 5.12.0 to 5.14.1.
  • Remove aiohttp-based network exception handling during config entry setup.
  • Remove related test and translation string for network_error.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
tests/components/roborock/test_init.py Removes test that asserted setup retries on network exceptions.
requirements_all.txt Updates pinned python-roborock version.
homeassistant/components/roborock/strings.json Removes the network_error error message definition.
homeassistant/components/roborock/manifest.json Updates integration requirement to python-roborock==5.14.1.
homeassistant/components/roborock/init.py Removes handling of network exceptions that previously triggered ConfigEntryNotReady.

Comment on lines 120 to 125
translation_domain=DOMAIN,
translation_key="home_data_fail",
) from err
except (aiohttp.ClientError, TimeoutError) as err:
_LOGGER.debug("Network error setting up Roborock: %s", err)
raise ConfigEntryNotReady(
translation_domain=DOMAIN,
translation_key="network_error",
) from err

async def shutdown_roborock(_: Event | None = None) -> None:
await asyncio.gather(device_manager.close(), cache.flush())
Comment on lines 259 to 260
@pytest.mark.parametrize("platforms", [[Platform.SENSOR]])
async def test_stale_device(

@justanotherariel justanotherariel left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@justanotherariel
justanotherariel merged commit 3c0a34c into home-assistant:dev Jun 1, 2026
48 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 2, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

bugfix cla-signed has-tests integration: roborock Quality Scale: silver small-pr PRs with less than 30 lines. Top 100 Integration is ranked within the top 100 by usage Top 200 Integration is ranked within the top 200 by usage

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants