Skip to content

feat: update schema requirements in StatusV2 and Consumable #806

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

Merged
allenporter merged 4 commits into from
Apr 5, 2026
Merged

feat: update schema requirements in StatusV2 and Consumable #806

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ed8729
feat: update schema requirements in StatusV2
allenporter Apr 4, 2026
ebf3d62
fix: update error_code and other fields to use _requires_schema_code …
allenporter Apr 4, 2026
1a188d9
feat: Add consumable fields
allenporter Apr 4, 2026
471f362
refactor: remove redundant default=None arguments from _requires_sche…
allenporter Apr 5, 2026
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
15 changes: 8 additions & 7 deletions roborock/data/v1/v1_containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ class StatusField(FieldNameBase):
WATER_BOX_MODE = "water_box_mode"
CHARGE_STATUS = "charge_status"
DRY_STATUS = "dry_status"
ERROR_CODE = "error_code"
Comment thread
allenporter marked this conversation as resolved.


def _requires_schema_code(requires_schema_code: str, default=None) -> Any:
Expand Down Expand Up @@ -293,11 +294,11 @@ class StatusV2(RoborockBase):

msg_ver: int | None = None
msg_seq: int | None = None
state: RoborockStateCode | None = None
battery: int | None = None
state: RoborockStateCode | None = field(metadata={"requires_schema_code": "state"}, default=None)
battery: int | None = field(metadata={"requires_schema_code": "battery"}, default=None)
clean_time: int | None = None
clean_area: int | None = None
error_code: RoborockErrorCode | None = None
error_code: RoborockErrorCode | None = field(metadata={"requires_schema_code": "error_code"}, default=None)
Comment thread
allenporter marked this conversation as resolved.
Outdated
map_present: int | None = None
in_cleaning: RoborockInCleaning | None = None
in_returning: int | None = None
Expand All @@ -307,12 +308,12 @@ class StatusV2(RoborockBase):
back_type: int | None = None
wash_phase: int | None = None
wash_ready: int | None = None
fan_power: int | None = None
fan_power: int | None = field(metadata={"requires_schema_code": "fan_power"}, default=None)
dnd_enabled: int | None = None
map_status: int | None = None
is_locating: int | None = None
lock_status: int | None = None
water_box_mode: int | None = None
water_box_mode: int | None = field(metadata={"requires_schema_code": "water_box_mode"}, default=None)
water_box_carriage_status: int | None = None
mop_forbidden_enable: int | None = None
camera_status: int | None = None
Expand All @@ -330,13 +331,13 @@ class StatusV2(RoborockBase):
collision_avoid_status: int | None = None
switch_map_mode: int | None = None
dock_error_status: RoborockDockErrorCode | None = None
charge_status: int | None = None
charge_status: int | None = field(metadata={"requires_schema_code": "charge_status"}, default=None)
unsave_map_reason: int | None = None
unsave_map_flag: int | None = None
wash_status: int | None = None
distance_off: int | None = None
in_warmup: int | None = None
dry_status: int | None = None
dry_status: int | None = field(metadata={"requires_schema_code": "drying_status"}, default=None)
rdt: int | None = None
clean_percent: int | None = None
rss: int | None = None
Expand Down
3 changes: 3 additions & 0 deletions tests/devices/traits/v1/__snapshots__/test_device_features.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
'battery': True,
'charge_status': True,
'dry_status': True,
'error_code': True,
'fan_power': True,
'state': True,
'water_box_mode': True,
Expand All @@ -14,6 +15,7 @@
'battery': True,
'charge_status': True,
'dry_status': True,
'error_code': True,
'fan_power': True,
'state': True,
'water_box_mode': True,
Expand All @@ -24,6 +26,7 @@
'battery': True,
'charge_status': True,
'dry_status': True,
'error_code': True,
'fan_power': True,
'state': True,
'water_box_mode': True,
Expand Down
6 changes: 4 additions & 2 deletions tests/devices/traits/v1/test_device_features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ async def test_is_attribute_supported(
assert device.v1_properties.device_features is not None
device_features_trait = device.v1_properties.device_features

is_supported = {field.value: device_features_trait.is_field_supported(StatusTrait, field) for field in StatusField}
assert is_supported == snapshot
is_v1_supported = {
field.value: device_features_trait.is_field_supported(StatusTrait, field) for field in StatusField
}
assert is_v1_supported == snapshot
Loading