fix: change device info class to dataclass

Author: humbertogontijo

roborock/api.py

@@ -318,9 +318,6 @@ async def get_multi_maps_list(self, device_id) -> MultiMapsList:
         except RoborockTimeout as e:
             _LOGGER.error(e)
 
-    async def get_map_v1(self, device_id):
-        return await self.send_command(device_id, RoborockCommand.GET_MAP_V1)
-
 
 class RoborockApiClient:
     def __init__(self, username: str, base_url=None) -> None:

roborock/cli.py

@@ -118,7 +118,7 @@ async def command(ctx, cmd, params):
     home_data = login_data.home_data
     device_map: dict[str, RoborockDeviceInfo] = {}
     for device in home_data.devices + home_data.received_devices:
-        device_map[device.duid] = RoborockDeviceInfo({"device": device})
+        device_map[device.duid] = RoborockDeviceInfo(device=device)
     mqtt_client = RoborockMqttClient(login_data.user_data, device_map)
     await mqtt_client.send_command(home_data.devices[0].duid, cmd, params)
     mqtt_client.__del__()

roborock/cloud_api.py

@@ -20,8 +20,8 @@
     UserData,
     RoborockDeviceInfo,
 )
-from .roborock_queue import RoborockQueue
 from .roborock_message import RoborockParser, md5bin, RoborockMessage
+from .roborock_queue import RoborockQueue
 from .typing import RoborockCommand
 from .util import run_in_executor
 
@@ -210,3 +210,6 @@ async def send_command(
         else:
             _LOGGER.debug(f"id={request_id} Response from {method}: {response}")
         return response
+
+    async def get_map_v1(self, device_id):
+        return await self.send_command(device_id, RoborockCommand.GET_MAP_V1)

roborock/containers.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 from enum import Enum
 
 from .code_mappings import STATE_CODE_TO_STATUS, ERROR_CODE_TO_TEXT, FAN_SPEED_CODES, MOP_MODE_CODES, \
@@ -260,7 +261,7 @@ def __init__(self, data: dict[str, any]) -> None:
     def is_valid(self):
         return set(self.keys()) == set([
             f for f in dir(self)
-            if not callable(getattr(self,f)) and not f.startswith('__')
+            if not callable(getattr(self, f)) and not f.startswith('__')
         ])
 
     def as_dict(self):
@@ -1072,17 +1073,11 @@ def rssi(self) -> int:
         return self.get(NetworkInfoField.RSSI)
 
 
-class RoborockDeviceInfo(RoborockBase):
-    @property
-    def device(self) -> HomeDataDevice:
-        return HomeDataDevice(self.get(RoborockDeviceInfoField.DEVICE))
-
-    @property
-    def product(self) -> HomeDataProduct:
-        return HomeDataProduct(self.get(RoborockDeviceInfoField.PRODUCT))
+@dataclass
+class RoborockDeviceInfo:
+    device: HomeDataDevice
 
 
+@dataclass
 class RoborockLocalDeviceInfo(RoborockDeviceInfo):
-    @property
-    def network_info(self) -> NetworkInfo:
-        return NetworkInfo(self.get(RoborockLocalDeviceInfoField.NETWORK_INFO))
+    network_info: NetworkInfo