python-roborock 2.9.5__tar.gz → 2.9.7__tar.gz

{python_roborock-2.9.5 → python_roborock-2.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-roborock
-Version: 2.9.5
+Version: 2.9.7
 Summary: A package to control Roborock vacuums.
 License: GPL-3.0-only
 Keywords: roborock,vacuum,homeassistant

{python_roborock-2.9.5 → python_roborock-2.9.7}/pyproject.toml

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

{python_roborock-2.9.5 → python_roborock-2.9.7}/roborock/api.py

@@ -21,7 +21,7 @@ from .roborock_future import RoborockFuture
 from .roborock_message import (
     RoborockMessage,
 )
-from .util import get_next_int, get_running_loop_or_create_one
+from .util import get_next_int
 
 _LOGGER = logging.getLogger(__name__)
 KEEPALIVE = 60
@@ -35,7 +35,6 @@ class RoborockClient(ABC):
 
     def __init__(self, device_info: DeviceData) -> None:
         """Initialize RoborockClient."""
-        self.event_loop = get_running_loop_or_create_one()
         self.device_info = device_info
         self._nonce = secrets.token_bytes(16)
         self._waiting_queue: dict[int, RoborockFuture] = {}
@@ -47,12 +46,6 @@ class RoborockClient(ABC):
         }
         self.is_available: bool = True
 
-    def __del__(self) -> None:
-        self.release()
-
-    def release(self) -> None:
-        self.sync_disconnect()
-
     async def async_release(self) -> None:
         await self.async_disconnect()
 
@@ -65,12 +58,12 @@ class RoborockClient(ABC):
         """Connect to the Roborock device."""
 
     @abstractmethod
-    def sync_disconnect(self) -> Any:
+    async def async_disconnect(self) -> Any:
         """Disconnect from the Roborock device."""
 
     @abstractmethod
-    async def async_disconnect(self) -> Any:
-        """Disconnect from the Roborock device."""
+    def is_connected(self) -> bool:
+        """Return True if the client is connected to the device."""
 
     @abstractmethod
     def on_message_received(self, messages: list[RoborockMessage]) -> None:

{python_roborock-2.9.5 → python_roborock-2.9.7}/roborock/cloud_api.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 import logging
 import threading
 from abc import ABC
@@ -121,7 +122,7 @@ class RoborockMqttClient(RoborockClient, ABC):
         """Check if the mqtt client is connected."""
         return self._mqtt_client.is_connected()
 
-    def sync_disconnect(self) -> Any:
+    def _sync_disconnect(self) -> Any:
         if not self.is_connected():
             return None
 
@@ -139,7 +140,7 @@ class RoborockMqttClient(RoborockClient, ABC):
 
         return disconnected_future
 
-    def sync_connect(self) -> Any:
+    def _sync_connect(self) -> Any:
         if self.is_connected():
             self._mqtt_client.maybe_restart_loop()
             return None
@@ -155,14 +156,15 @@ class RoborockMqttClient(RoborockClient, ABC):
 
     async def async_disconnect(self) -> None:
         async with self._mutex:
-            if disconnected_future := self.sync_disconnect():
+            if disconnected_future := self._sync_disconnect():
                 # There are no errors set on this future
                 await disconnected_future
-            await self.event_loop.run_in_executor(None, self._mqtt_client.loop_stop)
+            loop = asyncio.get_running_loop()
+            await loop.run_in_executor(None, self._mqtt_client.loop_stop)
 
     async def async_connect(self) -> None:
         async with self._mutex:
-            if connected_future := self.sync_connect():
+            if connected_future := self._sync_connect():
                 try:
                     await connected_future
                 except VacuumError as err:

{python_roborock-2.9.5 → python_roborock-2.9.7}/roborock/local_api.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import asyncio
 import logging
 from abc import ABC
-from asyncio import Lock, TimerHandle, Transport
+from asyncio import Lock, TimerHandle, Transport, get_running_loop
 from collections.abc import Callable
 from dataclasses import dataclass
 
@@ -61,7 +61,7 @@ class RoborockLocalClient(RoborockClient, ABC):
 
     def _connection_lost(self, exc: Exception | None):
         """Called when the transport connection is lost."""
-        self.sync_disconnect()
+        self._sync_disconnect()
         self.on_connection_lost(exc)
 
     def is_connected(self):
@@ -72,17 +72,19 @@ class RoborockLocalClient(RoborockClient, ABC):
             await self.ping()
         except RoborockException:
             pass
