python-roborock 4.0.2__tar.gz → 4.1.1__tar.gz

{python_roborock-4.0.2 → python_roborock-4.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-roborock
-Version: 4.0.2
+Version: 4.1.1
 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.0.2 → python_roborock-4.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "4.0.2"
+version = "4.1.1"
 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.0.2 → python_roborock-4.1.1}/roborock/cli.py

@@ -41,8 +41,8 @@ from pyshark import FileCapture  # type: ignore
 from pyshark.capture.live_capture import LiveCapture, UnknownInterfaceException  # type: ignore
 from pyshark.packet.packet import Packet  # type: ignore
 
-from roborock import SHORT_MODEL_TO_ENUM, RoborockCommand
-from roborock.data import DeviceData, RoborockBase, UserData
+from roborock import RoborockCommand
+from roborock.data import RoborockBase, UserData
 from roborock.device_features import DeviceFeatures
 from roborock.devices.cache import Cache, CacheData
 from roborock.devices.device import RoborockDevice
@@ -53,7 +53,6 @@ from roborock.devices.traits.v1.consumeable import ConsumableAttribute
 from roborock.devices.traits.v1.map_content import MapContentTrait
 from roborock.exceptions import RoborockException, RoborockUnsupportedFeature
 from roborock.protocol import MessageParser
-from roborock.version_1_apis.roborock_mqtt_client_v1 import RoborockMqttClientV1
 from roborock.web_api import RoborockApiClient
 
 _LOGGER = logging.getLogger(__name__)
@@ -822,44 +821,46 @@ async def get_device_info(ctx: click.Context):
     """
     click.echo("Discovering devices...")
     context: RoborockContext = ctx.obj
-    connection_cache = await context.get_devices()
-
-    home_data = connection_cache.cache_data.home_data
-
-    all_devices = home_data.get_all_devices()
-    if not all_devices:
+    device_connection_manager = await context.get_device_manager()
+    device_manager = await device_connection_manager.ensure_device_manager()
+    devices = await device_manager.get_devices()
+    if not devices:
         click.echo("No devices found.")
         return
 
-    click.echo(f"Found {len(all_devices)} devices. Fetching data...")
+    click.echo(f"Found {len(devices)} devices. Fetching data...")
 
     all_products_data = {}
 
-    for device in all_devices:
+    for device in devices:
         click.echo(f"  - Processing {device.name} ({device.duid})")
-        product_info = home_data.product_map[device.product_id]
-        device_data = DeviceData(device, product_info.model)
-        mqtt_client = RoborockMqttClientV1(connection_cache.user_data, device_data)
 
-        try:
-            init_status_result = await mqtt_client.send_command(
-                RoborockCommand.APP_GET_INIT_STATUS,
-            )
-            product_nickname = SHORT_MODEL_TO_ENUM.get(product_info.model.split(".")[-1]).name
-            current_product_data = {
-                "Protocol Version": device.pv,
-                "Product Nickname": product_nickname,
-                "New Feature Info": init_status_result.get("new_feature_info"),
-                "New Feature Info Str": init_status_result.get("new_feature_info_str"),
-                "Feature Info": init_status_result.get("feature_info"),
-            }
+        if device.product.model in all_products_data:
+            click.echo(f"    - Skipping duplicate model {device.product.model}")
+            continue
 
-            all_products_data[product_info.model] = current_product_data
+        current_product_data = {
+            "Protocol Version": device.device_info.pv,
+            "Product Nickname": device.product.product_nickname.name,
+        }
+        if device.v1_properties is not None:
+            try:
+                result: list[dict[str, Any]] = await device.v1_properties.command.send(
+                    RoborockCommand.APP_GET_INIT_STATUS
+                )
+            except Exception as e:
+                click.echo(f"    - Error processing device {device.name}: {e}", err=True)
+                continue
+            init_status_result = result[0] if result else {}
+            current_product_data.update(
+                {
+                    "New Feature Info": init_status_result.get("new_feature_info"),
+                    "New Feature Info Str": init_status_result.get("new_feature_info_str"),
+                    "Feature Info": init_status_result.get("feature_info"),
+                }
+            )
 
-        except Exception as e:
-            click.echo(f"    - Error processing device {device.name}: {e}", err=True)
-        finally:
-            await mqtt_client.async_release()
+        all_products_data[device.product.model] = current_product_data
 
     if all_products_data:
         click.echo("\n--- Device Information (copy to your YAML file) ---\n")

{python_roborock-4.0.2 → python_roborock-4.1.1}/roborock/data/code_mappings.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import logging
 from collections import namedtuple
 from enum import Enum, IntEnum, StrEnum
+from typing import Self
 
 _LOGGER = logging.getLogger(__name__)
 completed_warnings = set()
@@ -57,7 +58,7 @@ class RoborockModeEnum(StrEnum):
     code: int
     """The integer code associated with the enum member."""
 
-    def __new__(cls, value: str, code: int) -> RoborockModeEnum:
+    def __new__(cls, value: str, code: int) -> Self:
         """Creates a new enum member."""
         member = str.__new__(cls, value)
         member._value_ = value
@@ -65,7 +66,7 @@ class RoborockModeEnum(StrEnum):
         return member
 
     @classmethod
-    def from_code(cls, code: int) -> RoborockModeEnum:
+    def from_code(cls, code: int) -> Self:
         for member in cls:
             if member.code == code:
                 return member
@@ -83,7 +84,7 @@ class RoborockModeEnum(StrEnum):
             return None
 
     @classmethod
-    def from_value(cls, value: str) -> RoborockModeEnum:
+    def from_value(cls, value: str) -> Self:
         """Find enum member by string value (case-insensitive)."""
         for member in cls:
             if member.value.lower() == value.lower():
@@ -91,7 +92,7 @@ class RoborockModeEnum(StrEnum):
         raise ValueError(f"{value} is not a valid value for {cls.__name__}")
 
     @classmethod
-    def from_name(cls, name: str) -> RoborockModeEnum:
+    def from_name(cls, name: str) -> Self:
         """Find enum member by name (case-insensitive)."""
         for member in cls:
             if member.name.lower() == name.lower():

{python_roborock-4.0.2 → python_roborock-4.1.1}/roborock/devices/README.md

@@ -556,8 +556,6 @@ The new design:
 - Clear separation of concerns through layers
 - Users work with devices, not raw clients
 
-**Note**: Legacy APIs in `version_1_apis/` and `version_a01_apis/` are deprecated and will be removed.
-
 
 ## Implementation Details
 

{python_roborock-4.0.2 → python_roborock-4.1.1}/roborock/devices/device_manager.py

@@ -186,6 +186,7 @@ async def create_device_manager(
     session: aiohttp.ClientSession | None = None,
     ready_callback: DeviceReadyCallback | None = None,
     mqtt_session_unauthorized_hook: SessionUnauthorizedHook | None = None,
+    prefer_cache: bool = True,
 ) -> DeviceManager:
     """Convenience function to create and initialize a DeviceManager.
 
@@ -198,6 +199,7 @@ async def create_device_manager(
         mqtt_session_unauthorized_hook: Optional hook for MQTT session unauthorized
           events which may indicate rate limiting or revoked credentials. The
           caller may use this to refresh authentication tokens as needed.
+        prefer_cache: Whether to prefer cached device data over always fetching it from the API.
 
     Returns:
         An initialized DeviceManager with discovered devices.
@@ -259,5 +261,5 @@ async def create_device_manager(
         return dev
 
     manager = DeviceManager(web_api, device_creator, mqtt_session=mqtt_session, cache=cache, diagnostics=diagnostics)
-    await manager.discover_devices()
+    await manager.discover_devices(prefer_cache)
     return manager