python-roborock 4.2.2__tar.gz → 4.4.0__tar.gz

{python_roborock-4.2.2 → python_roborock-4.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-roborock
-Version: 4.2.2
+Version: 4.4.0
 Summary: A package to control Roborock vacuums.
 Project-URL: Repository, https://github.com/humbertogontijo/python-roborock
 Project-URL: Documentation, https://python-roborock.readthedocs.io/

{python_roborock-4.2.2 → python_roborock-4.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "4.2.2"
+version = "4.4.0"
 description = "A package to control Roborock vacuums."
 authors = [{ name = "humbertogontijo", email = "humbertogontijo@users.noreply.github.com" }, {name="Lash-L"}, {name="allenporter"}]
 requires-python = ">=3.11, <4"

{python_roborock-4.2.2 → python_roborock-4.4.0}/roborock/data/containers.py

@@ -232,6 +232,13 @@ class HomeDataProduct(RoborockBase):
         """Return a string with key product information for logging purposes."""
         return f"{self.name} (model={self.model}, category={self.category})"
 
+    @cached_property
+    def supported_schema_codes(self) -> set[str]:
+        """Return a set of fields that are supported by the device."""
+        if self.schema is None:
+            return set()
+        return {schema.code for schema in self.schema if schema.code is not None}
+
 
 @dataclass
 class HomeDataDevice(RoborockBase):

{python_roborock-4.2.2 → python_roborock-4.4.0}/roborock/data/v1/v1_containers.py

@@ -1,6 +1,7 @@
 import datetime
 import logging
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from enum import StrEnum
 from typing import Any
 
 from roborock.const import (
@@ -91,12 +92,39 @@ from .v1_code_mappings import (
 _LOGGER = logging.getLogger(__name__)
 
 
+class FieldNameBase(StrEnum):
+    """A base enum class that represents a field name in a RoborockBase dataclass."""
+
+
+class StatusField(FieldNameBase):
+    """An enum that represents a field in the `Status` class.
+
+    This is used with `roborock.devices.traits.v1.status.DeviceFeaturesTrait`
+    to understand if a feature is supported by the device using `is_field_supported`.
+
+    The enum values are names of fields in the `Status` class. Each field is
+    annotated with `requires_schema_code` metadata to map the field to a schema
+    code in the product schema, which may have a different name than the field/attribute name.
+    """
+
+    STATE = "state"
+    BATTERY = "battery"
+    FAN_POWER = "fan_power"
+    WATER_BOX_MODE = "water_box_mode"
+    CHARGE_STATUS = "charge_status"
+    DRY_STATUS = "dry_status"
+
+
+def _requires_schema_code(requires_schema_code: str, default=None) -> Any:
+    return field(metadata={"requires_schema_code": requires_schema_code}, default=default)
+
+
 @dataclass
 class Status(RoborockBase):
     msg_ver: int | None = None
     msg_seq: int | None = None
-    state: RoborockStateCode | None = None
-    battery: int | None = None
+    state: RoborockStateCode | None = _requires_schema_code("state", default=None)
+    battery: int | None = _requires_schema_code("battery", default=None)
     clean_time: int | None = None
     clean_area: int | None = None
     error_code: RoborockErrorCode | None = None
@@ -109,12 +137,12 @@ class Status(RoborockBase):
     back_type: int | None = None
     wash_phase: int | None = None
     wash_ready: int | None = None
-    fan_power: RoborockFanPowerCode | None = None
+    fan_power: RoborockFanPowerCode | None = _requires_schema_code("fan_power", default=None)
     dnd_enabled: int | None = None
     map_status: int | None = None
     is_locating: int | None = None
     lock_status: int | None = None
-    water_box_mode: RoborockMopIntensityCode | None = None
+    water_box_mode: RoborockMopIntensityCode | None = _requires_schema_code("water_box_mode", default=None)
     water_box_carriage_status: int | None = None
     mop_forbidden_enable: int | None = None
     camera_status: int | None = None
@@ -132,13 +160,13 @@ class Status(RoborockBase):
     collision_avoid_status: int | None = None
     switch_map_mode: int | None = None
     dock_error_status: RoborockDockErrorCode | None = None
-    charge_status: int | None = None
+    charge_status: int | None = _requires_schema_code("charge_status", default=None)
     unsave_map_reason: int | None = None
     unsave_map_flag: int | None = None
     wash_status: int | None = None
     distance_off: int | None = None
     in_warmup: int | None = None
-    dry_status: int | None = None
+    dry_status: int | None = _requires_schema_code("drying_status", default=None)
     rdt: int | None = None
     clean_percent: int | None = None
     rss: int | None = None

{python_roborock-4.2.2 → python_roborock-4.4.0}/roborock/devices/traits/v1/__init__.py

@@ -44,6 +44,12 @@ optional traits:
         available features.
     - `requires_dock_type` - If set, this is a function that accepts a `RoborockDockTypeCode`
         and returns a boolean indicating whether the trait is supported for that dock type.
+
+Additionally, DeviceFeaturesTrait has a method `is_field_supported` that is used to
+check individual trait field values. This is a more fine grained version to allow
+optional fields in a dataclass, vs the above feature checks that apply to an entire
+trait. The `requires_schema_code` field metadata attribute is a string of the schema
+code in HomeDataProduct Schema that is required for the field to be supported.
 """
 
 import logging
@@ -189,7 +195,7 @@ class PropertiesApi(Trait):
         self.maps = MapsTrait(self.status)
         self.map_content = MapContentTrait(map_parser_config)
         self.home = HomeTrait(self.status, self.maps, self.map_content, self.rooms, self._device_cache)
-        self.device_features = DeviceFeaturesTrait(product.product_nickname, self._device_cache)
+        self.device_features = DeviceFeaturesTrait(product, self._device_cache)
         self.network_info = NetworkInfoTrait(device_uid, self._device_cache)
         self.routines = RoutinesTrait(device_uid, web_api)
 

{python_roborock-4.2.2 → python_roborock-4.4.0}/roborock/devices/traits/v1/device_features.py

@@ -1,6 +1,7 @@
-from dataclasses import fields
+from dataclasses import Field, fields
 
-from roborock.data import AppInitStatus, RoborockProductNickname
+from roborock.data import AppInitStatus, HomeDataProduct, RoborockBase
+from roborock.data.v1.v1_containers import FieldNameBase
 from roborock.device_features import DeviceFeatures
 from roborock.devices.cache import DeviceCache
 from roborock.devices.traits.v1 import common
@@ -8,19 +9,42 @@ from roborock.roborock_typing import RoborockCommand
 
 
 class DeviceFeaturesTrait(DeviceFeatures, common.V1TraitMixin):
-    """Trait for managing Do Not Disturb (DND) settings on Roborock devices."""
+    """Trait for managing supported features on Roborock devices."""
 
     command = RoborockCommand.APP_GET_INIT_STATUS
 
-    def __init__(self, product_nickname: RoborockProductNickname, device_cache: DeviceCache) -> None:  # pylint: disable=super-init-not-called
-        """Initialize MapContentTrait."""
-        self._nickname = product_nickname
+    def __init__(self, product: HomeDataProduct, device_cache: DeviceCache) -> None:  # pylint: disable=super-init-not-called
+        """Initialize DeviceFeaturesTrait."""
+        self._product = product
+        self._nickname = product.product_nickname
         self._device_cache = device_cache
         # All fields of DeviceFeatures are required. Initialize them to False
         # so we have some known state.
         for field in fields(self):
             setattr(self, field.name, False)
 
+    def is_field_supported(self, cls: type[RoborockBase], field_name: FieldNameBase) -> bool:
+        """Determines if the specified field is supported by this device.
+
+        We use dataclass attributes on the field to specify the schema code that is required
+        for the field to be supported and it is compared against the list of
+        supported schema codes for the device returned in the product information.
+        """
+        dataclass_field: Field | None = None
+        for field in fields(cls):
+            if field.name == field_name:
+                dataclass_field = field
+                break
+        if dataclass_field is None:
+            raise ValueError(f"Field {field_name} not found in {cls}")
+
+        requires_schema_code = dataclass_field.metadata.get("requires_schema_code", None)
+        if requires_schema_code is None:
+            # We assume the field is supported
+            return True
+        # If the field requires a protocol that is not supported, we return False
+        return requires_schema_code in self._product.supported_schema_codes
+
     async def refresh(self) -> None:
         """Refresh the contents of this trait.
 

{python_roborock-4.2.2 → python_roborock-4.4.0}/roborock/web_api.py

@@ -62,7 +62,7 @@ class RoborockApiClient:
         Rate(40, Duration.DAY),
     ]
 
-    _login_limiter = Limiter(_LOGIN_RATES)
+    _login_limiter = Limiter(_LOGIN_RATES, max_delay=1000)
     _home_data_limiter = Limiter(_HOME_DATA_RATES)
 
     def __init__(
@@ -74,11 +74,11 @@ class RoborockApiClient:
         self._device_identifier = secrets.token_urlsafe(16)
         self.session = session
         self._iot_login_info: IotLoginInfo | None = None
+        self._base_urls = BASE_URLS if base_url is None else [base_url]
 
     async def _get_iot_login_info(self) -> IotLoginInfo:
         if self._iot_login_info is None:
-            valid_urls = BASE_URLS if self._base_url is None else [self._base_url]
-            for iot_url in valid_urls:
+            for iot_url in self._base_urls:
                 url_request = PreparedRequest(iot_url, self.session)
                 response = await url_request.request(
                     "post",
@@ -205,7 +205,7 @@ class RoborockApiClient:
 
     async def request_code(self) -> None:
         try:
-            self._login_limiter.try_acquire("login")
+            await self._login_limiter.try_acquire_async("login")
         except BucketFullException as ex:
             _LOGGER.info(ex.meta_info)
             raise RoborockRateLimit("Reached maximum requests for login. Please try again later.") from ex
@@ -239,7 +239,7 @@ class RoborockApiClient:
             _LOGGER.info("No country code or country found, trying old version of request code.")
             return await self.request_code()
         try:
-            self._login_limiter.try_acquire("login")
+            await self._login_limiter.try_acquire_async("login")
         except BucketFullException as ex:
             _LOGGER.info(ex.meta_info)
             raise RoborockRateLimit("Reached maximum requests for login. Please try again later.") from ex
@@ -269,6 +269,10 @@ class RoborockApiClient:
                 raise RoborockAccountDoesNotExist("Account does not exist - check your login and try again.")
             elif response_code == 9002:
                 raise RoborockTooFrequentCodeRequests("You have attempted to request too many codes. Try again later")
+            elif response_code == 3030 and len(self._base_urls) > 1:
+                self._base_urls = self._base_urls[1:]
+                self._iot_login_info = None
+                return await self.request_code_v4()
             else:
                 raise RoborockException(f"{code_response.get('msg')} - response code: {code_response.get('code')}")
 
@@ -363,7 +367,7 @@ class RoborockApiClient:
 
     async def pass_login(self, password: str) -> UserData:
         try:
-            self._login_limiter.try_acquire("login")
+            await self._login_limiter.try_acquire_async("login")
         except BucketFullException as ex:
             _LOGGER.info(ex.meta_info)
             raise RoborockRateLimit("Reached maximum requests for login. Please try again later.") from ex