python-roborock 2.11.3__tar.gz → 2.12.1__tar.gz

{python_roborock-2.11.3 → python_roborock-2.12.1}/PKG-INFO

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

{python_roborock-2.11.3 → python_roborock-2.12.1}/pyproject.toml

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

{python_roborock-2.11.3 → python_roborock-2.12.1}/roborock/cli.py

@@ -11,9 +11,10 @@ from pyshark.capture.live_capture import LiveCapture, UnknownInterfaceException
 from pyshark.packet.packet import Packet  # type: ignore
 
 from roborock import RoborockException
-from roborock.containers import DeviceData, LoginData
+from roborock.containers import DeviceData, HomeDataProduct, LoginData
 from roborock.protocol import MessageParser
 from roborock.util import run_sync
+from roborock.version_1_apis.roborock_local_client_v1 import RoborockLocalClientV1
 from roborock.version_1_apis.roborock_mqtt_client_v1 import RoborockMqttClientV1
 from roborock.web_api import RoborockApiClient
 
@@ -145,6 +146,29 @@ async def execute_scene(ctx, scene_id):
     await client.execute_scene(login_data.user_data, scene_id)
 
 
+@click.command()
+@click.option("--device_id", required=True)
+@click.pass_context
+@run_sync()
+async def status(ctx, device_id):
+    context: RoborockContext = ctx.obj
+    login_data = context.login_data()
+    if not login_data.home_data:
+        await _discover(ctx)
+        login_data = context.login_data()
+    home_data = login_data.home_data
+    devices = home_data.devices + home_data.received_devices
+    device = next(device for device in devices if device.duid == device_id)
+    product_info: dict[str, HomeDataProduct] = {product.id: product for product in home_data.products}
+    device_data = DeviceData(device, product_info[device.product_id].model)
+    mqtt_client = RoborockMqttClientV1(login_data.user_data, device_data)
+    networking = await mqtt_client.get_networking()
+    local_device_data = DeviceData(device, product_info[device.product_id].model, networking.ip)
+    local_client = RoborockLocalClientV1(local_device_data)
+    status = await local_client.get_status()
+    click.echo(json.dumps(status.as_dict(), indent=4))
+
+
 @click.command()
 @click.option("--device_id", required=True)
 @click.option("--cmd", required=True)
@@ -226,6 +250,7 @@ cli.add_command(discover)
 cli.add_command(list_devices)
 cli.add_command(list_scenes)
 cli.add_command(execute_scene)
+cli.add_command(status)
 cli.add_command(command)
 cli.add_command(parser)
 

{python_roborock-2.11.3 → python_roborock-2.12.1}/roborock/code_mappings.py

@@ -461,6 +461,7 @@ class RoborockDockTypeCode(RoborockEnum):
     s8_maxv_ultra_dock = 10
     qrevo_master_dock = 14
     qrevo_s_dock = 15
+    saros_r10_dock = 16
     qrevo_curv_dock = 17
 
 

{python_roborock-2.11.3 → python_roborock-2.12.1}/roborock/exceptions.py

@@ -68,3 +68,7 @@ class RoborockTooFrequentCodeRequests(RoborockException):
 
 class RoborockMissingParameters(RoborockException):
     """Class for Roborock missing parameters exceptions."""
+
+
+class RoborockTooManyRequest(RoborockException):
+    """Class for Roborock too many request exceptions."""

{python_roborock-2.11.3 → python_roborock-2.12.1}/roborock/version_1_apis/roborock_client_v1.py

@@ -72,6 +72,7 @@ WASH_N_FILL_DOCK = [
     RoborockDockTypeCode.p10_pro_dock,
     RoborockDockTypeCode.s8_maxv_ultra_dock,
     RoborockDockTypeCode.qrevo_s_dock,
+    RoborockDockTypeCode.saros_r10_dock,
     RoborockDockTypeCode.qrevo_curv_dock,
 ]
 RT = TypeVar("RT", bound=RoborockBase)

{python_roborock-2.11.3 → python_roborock-2.12.1}/roborock/web_api.py

@@ -22,6 +22,7 @@ from roborock.exceptions import (
     RoborockMissingParameters,
     RoborockNoUserAgreement,
     RoborockTooFrequentCodeRequests,
+    RoborockTooManyRequest,
     RoborockUrlException,
 )
 
@@ -54,6 +55,8 @@ class RoborockApiClient:
                     raise RoborockMissingParameters(
                         "You are missing parameters for this request, are you sure you " "entered your username?"
                     )
+                elif response_code == 9002:
+                    raise RoborockTooManyRequest("Please temporarily disable making requests and try again later.")
                 raise RoborockUrlException(f"error code: {response_code} msg: {response.get('error')}")
             response_data = response.get("data")
             if response_data is None: