fix: RoborockBase.as_dict

Author: humbertogontijo

roborock/containers.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 import re
-from dataclasses import dataclass
+from dataclasses import dataclass, asdict
 from enum import Enum
 from typing import Any, Optional
 
@@ -11,25 +13,32 @@
     RoborockErrorCode, RoborockDockDustCollectionModeCode, RoborockFanPowerCode
 
 
-def to_snake(s):
+def camelize(s: str):
+    first, *others = s.split('_')
+    return ''.join([first.lower(), *map(str.title, others)])
+
+
+def decamelize(s: str):
     return re.sub('([A-Z]+)', '_\\1', s).lower()
 
 
-def decamelize(d):
+def decamelize_obj(d: dict | list):
     if isinstance(d, list):
-        return [decamelize(i) if isinstance(i, (dict, list)) else i for i in d]
-    return {to_snake(a): decamelize(b) if isinstance(b, (dict, list)) else b for a, b in d.items()}
+        return [decamelize_obj(i) if isinstance(i, (dict, list)) else i for i in d]
+    return {decamelize(a): decamelize_obj(b) if isinstance(b, (dict, list)) else b for a, b in d.items()}
 
 
 @dataclass
 class RoborockBase:
 
     @classmethod
     def from_dict(cls, data: dict[str, any]):
-        return from_dict(cls, decamelize(data), config=Config(cast=[Enum]))
+        return from_dict(cls, decamelize_obj(data), config=Config(cast=[Enum]))
 
     def as_dict(self):
-        return self.__dict__
+        return asdict(self, dict_factory=lambda _fields: {
+            camelize(key): value for (key, value) in _fields if value is not None
+        })
 
 
 @dataclass

tests/mock_data.py

@@ -5,8 +5,6 @@
 BASE_URL = "https://usiot.roborock.com"
 
 USER_DATA = {
-    "tuyaname": "abc123",
-    "tuyapwd": "abc123",
     "uid": 123456,
     "tokentype": "token_type",
     "token": "abc123",

tests/test_containers.py

@@ -1,7 +1,6 @@
+from roborock import UserData, HomeData, Consumable, Status, DNDTimer, CleanSummary, CleanRecord, HomeDataProduct
 from roborock.code_mappings import RoborockStateCode, RoborockErrorCode, RoborockFanPowerCode, RoborockMopIntensityCode, \
     RoborockDockTypeCode, RoborockMopModeCode, RoborockDockErrorCode
-
-from roborock import UserData, HomeData, Consumable, Status, DNDTimer, CleanSummary, CleanRecord
 from .mock_data import USER_DATA, HOME_DATA_RAW, CONSUMABLE, STATUS, DND_TIMER, CLEAN_SUMMARY, CLEAN_RECORD
 
 
@@ -82,6 +81,12 @@ def test_home_data():
     assert hd.rooms[0].name == "Example room 1"
 
 
+def test_serialize_and_unserialize():
+    ud = UserData.from_dict(USER_DATA)
+    ud_dict = ud.as_dict()
+    assert ud_dict == USER_DATA
+
+
 def test_consumable():
     c = Consumable.from_dict(CONSUMABLE)
     assert c.main_brush_work_time == 74382
@@ -173,4 +178,4 @@ def test_clean_record():
     assert cr.dust_collection_status == 1
     assert cr.avoid_count == 19
     assert cr.wash_count == 2
-    assert cr.map_flag == 0
+    assert cr.map_flag == 0