python-roborock 2.16.0__tar.gz → 2.17.0__tar.gz

{python_roborock-2.16.0 → python_roborock-2.17.0}/PKG-INFO

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

{python_roborock-2.16.0 → python_roborock-2.17.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "2.16.0"
+version = "2.17.0"
 description = "A package to control Roborock vacuums."
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"

{python_roborock-2.16.0 → python_roborock-2.17.0}/roborock/code_mappings.py

@@ -78,6 +78,8 @@ class RoborockStateCode(RoborockEnum):
     mapping = 29
     egg_attack = 30
     patrol = 32
+    attaching_the_mop = 33  # on g20s ultra
+    detaching_the_mop = 34  # on g20s ultra
     charging_complete = 100
     device_offline = 101
     locked = 103

{python_roborock-2.16.0 → python_roborock-2.17.0}/roborock/const.py

@@ -34,6 +34,7 @@ ROBOROCK_QREVO_MASTER = "roborock.vacuum.a117"
 ROBOROCK_QREVO_CURV = "roborock.vacuum.a135"
 ROBOROCK_Q8_MAX = "roborock.vacuum.a73"
 ROBOROCK_G10S_PRO = "roborock.vacuum.a26"
+ROBOROCK_G20S_Ultra = "roborock.vacuum.a143"  # cn saros_r10
 ROBOROCK_G10S = "roborock.vacuum.a46"
 ROBOROCK_G10 = "roborock.vacuum.a29"
 ROCKROBO_G10_SG = "roborock.vacuum.a30"  # Variant of the G10, has similar features as S7
@@ -58,6 +59,7 @@ ROBOROCK_DYAD_PRO = "roborock.wetdryvac.a56"
 SUPPORTED_VACUUMS = [
     ROBOROCK_G10,
     ROBOROCK_G10S_PRO,
+    ROBOROCK_G20S_Ultra,
     ROBOROCK_Q5,
     ROBOROCK_Q7,
     ROBOROCK_Q7_MAX,

{python_roborock-2.16.0 → python_roborock-2.17.0}/roborock/containers.py

@@ -73,6 +73,7 @@ from .const import (
     SENSOR_DIRTY_REPLACE_TIME,
     SIDE_BRUSH_REPLACE_TIME,
     STRAINER_REPLACE_TIME,
+    ROBOROCK_G20S_Ultra,
 )
 from .exceptions import RoborockException
 
@@ -665,6 +666,7 @@ ModelStatus: dict[str, type[Status]] = {
     ROBOROCK_S8: S8Status,
     ROBOROCK_S8_PRO_ULTRA: S8ProUltraStatus,
     ROBOROCK_G10S_PRO: S7MaxVStatus,
+    ROBOROCK_G20S_Ultra: QRevoMasterStatus,
     ROBOROCK_P10: P10Status,
     # These likely are not correct,
     # but i am currently unable to do my typical reverse engineering/ get any data from users on this,

{python_roborock-2.16.0 → python_roborock-2.17.0}/roborock/web_api.py

@@ -36,8 +36,6 @@ class RoborockApiClient:
         self._default_url = "https://euiot.roborock.com"
         self.base_url = base_url
         self._device_identifier = secrets.token_urlsafe(16)
-        if session is None:
-            session = aiohttp.ClientSession()
         self.session = session
 
     async def _get_base_url(self) -> str:
@@ -470,7 +468,9 @@ class RoborockApiClient:
 
 
 class PreparedRequest:
-    def __init__(self, base_url: str, session: aiohttp.ClientSession, base_headers: dict | None = None) -> None:
+    def __init__(
+        self, base_url: str, session: aiohttp.ClientSession | None = None, base_headers: dict | None = None
+    ) -> None:
         self.base_url = base_url
         self.base_headers = base_headers or {}
         self.session = session
@@ -478,10 +478,10 @@ class PreparedRequest:
     async def request(self, method: str, url: str, params=None, data=None, headers=None, json=None) -> dict:
         _url = "/".join(s.strip("/") for s in [self.base_url, url])
         _headers = {**self.base_headers, **(headers or {})}
+        close_session = self.session is None
+        session = self.session if self.session is not None else aiohttp.ClientSession()
         try:
-            async with self.session.request(
-                method, _url, params=params, data=data, headers=_headers, json=json
-            ) as resp:
+            async with session.request(method, _url, params=params, data=data, headers=_headers, json=json) as resp:
                 return await resp.json()
         except ContentTypeError as err:
             """If we get an error, lets log everything for debugging."""
@@ -494,3 +494,6 @@ class PreparedRequest:
             _LOGGER.info("Resp raw: %s", resp_raw)
             # Still raise the err so that it's clear it failed.
             raise err
+        finally:
+            if close_session:
+                await session.close()