python-roborock 0.5.2__tar.gz → 0.5.3__tar.gz

{python_roborock-0.5.2 → python_roborock-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-roborock
-Version: 0.5.2
+Version: 0.5.3
 Summary: A package to control Roborock vacuums.
 Home-page: https://github.com/humbertogontijo/python-roborock
 License: GPL-3.0-only

{python_roborock-0.5.2 → python_roborock-0.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "0.5.2"
+version = "0.5.3"
 description = "A package to control Roborock vacuums."
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"

{python_roborock-0.5.2 → python_roborock-0.5.3}/roborock/api.py

@@ -262,7 +262,7 @@ class RoborockClient:
     async def get_dock_summary(self, device_id: str, dock_type: RoborockDockTypeCode) -> RoborockDockSummary:
         try:
             commands = [self.get_dust_collection_mode(device_id)]
-            if dock_type == RoborockDockTypeCode.EMPTY_WASH_FILL_DOCK:
+            if dock_type == RoborockDockTypeCode['3']:
                 commands += [self.get_wash_towel_mode(device_id), self.get_smart_wash_params(device_id)]
             [
                 dust_collection_mode,
@@ -292,7 +292,7 @@ class RoborockClient:
                 device_id, clean_summary.records[0]
             )
         dock_summary = None
-        if status and status.dock_type != RoborockDockTypeCode.NO_DOCK:
+        if status and status.dock_type != RoborockDockTypeCode['0']:
             dock_summary = await self.get_dock_summary(device_id, status.dock_type)
         if any([status, dnd_timer, clean_summary, consumable]):
             return RoborockDeviceProp(

{python_roborock-0.5.2 → python_roborock-0.5.3}/roborock/code_mappings.py

@@ -5,10 +5,29 @@ from enum import Enum
 
 class RoborockEnum(str, Enum):
 
+    def __str__(self):
+        return str(self.value)
+
     @classmethod
     def _missing_(cls, code: int):
         return cls._member_map_.get(str(code))
 
+    @classmethod
+    def as_dict(cls):
+        return {i.name: i.value for i in cls}
+
+    @classmethod
+    def values(cls):
+        return list(cls.as_dict().values())
+
+    @classmethod
+    def keys(cls):
+        return list(cls.as_dict().keys())
+
+    @classmethod
+    def items(cls):
+        return cls.as_dict().items()
+
 
 class RoborockCode:
 

{python_roborock-0.5.2 → python_roborock-0.5.3}/roborock/containers.py

@@ -5,7 +5,8 @@ from typing import Any, Optional
 
 from dacite import from_dict, Config
 
-from roborock.code_mappings import RoborockDockWashTowelModeCode, RoborockDockTypeCode
+from roborock.code_mappings import RoborockDockWashTowelModeCode, RoborockDockTypeCode, RoborockMopIntensityCode, \
+    RoborockStateCode
 from .code_mappings import RoborockMopModeCode, RoborockDockErrorCode, \
     RoborockErrorCode, RoborockDockDustCollectionModeCode, RoborockFanPowerCode
 
@@ -21,11 +22,7 @@ def decamelize(d):
 
 
 @dataclass
-class RoborockBase(dict):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__()
-        if isinstance(data, dict):
-            self.update(data)
+class RoborockBase:
 
     @classmethod
     def from_dict(cls, data: dict[str, any]):
@@ -164,7 +161,7 @@ class Status(RoborockBase):
     msg_ver: Optional[int] = None
     msg_seq: Optional[int] = None
     status: Optional[str] = None
-    state: Optional[int] = None
+    state: Optional[RoborockStateCode] = None
     battery: Optional[int] = None
     clean_time: Optional[int] = None
     clean_area: Optional[int] = None
@@ -183,7 +180,7 @@ class Status(RoborockBase):
     map_status: Optional[int] = None
     is_locating: Optional[int] = None
     lock_status: Optional[int] = None
-    water_box_mode: Optional[int] = None
+    water_box_mode: Optional[RoborockMopIntensityCode] = None
     mop_intensity: Optional[str] = None
     water_box_carriage_status: Optional[int] = None
     mop_forbidden_enable: Optional[int] = None
@@ -285,12 +282,12 @@ class SmartWashParams(RoborockBase):
 
 @dataclass
 class DustCollectionMode(RoborockBase):
-    mode: RoborockDockDustCollectionModeCode
+    mode: Optional[RoborockDockDustCollectionModeCode] = None
 
 
 @dataclass
 class WashTowelMode(RoborockBase):
-    wash_mode: RoborockDockWashTowelModeCode
+    wash_mode: Optional[RoborockDockWashTowelModeCode] = None
 
 
 @dataclass