feat: moving clean area to api (#63)

Author: Lash-L

roborock/containers.py

@@ -221,6 +221,7 @@ class Status(RoborockBase):
     battery: Optional[int] = None
     clean_time: Optional[int] = None
     clean_area: Optional[int] = None
+    square_meter_clean_area: Optional[float] = None
     error_code: Optional[RoborockErrorCode] = None
     map_present: Optional[int] = None
     in_cleaning: Optional[int] = None
@@ -258,6 +259,9 @@ class Status(RoborockBase):
     unsave_map_reason: Optional[int] = None
     unsave_map_flag: Optional[int] = None
 
+    def __post_init__(self) -> None:
+        self.square_meter_clean_area = round(self.clean_area / 1000000, 1) if self.clean_area is not None else None
+
 
 @dataclass
 class S4MaxStatus(Status):
@@ -345,17 +349,22 @@ class DnDTimer(RoborockBase):
 class CleanSummary(RoborockBase):
     clean_time: Optional[int] = None
     clean_area: Optional[int] = None
+    square_meter_clean_area: Optional[float] = None
     clean_count: Optional[int] = None
     dust_collection_count: Optional[int] = None
     records: Optional[list[int]] = None
 
+    def __post_init__(self) -> None:
+        self.square_meter_clean_area = round(self.clean_area / 1000000, 1) if self.clean_area is not None else None
+
 
 @dataclass
 class CleanRecord(RoborockBase):
     begin: Optional[int] = None
     end: Optional[int] = None
     duration: Optional[int] = None
     area: Optional[int] = None
+    square_meter_area: Optional[float] = None
     error: Optional[int] = None
     complete: Optional[int] = None
     start_type: Optional[int] = None
@@ -366,6 +375,9 @@ class CleanRecord(RoborockBase):
     wash_count: Optional[int] = None
     map_flag: Optional[int] = None
 
+    def __post_init__(self) -> None:
+        self.square_meter_area = round(self.area / 1000000, 1) if self.area is not None else None
+
 
 @dataclass
 class Consumable(RoborockBase):
@@ -382,7 +394,7 @@ class Consumable(RoborockBase):
     filter_time_left: Optional[int] = None
     sensor_time_left: Optional[int] = None
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self.main_brush_time_left = (
             MAIN_BRUSH_REPLACE_TIME - self.main_brush_work_time if self.main_brush_work_time is not None else None
         )

tests/test_containers.py

@@ -2,7 +2,6 @@
 from roborock.code_mappings import (
     RoborockDockErrorCode,
     RoborockDockTypeCode,
-    RoborockEnum,
     RoborockErrorCode,
     RoborockFanSpeedS7MaxV,
     RoborockMopIntensityS7,
@@ -94,11 +93,6 @@ def test_serialize_and_unserialize():
     ud = UserData.from_dict(USER_DATA)
     ud_dict = ud.as_dict()
     assert ud_dict == USER_DATA
-    s7_maxv_status = S7MaxVStatus.from_dict(STATUS)
-    s7_maxv_status_dict = s7_maxv_status.as_dict()
-    assert not isinstance(s7_maxv_status_dict.get("fanPower"), RoborockEnum)
-    s7_maxv_status = S7MaxVStatus.from_dict(s7_maxv_status_dict)
-    assert s7_maxv_status.__dict__ == STATUS
 
 
 def test_consumable():
@@ -121,6 +115,7 @@ def test_status():
     assert s.battery == 100
     assert s.clean_time == 1176
     assert s.clean_area == 20965000
+    assert s.square_meter_clean_area == 21.0
     assert s.error_code == RoborockErrorCode.none
     assert s.map_present == 1
     assert s.in_cleaning == 0
@@ -175,6 +170,7 @@ def test_clean_summary():
     cs = CleanSummary.from_dict(CLEAN_SUMMARY)
     assert cs.clean_time == 74382
     assert cs.clean_area == 1159182500
+    assert cs.square_meter_clean_area == 1159.2
     assert cs.clean_count == 31
     assert cs.dust_collection_count == 25
     assert len(cs.records) == 2
@@ -187,6 +183,7 @@ def test_clean_record():
     assert cr.end == 1672544638
     assert cr.duration == 1176
     assert cr.area == 20965000
+    assert cr.square_meter_area == 21.0
     assert cr.error == 0
     assert cr.complete == 1
     assert cr.start_type == 2