Merge remote-tracking branch 'origin/main' into switch_to_uv

# Conflicts:
#	poetry.lock
#	pyproject.toml

Author: Lash-L

pyproject.toml

@@ -21,7 +21,6 @@ classifiers = [
 dependencies = [
     "click>=8",
     "aiohttp>=3.8.2,<4",
-    "async-timeout",
     "pycryptodome~=3.18",
     "pycryptodomex~=3.18 ; sys_platform == 'darwin'",
     "paho-mqtt>=1.6.1,<3.0.0",

roborock/devices/a01_channel.py

@@ -29,16 +29,14 @@
 async def send_decoded_command(
     mqtt_channel: MqttChannel,
     params: dict[RoborockDyadDataProtocol, Any],
-) -> dict[RoborockDyadDataProtocol, Any]:
-    ...
+) -> dict[RoborockDyadDataProtocol, Any]: ...
 
 
 @overload
 async def send_decoded_command(
     mqtt_channel: MqttChannel,
     params: dict[RoborockZeoProtocol, Any],
-) -> dict[RoborockZeoProtocol, Any]:
-    ...
+) -> dict[RoborockZeoProtocol, Any]: ...
 
 
 async def send_decoded_command(

roborock/devices/traits/traits_mixin.py

@@ -42,7 +42,7 @@ def __init__(self, trait: Trait) -> None:
         """
         for item in fields(self):
             trait_type = _get_trait_type(item)
-            if trait_type == type(trait):
+            if trait_type is type(trait):
                 setattr(self, item.name, trait)
                 break
 

roborock/devices/traits/v1/map_content.py

@@ -1,4 +1,5 @@
 """Trait for fetching the map content from Roborock devices."""
+
 import logging
 from dataclasses import dataclass
 

roborock/devices/traits/v1/maps.py

@@ -4,6 +4,7 @@
 with maps and rooms, such as map names and room names. These override the
 base container datatypes to add additional fields.
 """
+
 import logging
 from typing import Self
 

roborock/devices/v1_rpc_channel.py

@@ -6,7 +6,6 @@
 and local connections, preferring local when available.
 """
 
-
 import asyncio
 import logging
 from collections.abc import Callable

roborock/roborock_future.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
+import asyncio
 from asyncio import Future
 from typing import Any
 
-import async_timeout
-
 from .exceptions import VacuumError
 
 
@@ -30,7 +29,7 @@ def set_exception(self, exc: VacuumError) -> None:
 
     async def async_get(self, timeout: float | int) -> tuple[Any, VacuumError | None]:
         try:
-            async with async_timeout.timeout(timeout):
+            async with asyncio.timeout(timeout):
                 return await self.fut
         finally:
             self.fut.cancel()

roborock/version_1_apis/roborock_local_client_v1.py

@@ -5,8 +5,6 @@
 from dataclasses import dataclass
 from enum import StrEnum
 
-import async_timeout
-
 from .. import CommandVacuumError, DeviceData, RoborockCommand
 from ..api import RoborockClient
 from ..exceptions import RoborockConnectionException, RoborockException, VacuumError
@@ -101,7 +99,7 @@ async def async_connect(self) -> None:
             try:
                 if not self.is_connected():
                     self._sync_disconnect()
-                    async with async_timeout.timeout(self.queue_timeout):
+                    async with asyncio.timeout(self.queue_timeout):
                         self._logger.debug(f"Connecting to {self.host}")
                         loop = get_running_loop()
                         self.transport, _ = await loop.create_connection(  # type: ignore

tests/devices/traits/v1/fixtures.py

@@ -1,4 +1,4 @@
-""""Fixtures for V1 trait tests."""
+"""Fixtures for V1 trait tests."""
 
 from unittest.mock import AsyncMock
 

tests/mqtt/test_roborock_session.py

@@ -60,10 +60,12 @@ def new_client(*args: Any, **kwargs: Any) -> mqtt.Client:
         task = event_loop.create_task(poll_sockets(client))
         return client
 
-    with patch("aiomqtt.client.Client._on_socket_open"), patch("aiomqtt.client.Client._on_socket_close"), patch(
-        "aiomqtt.client.Client._on_socket_register_write"
-    ), patch("aiomqtt.client.Client._on_socket_unregister_write"), patch(
-        "aiomqtt.client.mqtt.Client", side_effect=new_client
+    with (
+        patch("aiomqtt.client.Client._on_socket_open"),
+        patch("aiomqtt.client.Client._on_socket_close"),
+        patch("aiomqtt.client.Client._on_socket_register_write"),
+        patch("aiomqtt.client.Client._on_socket_unregister_write"),
+        patch("aiomqtt.client.mqtt.Client", side_effect=new_client),
     ):
         yield
         if task: