pymammotion 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -691,8 +691,22 @@ class CloudIOTGateway:
         return self._devices_by_account_response
 
     async def send_cloud_command(self, iot_id: str, command: bytes) -> str:
-        """Send a cloud command to the specified IoT device."""
 
+        """Sends a cloud command to a specified IoT device.
+        
+        This function checks if the IoT token is expired and attempts to refresh it if
+        possible. It then constructs a request using the provided command and sends it
+        to the IoT device via an asynchronous HTTP POST request. The function handles
+        various error codes and exceptions based on the response from the cloud
+        service.
+        
+        Args:
+            iot_id (str): The unique identifier of the IoT device.
+            command (bytes): The command to be sent to the IoT device in binary format.
+        
+        Returns:
+            str: A unique message ID for the sent command.
+        """
         if command is None:
             raise Exception("Command is missing / None")
 

pymammotion/data/state_manager.py

@@ -71,18 +71,18 @@ class StateManager:
         """Set device."""
         self._device = device
 
-    def properties(self, thing_properties: ThingPropertiesMessage) -> None:
+    async def properties(self, thing_properties: ThingPropertiesMessage) -> None:
         # TODO update device based off thing properties
         self._device.mqtt_properties = thing_properties
-        self.on_properties_callback(thing_properties)
+        await self.on_properties_callback(thing_properties)
 
-    def status(self, thing_status: ThingStatusMessage) -> None:
+    async def status(self, thing_status: ThingStatusMessage) -> None:
         if not self._device.online:
             self._device.online = True
         self._device.status_properties = thing_status
         if self._device.mower_state.product_key == "":
             self._device.mower_state.product_key = thing_status.params.productKey
-        self.on_status_callback(thing_status)
+        await self.on_status_callback(thing_status)
 
     @property
     def online(self) -> bool:
@@ -105,16 +105,17 @@ class StateManager:
             await self.ble_on_notification_callback.data_event(res)
 
     async def on_properties_callback(self, thing_properties: ThingPropertiesMessage) -> None:
-        """Check if we have a callback for properties."""
+        """Call properties callback if it exists."""
         if self.properties_callback:
             await self.properties_callback.data_event(thing_properties)
 
     async def on_status_callback(self, thing_status: ThingStatusMessage) -> None:
-        """Check if we have a callback for status."""
+        """Execute the status callback if it is set."""
         if self.status_callback:
             await self.status_callback.data_event(thing_status)
 
     async def get_commondata_ack_callback(self, comm_data: NavGetCommDataAck | SvgMessageAckT) -> None:
+        """Asynchronously calls the appropriate callback based on available handlers."""
         if self.cloud_get_commondata_ack_callback:
             await self.cloud_get_commondata_ack_callback(comm_data)
         elif self.ble_get_commondata_ack_callback:

pymammotion/http/http.py

@@ -18,7 +18,7 @@ class MammotionHTTP:
         self._password = None
         self.response: Response | None = None
         self.login_info: LoginResponseData | None = None
-        self._headers = {"User-Agent": "okhttp/4.9.3", "App-Version": "google Pixel 2 XL taimen-Android 11,1.11.332"}
+        self._headers = {"User-Agent": "okhttp/4.9.3", "App-Version": "Home Assistant,1.14.2.29"}
         self.encryption_utils = EncryptionUtils()
 
     @staticmethod
@@ -93,12 +93,13 @@ class MammotionHTTP:
                     print(data)
 
     async def get_stream_subscription(self, iot_id: str) -> Response[StreamSubscriptionResponse]:
-        """Get agora.io data for view camera stream"""
+        """Fetches stream subscription data from agora.io for a given IoT device."""
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
             async with session.post(
                 "/device-server/v1/stream/subscription",
                 json={"deviceId": iot_id},
                 headers={
+                    **self._headers,
                     "Authorization": f"Bearer {self.login_info.access_token}",
                     "Content-Type": "application/json",
                     "User-Agent": "okhttp/4.9.3",
@@ -116,9 +117,8 @@ class MammotionHTTP:
     async def get_stream_subscription_mini_or_x_series(
         self, iot_id: str, is_yuka: bool
     ) -> Response[StreamSubscriptionResponse]:
-        """Get agora.io data for view camera stream (New models 2025)"""
-
         # Prepare the payload with cameraStates based on is_yuka flag
+        """Fetches stream subscription data for a given IoT device."""
         payload = {"deviceId": iot_id, "mode": 0, "cameraStates": []}
 
         # Add appropriate cameraStates based on the is_yuka flag
@@ -132,6 +132,7 @@ class MammotionHTTP:
                 "/device-server/v1/stream/token",
                 json=payload,
                 headers={
+                    **self._headers,
                     "Authorization": f"Bearer {self.login_info.access_token}",
                     "Content-Type": "application/json",
                     "User-Agent": "okhttp/4.9.3",
@@ -147,7 +148,7 @@ class MammotionHTTP:
                 return response
 
     async def get_video_resource(self, iot_id: str) -> Response[VideoResourceResponse]:
-        """Get video resource for new models (2025 series)"""
+        """Fetch video resource for a given IoT ID."""
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
             async with session.get(
                 f"/device-server/v1/video-resource/{iot_id}",
@@ -167,12 +168,13 @@ class MammotionHTTP:
                 return response
 
     async def get_device_ota_firmware(self, iot_ids: list[str]) -> Response[list[CheckDeviceVersion]]:
-        """Device firmware upgrade check."""
+        """Checks device firmware versions for a list of IoT IDs."""
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
             async with session.post(
                 "/device-server/v1/devices/version/check",
                 json={"deviceIds": iot_ids},
                 headers={
+                    **self._headers,
                     "Authorization": f"Bearer {self.login_info.access_token}",
                     "Content-Type": "application/json",
                     "User-Agent": "okhttp/4.9.3",
@@ -184,12 +186,13 @@ class MammotionHTTP:
                 return response_factory(Response[list[CheckDeviceVersion]], data)
 
     async def start_ota_upgrade(self, iot_id: str, version: str) -> Response[str]:
-        """Device firmware upgrade."""
+        """Initiates an OTA upgrade for a device."""
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
             async with session.post(
                 "/device-server/v1/ota/device/upgrade",
                 json={"deviceId": iot_id, "version": version},
                 headers={
+                    **self._headers,
                     "Authorization": f"Bearer {self.login_info.access_token}",
                     "Content-Type": "application/json",
                     "User-Agent": "okhttp/4.9.3",
@@ -208,14 +211,14 @@ class MammotionHTTP:
         return await self.login(account, self._password)
 
     async def login(self, account: str, password: str) -> Response[LoginResponseData]:
+        """Logs in to the service using provided account and password."""
         self.account = account
         self._password = password
         async with ClientSession(MAMMOTION_DOMAIN) as session:
             async with session.post(
                 "/oauth/token",
                 headers={
-                    "User-Agent": "okhttp/4.9.3",
-                    "App-Version": "google Pixel 2 XL taimen-Android 11,1.11.332",
+                    **self._headers,
                     "Encrypt-Key": self.encryption_utils.encrypt_by_public_key(),
                     "Decrypt-Type": "3",
                     "Ec-Version": "v1",

pymammotion/http/model/response_factory.py

@@ -6,6 +6,21 @@ T = TypeVar("T")
 
 
 def deserialize_data(value, target_type):
+    """Deserialize data into a specified target type.
+    
+    The function handles deserialization of basic types, lists, and unions. It
+    recursively processes list elements and supports optional types by handling
+    Union[T, None]. For custom types with a `from_dict` method, it calls this
+    method for deserialization. If the target type is unknown or unsupported, it
+    returns the value unchanged.
+    
+    Args:
+        value: The data to be deserialized.
+        target_type (type): The desired type into which the data should be deserialized.
+    
+    Returns:
+        The deserialized data in the specified target type.
+    """
     if value is None:
         return None
 
@@ -30,6 +45,7 @@ def deserialize_data(value, target_type):
 
 def response_factory(response_cls: type[Response[T]], raw_dict: dict) -> Response[T]:
     # Extract the type of the generic `data` field
+    """Create a Response instance from a dictionary."""
     data_type = get_args(response_cls)[0] if get_args(response_cls) else None
 
     if data_type:

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -310,12 +310,12 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
     async def _parse_message_properties_for_device(self, event: ThingPropertiesMessage) -> None:
         if event.params.iotId != self.iot_id:
             return
-        self.state_manager.properties(event)
+        await self.state_manager.properties(event)
 
     async def _parse_message_status_for_device(self, status: ThingStatusMessage) -> None:
         if status.params.iotId != self.iot_id:
             return
-        self.state_manager.status(status)
+        await self.state_manager.status(status)
 
     async def _parse_message_for_device(self, event: ThingEventMessage) -> None:
         params = event.params

{pymammotion-0.5.0.dist-info → pymammotion-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.5.0
+Version: 0.5.2
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.5.0.dist-info → pymammotion-0.5.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pymammotion/__init__.py,sha256=H-U94bNLp0LPC6hkRopVEUlUsZSR97n7WfKGPjK1GMg,1638
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
 pymammotion/aliyun/client.py,sha256=GCpAnLOVWW_W0c8UvdRpWVzZH5oLto8JZnb82stJi-8,9662
-pymammotion/aliyun/cloud_gateway.py,sha256=xJN0GiR4-qMIBXUfGUFyKwqlRIAPGvbFi6GSoO3NfiM,29080
+pymammotion/aliyun/cloud_gateway.py,sha256=dRsxFOm_ou1X0VjU-i5B5hee3ay3q6HK1bqEP0oK0EE,29717
 pymammotion/aliyun/model/aep_response.py,sha256=EY4uMTJ4F9rvbcXnAOc5YKi7q__9kIVgfDwfyr65Gk0,421
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
 pymammotion/aliyun/model/dev_by_account_response.py,sha256=P9yYy4Z2tLkJSqXA_5XGaCUliSSVa5ILl7VoMtL_tCA,977
@@ -45,17 +45,17 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 pymammotion/data/mqtt/event.py,sha256=C8TGRJs9wNxwg9FFmr9qcsweDnl5v5kcVcwiHxtYzJw,5384
 pymammotion/data/mqtt/properties.py,sha256=FMZHDwKO-vZeaMP0ewVZ22wgBVhi244l2ZAWb9wFANQ,4259
 pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
-pymammotion/data/state_manager.py,sha256=Of7S5jt53J-kUjJ30NWKsuLs5m9vXd_PJbUpXGtR-Vk,11398
+pymammotion/data/state_manager.py,sha256=Q0WTI-ehXH50bQEroXibzGK5MLRx5OThGZ86NNCPJjc,11508
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=Z8WYxv_-5khEqKjL1w4c_Et24G1Kdm8QFuIBylD3h3U,3021
 pymammotion/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/encryption.py,sha256=lzXu3WwBdQlzjXxWnlJuRgkCrKdPbxx5drhMitVKIEk,8287
-pymammotion/http/http.py,sha256=wb2Jef_dHEG_TjJeDxTLTKfySp6KPjacv2ElJpLdY8Y,11939
+pymammotion/http/http.py,sha256=_Umuj6DKnTiDZ_y6C6DqPvHMRxKvqHqM0G_1QlsmHN8,12103
 pymammotion/http/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/model/camera_stream.py,sha256=ilxQNny_w9Frwt-m8kbHinvyjDv4Bx8C2swfZ2lTEDE,600
 pymammotion/http/model/http.py,sha256=VDBmi9nyY5Y2ns_HYvKIyzbkKRxhZ5elpq0lWXWzbGw,4123
-pymammotion/http/model/response_factory.py,sha256=lM5yfwlv2IZGn4Fk84BG3cmfXPd6dxQUnhXzRKn2Moc,1236
+pymammotion/http/model/response_factory.py,sha256=f5_ZR0-4sLOU-q28BVy5sQOReSoND2A8UvpOOwnwrzA,1936
 pymammotion/mammotion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/abstract_message.py,sha256=P5FcjGkfoQ1O4Q9JKdq306TisQnJ40xDXufR-juNn8k,792
@@ -74,7 +74,7 @@ pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_A
 pymammotion/mammotion/devices/base.py,sha256=qDh7P7fnakDKgxTqjNLcQg8eE-6gHJaXAV0ONjhy_IU,12038
 pymammotion/mammotion/devices/mammotion.py,sha256=iXXV_jqv8w35ugaMRev3lEp_oKJTob54LZ6ZF659h-Y,15087
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=dSDw8xLUfAU2c9vKX65w87Rm2E78284WjJ72CKniPt4,19349
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=YvBtuYoWPaNKrcDQWS2pj2lxhuJqmhDUWb8epQUCeXE,14816
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=sj13Z08mhuinsAExSlZ1f_u8FWh8OH43Lt2hzzfvNdI,14828
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
 pymammotion/mqtt/linkkit/h2client.py,sha256=w9Nvi_nY4CLD_fw-pHtYChwQf7e2TiAGeqkY_sF4cf0,19659
@@ -124,7 +124,7 @@ pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tp
 pymammotion/utility/mur_mur_hash.py,sha256=xEfOZVbqRawJj66eLgtnZ85OauDR47oIPr29OHelzPI,4468
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.5.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.0.dist-info/METADATA,sha256=DVc6j1Fq5v8zkHrROnvptgNkC_XNI8yjy_MnUrUzlX0,3870
-pymammotion-0.5.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.5.0.dist-info/RECORD,,
+pymammotion-0.5.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.2.dist-info/METADATA,sha256=-Qj7lhgHAoIQzfB2NlfbFXOUpQkkVYqI6Q2D00dZleg,3870
+pymammotion-0.5.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.5.2.dist-info/RECORD,,