-        self.keep_alive_task = self.event_loop.call_later(10, lambda: asyncio.create_task(self.keep_alive_func()))
+        loop = asyncio.get_running_loop()
+        self.keep_alive_task = loop.call_later(10, lambda: asyncio.create_task(self.keep_alive_func()))
 
     async def async_connect(self) -> None:
         should_ping = False
         async with self._mutex:
             try:
                 if not self.is_connected():
-                    self.sync_disconnect()
+                    self._sync_disconnect()
                     async with async_timeout.timeout(self.queue_timeout):
                         self._logger.debug(f"Connecting to {self.host}")
-                        self.transport, _ = await self.event_loop.create_connection(  # type: ignore
+                        loop = get_running_loop()
+                        self.transport, _ = await loop.create_connection(  # type: ignore
                             lambda: self._local_protocol, self.host, 58867
                         )
                         self._logger.info(f"Connected to {self.host}")
@@ -93,8 +95,9 @@ class RoborockLocalClient(RoborockClient, ABC):
             await self.hello()
             await self.keep_alive_func()
 
-    def sync_disconnect(self) -> None:
-        if self.transport and self.event_loop.is_running():
+    def _sync_disconnect(self) -> None:
+        loop = asyncio.get_running_loop()
+        if self.transport and loop.is_running():
             self._logger.debug(f"Disconnecting from {self.host}")
             self.transport.close()
         if self.keep_alive_task:
@@ -102,7 +105,7 @@ class RoborockLocalClient(RoborockClient, ABC):
 
     async def async_disconnect(self) -> None:
         async with self._mutex:
-            self.sync_disconnect()
+            self._sync_disconnect()
 
     async def hello(self):
         request_id = 1

{python_roborock-2.9.5 → python_roborock-2.9.7}/roborock/util.py

@@ -74,8 +74,7 @@ def run_sync():
 
 
 class RepeatableTask:
-    def __init__(self, loop: AbstractEventLoop, callback: Callable[[], Coroutine], interval: int):
-        self.loop = loop
+    def __init__(self, callback: Callable[[], Coroutine], interval: int):
         self.callback = callback
         self.interval = interval
         self._task: TimerHandle | None = None
@@ -86,7 +85,8 @@ class RepeatableTask:
             response = await self.callback()
         except RoborockException:
             pass
-        self._task = self.loop.call_later(self.interval, self._run_task_soon)
+        loop = asyncio.get_running_loop()
+        self._task = loop.call_later(self.interval, self._run_task_soon)
         return response
 
     def _run_task_soon(self):

{python_roborock-2.9.5 → python_roborock-2.9.7}/roborock/version_1_apis/roborock_client_v1.py

@@ -82,11 +82,11 @@ _SendCommandT = Callable[[RoborockCommand | str, list | dict | int | None], Any]
 
 
 class AttributeCache:
-    def __init__(self, attribute: RoborockAttribute, loop: asyncio.AbstractEventLoop, send_command: _SendCommandT):
+    def __init__(self, attribute: RoborockAttribute, send_command: _SendCommandT):
         self.attribute = attribute
         self._send_command = send_command
         self.attribute = attribute
-        self.task = RepeatableTask(loop, self._async_value, EVICT_TIME)
+        self.task = RepeatableTask(self._async_value, EVICT_TIME)
         self._value: Any = None
         self._mutex = asyncio.Lock()
         self.unsupported: bool = False
@@ -156,7 +156,7 @@ class RoborockClientV1(RoborockClient, ABC):
         super().__init__(device_info)
         self._status_type: type[Status] = ModelStatus.get(device_info.model, S7MaxVStatus)
         self.cache: dict[CacheableAttribute, AttributeCache] = {
-            cacheable_attribute: AttributeCache(attr, self.event_loop, self._send_command)
+            cacheable_attribute: AttributeCache(attr, self._send_command)
             for cacheable_attribute, attr in get_cache_map().items()
         }
         if device_info.device.duid not in self._listeners:
@@ -164,10 +164,6 @@ class RoborockClientV1(RoborockClient, ABC):
         self.listener_model = self._listeners[device_info.device.duid]
         self._endpoint = endpoint
 
-    def release(self):
-        super().release()
-        [item.stop() for item in self.cache.values()]
-
     async def async_release(self) -> None:
         await super().async_release()
         [item.stop() for item in self.cache.values()]