python-roborock 4.24.0__tar.gz → 4.26.0__tar.gz

{python_roborock-4.24.0 → python_roborock-4.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-roborock
-Version: 4.24.0
+Version: 4.26.0
 Summary: A package to control Roborock vacuums.
 Project-URL: Repository, https://github.com/humbertogontijo/python-roborock
 Project-URL: Documentation, https://python-roborock.readthedocs.io/

{python_roborock-4.24.0 → python_roborock-4.26.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "4.24.0"
+version = "4.26.0"
 description = "A package to control Roborock vacuums."
 authors = [{ name = "humbertogontijo", email = "humbertogontijo@users.noreply.github.com" }, {name="Lash-L"}, {name="allenporter"}]
 requires-python = ">=3.11, <4"

{python_roborock-4.24.0 → python_roborock-4.26.0}/roborock/cli.py

@@ -764,21 +764,6 @@ async def network_info(ctx, device_id: str):
     await _display_v1_trait(context, device_id, lambda v1: v1.network_info)
 
 
-def _parse_b01_q10_command(cmd: str) -> B01_Q10_DP:
-    """Parse B01_Q10 command from either enum name or value."""
-    try:
-        return B01_Q10_DP(int(cmd))
-    except ValueError:
-        try:
-            return B01_Q10_DP.from_name(cmd)
-        except ValueError:
-            try:
-                return B01_Q10_DP.from_value(cmd)
-            except ValueError:
-                pass
-    raise RoborockException(f"Invalid command {cmd} for B01_Q10 device")
-
-
 @click.command()
 @click.option("--device_id", required=True)
 @click.option("--cmd", required=True)
@@ -795,7 +780,8 @@ async def command(ctx, cmd, device_id, params):
         if result:
             click.echo(dump_json(result))
     elif device.b01_q10_properties is not None:
-        cmd_value = _parse_b01_q10_command(cmd)
+        if cmd_value := B01_Q10_DP.from_any_optional(cmd) is None:
+            raise RoborockException(f"Invalid command {cmd} for B01_Q10 device")
         command_trait: Trait = device.b01_q10_properties.command
         await command_trait.send(cmd_value, json.loads(params) if params is not None else None)
         click.echo("Command sent successfully; Enable debug logging (-d) to see responses.")

{python_roborock-4.24.0 → python_roborock-4.26.0}/roborock/data/b01_q7/b01_q7_containers.py

@@ -114,7 +114,7 @@ class B01Props(RoborockBase):
     wind: SCWindMapping | None = None
     water: WaterLevelMapping | None = None
     mode: CleanTypeMapping | None = None
-    quantity: int | None = None
+    quantity: int | None = None  # The Q7 L5 reports its battery level as 'quantity'
     alarm: int | None = None
     volume: int | None = None
     hypa: int | None = None
@@ -169,6 +169,13 @@ class B01Props(RoborockBase):
     recommend: Recommend | None = None
     add_sweep_status: int | None = None
 
+    @property
+    def battery(self) -> int | None:
+        """
+        Returns device battery level as a percentage.
+        """
+        return self.quantity
+
     @property
     def main_brush_time_left(self) -> int | None:
         """

{python_roborock-4.24.0 → python_roborock-4.26.0}/roborock/data/code_mappings.py

@@ -100,6 +100,30 @@ class RoborockModeEnum(StrEnum):
                 return member
         raise ValueError(f"{name} is not a valid name for {cls.__name__}")
 
+    @classmethod
+    def from_any_optional(cls, value: str | int) -> Self | None:
+        """Resolve a string or int to an enum member.
+
+        Tries to look up by enum name, string value, or integer code
+        and returns None if no match is found.
+        """
+        # Try enum name lookup (e.g. "SEEK")
+        try:
+            return cls.from_name(str(value))
+        except ValueError:
+            pass
+        # Try DP string value lookup (e.g. "dpSeek")
+        try:
+            return cls.from_value(str(value))
+        except ValueError:
+            pass
+        # Try integer code lookup (e.g. "11")
+        try:
+            return cls.from_code(int(value))
+        except (ValueError, TypeError):
+            pass
+        return None
+
     @classmethod
     def keys(cls) -> list[str]:
         """Returns a list of all member values."""