python-roborock 7.8.1__tar.gz → 7.9.0__tar.gz

{python_roborock-7.8.1 → python_roborock-7.9.0}/PKG-INFO

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

{python_roborock-7.8.1 → python_roborock-7.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "7.8.1"
+version = "7.9.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-7.8.1 → python_roborock-7.9.0}/roborock/data/v1/v1_containers.py

@@ -459,6 +459,28 @@ class SmartWashParams(RoborockBase):
     wash_interval: int | None = None
 
 
+@dataclass
+class MopDryerProfile(RoborockBase):
+    """Dryer parameters for one state of the auto mop-drying setting."""
+
+    cliff_on: int | None = None
+    cliff_off: int | None = None
+    count: int | None = None
+    dry_time: int | None = None
+    """Drying duration in seconds. Only present in the ``on`` profile."""
+    dry_heating_film_time: int | None = None
+    """Heating element run time in seconds. Only present in the ``on`` profile."""
+
+
+@dataclass
+class MopDryerSetting(RoborockBase):
+    """Auto mop-drying setting, as returned by APP_GET_DRYER_SETTING."""
+
+    status: int | None = None
+    on: MopDryerProfile | None = None
+    off: MopDryerProfile | None = None
+
+
 @dataclass
 class DustCollectionMode(RoborockBase):
     mode: RoborockDockDustCollectionModeCode | None = None

{python_roborock-7.8.1 → python_roborock-7.9.0}/roborock/devices/traits/v1/__init__.py

@@ -82,6 +82,7 @@ from . import (
     led_status,
     map_content,
     maps,
+    mop_dryer,
     network_info,
     obstacle_photos,
     rooms,
@@ -105,6 +106,7 @@ from .home import HomeTrait
 from .led_status import LedStatusTrait
 from .map_content import MapContentTrait
 from .maps import MapsTrait
+from .mop_dryer import MopDryerTrait
 from .network_info import NetworkInfoTrait
 from .obstacle_photos import ObstaclePhotoTrait
 from .rooms import RoomsTrait
@@ -132,6 +134,7 @@ __all__ = [
     "led_status",
     "map_content",
     "maps",
+    "mop_dryer",
     "network_info",
     "obstacle_photos",
     "rooms",
@@ -175,6 +178,7 @@ class PropertiesApi(Trait):
     wash_towel_mode: WashTowelModeTrait | None = None
     smart_wash_params: SmartWashParamsTrait | None = None
     obstacle_photos: ObstaclePhotoTrait | None = None
+    mop_dryer: MopDryerTrait | None = None
 
     def __init__(
         self,

python_roborock-7.9.0/roborock/devices/traits/v1/mop_dryer.py

@@ -0,0 +1,51 @@
+"""Trait for the dock mop dryer."""
+
+from roborock.data import MopDryerSetting
+from roborock.device_features import RoborockDockFeatures
+from roborock.devices.traits.v1 import common
+from roborock.roborock_typing import RoborockCommand
+
+_STATUS_PARAM = "status"
+
+
+def _supports_mop_dryer(dock_features: RoborockDockFeatures) -> bool:
+    return dock_features.is_dryable
+
+
+class MopDryerTrait(MopDryerSetting, common.V1TraitMixin, common.RoborockSwitchBase):
+    """Trait for the dock mop dryer.
+
+    The switch controls the auto mop-drying setting, i.e. whether the dock
+    dries the mop after washing. ``start_dry`` and ``stop_dry`` control a
+    drying cycle directly. Whether a cycle is currently running is reported
+    as ``dry_status`` on the device status.
+    """
+
+    command = RoborockCommand.APP_GET_DRYER_SETTING
+    converter = common.DefaultConverter(MopDryerSetting)
+    requires_dock_features = _supports_mop_dryer
+
+    @property
+    def is_on(self) -> bool:
+        """Return whether auto mop drying is enabled."""
+        return self.status == 1
+
+    async def enable(self) -> None:
+        """Enable auto mop drying."""
+        await self.rpc_channel.send_command(RoborockCommand.APP_SET_DRYER_SETTING, params={_STATUS_PARAM: 1})
+        # Optimistic update to avoid an extra refresh
+        self.status = 1
+
+    async def disable(self) -> None:
+        """Disable auto mop drying."""
+        await self.rpc_channel.send_command(RoborockCommand.APP_SET_DRYER_SETTING, params={_STATUS_PARAM: 0})
+        # Optimistic update to avoid an extra refresh
+        self.status = 0
+
+    async def start_dry(self) -> None:
+        """Start a mop drying cycle."""
+        await self.rpc_channel.send_command(RoborockCommand.APP_SET_DRYER_STATUS, params={_STATUS_PARAM: 1})
+
+    async def stop_dry(self) -> None:
+        """Stop the running mop drying cycle."""
+        await self.rpc_channel.send_command(RoborockCommand.APP_SET_DRYER_STATUS, params={_STATUS_PARAM: 0})

{python_roborock-7.8.1 → python_roborock-7.9.0}/roborock/web_api.py

@@ -38,6 +38,10 @@ BASE_URLS = [
     "https://ruiot.roborock.com",
 ]
 
+# Fallback user agreement version, used only if the latest version cannot be fetched.
+DEFAULT_AGREEMENT_MAJOR_VERSION = 14
+DEFAULT_AGREEMENT_MINOR_VERSION = 0
+
 
 @dataclass
 class IotLoginInfo:
@@ -292,6 +296,34 @@ class RoborockApiClient:
 
         return code_response["data"]["k"]
 
+    async def _get_agreement_version(self, country: str) -> dict[str, int]:
+        """Get the latest user agreement version for the given country.
+
+        The login endpoint rejects a stale agreement version with code 3006. The
+        current version differs per server and per country, so it must be looked
+        up rather than hardcoded. Falls back to the previously hardcoded values
+        if the lookup fails so that login is never blocked by this request.
+        """
+        try:
+            base_url = await self.base_url
+            agreement_request = PreparedRequest(base_url, self.session, {"header_clientlang": "en"})
+            response = await agreement_request.request(
+                "get",
+                "/api/v3/app/agreement/latest",
+                params={"country": country},
+            )
+            if response is not None and response.get("code") == 200:
+                data = response.get("data") or {}
+                major = data.get("majorVersion")
+                minor = data.get("minorVersion")
+                if isinstance(major, int) and isinstance(minor, int):
+                    _LOGGER.debug("Using user agreement version %s.%s for %s", major, minor, country)
+                    return {"majorVersion": major, "minorVersion": minor}
+            _LOGGER.debug("Unexpected agreement version response: %s", response)
+        except RoborockException as err:
+            _LOGGER.debug("Could not fetch latest user agreement version: %s", err)
+        return {"majorVersion": DEFAULT_AGREEMENT_MAJOR_VERSION, "minorVersion": DEFAULT_AGREEMENT_MINOR_VERSION}
+
     async def code_login_v4(
         self, code: int | str, country: str | None = None, country_code: int | None = None
     ) -> UserData:
@@ -334,10 +366,7 @@ class RoborockApiClient:
                 "countryCode": country_code,
                 "email": self._username,
                 "code": code,
-                # Major and minor version are the user agreement version, we will need to see if this needs to be
-                # dynamic https://usiot.roborock.com/api/v3/app/agreement/latest?country=US
-                "majorVersion": 14,
-                "minorVersion": 0,
+                **await self._get_agreement_version(country),
             },
         )
         if login_response is None: