chore: address comments from copilot

Author: Lash-L

roborock/data/v1/v1_clean_modes.py

@@ -207,12 +207,32 @@ def get_mop_only_vacuum_mode(features: DeviceFeatures) -> VacuumModes:
     return VacuumModes.OFF
 
 
-_CLEAN_MOTOR_MODE_PARAMS: dict[CleaningModes, tuple[int, int, int]] = {
-    CleaningModes.VACUUM: (VacuumModes.BALANCED.code, WaterModes.OFF.code, CleanRoutes.STANDARD.code),
-    CleaningModes.VAC_AND_MOP: (VacuumModes.BALANCED.code, WaterModes.STANDARD.code, CleanRoutes.STANDARD.code),
-    CleaningModes.CUSTOM: (VacuumModes.CUSTOMIZED.code, WaterModes.CUSTOMIZED.code, CleanRoutes.CUSTOMIZED.code),
-    CleaningModes.SMART_MODE: (VacuumModes.SMART_MODE.code, WaterModes.SMART_MODE.code, CleanRoutes.SMART_MODE.code),
-}
+def _get_default_mopping_water_code(features: DeviceFeatures) -> int:
+    """Pick a sensible default water code when mopping for the device."""
+    # Water-slide devices use a disjoint set of water codes; pick a mid-flow
+    # slide code instead of the standard 202, which they don't accept.
+    if features.is_water_slide_mode_supported:
+        return WaterModes.PURE_WATER_FLOW_MIDDLE.code
+    return WaterModes.STANDARD.code
+
+
+def _get_clean_motor_mode_params(mode: CleaningModes, features: DeviceFeatures) -> tuple[int, int, int]:
+    """Return (fan_power, water_box_mode, mop_mode) codes for the high-level mode."""
+    if mode == CleaningModes.VACUUM:
+        return (VacuumModes.BALANCED.code, WaterModes.OFF.code, CleanRoutes.STANDARD.code)
+    if mode == CleaningModes.VAC_AND_MOP:
+        return (VacuumModes.BALANCED.code, _get_default_mopping_water_code(features), CleanRoutes.STANDARD.code)
+    if mode == CleaningModes.MOP:
+        return (
+            get_mop_only_vacuum_mode(features).code,
+            _get_default_mopping_water_code(features),
+            CleanRoutes.STANDARD.code,
+        )
+    if mode == CleaningModes.CUSTOM:
+        return (VacuumModes.CUSTOMIZED.code, WaterModes.CUSTOMIZED.code, CleanRoutes.CUSTOMIZED.code)
+    if mode == CleaningModes.SMART_MODE:
+        return (VacuumModes.SMART_MODE.code, WaterModes.SMART_MODE.code, CleanRoutes.SMART_MODE.code)
+    raise RoborockUnsupportedFeature(f"Cleaning mode {mode.value!r} is not supported")
 
 
 def get_cleaning_mode_parameters(cleaning_mode: str | CleaningModes, features: DeviceFeatures) -> list[dict[str, int]]:
@@ -224,13 +244,7 @@ def get_cleaning_mode_parameters(cleaning_mode: str | CleaningModes, features: D
     if mode not in get_cleaning_mode_options(features):
         raise RoborockUnsupportedFeature(f"Cleaning mode {mode.value!r} is not supported")
 
-    if mode == CleaningModes.MOP:
-        fan_power = get_mop_only_vacuum_mode(features).code
-        water_box_mode = WaterModes.STANDARD.code
-        mop_mode = CleanRoutes.STANDARD.code
-    else:
-        fan_power, water_box_mode, mop_mode = _CLEAN_MOTOR_MODE_PARAMS[mode]
-
+    fan_power, water_box_mode, mop_mode = _get_clean_motor_mode_params(mode, features)
     params: dict[str, int] = {"fan_power": fan_power, "water_box_mode": water_box_mode}
     if features.is_clean_route_setting_supported:
         params["mop_mode"] = mop_mode

roborock/devices/traits/v1/status.py

@@ -38,11 +38,11 @@ class StatusTrait(StatusV2, common.V1TraitMixin):
     - Water Mode
     - Mop Route
 
-    You should call the _options() version of the attribute to know which are
-    supported for your device (i.e. fan_speed_options())
-    Then you can call the _mapping to convert an int value to the actual Enum.
-    (i.e. fan_speed_mapping())
-    You can call the _name property to get the str value of the enum. (i.e. fan_speed_name)
+    You should use the _options version of the attribute to know which are
+    supported for your device (i.e. fan_speed_options)
+    Then you can use the _mapping to convert an int value to the actual Enum.
+    (i.e. fan_speed_mapping)
+    You can use the _name property to get the str value of the enum. (i.e. fan_speed_name)
 
     """
 

tests/devices/traits/v1/test_status.py

@@ -41,6 +41,8 @@ def _create_cleaning_mode_status_trait(**feature_overrides: bool) -> StatusTrait
     features.is_customized_clean_supported = True
     features.is_clean_route_setting_supported = True
     for feature_name, value in feature_overrides.items():
+        if not hasattr(features, feature_name):
+            raise AttributeError(f"Unknown DeviceFeatures override: {feature_name}")
         setattr(features, feature_name, value)
     return StatusTrait(cast(DeviceFeaturesTrait, features), region="us")
 
@@ -305,6 +307,33 @@ def test_get_cleaning_mode_parameters_without_clean_route_setting() -> None:
     ]
 
 
+def test_get_cleaning_mode_parameters_water_slide_device() -> None:
+    """Water-slide devices should use a slide-compatible water code, not 202."""
+    status_trait = _create_cleaning_mode_status_trait(is_water_slide_mode_supported=True)
+
+    assert status_trait.get_cleaning_mode_parameters(CleaningModes.VACUUM) == [
+        {
+            "fan_power": VacuumModes.BALANCED.code,
+            "water_box_mode": WaterModes.OFF.code,
+            "mop_mode": CleanRoutes.STANDARD.code,
+        }
+    ]
+    assert status_trait.get_cleaning_mode_parameters(CleaningModes.VAC_AND_MOP) == [
+        {
+            "fan_power": VacuumModes.BALANCED.code,
+            "water_box_mode": WaterModes.PURE_WATER_FLOW_MIDDLE.code,
+            "mop_mode": CleanRoutes.STANDARD.code,
+        }
+    ]
+    assert status_trait.get_cleaning_mode_parameters(CleaningModes.MOP) == [
+        {
+            "fan_power": VacuumModes.OFF.code,
+            "water_box_mode": WaterModes.PURE_WATER_FLOW_MIDDLE.code,
+            "mop_mode": CleanRoutes.STANDARD.code,
+        }
+    ]
+
+
 def test_current_cleaning_mode_gentle_not_mop_without_pure_mop() -> None:
     """Test code 105 is not treated as mop-only on devices without pure mop."""
     status_trait = _create_cleaning_mode_status_trait(is_pure_clean_mop_supported=False)