Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions device_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ roborock.vacuum.s5e:
- 125
roborock.vacuum.sc05:
protocol_version: B01
product_nickname: PEARLPLUS
product_nickname: Unknown
product:
id: 5ayEx3aKgStqZZ0v5IpMBP
name: Roborock Q7 Series
Expand Down Expand Up @@ -1303,7 +1303,7 @@ roborock.vacuum.sc05:
property: 'null'
roborock.vacuum.a288:
protocol_version: '1.0'
product_nickname: PEARLPLUS
product_nickname: Unknown
new_feature_info: 4499197267967999
new_feature_info_str: 0000000000099518CCFF7EFDA8E93EDDDBFF8F7F7EFEFFFF
feature_info:
Expand Down Expand Up @@ -1456,7 +1456,7 @@ roborock.vacuum.a288:

roborock.vacuum.ss07:
protocol_version: B01
product_nickname: PEARLPLUS
product_nickname: Unknown
product:
id: 3gKDz7BnDrjXOVBAEXj4uw
name: Roborock Q10 Series
Expand Down
5 changes: 2 additions & 3 deletions roborock/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -1203,11 +1203,10 @@ async def get_device_info(ctx: click.Context, record: bool, device_info_file: st
click.echo(f" - Skipping duplicate model {model}")
continue

product_nickname = SHORT_MODEL_TO_ENUM.get(model.split(".")[-1])
current_product_data = {
"protocol_version": device.device_info.pv,
"product_nickname": device.product.product_nickname.name
if device.product.product_nickname
else "Unknown",
"product_nickname": product_nickname.name if product_nickname else "Unknown",
}
if device.v1_properties is not None:
try:
Expand Down
56 changes: 53 additions & 3 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
import json
from pathlib import Path
from typing import Any
from unittest.mock import Mock
from unittest.mock import AsyncMock, Mock

import pytest
import yaml
from click.testing import CliRunner

from roborock.cli import ConnectionCache, RoborockContext, cli
from roborock.data import HomeDataSchedule, UserData
from roborock.cli import ConnectionCache, DeviceConnectionManager, RoborockContext, cli
from roborock.data import HomeDataProduct, HomeDataSchedule, RoborockCategory, UserData
from roborock.devices.device import RoborockDevice
from roborock.devices.device_manager import DeviceManager
from roborock.exceptions import RoborockException
from roborock.roborock_typing import RoborockCommand
from roborock.web_api import RoborockApiClient
from tests.mock_data import USER_DATA, USER_EMAIL

Expand Down Expand Up @@ -85,3 +89,49 @@ def test_update_job_api_error(mock_api: Mock, tmp_path: Path, job_data: dict[str
assert result.exit_code == 1
assert result.output == "Error: Job not found\n"
mock_api.return_value.update_job.assert_awaited_once()


@pytest.mark.parametrize(
("model", "expected_nickname"),
[
("roborock.vacuum.a294", "Unknown"),
("roborock.vacuum.unrecognized", "Unknown"),
("roborock.vacuum.a87", "PEARLPLUS"),
("roborock.vacuum.a101", "PEARLS"),
],
)
def test_get_device_info_product_nickname(monkeypatch: pytest.MonkeyPatch, model: str, expected_nickname: str) -> None:
"""Device info exports unknown families and retains mapped family names."""
product = HomeDataProduct(id="test-product", name="Test vacuum", model=model, category=RoborockCategory.VACUUM)
init_status = {
"new_feature_info": 2247397454282751,
"new_feature_info_str": "0000009021D0B410C0C47EFDA82934C952BA8F507EDEFFFE",
"feature_info": list(range(111, 126)),
}
device = Mock(spec=RoborockDevice)
device.name = "Test vacuum"
device.duid = "test-device"
device.product = product
device.device_info = Mock(pv="1.0")
device.v1_properties = Mock()
send_command = AsyncMock(return_value=[init_status])
device.v1_properties.command.send = send_command
device_manager = AsyncMock(spec=DeviceManager)
device_manager.get_devices.return_value = [device]
connection_manager = AsyncMock(spec=DeviceConnectionManager)
connection_manager.ensure_device_manager.return_value = device_manager
monkeypatch.setattr(RoborockContext, "get_device_manager", AsyncMock(return_value=connection_manager))

result = CliRunner().invoke(cli, ["get-device-info"])

assert result.exit_code == 0, result.output
device_info = yaml.safe_load(result.output.split("--- Device Information (copy to your YAML file) ---\n\n")[1])
assert device_info == {
model: {
"protocol_version": "1.0",
"product_nickname": expected_nickname,
**init_status,
"product": product.as_dict(),
}
}
send_command.assert_awaited_once_with(RoborockCommand.APP_GET_INIT_STATUS)
Loading