python-roborock 7.8.1__py3-none-any.whl → 7.9.0__py3-none-any.whl

{python_roborock-7.8.1.dist-info → python_roborock-7.9.0.dist-info}/METADATA

@@ -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.dist-info → python_roborock-7.9.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ roborock/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 roborock/roborock_message.py,sha256=VWsytnm7nQqOMBj7oYbiqPPqwE9qClDSI03CFuHXsds,11822
 roborock/roborock_typing.py,sha256=xppavdf57-Cu6elj3MP403uT75Tjw5Zs6bLGPLQmZf4,15483
 roborock/util.py,sha256=4zibjn2MgPrLCiha66LUXZj907LOXUtNzugbbb0NIlo,1634
-roborock/web_api.py,sha256=ypW9e11U0jNXnyIQO9UN0DnIdz4c6AxtJlUJmjuEl-o,40514
+roborock/web_api.py,sha256=-igt3Y4-kOoWX4mKkjt-P-7t7uHxNGkOm11-_W2ge0c,42065
 roborock/data/__init__.py,sha256=jSZHOrd-LfVN-TdBkjNW334ef99rGBz4-hPT_7KvoLs,278
 roborock/data/code_mappings.py,sha256=j-ZZRtQQdIMJQAgEwDAxWKreNhD6U36oIhBKr_nLbis,9783
 roborock/data/containers.py,sha256=ePz1tmhNY1QpgiVlyc8j6PH5kjU6fkZYtBByCFj2wzU,17896
@@ -30,7 +30,7 @@ roborock/data/mower/mower_containers.py,sha256=PYNVhbGCafkchenBlBmG_fUnIC-9WfxF8
 roborock/data/v1/__init__.py,sha256=Lx_D6baZrCMxp57D0NcdiA8rssJ5NnInZwUwrT79XOI,91
 roborock/data/v1/v1_clean_modes.py,sha256=ZUhMqrM9MwnXFl3btZj9_LEAOmhNIl80krW-AiuWouk,13866
 roborock/data/v1/v1_code_mappings.py,sha256=hToQbd38mM3Dw8ONLyuDa2scqmNs0gNgOyqVgm-Gg7Y,12948
-roborock/data/v1/v1_containers.py,sha256=UBScIG6VKziEAC0FaQRHnfrGWDY06nITY8NkFJEzhiE,17256
+roborock/data/v1/v1_containers.py,sha256=6erBnuQicFsdAsUaWIEAghzOxUU-xGuwqJBhcy_snZ4,17939
 roborock/data/zeo/__init__.py,sha256=VxG5qG4M24DGOq2YAaxownWp6bEfj9DEOgOMHmTpcqY,63
 roborock/data/zeo/zeo_code_mappings.py,sha256=mfm2xoI8RllPZfyZE0HmUhUhLECwRD0llkMNWfaEHvw,8057
 roborock/data/zeo/zeo_containers.py,sha256=huDeisutagKz1rzsLZr_tGAietec_qOd0KB3i09YGgo,4339
@@ -72,7 +72,7 @@ roborock/devices/traits/b01/q7/__init__.py,sha256=tbsZSe2VojCN7uRdHPm74on8WrexJe
 roborock/devices/traits/b01/q7/clean_summary.py,sha256=M43iJVeYjrkBV6ZxXdHtn4Rd5Mx-KAK7WLU5fABiN8I,2742
 roborock/devices/traits/b01/q7/map.py,sha256=NfPQAEwNCUsb0SYGMxmGeq4q4rEHqDJK0zTD5cE-ESs,1299
 roborock/devices/traits/b01/q7/map_content.py,sha256=O4UMnmX0-K-jxhOaknUZpWJSwxUuaTd2_D9_AP-elGY,4920
