Skip to content

Add more vacuum requests #1331

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
rytilahti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add more vacuum requests #1331

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
62 changes: 42 additions & 20 deletions devtools/helpers/smartrequests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,35 @@
_LOGGER = logging.getLogger(__name__)


@dataclass
class SmartRequestParams:
Copy link
Collaborator

@sdb9696 sdb9696 Dec 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this pr move the SmartRequestParams out of the SmartRequest class, but only for the GetCleanAttrParams and GetMapDataParams?

Copy link
Member Author

@rytilahti rytilahti Dec 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was about to use raw SmartRequestParams to avoid defining new classes, but it didn't work so I added the classes. I will move it back later.

"""Base class for Smart request params.

The to_dict() method of this class omits null values which
is required by the devices.
"""

def to_dict(self):
"""Return the params as a dict with values of None omitted."""
return asdict(
self, dict_factory=lambda x: {k: v for (k, v) in x if v is not None}
)


@dataclass
class GetCleanAttrParams(SmartRequestParams):
"""Get clean attr parameters."""

type: str # global: normal, pose: spot cleaning


@dataclass
class GetMapDataParams(SmartRequestParams):
"""Map data parameters."""

id: int


class SmartRequest:
"""Class to represent a smart protocol request."""

Expand All @@ -50,20 +79,6 @@ def to_dict(self):
"""Return the request as a dict suitable for passing to query()."""
return {self.method_name: self.params}

@dataclass
class SmartRequestParams:
"""Base class for Smart request params.

The to_dict() method of this class omits null values which
is required by the devices.
"""

def to_dict(self):
"""Return the params as a dict with values of None ommited."""
return asdict(
self, dict_factory=lambda x: {k: v for (k, v) in x if v is not None}
)

@dataclass
class DeviceOnParams(SmartRequestParams):
"""Get Rules Params."""
Expand Down Expand Up @@ -291,9 +306,7 @@ def get_on_off_gradually_info(
params: SmartRequestParams | None = None,
) -> SmartRequest:
"""Get preset rules."""
return SmartRequest(
"get_on_off_gradually_info", params or SmartRequest.SmartRequestParams()
)
return SmartRequest("get_on_off_gradually_info", params or SmartRequestParams())

@staticmethod
def get_auto_light_info() -> SmartRequest:
Expand Down Expand Up @@ -429,23 +442,32 @@ def get_component_requests(component_id, ver_code):
"clean": [
SmartRequest.get_raw_request("getCleanRecords"),
SmartRequest.get_raw_request("getVacStatus"),
SmartRequest.get_raw_request("getCleanStatus"),
SmartRequest.get_raw_request("getCleanAttr", GetCleanAttrParams(type="global")),
SmartRequest.get_raw_request("getCleanAttr", GetCleanAttrParams(type="pose")),
],
"battery": [SmartRequest.get_raw_request("getBatteryInfo")],
"consumables": [SmartRequest.get_raw_request("getConsumablesInfo")],
"direction_control": [],
"button_and_led": [],
"button_and_led": [SmartRequest.get_raw_request("getChildLockInfo")],
"speaker": [
SmartRequest.get_raw_request("getSupportVoiceLanguage"),
SmartRequest.get_raw_request("getCurrentVoiceLanguage"),
SmartRequest.get_raw_request("getVolume"),
],
"map": [
SmartRequest.get_raw_request("getMapInfo"),
SmartRequest.get_raw_request("getMapData"),
SmartRequest.get_raw_request("getAreaUnit"),
SmartRequest.get_raw_request("getMapData", GetMapDataParams(id=-1)),
],
"auto_change_map": [SmartRequest.get_raw_request("getAutoChangeMap")],
"dust_bucket": [SmartRequest.get_raw_request("getAutoDustCollection")],
"dust_bucket": [
SmartRequest.get_raw_request("getAutoDustCollection"),
SmartRequest.get_raw_request("getDustCollectionInfo"),
],
"mop": [SmartRequest.get_raw_request("getMopState")],
"do_not_disturb": [SmartRequest.get_raw_request("getDoNotDisturb")],
"carpet_area": [SmartRequest.get_raw_request("getCarpetClean")],
"charge_pose_clean": [],
"continue_breakpoint_sweep": [],
"goto_point": [],
Expand Down