python-roborock 2.2.2__py3-none-any.whl → 2.3.0__py3-none-any.whl

{python_roborock-2.2.2.dist-info → python_roborock-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-roborock
-Version: 2.2.2
+Version: 2.3.0
 Summary: A package to control Roborock vacuums.
 Home-page: https://github.com/humbertogontijo/python-roborock
 License: GPL-3.0-only

{python_roborock-2.2.2.dist-info → python_roborock-2.3.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ roborock/__init__.py,sha256=AqfxNGj4wILqL7dooJyQQd6w7o2EW02fMAF51wT9VK8,165
 roborock/api.py,sha256=jI5jbBZf47HHEI8j_JM_00DqrhrgbmlA6FivPCgFajc,4123
 roborock/cli.py,sha256=l4dOt9HZ4TZOZNp_btsNCZEDUihM94Dz173KPtUYdm4,6826
 roborock/cloud_api.py,sha256=8p_iRfXRstBW5KfdxFtya41VJjeRXbdwfpASXIqASqM,7144
-roborock/code_mappings.py,sha256=O2TDyMXZdpR7-cCPBWAD2ltGT7oFmn_yzwcXNgguzCQ,14415
+roborock/code_mappings.py,sha256=F498ZH0FszmM-Un-vfFsQMs0odzR0Vk_JvCJVbT2ljI,14507
 roborock/command_cache.py,sha256=E8e7EYzYFZEmw_cIfhPYZXNpBuSJbIAT9KXnE-e5NPg,7912
 roborock/const.py,sha256=p2d52jaX7ZSNFSoLgq2nZVKP0qxnoONSm7y2eaQFqbM,2386
 roborock/containers.py,sha256=s9IXGYNlX9WwmkSUZZzkOPMlgy1Z5juHaB9S8heXXoY,27991
@@ -15,15 +15,15 @@ roborock/roborock_message.py,sha256=2-boInkxHLD4dZxRFslfoqyIy5XalTlJsSdxNQbvUBg,
 roborock/roborock_typing.py,sha256=3guzjcgwbwmz-COZyCBY6UAtLh7Br56GCFYL2L08ot0,23536
 roborock/util.py,sha256=kXIWW5EWs7w_7u26jPjBmeZUM_WR9bD8A2-qWL5baTQ,3465
 roborock/version_1_apis/__init__.py,sha256=BDAkBZPOtpyYUPUa6VaZd7Aaza1hbvM2fIzsjIGD9Vc,183
-roborock/version_1_apis/roborock_client_v1.py,sha256=-tQ0I90adCYM-XPuemW9MBaiEWkYhL-xRDPLRE7BADc,21262
+roborock/version_1_apis/roborock_client_v1.py,sha256=OaKQjHy_ZYdSh360D7MUgzjvw2yD0xqpEIYxyYCGovM,21307
 roborock/version_1_apis/roborock_local_client_v1.py,sha256=tPou8JnUEIKbUZcmUA7RRLycCSEjg0JFaZNdNLU6nmE,3477
 roborock/version_1_apis/roborock_mqtt_client_v1.py,sha256=5MhgmosZu-ujj3fuKr6QAN-H5LtF_OIwM-t-Zsd0J_w,3358
 roborock/version_a01_apis/__init__.py,sha256=i_WTIX0LUCG93YX3RraNaQYNYBMY-xJI7ncWMdUFQVs,111
 roborock/version_a01_apis/roborock_client_a01.py,sha256=ISXMQ7pFoohoHG2mmukdZx6J7S2sgYvvInpJGqtKGL8,7424
 roborock/version_a01_apis/roborock_mqtt_client_a01.py,sha256=fiy2LdCVYwAXo70QN5vwOM8abEHTGACmaLzaEiB8rmk,3043
-roborock/web_api.py,sha256=p3hNVVJ7QYFjcYc1wTrJs4EtE83tDThbQHSJFWanWN4,13040
-python_roborock-2.2.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_roborock-2.2.2.dist-info/METADATA,sha256=t6MTuxzD56JShT4tJTSikpeMp_edUkhGmKvMix2p6ck,2598
-python_roborock-2.2.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_roborock-2.2.2.dist-info/entry_points.txt,sha256=3V_nm8VDR5Wg8m9QlRy9R4olW2lC--6JrDjZJpQpDNI,46
-python_roborock-2.2.2.dist-info/RECORD,,
+roborock/web_api.py,sha256=E438Ma7K7SEhPvr9d5EEpfzkJLOjSbDsAmHQw9iGsWU,13729
+python_roborock-2.3.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_roborock-2.3.0.dist-info/METADATA,sha256=3kH4R8bE3QHKSUfPm018sesghKs6i_pSwFDWvcjUKZE,2598
+python_roborock-2.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_roborock-2.3.0.dist-info/entry_points.txt,sha256=3V_nm8VDR5Wg8m9QlRy9R4olW2lC--6JrDjZJpQpDNI,46
+python_roborock-2.3.0.dist-info/RECORD,,

roborock/code_mappings.py

@@ -248,7 +248,10 @@ class RoborockFanSpeedP10(RoborockFanPowerCode):
 
 class RoborockFanSpeedS8MaxVUltra(RoborockFanPowerCode):
     off = 105
+    quiet = 101
     balanced = 102
+    turbo = 103
+    max = 104
     custom = 106
     max_plus = 108
     smart_mode = 110
@@ -324,6 +327,8 @@ class RoborockMopIntensityS8MaxVUltra(RoborockMopIntensityCode):
     low = 201
     medium = 202
     high = 203
+    custom = 204
+    max = 208
     smart_mode = 209
     custom_water_flow = 207
 
@@ -394,6 +399,7 @@ class RoborockDockWashTowelModeCode(RoborockEnum):
     light = 0
     balanced = 1
     deep = 2
+    smart = 10
 
 
 class RoborockCategory(Enum):

roborock/version_1_apis/roborock_client_v1.py

@@ -65,6 +65,7 @@ WASH_N_FILL_DOCK = [
     RoborockDockTypeCode.empty_wash_fill_dock,
     RoborockDockTypeCode.s8_dock,
     RoborockDockTypeCode.p10_dock,
+    RoborockDockTypeCode.s8_maxv_ultra_dock,
 ]
 RT = TypeVar("RT", bound=RoborockBase)
 EVICT_TIME = 60

roborock/web_api.py

@@ -3,11 +3,13 @@ from __future__ import annotations
 import base64
 import hashlib
 import hmac
+import logging
 import math
 import secrets
 import time
 
 import aiohttp
+from aiohttp import ContentTypeError
 
 from roborock.containers import HomeData, HomeDataRoom, ProductResponse, RRiot, UserData
 from roborock.exceptions import (
@@ -23,6 +25,8 @@ from roborock.exceptions import (
     RoborockUrlException,
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class RoborockApiClient:
     def __init__(self, username: str, base_url=None) -> None:
@@ -294,11 +298,23 @@ class PreparedRequest:
         _url = "/".join(s.strip("/") for s in [self.base_url, url])
         _headers = {**self.base_headers, **(headers or {})}
         async with aiohttp.ClientSession() as session:
-            async with session.request(
-                method,
-                _url,
-                params=params,
-                data=data,
-                headers=_headers,
-            ) as resp:
-                return await resp.json()
+            try:
+                async with session.request(
+                    method,
+                    _url,
+                    params=params,
+                    data=data,
+                    headers=_headers,
+                ) as resp:
+                    return await resp.json()
+            except ContentTypeError as err:
+                """If we get an error, lets log everything for debugging."""
+                try:
+                    resp_json = await resp.json(content_type=None)
+                    _LOGGER.info("Resp: %s", resp_json)
+                except ContentTypeError as err_2:
+                    _LOGGER.info(err_2)
+                resp_raw = await resp.read()
+                _LOGGER.info("Resp raw: %s", resp_raw)
+                # Still raise the err so that it's clear it failed.
+                raise err