[pull] dev from home-assistant:dev

homeassistant/components/airly/sensor.py

@@ -127,7 +127,7 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     ),
     AirlySensorEntityDescription(
         key=ATTR_API_CO,
-        translation_key="co",
+        device_class=SensorDeviceClass.CO,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,

homeassistant/components/airly/strings.json

@@ -23,9 +23,6 @@
     "sensor": {
       "caqi": {
         "name": "Common air quality index"
-      },
-      "co": {
-        "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
       }
     }
   },

homeassistant/components/pyload/coordinator.py

@@ -68,7 +68,9 @@ async def _async_update_data(self) -> PyLoadData:
             raise ConfigEntryAuthFailed(
                 translation_domain=DOMAIN,
                 translation_key="setup_authentication_exception",
-                translation_placeholders={CONF_USERNAME: self.pyload.username},
+                translation_placeholders={
+                    CONF_USERNAME: self.config_entry.data[CONF_USERNAME]
+                },
             ) from e
         except CannotConnect as e:
             raise UpdateFailed(

homeassistant/components/pyload/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["pyloadapi"],
   "quality_scale": "platinum",
-  "requirements": ["PyLoadAPI==2.0.0"]
+  "requirements": ["PyLoadAPI==2.1.0"]
 }

homeassistant/components/roborock/button.py

@@ -3,11 +3,13 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Callable
 from dataclasses import dataclass
 import itertools
 import logging
 from typing import Any
 
+from roborock.device_features import is_wash_n_fill_dock
 from roborock.devices.traits.v1.consumeable import ConsumableAttribute
 from roborock.exceptions import RoborockException
 from roborock.roborock_message import RoborockZeoProtocol
@@ -43,6 +45,13 @@ class RoborockButtonDescription(ButtonEntityDescription):
     """Describes a Roborock button entity."""
 
     attribute: ConsumableAttribute
+    is_dock_entity: bool = False
+    is_supported: Callable[[RoborockDataUpdateCoordinator], bool] = lambda _: True
+
+
+def _supports_dock_consumables(coordinator: RoborockDataUpdateCoordinator) -> bool:
+    dock_type = coordinator.properties_api.status.dock_type
+    return dock_type is not None and is_wash_n_fill_dock(dock_type)
 
 
 CONSUMABLE_BUTTON_DESCRIPTIONS = [
@@ -74,6 +83,24 @@ class RoborockButtonDescription(ButtonEntityDescription):
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,
     ),
+    RoborockButtonDescription(
+        key="reset_dock_strainer_consumable",
+        translation_key="reset_dock_strainer_consumable",
+        attribute=ConsumableAttribute.STRAINER_WORK_TIME,
+        entity_category=EntityCategory.CONFIG,
+        entity_registry_enabled_default=False,
+        is_dock_entity=True,
+        is_supported=_supports_dock_consumables,
+    ),
+    RoborockButtonDescription(
+        key="reset_dock_cleaning_brush_consumable",
+        translation_key="reset_dock_cleaning_brush_consumable",
+        attribute=ConsumableAttribute.CLEANING_BRUSH_WORK_TIME,
+        entity_category=EntityCategory.CONFIG,
+        entity_registry_enabled_default=False,
+        is_dock_entity=True,
+        is_supported=_supports_dock_consumables,
+    ),
 ]
 
 
@@ -128,8 +155,9 @@ async def async_setup_entry(
                     description,
                 )
                 for coordinator in config_entry.runtime_data.v1
-                for description in CONSUMABLE_BUTTON_DESCRIPTIONS
                 if isinstance(coordinator, RoborockDataUpdateCoordinator)
+                for description in CONSUMABLE_BUTTON_DESCRIPTIONS
+                if description.is_supported(coordinator)
             ),
             (
                 RoborockRoutineButtonEntity(
@@ -176,9 +204,14 @@ def __init__(
         entity_description: RoborockButtonDescription,
     ) -> None:
         """Create a button entity."""
+        device_info = (
+            coordinator.dock_device_info
+            if entity_description.is_dock_entity
+            else coordinator.device_info
+        )
         super().__init__(
             f"{entity_description.key}_{coordinator.duid_slug}",
-            coordinator.device_info,
+            device_info,
             api=coordinator.properties_api.command,
         )
         self.entity_description = entity_description

homeassistant/components/roborock/coordinator.py

@@ -550,6 +550,7 @@ def __init__(
             RoborockB01Props.WIND,
             RoborockB01Props.WATER,
             RoborockB01Props.MODE,
+            RoborockB01Props.CLEAN_PATH_PREFERENCE,
             RoborockB01Props.QUANTITY,
         ]
 

homeassistant/components/roborock/icons.json

@@ -24,6 +24,12 @@
       "reset_air_filter_consumable": {
         "default": "mdi:air-filter"
       },
+      "reset_dock_cleaning_brush_consumable": {
+        "default": "mdi:brush"
+      },
+      "reset_dock_strainer_consumable": {
+        "default": "mdi:filter"
+      },
       "reset_main_brush_consumable": {
         "default": "mdi:brush"
       },

homeassistant/components/roborock/select.py

@@ -8,6 +8,7 @@
 
 from roborock import B01Props, CleanTypeMapping
 from roborock.data import (
+    CleanPathPreferenceMapping,
     RoborockDockDustCollectionModeCode,
     RoborockEnum,
     WaterLevelMapping,
@@ -118,6 +119,16 @@ class RoborockSelectDescriptionA01(SelectEntityDescription):
         options_lambda=lambda _: list(CleanTypeMapping.keys()),
         entity_category=EntityCategory.CONFIG,
     ),
+    RoborockB01SelectDescription(
+        key="cleaning_route",
+        translation_key="cleaning_route",
+        api_fn=lambda api, value: api.set_clean_path_preference(
+            CleanPathPreferenceMapping.from_value(value)
+        ),
+        value_fn=lambda data: data.clean_path_preference_name,
+        options_lambda=lambda _: list(CleanPathPreferenceMapping.keys()),
+        entity_category=EntityCategory.CONFIG,
+    ),
 ]
 
 

homeassistant/components/roborock/strings.json

@@ -93,6 +93,12 @@
       "reset_air_filter_consumable": {
         "name": "Reset air filter consumable"
       },
+      "reset_dock_cleaning_brush_consumable": {
+        "name": "Reset cleaning brush consumable"
+      },
+      "reset_dock_strainer_consumable": {
+        "name": "Reset strainer consumable"
+      },
       "reset_main_brush_consumable": {
         "name": "Reset main brush consumable"
       },
@@ -123,6 +129,13 @@
           "vacuum": "Vacuum only"
         }
       },
+      "cleaning_route": {
+        "name": "Cleaning route",
+        "state": {
+          "balanced": "[%key:component::roborock::entity::vacuum::roborock::state_attributes::fan_speed::state::balanced%]",
+          "deep": "[%key:component::roborock::entity::select::mop_mode::state::deep%]"
+        }
+      },
       "detergent_type": {
         "name": "Detergent type",
         "state": {

tests/components/airly/snapshots/test_sensor.ambr

@@ -29,14 +29,14 @@
         'suggested_display_precision': 0,
       }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.CO: 'carbon_monoxide'>,
     'original_icon': None,
     'original_name': 'Carbon monoxide',
     'platform': 'airly',
     'previous_unique_id': None,
     'suggested_object_id': None,
     'supported_features': 0,
-    'translation_key': 'co',
+    'translation_key': None,
     'unique_id': '123-456-co',
     'unit_of_measurement': 'μg/m³',
   })
@@ -45,6 +45,7 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'attribution': 'Data provided by Airly',
+      'device_class': 'carbon_monoxide',
       'friendly_name': 'Home Carbon monoxide',
       'limit': 4000,
       'percent': 4,

tests/components/roborock/conftest.py

@@ -159,6 +159,7 @@ async def return_to_dock_side_effect():
     b01_trait.find_me = AsyncMock()
     b01_trait.set_fan_speed = AsyncMock()
     b01_trait.set_mode = AsyncMock()
+    b01_trait.set_clean_path_preference = AsyncMock()
     b01_trait.set_water_level = AsyncMock()
     b01_trait.send = AsyncMock()
     return b01_trait

tests/components/roborock/mock_data.py

@@ -5,6 +5,7 @@
 from PIL import Image
 from roborock.data import (
     B01Props,
+    CleanPathPreferenceMapping,
     CleanRecord,
     CleanSummary,
     Consumable,
@@ -1558,6 +1559,7 @@
 
 Q7_B01_PROPS = B01Props(
     status=WorkStatusMapping.SWEEP_MOPING,
+    clean_path_preference=CleanPathPreferenceMapping.BALANCED,
     main_brush=5000,
     side_brush=3000,
     hypa=1500,