pymammotion 0.5.14__tar.gz → 0.5.16__tar.gz

{pymammotion-0.5.14 → pymammotion-0.5.16}/PKG-INFO

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

{pymammotion-0.5.14 → pymammotion-0.5.16}/pymammotion/aliyun/cloud_gateway.py

@@ -25,6 +25,7 @@ from pymammotion.aliyun.model.dev_by_account_response import ListingDevByAccount
 from pymammotion.aliyun.model.login_by_oauth_response import LoginByOAuthResponse
 from pymammotion.aliyun.model.regions_response import RegionResponse
 from pymammotion.aliyun.model.session_by_authcode_response import SessionByAuthCodeResponse
+from pymammotion.aliyun.model.thing_response import ThingPropertiesResponse
 from pymammotion.aliyun.regions import region_mappings
 from pymammotion.const import ALIYUN_DOMAIN, APP_KEY, APP_SECRET, APP_VERSION
 from pymammotion.http.http import MammotionHTTP
@@ -771,7 +772,7 @@ class CloudIOTGateway:
                 str(response_body_dict.get("message")),
             )
             if response_body_dict.get("code") == 22000:
-                logger.error(response)
+                logger.error(response.body)
                 raise FailedRequestException(iot_id)
             if response_body_dict.get("code") == 20056:
                 logger.debug("Gateway timeout.")
@@ -786,6 +787,49 @@ class CloudIOTGateway:
 
         return message_id
 
+    async def get_device_properties(self, iot_id: str) -> ThingPropertiesResponse:
+        """List bindings by account."""
+        config = Config(
+            app_key=self._app_key,
+            app_secret=self._app_secret,
+            domain=self._region_response.data.apiGatewayEndpoint,
+        )
+
+        client = Client(config)
+
+        # build request
+        request = CommonParams(
+            api_ver="1.0.0",
+            language="en-US",
+            iot_token=self._session_by_authcode_response.data.iotToken,
+        )
+        body = IoTApiRequest(
+            id=str(uuid.uuid4()),
+            params={
+                "iotId": f"{iot_id}",
+            },
+            request=request,
+            version="1.0",
+        )
+
+        # send request
+        response = await client.async_do_request("/thing/properties/get", "https", "POST", None, body, RuntimeOptions())
+        logger.debug(response.status_message)
+        logger.debug(response.headers)
+        logger.debug(response.status_code)
+        logger.debug(response.body)
+
+        # Decode the response body
+        response_body_str = response.body.decode("utf-8")
+
+        # Load the JSON string into a dictionary
+        response_body_dict = self.parse_json_response(response_body_str)
+
+        if int(response_body_dict.get("code")) != 200:
+            raise Exception("Error in getting properties: " + response_body_dict["msg"])
+
+        return ThingPropertiesResponse.from_dict(response_body_dict)
+
     @property
     def devices_by_account_response(self):
         return self._devices_by_account_response

pymammotion-0.5.16/pymammotion/aliyun/model/thing_response.py

@@ -0,0 +1,12 @@
+from dataclasses import dataclass
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
+from pymammotion.data.mqtt.properties import Items
+
+
+@dataclass
+class ThingPropertiesResponse(DataClassORJSONMixin):
+    code: int
+    data: Items | None
+    id: str | None = None

{pymammotion-0.5.14 → pymammotion-0.5.16}/pymammotion/data/model/device.py

@@ -151,3 +151,20 @@ class MowingDevice(DataClassORJSONMixin):
                     self.device_firmwares.rtk_version = mod.version
                 case 103:
                     self.device_firmwares.lora_version = mod.version
+
+
+@dataclass
+class RTKDevice(DataClassORJSONMixin):
+    name: str
+    iot_id: str
+    product_key: str
+    online: bool = True
+    lat: float = 0.0
+    lon: float = 0.0
+    lora: str = ""
+    wifi_rssi: int = 0
+    device_version: str = ""
+    lora_version: str = ""
+    wifi_sta_mac: str = ""
+    bt_mac: str = ""
+    update_check: CheckDeviceVersion = field(default_factory=CheckDeviceVersion)

{pymammotion-0.5.14 → pymammotion-0.5.16}/pymammotion/data/mqtt/status.py

@@ -30,7 +30,7 @@ class Params(DataClassORJSONMixin):
     activeTime: int
     ip: str
     aliyunCommodityCode: Literal["iothub_senior"]
-    categoryKey: Literal["LawnMower"]
+    categoryKey: Literal["LawnMower", "Tracker"]
     nodeType: Literal["DEVICE"]
     productKey: str
     statusLast: int

{pymammotion-0.5.14 → pymammotion-0.5.16}/pymammotion/http/http.py

@@ -8,6 +8,7 @@ from pymammotion.http.encryption import EncryptionUtils
 from pymammotion.http.model.camera_stream import StreamSubscriptionResponse, VideoResourceResponse
 from pymammotion.http.model.http import CheckDeviceVersion, ErrorInfo, LoginResponseData, Response
 from pymammotion.http.model.response_factory import response_factory
+from pymammotion.http.model.rtk import RTK
 
 
 class MammotionHTTP:
@@ -209,6 +210,22 @@ class MammotionHTTP:
                 # Assuming the data format matches the expected structure
                 return response_factory(Response[str], data)
 
+    async def get_rtk_devices(self) -> Response[list[RTK]]:
+        """Fetches stream subscription data from agora.io for a given IoT device."""
+        async with ClientSession(MAMMOTION_API_DOMAIN) as session:
+            async with session.get(
+                "/device-server/v1/rtk/devices",
+                headers={
+                    **self._headers,
+                    "Authorization": f"Bearer {self.login_info.access_token}",
+                    "Content-Type": "application/json",
+                    "User-Agent": "okhttp/4.9.3",
+                },
+            ) as resp:
+                data = await resp.json()
+
+                return response_factory(Response[list[RTK]], data)
+
     async def refresh_login(self, account: str, password: str | None = None) -> Response[LoginResponseData]:
         if self._password is None and password is not None:
             self._password = password
@@ -229,13 +246,13 @@ class MammotionHTTP:
                     "Decrypt-Type": "3",
                     "Ec-Version": "v1",
                 },
-                params=dict(
-                    username=self.encryption_utils.encryption_by_aes(account),
-                    password=self.encryption_utils.encryption_by_aes(password),
-                    client_id=self.encryption_utils.encryption_by_aes(MAMMOTION_CLIENT_ID),
-                    client_secret=self.encryption_utils.encryption_by_aes(MAMMOTION_CLIENT_SECRET),
-                    grant_type=self.encryption_utils.encryption_by_aes("password"),
-                ),
+                params={
+                    "username": self.encryption_utils.encryption_by_aes(account),
+                    "password": self.encryption_utils.encryption_by_aes(password),
+                    "client_id": self.encryption_utils.encryption_by_aes(MAMMOTION_CLIENT_ID),
+                    "client_secret": self.encryption_utils.encryption_by_aes(MAMMOTION_CLIENT_SECRET),
+                    "grant_type": self.encryption_utils.encryption_by_aes("password"),
+                },
             ) as resp:
                 if resp.status != 200:
                     print(resp.json())

pymammotion-0.5.16/pymammotion/http/model/rtk.py

@@ -0,0 +1,16 @@
+"""RTK device information."""
+from dataclasses import dataclass, field
+
+from mashumaro import field_options
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
+
+@dataclass
+class RTK(DataClassORJSONMixin):
+    """RTK device information."""
+
+    device_id: str = field(metadata=field_options(alias="deviceId"))
+    device_name: str = field(metadata=field_options(alias="deviceName"))
+    product_key: str = field(metadata=field_options(alias="productKey"))
+    status: int
+    lora: str

pymammotion-0.5.16/pymammotion/mammotion/commands/messages/basestation.py

@@ -0,0 +1,43 @@
+"""RTK protobuf commands."""
+
+from abc import ABC
+from logging import getLogger
+import time
+
+from pymammotion.mammotion.commands.abstract_message import AbstractMessage
+from pymammotion.proto import (
+    AppToBaseMqttRtkT,
+    BaseStation,
+    LubaMsg,
+    MsgAttr,
+    MsgCmdType,
+    MsgDevice,
+    RequestBasestationInfoT,
+)
+
+logger = getLogger(__name__)
+
+
+class MessageBasestation(AbstractMessage, ABC):
+    def send_order_msg_basestation(self, driver) -> bytes:
+        return LubaMsg(
+            msgtype=MsgCmdType.BASESTATION,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=self.get_msg_device(MsgCmdType.BASESTATION, MsgDevice.DEV_MAINCTL),
+            msgattr=MsgAttr.REQ,
+            timestamp=round(time.time() * 1000),
+            seqs=self.seqs.increment_and_get() & 255,
+            version=1,
+            subtype=self.user_account,
+            driver=driver,
+        ).SerializeToString()
+
+    def basestation_info(self) -> bytes:
+        """Build and send a request to get basestation info (request_type=1)."""
+        base = BaseStation(to_dev=RequestBasestationInfoT(request_type=1))
+        return self.send_order_msg_basestation(base)
+
+    def set_base_net_rtk_switch(self, rtk_switch: int) -> bytes:
+        """Set RTK switch via app_to_base_mqtt_rtk_t."""
+        base = BaseStation(app_to_base_mqtt_rtk_msg=AppToBaseMqttRtkT(rtk_switch=rtk_switch))
+        return self.send_order_msg_basestation(base)

{pymammotion-0.5.14 → pymammotion-0.5.16}/pymammotion/mammotion/commands/messages/media.py

@@ -81,7 +81,7 @@ class MessageMedia(AbstractMessage, ABC):
         manual off: false, id=1127, power_ctrl=2
         """
         ids = 1125 if manual_ctrl else 1127
-        manual_light_ctrl = LampManualCtrlSta.manual_power_off if manual_ctrl else LampManualCtrlSta.manual_power_on
+        manual_light_ctrl = LampManualCtrlSta.manual_power_on if manual_ctrl else LampManualCtrlSta.manual_power_off
         return self.send_order_msg_media(
             SocMul(set_lamp=SetHeadlamp(set_ids=ids, lamp_power_ctrl=2, lamp_manual_ctrl=manual_light_ctrl))
         )

{pymammotion-0.5.14 → pymammotion-0.5.16}/pymammotion/proto/__init__.py

@@ -235,6 +235,7 @@ class MsgCmdType(betterproto.Enum):
     ESP = 248
     MUL = 249
     PEPT = 250
+    BASESTATION = 251
 
 
 

{pymammotion-0.5.14 → pymammotion-0.5.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.5.14"
+version     = "0.5.16"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -66,7 +66,7 @@ autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.5.14"
+current_version = "0.5.16"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true