python-roborock 7.8.0__py3-none-any.whl → 7.8.2__py3-none-any.whl

{python_roborock-7.8.0.dist-info → python_roborock-7.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-roborock
-Version: 7.8.0
+Version: 7.8.2
 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.0.dist-info → python_roborock-7.8.2.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
@@ -126,8 +126,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.0.dist-info/METADATA,sha256=oab4MAQUTzua8lpKUIFMyFlMK0ihrRYSJ1xdVY5B1Bw,5278
-python_roborock-7.8.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-python_roborock-7.8.0.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
-python_roborock-7.8.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-python_roborock-7.8.0.dist-info/RECORD,,
+python_roborock-7.8.2.dist-info/METADATA,sha256=gGL_22pmtd_9mGvWO7QMZm5qAqivJqNpeXrBzhYdEYA,5278
+python_roborock-7.8.2.dist-info/WHEEL,sha256=THafob7ofN-NsuMN7Mg4qZyHaQI7KkD-QlcQatYhXPo,87
+python_roborock-7.8.2.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
+python_roborock-7.8.2.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+python_roborock-7.8.2.dist-info/RECORD,,

{python_roborock-7.8.0.dist-info → python_roborock-7.8.2.dist-info}/WHEEL

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

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: