python-roborock 2.9.4__tar.gz → 2.9.6__tar.gz

{python_roborock-2.9.4 → python_roborock-2.9.6}/PKG-INFO

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

{python_roborock-2.9.4 → python_roborock-2.9.6}/pyproject.toml

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

{python_roborock-2.9.4 → python_roborock-2.9.6}/roborock/api.py

@@ -31,8 +31,9 @@ class RoborockClient(ABC):
     """Roborock client base class."""
 
     _logger: logging.LoggerAdapter
+    queue_timeout: int
 
-    def __init__(self, device_info: DeviceData, queue_timeout: int = 4) -> None:
+    def __init__(self, device_info: DeviceData) -> None:
         """Initialize RoborockClient."""
         self.event_loop = get_running_loop_or_create_one()
         self.device_info = device_info
@@ -45,13 +46,6 @@ class RoborockClient(ABC):
             "misc_info": {"Nonce": base64.b64encode(self._nonce).decode("utf-8")}
         }
         self.is_available: bool = True
-        self.queue_timeout = queue_timeout
-
-    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 +59,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:
@@ -91,6 +85,7 @@ class RoborockClient(ABC):
 
     async def validate_connection(self) -> None:
         if not self.should_keepalive():
+            self._logger.info("Resetting Roborock connection due to kepalive timeout")
             await self.async_disconnect()
         await self.async_connect()
 

{python_roborock-2.9.4 → python_roborock-2.9.6}/roborock/cloud_api.py

@@ -46,12 +46,12 @@ class _Mqtt(mqtt.Client):
 class RoborockMqttClient(RoborockClient, ABC):
     """Roborock MQTT client base class."""
 
-    def __init__(self, user_data: UserData, device_info: DeviceData, queue_timeout: int = 10) -> None:
+    def __init__(self, user_data: UserData, device_info: DeviceData) -> None:
         """Initialize the Roborock MQTT client."""
         rriot = user_data.rriot
         if rriot is None:
             raise RoborockException("Got no rriot data from user_data")
-        RoborockClient.__init__(self, device_info, queue_timeout)
+        RoborockClient.__init__(self, device_info)
         self._mqtt_user = rriot.u
         self._hashed_user = md5hex(self._mqtt_user + ":" + rriot.k)[2:10]
         url = urlparse(rriot.r.m)
@@ -121,7 +121,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 +139,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 +155,14 @@ 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)
 
     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.4 → python_roborock-2.9.6}/roborock/local_api.py

@@ -37,7 +37,7 @@ class _LocalProtocol(asyncio.Protocol):
 class RoborockLocalClient(RoborockClient, ABC):
     """Roborock local client base class."""
 
-    def __init__(self, device_data: DeviceData, queue_timeout: int = 4):
+    def __init__(self, device_data: DeviceData):
         """Initialize the Roborock local client."""
         if device_data.host is None:
             raise RoborockException("Host is required")
@@ -48,7 +48,7 @@ class RoborockLocalClient(RoborockClient, ABC):
         self.transport: Transport | None = None
         self._mutex = Lock()
         self.keep_alive_task: TimerHandle | None = None
-        RoborockClient.__init__(self, device_data, queue_timeout)
+        RoborockClient.__init__(self, device_data)
         self._local_protocol = _LocalProtocol(self._data_received, self._connection_lost)
 
     def _data_received(self, message):
@@ -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):
@@ -79,7 +79,7 @@ class RoborockLocalClient(RoborockClient, ABC):
         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
@@ -93,7 +93,7 @@ class RoborockLocalClient(RoborockClient, ABC):
             await self.hello()
             await self.keep_alive_func()
 
-    def sync_disconnect(self) -> None:
+    def _sync_disconnect(self) -> None:
         if self.transport and self.event_loop.is_running():
             self._logger.debug(f"Disconnecting from {self.host}")
             self.transport.close()
@@ -102,7 +102,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.4 → python_roborock-2.9.6}/roborock/version_1_apis/roborock_client_v1.py

@@ -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()]

{python_roborock-2.9.4 → python_roborock-2.9.6}/roborock/version_1_apis/roborock_local_client_v1.py

@@ -17,8 +17,9 @@ class RoborockLocalClientV1(RoborockLocalClient, RoborockClientV1):
 
     def __init__(self, device_data: DeviceData, queue_timeout: int = 4):
         """Initialize the Roborock local client."""
-        RoborockLocalClient.__init__(self, device_data, queue_timeout)
+        RoborockLocalClient.__init__(self, device_data)
         RoborockClientV1.__init__(self, device_data, "abc")
+        self.queue_timeout = queue_timeout
         self._logger = RoborockLoggerAdapter(device_data.device.name, _LOGGER)
 
     def build_roborock_message(

{python_roborock-2.9.4 → python_roborock-2.9.6}/roborock/version_1_apis/roborock_mqtt_client_v1.py

@@ -32,8 +32,9 @@ class RoborockMqttClientV1(RoborockMqttClient, RoborockClientV1):
             raise RoborockException("Got no rriot data from user_data")
         endpoint = base64.b64encode(Utils.md5(rriot.k.encode())[8:14]).decode()
 
-        RoborockMqttClient.__init__(self, user_data, device_info, queue_timeout)
+        RoborockMqttClient.__init__(self, user_data, device_info)
         RoborockClientV1.__init__(self, device_info, endpoint)
+        self.queue_timeout = queue_timeout
         self._logger = RoborockLoggerAdapter(device_info.device.name, _LOGGER)
 
     async def send_message(self, roborock_message: RoborockMessage):

{python_roborock-2.9.4 → python_roborock-2.9.6}/roborock/version_a01_apis/roborock_client_a01.py

@@ -108,9 +108,9 @@ zeo_data_protocol_entries = {
 class RoborockClientA01(RoborockClient, ABC):
     """Roborock client base class for A01 devices."""
 
-    def __init__(self, device_info: DeviceData, category: RoborockCategory, queue_timeout: int = 4):
+    def __init__(self, device_info: DeviceData, category: RoborockCategory):
         """Initialize the Roborock client."""
-        super().__init__(device_info, queue_timeout)
+        super().__init__(device_info)
         self.category = category
 
     def on_message_received(self, messages: list[RoborockMessage]) -> None:

{python_roborock-2.9.4 → python_roborock-2.9.6}/roborock/version_a01_apis/roborock_mqtt_client_a01.py

@@ -34,8 +34,9 @@ class RoborockMqttClientA01(RoborockMqttClient, RoborockClientA01):
         if rriot is None:
             raise RoborockException("Got no rriot data from user_data")
 
-        RoborockMqttClient.__init__(self, user_data, device_info, queue_timeout)
-        RoborockClientA01.__init__(self, device_info, category, queue_timeout)
+        RoborockMqttClient.__init__(self, user_data, device_info)
+        RoborockClientA01.__init__(self, device_info, category)
+        self.queue_timeout = queue_timeout
         self._logger = RoborockLoggerAdapter(device_info.device.name, _LOGGER)
 
     async def send_message(self, roborock_message: RoborockMessage):