chore: use the existing device logger

Author: allenporter

roborock/devices/device.py

@@ -12,9 +12,9 @@
 from typing import Any, TypeVar, cast
 
 from roborock.data import HomeDataDevice, HomeDataProduct
-from roborock.devices.logger import DeviceLoggerAdapter
 from roborock.exceptions import RoborockException
 from roborock.roborock_message import RoborockMessage
+from roborock.util import RoborockLoggerAdapter
 
 from .channel import Channel
 from .traits import Trait
@@ -60,7 +60,7 @@ def __init__(
         """
         TraitsMixin.__init__(self, trait)
         self._duid = device_info.duid
-        self._logger = DeviceLoggerAdapter(_LOGGER, self._duid)
+        self._logger = RoborockLoggerAdapter(self._duid, _LOGGER)
         self._name = device_info.name
         self._device_info = device_info
         self._product = product

roborock/devices/local_channel.py

@@ -11,9 +11,8 @@
 from roborock.roborock_message import RoborockMessage, RoborockMessageProtocol
 
 from ..protocols.v1_protocol import LocalProtocolVersion
-from ..util import get_next_int
+from ..util import RoborockLoggerAdapter, get_next_int
 from .channel import Channel
-from .logger import DeviceLoggerAdapter
 
 _LOGGER = logging.getLogger(__name__)
 _PORT = 58867
@@ -55,7 +54,7 @@ class LocalChannel(Channel):
 
     def __init__(self, host: str, local_key: str, device_uid: str) -> None:
         self._host = host
-        self._logger = DeviceLoggerAdapter(_LOGGER, device_uid)
+        self._logger = RoborockLoggerAdapter(device_uid, _LOGGER)
         self._transport: asyncio.Transport | None = None
         self._protocol: _LocalProtocol | None = None
         self._subscribers: CallbackList[RoborockMessage] = CallbackList(self._logger)

roborock/devices/logger.py

@@ -9,9 +9,9 @@
 from roborock.mqtt.session import MqttParams, MqttSession, MqttSessionException
 from roborock.protocol import create_mqtt_decoder, create_mqtt_encoder
 from roborock.roborock_message import RoborockMessage
+from roborock.util import RoborockLoggerAdapter
 
 from .channel import Channel
-from .logger import DeviceLoggerAdapter
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,7 +26,7 @@ class MqttChannel(Channel):
     def __init__(self, mqtt_session: MqttSession, duid: str, local_key: str, rriot: RRiot, mqtt_params: MqttParams):
         self._mqtt_session = mqtt_session
         self._duid = duid
-        self._logger = DeviceLoggerAdapter(_LOGGER, duid)
+        self._logger = RoborockLoggerAdapter(duid, _LOGGER)
         self._local_key = local_key
         self._rriot = rriot
         self._mqtt_params = mqtt_params

roborock/devices/mqtt_channel.py

@@ -12,7 +12,6 @@
 from typing import Any, TypeVar
 
 from roborock.data import HomeDataDevice, NetworkInfo, RoborockBase, UserData
-from roborock.devices.logger import DeviceLoggerAdapter
 from roborock.exceptions import RoborockException
 from roborock.mqtt.health_manager import HealthManager
 from roborock.mqtt.session import MqttParams, MqttSession
@@ -31,6 +30,7 @@
 )
 from roborock.roborock_message import RoborockMessage, RoborockMessageProtocol
 from roborock.roborock_typing import RoborockCommand
+from roborock.util import RoborockLoggerAdapter
 
 from .cache import DeviceCache
 from .channel import Channel
@@ -71,7 +71,7 @@ class RpcStrategy:
 class RpcChannel(V1RpcChannel):
     """Provides an RPC interface around a pub/sub transport channel."""
 
-    def __init__(self, rpc_strategies_cb: Callable[[], list[RpcStrategy]], logger: DeviceLoggerAdapter) -> None:
+    def __init__(self, rpc_strategies_cb: Callable[[], list[RpcStrategy]], logger: RoborockLoggerAdapter) -> None:
         """Initialize the RpcChannel with an ordered list of strategies."""
         self._rpc_strategies_cb = rpc_strategies_cb
         self._logger = logger
@@ -110,7 +110,7 @@ async def send_command(
 
     @staticmethod
     async def _send_rpc(
-        strategy: RpcStrategy, request: RequestMessage, logger: DeviceLoggerAdapter
+        strategy: RpcStrategy, request: RequestMessage, logger: RoborockLoggerAdapter
     ) -> ResponseData | bytes:
         """Send a command and return a decoded response type.
 
@@ -178,7 +178,7 @@ def __init__(
     ) -> None:
         """Initialize the V1Channel."""
         self._device_uid = device_uid
-        self._logger = DeviceLoggerAdapter(_LOGGER, device_uid)
+        self._logger = RoborockLoggerAdapter(device_uid, _LOGGER)
         self._security_data = security_data
         self._mqtt_channel = mqtt_channel
         self._mqtt_health_manager = HealthManager(self._mqtt_channel.restart)