Skip to content

fix: mark non vacuum v1 devices as not supported #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lash-L wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: mark non vacuum v1 devices as not supported #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions roborock/devices/device_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
HomeData,
HomeDataDevice,
HomeDataProduct,
RoborockCategory,
UserData,
)
from roborock.devices.device import DeviceReadyCallback, RoborockDevice
Expand Down Expand Up @@ -228,6 +229,10 @@ def device_creator(home_data: HomeData, device: HomeDataDevice, product: HomeDat
device_cache: DeviceCache = DeviceCache(device.duid, cache)
match device.pv:
case DeviceVersion.V1:
if product.category != RoborockCategory.VACUUM:
raise UnsupportedDeviceError(
f"Device {device.name} has unsupported V1 category {product.category}: {product.model}"
)
channel = create_v1_channel(user_data, mqtt_params, mqtt_session, device, device_cache)
trait = v1.create(
device.duid,
Expand Down
52 changes: 52 additions & 0 deletions tests/devices/test_device_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,3 +420,55 @@ async def test_unsupported_protocol_version() -> None:
assert diagnostics_data
assert diagnostics_data.get("supported_devices") == {"1.0": 1}
assert diagnostics_data.get("unsupported_devices") == {"unknown-pv": 1}


async def test_unsupported_v1_category() -> None:
"""Test that non-vacuum V1 devices are skipped as unsupported."""
with patch("roborock.devices.device_manager.UserWebApiClient.get_home_data") as mock_home_data:
home_data = HomeData.from_dict(
{
"id": 1,
"name": "Test Home",
"devices": [
{
"duid": "device-uid-1",
"name": "Device 1",
"pv": "1.0",
"productId": "product-id-1",
"localKey": mock_data.LOCAL_KEY,
},
{
"duid": "device-uid-2",
"name": "Device 2",
"pv": "1.0",
"productId": "product-id-2",
"localKey": mock_data.LOCAL_KEY,
},
],
"products": [
{
"id": "product-id-1",
"name": "Roborock S7 MaxV",
"model": "roborock.vacuum.a27",
"category": "robot.vacuum.cleaner",
},
{
"id": "product-id-2",
"name": "Roborock RockNeo",
"model": "roborock.mower.q105",
"category": "roborock.mower",
},
],
}
)
mock_home_data.return_value = home_data

device_manager = await create_device_manager(USER_PARAMS)
devices = await device_manager.get_devices()
assert [device.duid for device in devices] == ["device-uid-1"]

diagnostics = device_manager.diagnostic_data()
diagnostics_data = diagnostics.get("diagnostics")
assert diagnostics_data
assert diagnostics_data.get("supported_devices") == {"1.0": 1}
assert diagnostics_data.get("unsupported_devices") == {"1.0": 1}
Loading