-roborock/devices/traits/v1/__init__.py,sha256=gzp5b2aJCugHF_9jqEZG7ycsv_xCMZa8ymhtm3Nqofg,16986
+roborock/devices/traits/v1/__init__.py,sha256=dXSulH8cKqgPSua_4XhLRVk7PyCQxcsW7-aXLRBI370,17098
 roborock/devices/traits/v1/child_lock.py,sha256=NeaPqcEoBRXvEzKZGonkyINkwCBOK3xa4zSWvJW66kA,1161
 roborock/devices/traits/v1/clean_summary.py,sha256=gwAwJMuJewrdSxmYEaD5mywYrqfz62__NB7sL23u98A,4641
 roborock/devices/traits/v1/command.py,sha256=2yNyCF_EDPkLE_vK6IN5VB8ZVypwrrwKTByCdQzJs3c,1494
@@ -86,6 +86,7 @@ roborock/devices/traits/v1/home.py,sha256=UCLGCkhIowmVSjNv_aC76MortpKn8v0E1jlQA1
 roborock/devices/traits/v1/led_status.py,sha256=qUY6GgC-RSXCAKlL2D0_FBO-1xwi2eU3fkMFg-pLQCs,1754
 roborock/devices/traits/v1/map_content.py,sha256=w_34H6ItiYm98QFOmEDCP0AvTBWAFVuB-uz5rmgBRwI,3175
 roborock/devices/traits/v1/maps.py,sha256=JdOjJCeJ6iAH85pNHKHbVGlD-zOrha9h6XAh7IDeQr8,3468
+roborock/devices/traits/v1/mop_dryer.py,sha256=O_kesBuk_oxtcTE3jFD3Qm2lH939kQatib2aEjvPwCY,1979
 roborock/devices/traits/v1/network_info.py,sha256=CX9-ye2Zb_8lAWPGvegXWSOguxMY2K0xO-2OmWmE67o,2291
 roborock/devices/traits/v1/obstacle_photos.py,sha256=Aul1sOxJ6AxLWqI5AbeHHSzxfUPzQfQDCPIvZ3oXb_4,4179
 roborock/devices/traits/v1/rooms.py,sha256=SEAs3sHZxDmiiSWc9Korm838zu8ub_04CsmJVlT4F48,6237
@@ -126,8 +127,8 @@ roborock/testing/channel.py,sha256=vjulT5MHBe8lAq6XITUqcxJVcCILWx7ZEcw5imTx0Tk,7
 roborock/testing/cloud.py,sha256=L2L0KlZDYaMuoV19KUQUoq5EAUDeNQ1lJ8Ew5YaOgjo,11946
 roborock/testing/simulator.py,sha256=g8ZUWVSjgAzuRRxWOCeOq-7deodyEItwUpqEw9RzCmQ,4347
 roborock/testing/v1_simulator.py,sha256=_LX_vsBMcB2Uu2QDt8QnQymgtVtbnwD5Xa7tmhiPAnY,14439
-python_roborock-7.8.1.dist-info/METADATA,sha256=77EsLWO11LPYHIV2lWaCCpDc_DBbcn8yruBM9dXohNA,5278
-python_roborock-7.8.1.dist-info/WHEEL,sha256=THafob7ofN-NsuMN7Mg4qZyHaQI7KkD-QlcQatYhXPo,87
-python_roborock-7.8.1.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
-python_roborock-7.8.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-python_roborock-7.8.1.dist-info/RECORD,,
+python_roborock-7.9.0.dist-info/METADATA,sha256=KZWHzuRvz4cVEnK2e9-EMTPQ7kboPnd42_4bgkbnxfQ,5278
+python_roborock-7.9.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+python_roborock-7.9.0.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
+python_roborock-7.9.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+python_roborock-7.9.0.dist-info/RECORD,,

{python_roborock-7.8.1.dist-info → python_roborock-7.9.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.32.3
+Generator: hatchling 1.32.4
 Root-Is-Purelib: true
 Tag: py3-none-any

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

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,

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})

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: