Skip to content

Commit f95c791

Browse files
author
Harry Coureau
committed
fix: report unknown product families in device info
1 parent ed5f859 commit f95c791

2 files changed

Lines changed: 55 additions & 6 deletions

File tree

‎roborock/cli.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,11 +1203,10 @@ async def get_device_info(ctx: click.Context, record: bool, device_info_file: st
12031203
click.echo(f" - Skipping duplicate model {model}")
12041204
continue
12051205

1206+
product_nickname = SHORT_MODEL_TO_ENUM.get(model.split(".")[-1])
12061207
current_product_data = {
12071208
"protocol_version": device.device_info.pv,
1208-
"product_nickname": device.product.product_nickname.name
1209-
if device.product.product_nickname
1210-
else "Unknown",
1209+
"product_nickname": product_nickname.name if product_nickname else "Unknown",
12111210
}
12121211
if device.v1_properties is not None:
12131212
try:

‎tests/test_cli.py‎

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@
33
import json
44
from pathlib import Path
55
from typing import Any
6-
from unittest.mock import Mock
6+
from unittest.mock import AsyncMock, Mock
77

88
import pytest
9+
import yaml
910
from click.testing import CliRunner
1011

11-
from roborock.cli import ConnectionCache, RoborockContext, cli
12-
from roborock.data import HomeDataSchedule, UserData
12+
from roborock.cli import ConnectionCache, DeviceConnectionManager, RoborockContext, cli
13+
from roborock.data import HomeDataProduct, HomeDataSchedule, RoborockCategory, UserData
14+
from roborock.devices.device import RoborockDevice
15+
from roborock.devices.device_manager import DeviceManager
1316
from roborock.exceptions import RoborockException
17+
from roborock.roborock_typing import RoborockCommand
1418
from roborock.web_api import RoborockApiClient
1519
from tests.mock_data import USER_DATA, USER_EMAIL
1620

@@ -85,3 +89,49 @@ def test_update_job_api_error(mock_api: Mock, tmp_path: Path, job_data: dict[str
8589
assert result.exit_code == 1
8690
assert result.output == "Error: Job not found\n"
8791
mock_api.return_value.update_job.assert_awaited_once()
92+
93+
94+
@pytest.mark.parametrize(
95+
("model", "expected_nickname"),
96+
[
97+
("roborock.vacuum.a294", "Unknown"),
98+
("roborock.vacuum.unrecognized", "Unknown"),
99+
("roborock.vacuum.a87", "PEARLPLUS"),
100+
("roborock.vacuum.a101", "PEARLS"),
101+
],
102+
)
103+
def test_get_device_info_product_nickname(monkeypatch: pytest.MonkeyPatch, model: str, expected_nickname: str) -> None:
104+
"""Device info exports unknown families and retains mapped family names."""
105+
product = HomeDataProduct(id="test-product", name="Test vacuum", model=model, category=RoborockCategory.VACUUM)
106+
init_status = {
107+
"new_feature_info": 2247397454282751,
108+
"new_feature_info_str": "0000009021D0B410C0C47EFDA82934C952BA8F507EDEFFFE",
109+
"feature_info": list(range(111, 126)),
110+
}
111+
device = Mock(spec=RoborockDevice)
112+
device.name = "Test vacuum"
113+
device.duid = "test-device"
114+
device.product = product
115+
device.device_info = Mock(pv="1.0")
116+
device.v1_properties = Mock()
117+
send_command = AsyncMock(return_value=[init_status])
118+
device.v1_properties.command.send = send_command
119+
device_manager = AsyncMock(spec=DeviceManager)
120+
device_manager.get_devices.return_value = [device]
121+
connection_manager = AsyncMock(spec=DeviceConnectionManager)
122+
connection_manager.ensure_device_manager.return_value = device_manager
123+
monkeypatch.setattr(RoborockContext, "get_device_manager", AsyncMock(return_value=connection_manager))
124+
125+
result = CliRunner().invoke(cli, ["get-device-info"])
126+
127+
assert result.exit_code == 0, result.output
128+
device_info = yaml.safe_load(result.output.split("--- Device Information (copy to your YAML file) ---\n\n")[1])
129+
assert device_info == {
130+
model: {
131+
"protocol_version": "1.0",
132+
"product_nickname": expected_nickname,
133+
**init_status,
134+
"product": product.as_dict(),
135+
}
136+
}
137+
send_command.assert_awaited_once_with(RoborockCommand.APP_GET_INIT_STATUS)

0 commit comments

Comments
 (0)