Add select entities for Roborock q10 s5+ by lboue · Pull Request #166142 · home-assistant/core

lboue · 2026-03-21T19:59:44Z

Proposed change

This PR adds a cleaning mode select entity for the Roborock Q10 S5+ integration.

Added RoborockQ10CleanModeSelectEntity to expose cleaning mode selection in Home Assistant.
Mapped Q10 modes to existing keys for consistency:
- BOTH_WORK → vac_and_mop
- ONLY_SWEEP → vacuum
- ONLY_MOP → mop
Reused existing translation labels (no duplicate mode names).
Simplified the options property: removed redundant filtering of YXCleanType.UNKNOWN (now handled by the mapping function), improving code clarity and efficiency.
Added tests for current option, successful updates, and error handling.

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: Roborock: Q10, Q7, and other new vacuums not supported #144138
Link to documentation pull request:
Link to developer documentation pull request:
Link to frontend pull request:

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
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.
Any generated code has been carefully reviewed for correctness and compliance with project standards.

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated for www.home-assistant.io

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 diff between library versions and ideally a link to the changelog/release notes is added to the PR description.

To help with the load of incoming pull requests:

I have reviewed two other open pull requests in this repository.

Add select entity support for Q10 devices with: - RoborockQ10CleanModeSelectEntity for setting cleaning mode - Helper function _get_q10_cleaning_mode to extract current mode from Q10 data - Integration with Q10UpdateCoordinator for push-based updates - Support for YXCleanType enum modes (vacuum, vac_and_mop, mop, auto, etc.) - Async command sending with set_clean_mode via Q10 vacuum trait All existing select tests pass (18/18) for V1, Q7, and Zeo devices.

Add test coverage for the new RoborockQ10CleanModeSelectEntity: - test_q10_cleaning_mode_select_current_option: Verify entity exists with valid options - test_q10_cleaning_mode_select_update_success: Test setting a valid cleaning mode - test_q10_cleaning_mode_select_update_failure: Test error handling when API call fails All select tests pass (21/18 - 3 new Q10 tests added).

Add translation keys for Q10 specific cleaning modes: - both_work: Vacuum and mop - only_sweep: Vacuum only - only_mop: Mop only Keep existing Q7 mode translations for backward compatibility.

home-assistant · 2026-03-21T19:59:51Z

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 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 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.

- Add _map_q10_clean_mode_to_state_key() function to map YXCleanType enum values to existing Q7 keys - BOTH_WORK → vac_and_mop - ONLY_SWEEP → vacuum - ONLY_MOP → mop - Remove duplicate translations from strings.json (both_work, only_sweep, only_mop) - Update Q10 entity to use mapped state keys instead of enum names - Update tests to use correct mapped option names - All 21 select tests passing (18 existing + 3 Q10)

Copilot

Pull request overview

Adds a new select entity to the Roborock integration to control Q10 S5+ cleaning mode, with corresponding translations and tests.

Changes:

Add RoborockQ10CleanModeSelectEntity and wire it into async_setup_entry for Q10 coordinators.
Extend strings.json with additional cleaning_mode state translations used by Q10.
Add initial tests covering entity existence and service calls for the new Q10 select.

Reviewed changes

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

File	Description
`homeassistant/components/roborock/select.py`	Adds a Q10 cleaning mode select entity and setup wiring.
`homeassistant/components/roborock/strings.json`	Adds translations for new Q10 cleaning mode option keys.
`tests/components/roborock/test_select.py`	Adds tests for Q10 cleaning mode select existence and service behavior.

homeassistant/components/roborock/select.py

tests/components/roborock/test_select.py

…0_DP and validate state options

Copilot

Pull request overview

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

homeassistant/components/roborock/select.py

tests/components/roborock/test_select.py

…c state

…update references

…rror for invalid options

Copilot

Pull request overview

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

tests/components/roborock/test_select.py

homeassistant/components/roborock/select.py

Copilot

Pull request overview

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

tests/components/roborock/test_select.py

homeassistant/components/roborock/select.py

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

homeassistant/components/roborock/select.py

Copilot

Pull request overview

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

Copilot

Pull request overview

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

homeassistant/components/roborock/select.py

…plify state key mapping

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Copilot · 2026-03-23T12:20:38Z

homeassistant/components/roborock/select.py

+        if clean_mode is None or clean_mode.code is None:
+            return None
+        code = clean_mode.code
+        for mode in YXCleanType:
+            if getattr(mode, "code", None) == code:
+                if mode == YXCleanType.UNKNOWN:
+                    return None
+                return mode.value
+        return None


current_option appears to treat status.clean_mode as a code-bearing object and then loops over YXCleanType to find a matching member. Since other Q10 entities (e.g. RoborockQ10Vacuum.fan_speed) use the enum value directly, consider returning clean_mode.value when clean_mode is a YXCleanType (and None for None/UNKNOWN). This removes the redundant enum scan and avoids coupling to a .code attribute.

Suggested change

if clean_mode is None or clean_mode.code is None:

return None

code = clean_mode.code

for mode in YXCleanType:

if getattr(mode, "code", None) == code:

if mode == YXCleanType.UNKNOWN:

return None

return mode.value

return None

# Treat clean_mode as a YXCleanType enum when possible.

if not isinstance(clean_mode, YXCleanType):

return None

if clean_mode is YXCleanType.UNKNOWN:

return None

return clean_mode.value

allenporter · 2026-03-24T02:56:06Z

homeassistant/components/roborock/select.py

+        mode = None
+        for m in YXCleanType:
+            if m.value == option:
+                mode = m
+                break
+        if mode is None:


Suggested change

mode = None

for m in YXCleanType:

if m.value == option:

mode = m

break

if mode is None:

if (mode := YXCleanType.from_code_optional(option) is None:

allenporter · 2026-03-24T02:57:00Z

homeassistant/components/roborock/select.py

+        clean_mode = self.coordinator.api.status.clean_mode
+        if clean_mode is None or clean_mode.code is None:
+            return None
+        code = clean_mode.code
+        for mode in YXCleanType:
+            if getattr(mode, "code", None) == code:
+                if mode == YXCleanType.UNKNOWN:
+                    return None
+                return mode.value
+        return None


I was expecting to see something like this:

Suggested change

clean_mode = self.coordinator.api.status.clean_mode

if clean_mode is None or clean_mode.code is None:

return None

code = clean_mode.code

for mode in YXCleanType:

if getattr(mode, "code", None) == code:

if mode == YXCleanType.UNKNOWN:

return None

return mode.value

return None

clean_mode = self.coordinator.api.status.clean_mode

if clean_mode is None or clean_mode.code is None:

return None

return clean_mode.value

allenporter · 2026-03-24T02:57:37Z

tests/components/roborock/test_select.py

+    options = state.attributes.get("options")
+    assert options is not None
+    assert set(options) == {"vac_and_mop", "vacuum", "mop"}
+    assert len(options) == len(set(options))


This is not needed given the previous line right?

Suggested change

assert len(options) == len(set(options))

allenporter · 2026-03-24T02:58:27Z

tests/components/roborock/test_select.py

+    assert updated_state.state != STATE_UNKNOWN
+    assert updated_state.state == "vac_and_mop"


We can just directly check the final value, right?

Suggested change

assert updated_state.state != STATE_UNKNOWN

assert updated_state.state == "vac_and_mop"

assert updated_state.state == "vac_and_mop"

allenporter · 2026-03-24T02:59:00Z

tests/components/roborock/test_select.py

+    """Test Q10 cleaning mode select entity current option."""
+    entity_id = "select.roborock_q10_s5_cleaning_mode"
+    state = hass.states.get(entity_id)
+    assert state is not None


Below we assert that state.state changes, so i think we should assert on its starting value here otherwise we haven't confirmed the update really happened.

allenporter · 2026-03-24T03:00:19Z

tests/components/roborock/test_select.py

+        )
+
+
+async def test_q10_cleaning_mode_select_invalid_option(


We don't write tests that directly depend on entities, and instead use the home assistant APIs to communicate with them. Please use hass.services.async_call like is done in the other previous tests.

lboue added 3 commits March 21, 2026 20:52

i18n(roborock): Add Q10 cleaning mode translations

213b328

Add translation keys for Q10 specific cleaning modes: - both_work: Vacuum and mop - only_sweep: Vacuum only - only_mop: Mop only Keep existing Q7 mode translations for backward compatibility.

Copilot AI review requested due to automatic review settings March 21, 2026 19:59

home-assistant bot added cla-signed has-tests integration: roborock labels Mar 21, 2026

home-assistant bot assigned allenporter Mar 21, 2026

home-assistant bot added the Quality Scale: silver label Mar 21, 2026

Copilot started reviewing on behalf of lboue March 21, 2026 20:00 View session

Copilot AI reviewed Mar 21, 2026

View reviewed changes

lboue added the new-feature label Mar 21, 2026

lboue added 3 commits March 21, 2026 21:08

fix(roborock): Use Q10 status trait for cleaning mode select state

d5af70e

fix(roborock): Update Q10 cleaning mode select test to include B01_Q1…

dd439b6

…0_DP and validate state options

fix(roborock): Import YXCleanType for Q10 cleaning mode select updates

d059c53

Copilot AI review requested due to automatic review settings March 21, 2026 20:11

Copilot started reviewing on behalf of lboue March 21, 2026 20:12 View session

Copilot AI reviewed Mar 21, 2026

View reviewed changes

lboue added 2 commits March 21, 2026 22:18

fix(roborock): Remove unused import of B01_Q10_DP from select.py

8452734

fix(roborock): Update Q10 cleaning mode select test to assert specifi…

9e5435b

…c state

Copilot AI review requested due to automatic review settings March 21, 2026 21:19

Copilot started reviewing on behalf of lboue March 21, 2026 21:20 View session

lboue added 2 commits March 21, 2026 22:21

refactor(roborock): Rename q10_device fixture to fake_q10_vacuum and …

b5fc23b

…update references

fix(roborock): Update async_select_option to raise ServiceValidationE…

e4b86e7

…rror for invalid options

Copilot AI reviewed Mar 21, 2026

View reviewed changes

tests/components/roborock/test_select.py Outdated Show resolved Hide resolved

tests/components/roborock/test_select.py Outdated Show resolved Hide resolved

lboue marked this pull request as ready for review March 21, 2026 21:24

lboue requested a review from allenporter as a code owner March 21, 2026 21:24

allenporter requested changes Mar 21, 2026

View reviewed changes

homeassistant/components/roborock/select.py Outdated Show resolved Hide resolved

lboue requested a review from Copilot March 22, 2026 15:06

Copilot started reviewing on behalf of lboue March 22, 2026 15:06 View session

Add test for handling invalid cleaning mode selection in Q10

c29fd2c

Copilot AI reviewed Mar 22, 2026

View reviewed changes

tests/components/roborock/test_select.py Show resolved Hide resolved

homeassistant/components/roborock/select.py Outdated Show resolved Hide resolved

lboue added 2 commits March 22, 2026 16:11

Remove unnecessary async refresh call in Q10 clean mode selection

0261b6c

Add assertions to validate Q10 cleaning mode options in test

9057aa9

lboue marked this pull request as ready for review March 22, 2026 17:38

Copilot AI review requested due to automatic review settings March 22, 2026 17:38

home-assistant bot requested a review from allenporter March 22, 2026 17:38

Copilot started reviewing on behalf of lboue March 22, 2026 17:39 View session

Copilot AI reviewed Mar 22, 2026

View reviewed changes

homeassistant/components/roborock/select.py Outdated Show resolved Hide resolved

lboue and others added 2 commits March 22, 2026 22:45

Merge branch 'dev' into feat/roborock-q10-s5-plus-vacuum-select

9c372a2

Update cleaning mode selection for Q10 vacuum to use VAC_AND_MOP

bd1c87d

Copilot AI review requested due to automatic review settings March 22, 2026 21:46

Copilot started reviewing on behalf of lboue March 22, 2026 21:47 View session

Copilot AI reviewed Mar 22, 2026

View reviewed changes

Remove UNKNOWN option from Q10 clean mode selection

77b9243

lboue requested a review from Copilot March 22, 2026 22:47

Copilot started reviewing on behalf of lboue March 22, 2026 22:47 View session

Copilot AI reviewed Mar 22, 2026

View reviewed changes

joostlek changed the title ~~Feat/roborock q10 s5 plus vacuum select~~ Add select entities for Roborock q10 s5+ Mar 22, 2026

allenporter requested changes Mar 22, 2026

View reviewed changes

homeassistant/components/roborock/select.py Outdated Show resolved Hide resolved

home-assistant bot marked this pull request as draft March 22, 2026 23:28

Refactor Q10 cleaning mode handling to remove legacy mappings and sim…

babc3ae

…plify state key mapping

lboue requested a review from allenporter March 23, 2026 12:08

lboue marked this pull request as ready for review March 23, 2026 12:16

Copilot AI review requested due to automatic review settings March 23, 2026 12:16

Copilot AI reviewed Mar 23, 2026

View reviewed changes

allenporter requested changes Mar 24, 2026

View reviewed changes

home-assistant bot marked this pull request as draft March 24, 2026 03:00

		assert updated_state.state != STATE_UNKNOWN
		assert updated_state.state == "vac_and_mop"

Uh oh!

Conversation

lboue commented Mar 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed change

Type of change

Additional information

Checklist

Uh oh!

home-assistant bot commented Mar 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

allenporter Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

allenporter Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

allenporter Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

allenporter Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

allenporter Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

allenporter Mar 24, 2026

Choose a reason for hiding this comment

lboue commented Mar 21, 2026 •

edited

Loading