python-roborock 4.17.0__tar.gz → 4.17.2__tar.gz

{python_roborock-4.17.0 → python_roborock-4.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-roborock
-Version: 4.17.0
+Version: 4.17.2
 Summary: A package to control Roborock vacuums.
 Project-URL: Repository, https://github.com/humbertogontijo/python-roborock
 Project-URL: Documentation, https://python-roborock.readthedocs.io/
@@ -23,7 +23,7 @@ Requires-Dist: construct<3,>=2.10.57
 Requires-Dist: paho-mqtt<3.0.0,>=1.6.1
 Requires-Dist: pycryptodomex~=3.18; sys_platform == 'darwin'
 Requires-Dist: pycryptodome~=3.18
-Requires-Dist: pyrate-limiter<4,>=3.7.0
+Requires-Dist: pyrate-limiter<5,>=4.0.0
 Requires-Dist: vacuum-map-parser-roborock
 Description-Content-Type: text/markdown
 

{python_roborock-4.17.0 → python_roborock-4.17.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "4.17.0"
+version = "4.17.2"
 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"
@@ -26,7 +26,7 @@ dependencies = [
     "paho-mqtt>=1.6.1,<3.0.0",
     "construct>=2.10.57,<3",
     "vacuum-map-parser-roborock",
-    "pyrate-limiter>=3.7.0,<4",
+    "pyrate-limiter>=4.0.0,<5",
     "aiomqtt>=2.5.0,<3",
     "click-shell~=2.1",
 ]

{python_roborock-4.17.0 → python_roborock-4.17.2}/roborock/data/v1/v1_clean_modes.py

@@ -16,7 +16,6 @@ class VacuumModes(RoborockModeEnum):
     TURBO = ("turbo", 103)
     MAX = ("max", 104)
     MAX_PLUS = ("max_plus", 108)
-    CARPET = ("carpet", 107)
     OFF_RAISE_MAIN_BRUSH = ("off_raise_main_brush", 109)
     CUSTOMIZED = ("custom", 106)
     SMART_MODE = ("smart_mode", 110)
@@ -85,8 +84,6 @@ def get_clean_modes(features: DeviceFeatures) -> list[VacuumModes]:
     if features.is_max_plus_mode_supported or features.is_none_pure_clean_mop_with_max_plus:
         # If the vacuum has max plus mode supported
         modes.append(VacuumModes.MAX_PLUS)
-    if features.is_carpet_deep_clean_supported:
-        modes.append(VacuumModes.CARPET)
     if features.is_pure_clean_mop_supported:
         # If the vacuum is capable of 'pure mop clean' aka no vacuum
         if features.is_support_main_brush_up_down_supported:

{python_roborock-4.17.0 → python_roborock-4.17.2}/roborock/web_api.py

@@ -12,7 +12,7 @@ from dataclasses import dataclass
 
 import aiohttp
 from aiohttp import ContentTypeError, FormData
-from pyrate_limiter import BucketFullException, Duration, Limiter, Rate
+from pyrate_limiter import Duration, Limiter, Rate
 
 from roborock import HomeDataSchedule
 from roborock.data import HomeData, HomeDataRoom, HomeDataScene, ProductResponse, RRiot, UserData
@@ -62,7 +62,7 @@ class RoborockApiClient:
         Rate(40, Duration.DAY),
     ]
 
-    _login_limiter = Limiter(_LOGIN_RATES, max_delay=1000)
+    _login_limiter = Limiter(_LOGIN_RATES)
     _home_data_limiter = Limiter(_HOME_DATA_RATES)
 
     def __init__(
@@ -204,11 +204,8 @@ class RoborockApiClient:
         return add_device_response["result"]
 
     async def request_code(self) -> None:
-        try:
-            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
+        if not await self._login_limiter.try_acquire_async("login", blocking=True, timeout=1):
+            raise RoborockRateLimit("Reached maximum requests for login. Please try again later.")
         base_url = await self.base_url
         header_clientid = self._get_header_client_id()
         code_request = PreparedRequest(base_url, self.session, {"header_clientid": header_clientid})
@@ -238,11 +235,8 @@ class RoborockApiClient:
         if await self.country_code is None or await self.country is None:
             _LOGGER.info("No country code or country found, trying old version of request code.")
             return await self.request_code()
-        try:
-            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
+        if not await self._login_limiter.try_acquire_async("login", blocking=True, timeout=1):
+            raise RoborockRateLimit("Reached maximum requests for login. Please try again later.")
         base_url = await self.base_url
         header_clientid = self._get_header_client_id()
         code_request = PreparedRequest(
@@ -370,11 +364,8 @@ class RoborockApiClient:
         return UserData.from_dict(user_data)
 
     async def pass_login(self, password: str) -> UserData:
-        try:
-            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
+        if not await self._login_limiter.try_acquire_async("login", blocking=True, timeout=1):
+            raise RoborockRateLimit("Reached maximum requests for login. Please try again later.")
         base_url = await self.base_url
         header_clientid = self._get_header_client_id()
 
@@ -468,11 +459,8 @@ class RoborockApiClient:
         return home_id_response["data"]["rrHomeId"]
 
     async def get_home_data(self, user_data: UserData) -> HomeData:
-        try:
-            self._home_data_limiter.try_acquire("home_data")
-        except BucketFullException as ex:
-            _LOGGER.info(ex.meta_info)
-            raise RoborockRateLimit("Reached maximum requests for home data. Please try again later.") from ex
+        if not self._home_data_limiter.try_acquire("home_data", blocking=False):
+            raise RoborockRateLimit("Reached maximum requests for home data. Please try again later.")
         rriot = user_data.rriot
         if rriot is None:
             raise RoborockException("rriot is none")
@@ -497,11 +485,8 @@ class RoborockApiClient:
 
     async def get_home_data_v2(self, user_data: UserData) -> HomeData:
         """This is the same as get_home_data, but uses a different endpoint and includes non-robotic vacuums."""
-        try:
-            self._home_data_limiter.try_acquire("home_data")
-        except BucketFullException as ex:
-            _LOGGER.info(ex.meta_info)
-            raise RoborockRateLimit("Reached maximum requests for home data. Please try again later.") from ex
+        if not self._home_data_limiter.try_acquire("home_data", blocking=False):
+            raise RoborockRateLimit("Reached maximum requests for home data. Please try again later.")
         rriot = user_data.rriot
         if rriot is None:
             raise RoborockException("rriot is none")
@@ -526,11 +511,8 @@ class RoborockApiClient:
 
     async def get_home_data_v3(self, user_data: UserData) -> HomeData:
         """This is the same as get_home_data, but uses a different endpoint and includes non-robotic vacuums."""
-        try:
-            self._home_data_limiter.try_acquire("home_data")
-        except BucketFullException as ex:
-            _LOGGER.info(ex.meta_info)
-            raise RoborockRateLimit("Reached maximum requests for home data. Please try again later.") from ex
+        if not self._home_data_limiter.try_acquire("home_data", blocking=False):
+            raise RoborockRateLimit("Reached maximum requests for home data. Please try again later.")
         rriot = user_data.rriot
         home_id = await self._get_home_id(user_data)
         if rriot.r.a is None: