python-roborock 0.24.1__tar.gz → 0.25.2__tar.gz

{python_roborock-0.24.1 → python_roborock-0.25.2}/PKG-INFO

@@ -1,30 +1,30 @@
 Metadata-Version: 2.1
 Name: python-roborock
-Version: 0.24.1
+Version: 0.25.2
 Summary: A package to control Roborock vacuums.
 Home-page: https://github.com/humbertogontijo/python-roborock
 License: GPL-3.0-only
 Author: humbertogontijo
 Author-email: humbertogontijo@users.noreply.github.com
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: aiohttp (>=3.8.2,<4.0.0)
+Requires-Dist: alexapy (>=1.26.8,<2.0.0)
 Requires-Dist: async-timeout
 Requires-Dist: click (>=8)
-Requires-Dist: construct (>=2.10.56,<3.0.0)
+Requires-Dist: construct (>=2.10.68,<3.0.0)
 Requires-Dist: dacite (>=1.8.0,<1.9.0)
 Requires-Dist: paho-mqtt (>=1.6.1,<1.7.0)
-Requires-Dist: pycryptodome (>=3.17.0,<3.18.0)
-Requires-Dist: pycryptodomex (>=3.17.0,<3.18.0) ; sys_platform == "darwin"
+Requires-Dist: pycryptodome (>=3.17,<3.19)
+Requires-Dist: pycryptodomex (>=3.17,<3.19) ; sys_platform == "darwin"
 Project-URL: Repository, https://github.com/humbertogontijo/python-roborock
 Description-Content-Type: text/markdown
 

{python_roborock-0.24.1 → python_roborock-0.25.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "0.24.1"
+version = "0.25.2"
 description = "A package to control Roborock vacuums."
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"
@@ -19,15 +19,16 @@ packages = [{include = "roborock"}]
 roborock = "roborock.cli:main"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10"
 click = ">=8"
 aiohttp = "^3.8.2"
 async-timeout = "*"
-pycryptodome = "~3.17.0"
-pycryptodomex = {version = "~3.17.0", markers = "sys_platform == 'darwin'"}
+pycryptodome = ">=3.17,<3.19"
+pycryptodomex = {version = ">=3.17,<3.19", markers = "sys_platform == 'darwin'"}
 paho-mqtt = "~1.6.1"
 dacite = "~1.8.0"
-construct = "^2.10.56"
+construct = "^2.10.68"
+alexapy = "^1.26.8"
 
 
 [build-system]

{python_roborock-0.24.1 → python_roborock-0.25.2}/roborock/api.py

@@ -103,6 +103,8 @@ class RoborockClient:
         self._last_disconnection = self.time_func()
         self.keep_alive = KEEPALIVE
         self._diagnostic_data: dict[str, dict[str, Any]] = {}
+        self.dnd_timer: DnDTimer | None = None
+        self.valley_timer: ValleyElectricityTimer | None = None
 
     def __del__(self) -> None:
         self.sync_disconnect()
@@ -255,11 +257,19 @@ class RoborockClient:
 
     @fallback_cache
     async def get_dnd_timer(self) -> DnDTimer | None:
-        return await self.send_command(RoborockCommand.GET_DND_TIMER, return_type=DnDTimer)
+        result = await self.send_command(RoborockCommand.GET_DND_TIMER, return_type=DnDTimer)
+        if result is not None:
+            self.dnd_timer = result
+        return result
 
     @fallback_cache
     async def get_valley_electricity_timer(self) -> ValleyElectricityTimer | None:
-        return await self.send_command(RoborockCommand.GET_VALLEY_ELECTRICITY_TIMER, return_type=ValleyElectricityTimer)
+        result = await self.send_command(
+            RoborockCommand.GET_VALLEY_ELECTRICITY_TIMER, return_type=ValleyElectricityTimer
+        )
+        if result is not None:
+            self.valley_timer = result
+        return result
 
     @fallback_cache
     async def get_clean_summary(self) -> CleanSummary | None:
@@ -323,13 +333,11 @@ class RoborockClient:
     @fallback_cache
     async def get_prop(self) -> DeviceProp | None:
         """Gets device general properties."""
-        [status, clean_summary, consumable, dnd_timer, valley_electricity_timer] = await asyncio.gather(
+        [status, clean_summary, consumable] = await asyncio.gather(
             *[
                 self.get_status(),
                 self.get_clean_summary(),
                 self.get_consumable(),
-                self.get_dnd_timer(),
-                self.get_valley_electricity_timer(),
             ]
         )
         last_clean_record = None
@@ -338,13 +346,11 @@ class RoborockClient:
         dock_summary = None
         if status and status.dock_type is not None and status.dock_type != RoborockDockTypeCode.no_dock:
             dock_summary = await self.get_dock_summary(status.dock_type)
-        if any([status, dnd_timer, clean_summary, consumable]):
+        if any([status, clean_summary, consumable]):
             return DeviceProp(
                 status,
                 clean_summary,
                 consumable,
-                dnd_timer,
-                valley_electricity_timer,
                 last_clean_record,
                 dock_summary,
             )

{python_roborock-0.24.1 → python_roborock-0.25.2}/roborock/code_mappings.py

@@ -223,6 +223,7 @@ class RoborockDockErrorCode(RoborockEnum):
     duct_blockage = 34
     water_empty = 38
     waste_water_tank_full = 39
+    dirty_tank_latch_open = 44
 
 
 class RoborockDockTypeCode(RoborockEnum):

{python_roborock-0.24.1 → python_roborock-0.25.2}/roborock/roborock_typing.py

@@ -8,12 +8,10 @@ from .containers import (
     CleanRecord,
     CleanSummary,
     Consumable,
-    DnDTimer,
     DustCollectionMode,
     RoborockBase,
     SmartWashParams,
     Status,
-    ValleyElectricityTimer,
     WashTowelMode,
 )
 
@@ -314,8 +312,6 @@ class DeviceProp(RoborockBase):
     status: Optional[Status] = None
     clean_summary: Optional[CleanSummary] = None
     consumable: Optional[Consumable] = None
-    dnd_timer: Optional[DnDTimer] = None
-    valley_electricity_timer: Optional[ValleyElectricityTimer] = None
     last_clean_record: Optional[CleanRecord] = None
     dock_summary: Optional[DockSummary] = None
 
@@ -326,10 +322,6 @@ class DeviceProp(RoborockBase):
             self.clean_summary = device_prop.clean_summary
         if device_prop.consumable:
             self.consumable = device_prop.consumable
-        if device_prop.dnd_timer:
-            self.dnd_timer = device_prop.dnd_timer
-        if device_prop.valley_electricity_timer:
-            self.valley_electricity_timer = device_prop.valley_electricity_timer
         if device_prop.last_clean_record:
             self.last_clean_record = device_prop.last_clean_record
         if device_prop.dock_summary:

python_roborock-0.24.1/roborock/test.py

@@ -1,79 +0,0 @@
-import asyncio
-import logging
-
-from roborock import (
-    CacheableCommands,
-    DeviceData,
-    HomeDataDevice,
-    ROBOROCK_S7_MAXV,
-)
-from roborock.local_api import RoborockLocalClient
-
-local_key = "nXTBj42ej5WxQopO"
-
-buffer = {0: bytes()}
-
-
-async def main():
-    logging_config = {"level": logging.DEBUG}
-    logging.basicConfig(**logging_config)
-    device_info = DeviceData(
-        device=HomeDataDevice(duid="1r9W0cAmDZ2COuVekgRhKA", local_key=local_key, name="test name", fv="1"),
-        model=ROBOROCK_S7_MAXV,
-        host="192.168.1.33",
-    )
-    print(CacheableCommands)
-    client1 = RoborockLocalClient(device_info)
-    # {
-    #     'max_multi_map': 4,
-    #     'max_bak_map': 1,
-    #     'multi_map_count': 1,
-    #     'map_info': [{
-    #                      'mapFlag': 0,
-    #                      'add_time': 1685652974,
-    #                      'length': 11,
-    #                      'name': 'Apartamento',
-    #                      'bak_maps': [{'mapFlag': 4, 'add_time': 1685552361}]
-    #                  }]
-    # }
-    x = await client1.get_valley_electricity_timer()
-    print(x)
-    await asyncio.sleep(5)
-
-    # capture = pyshark.LiveCapture(interface="rvi0")
-    #
-    # def on_package(packet: Packet):
-    #     if hasattr(packet, "ip"):
-    #         if packet.transport_layer == "TCP" and (packet.ip.dst == local_ip or packet.ip.src == local_ip):
-    #             if hasattr(packet, "DATA"):
-    #                 if hasattr(packet.DATA, "data"):
-    #                     if packet.ip.dst == local_ip:
-    #                         print("Request")
-    #                         try:
-    #                             f, buffer[0] = MessageParser.parse(
-    #                                 buffer[0] + bytes.fromhex(packet.DATA.data), local_key
-    #                             )
-    #                             print(f)
-    #                         except BaseException as e:
-    #                             print(e)
-    #                             pass
-    #                     elif packet.ip.src == local_ip:
-    #                         print("Response")
-    #                         try:
-    #                             f, buffer[0] = MessageParser.parse(
-    #                                 buffer[0] + bytes.fromhex(packet.DATA.data), local_key
-    #                             )
-    #                             print(f)
-    #                         except BaseException as e:
-    #                             print(e)
-    #                             pass
-    #
-    # while True:
-    #     try:
-    #         await capture.packets_from_tshark(on_package, close_tshark=False)
-    #     except Exception as e:
-    #         print(e)
-
-
-if __name__ == "__main__":
-    asyncio.run(main())