pymammotion 0.4.22__py3-none-any.whl → 0.4.25__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -11,7 +11,7 @@ import string
 import time
 import uuid
 
-from aiohttp import ClientSession
+from aiohttp import ClientSession, ConnectionTimeoutError
 from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequest
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
@@ -24,6 +24,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.regions import region_mappings
 from pymammotion.const import ALIYUN_DOMAIN, APP_KEY, APP_SECRET, APP_VERSION
 from pymammotion.http.http import MammotionHTTP
 from pymammotion.utility.datatype_converter import DatatypeConverter
@@ -178,14 +179,28 @@ class CloudIOTGateway:
         )
 
         # send request
-        response = await client.async_do_request(
-            "/living/account/region/get", "https", "POST", None, body, RuntimeOptions()
-        )
-        logger.debug(response.status_message)
-        logger.debug(response.headers)
-        logger.debug(response.status_code)
-        logger.debug(response.body)
-
+        try:
+            response = await client.async_do_request(
+                "/living/account/region/get", "https", "POST", None, body, RuntimeOptions()
+            )
+            logger.debug(response.status_message)
+            logger.debug(response.headers)
+            logger.debug(response.status_code)
+            logger.debug(response.body)
+        except ConnectionTimeoutError:
+            body = {"data": {}, "code": 200}
+
+            region = region_mappings.get(country_code, "US")
+            body["data"]["shortRegionId"] = region
+            body["data"]["regionEnglishName"] = ""
+            body["data"]["oaApiGatewayEndpoint"] = f"living-account.{region}.aliyuncs.com"
+            body["data"]["regionId"] = region
+            body["data"]["mqttEndpoint"] = f"public.itls.{region}.aliyuncs.com:1883"
+            body["data"]["pushChannelEndpoint"] = f"living-accs.{region}.aliyuncs.com"
+            body["data"]["apiGatewayEndpoint"] = f"{region}.api-iot.aliyuncs.com"
+
+            RegionResponse.from_dict(body)
+            return body
         # Decode the response body
         response_body_str = response.body.decode("utf-8")
 

pymammotion/aliyun/regions.py

@@ -0,0 +1,62 @@
+region_mappings = {
+    # Asia Pacific
+    "CN": "cn-hongkong",  # China -> Hong Kong
+    "HK": "cn-hongkong",  # Hong Kong
+    "TW": "cn-hongkong",  # Taiwan -> Hong Kong
+    "MO": "cn-hongkong",  # Macau -> Hong Kong
+    # Southeast Asia
+    "SG": "ap-southeast-1",  # Singapore
+    "MY": "ap-southeast-3",  # Malaysia
+    "ID": "ap-southeast-5",  # Indonesia
+    "TH": "ap-southeast-1",  # Thailand -> Singapore
+    "VN": "ap-southeast-1",  # Vietnam -> Singapore
+    "PH": "ap-southeast-1",  # Philippines -> Singapore
+    "BN": "ap-southeast-1",  # Brunei -> Singapore
+    "KH": "ap-southeast-1",  # Cambodia -> Singapore
+    "LA": "ap-southeast-1",  # Laos -> Singapore
+    "MM": "ap-southeast-1",  # Myanmar -> Singapore
+    # Australia/Oceania
+    "AU": "ap-southeast-2",  # Australia
+    "NZ": "ap-southeast-2",  # New Zealand -> Australia
+    "FJ": "ap-southeast-2",  # Fiji -> Australia
+    "PG": "ap-southeast-2",  # Papua New Guinea -> Australia
+    # South Asia
+    "IN": "ap-south-1",  # India
+    "LK": "ap-south-1",  # Sri Lanka -> India
+    "PK": "ap-south-1",  # Pakistan -> India
+    "BD": "ap-south-1",  # Bangladesh -> India
+    "NP": "ap-south-1",  # Nepal -> India
+    "BT": "ap-south-1",  # Bhutan -> India
+    "MV": "ap-south-1",  # Maldives -> India
+    # Middle East
+    "AE": "me-east-1",  # UAE
+    "SA": "me-east-1",  # Saudi Arabia -> UAE
+    "QA": "me-east-1",  # Qatar -> UAE
+    "KW": "me-east-1",  # Kuwait -> UAE
+    "BH": "me-east-1",  # Bahrain -> UAE
+    "OM": "me-east-1",  # Oman -> UAE
+    "IL": "me-east-1",  # Israel -> UAE
+    "TR": "me-east-1",  # Turkey -> UAE
+    # Europe
+    "DE": "eu-central-1",  # Germany
+    "FR": "eu-central-1",  # France -> Germany
+    "IT": "eu-central-1",  # Italy -> Germany
+    "ES": "eu-central-1",  # Spain -> Germany
+    "GB": "eu-central-1",  # UK -> Germany
+    "IE": "eu-central-1",  # Ireland -> Germany
+    "NL": "eu-central-1",  # Netherlands -> Germany
+    "BE": "eu-central-1",  # Belgium -> Germany
+    "CH": "eu-central-1",  # Switzerland -> Germany
+    "AT": "eu-central-1",  # Austria -> Germany
+    "PL": "eu-central-1",  # poland -> Germany
+    # North America
+    "US": "us-east-1",  # USA
+    "CA": "us-east-1",  # Canada -> US East
+    "MX": "us-west-1",  # Mexico -> US West
+    # South America
+    "BR": "us-east-1",  # Brazil -> US East
+    "AR": "us-east-1",  # Argentina -> US East
+    "CL": "us-east-1",  # Chile -> US East
+    "CO": "us-east-1",  # Colombia -> US East
+    "PE": "us-east-1",  # Peru -> US East
+}

pymammotion/data/model/hash_list.py

@@ -86,27 +86,43 @@ class FrameList(DataClassORJSONMixin):
 
 @dataclass
 class Plan(DataClassORJSONMixin):
+    pver: int = 0
     sub_cmd: int = 2
+    area: int = 0
+    work_time: int = 0
     version: str = ""
+    id: str = ""
     user_id: str = ""
     device_id: str = ""
     plan_id: str = ""
     task_id: str = ""
-    start_time: str = "00:00"
+    job_id: str = ""
+    start_time: str = ""
+    end_time: str = ""
+    week: int = 0
     knife_height: int = 0
     model: int = 0
     edge_mode: int = 0
+    required_time: int = 0
+    route_angle: int = 0
     route_model: int = 0
     route_spacing: int = 0
     ultrasonic_barrier: int = 0
     total_plan_num: int = 0
+    plan_index: int = 0
+    result: int = 0
     speed: float = 0.0
     task_name: str = ""
-    zone_hashs: list[str] = field(default_factory=list)
+    job_name: str = ""
+    zone_hashs: list[int] = field(default_factory=list)
     reserved: str = ""
     start_date: str = ""
+    end_date: str = ""
     trigger_type: int = 0
-    remained_seconds: str = "-1"
+    day: int = 0
+    weeks: list[int] = field(default_factory=list)
+    remained_seconds: int = 0
+    toward_mode: int = 0
     toward_included_angle: int = 0
 
 
@@ -263,6 +279,9 @@ class HashList(DataClassORJSONMixin):
 
         return []
 
+    def update_plan(self, plan: Plan) -> None:
+        self.plan[plan.plan_index] = plan
+
     def update(self, hash_data: NavGetCommData | SvgMessage) -> bool:
         """Update the map data."""
 

pymammotion/data/state_manager.py

@@ -9,7 +9,7 @@ import betterproto
 
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.device_info import SideLight
-from pymammotion.data.model.hash_list import AreaHashNameList, NavGetCommData, NavGetHashListData, SvgMessage
+from pymammotion.data.model.hash_list import AreaHashNameList, NavGetCommData, NavGetHashListData, Plan, SvgMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
 from pymammotion.proto import (
@@ -21,6 +21,7 @@ from pymammotion.proto import (
     LubaMsg,
     NavGetCommDataAck,
     NavGetHashListAck,
+    NavPlanJobSet,
     SvgMessageAckT,
     TimeCtrlLight,
     WifiIotStatusReport,
@@ -36,6 +37,7 @@ class StateManager:
     last_updated_at: datetime = datetime.now()
     cloud_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
     cloud_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
+    cloud_get_plan_callback: Callable[[NavPlanJobSet], Awaitable[None]] | None = None
     cloud_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
 
     # possibly don't need anymore
@@ -43,6 +45,7 @@ class StateManager:
 
     ble_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
     ble_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
+    ble_get_plan_callback: Callable[[NavPlanJobSet], Awaitable[None]] | None = None
     ble_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
 
     # possibly don't need anymore
@@ -97,6 +100,12 @@ class StateManager:
         elif self.ble_get_commondata_ack_callback:
             await self.ble_get_commondata_ack_callback(comm_data)
 
+    async def get_plan_callback(self, planjob: NavPlanJobSet) -> None:
+        if self.cloud_get_plan_callback:
+            await self.get_plan_callback(planjob)
+        elif self.ble_get_plan_callback:
+            await self.ble_get_plan_callback(planjob)
+
     async def notification(self, message: LubaMsg) -> None:
         """Handle protobuf notifications."""
         res = betterproto.which_one_of(message, "LubaSubMsg")
@@ -138,6 +147,11 @@ class StateManager:
                 )
                 if updated:
                     await self.get_commondata_ack_callback(common_data)
+            case "todev_planjob_set":
+                planjob: NavPlanJobSet = nav_msg[1]
+                self._device.map.update_plan(Plan.from_dict(planjob.to_dict(casing=betterproto.Casing.SNAKE)))
+                await self.get_plan_callback(planjob)
+
             case "toapp_svg_msg":
                 common_svg_data: SvgMessageAckT = nav_msg[1]
                 updated = self._device.map.update(

pymammotion/mammotion/devices/base.py

@@ -10,7 +10,7 @@ from pymammotion.data.model import RegionData
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.raw_data import RawMowerData
 from pymammotion.data.state_manager import StateManager
-from pymammotion.proto import LubaMsg, NavGetCommDataAck, NavGetHashListAck, SvgMessageAckT
+from pymammotion.proto import LubaMsg, NavGetCommDataAck, NavGetHashListAck, NavPlanJobSet, SvgMessageAckT
 from pymammotion.utility.device_type import DeviceType
 
 _LOGGER = logging.getLogger(__name__)
@@ -89,6 +89,14 @@ class MammotionBaseDevice:
             region_data.current_frame = current_frame
             await self.queue_command("get_regional_data", regional_data=region_data)
 
+    async def plan_callback(self, plan: NavPlanJobSet) -> None:
+        if plan.plan_index != 0 and plan.total_plan_num - 1 != plan.plan_index:
+            index = plan.plan_index
+            while index in self.mower.map.plan and index < plan.total_plan_num:
+                index += 1
+            if index < plan.total_plan_num:
+                await self.queue_command("read_plan", plan_index=index)
+
     def _update_raw_data(self, data: bytes) -> None:
         """Update raw and model data from notifications."""
         tmp_msg = LubaMsg().parse(data)
@@ -216,7 +224,8 @@ class MammotionBaseDevice:
         if self._cloud_device and len(self.mower.map.area_name) == 0 and not DeviceType.is_luba1(self.mower.name):
             await self.queue_command("get_area_name_list", device_id=self._cloud_device.iotId)
 
-        await self.queue_command("read_plan", sub_cmd=2, plan_index=0)
+        if len(self.mower.map.plan) == 0 or self.mower.map.plan[0].total_plan_num != len(self.mower.map.plan):
+            await self.queue_command("read_plan", sub_cmd=2, plan_index=0)
 
         for hash, frame in list(self.mower.map.area.items()):
             missing_frames = self.mower.map.find_missing_frames(frame)

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -91,6 +91,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         self.set_queue_callback(self.queue_command)
         self._state_manager.ble_gethash_ack_callback = self.datahash_response
         self._state_manager.ble_get_commondata_ack_callback = self.commdata_response
+        self._state_manager.ble_get_plan_callback = self.plan_callback
         loop = asyncio.get_event_loop()
         loop.create_task(self.process_queue())
 

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -167,6 +167,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt.on_connected_event.add_subscribers(self.on_connect)
         self._state_manager.cloud_gethash_ack_callback = self.datahash_response
         self._state_manager.cloud_get_commondata_ack_callback = self.commdata_response
+        self._state_manager.cloud_get_plan_callback = self.plan_callback
         self.set_queue_callback(self.queue_command)
 
         if self._mqtt.is_ready:
@@ -229,7 +230,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
     async def _ble_sync(self) -> None:
         if self.stopped or self._mqtt.is_connected is False:
             return
-        
+
         command_bytes = self._commands.send_todev_ble_sync(3)
         try:
             await self._mqtt.send_command(self.iot_id, command_bytes)

{pymammotion-0.4.22.dist-info → pymammotion-0.4.25.dist-info}/METADATA

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

{pymammotion-0.4.22.dist-info → pymammotion-0.4.25.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pymammotion/__init__.py,sha256=u1OHuD8Uj0qCOH4I7Lt5d7T-TPt1R0pY-bv8S6UfVxM,1587
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
 pymammotion/aliyun/client.py,sha256=DWHGBuRCMIHdm2AgIV8XsUCxc4kP7TAmhAlpxcrtz3s,9591
-pymammotion/aliyun/cloud_gateway.py,sha256=-mgofsFzUzh405ZurExnNQeoXsnPxB232Wv8G1WoSh0,27311
+pymammotion/aliyun/cloud_gateway.py,sha256=5ffP4rwC-dCcyFOvk1pU0Pgi7euDlhoUYpgGL-X6NH8,28137
 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
@@ -9,6 +9,7 @@ pymammotion/aliyun/model/login_by_oauth_response.py,sha256=g7JnvEjoa3SplHd-UqCuK
 pymammotion/aliyun/model/regions_response.py,sha256=HSnpPcgpjr6VNXBQHw__gn-xWCkQ-MZ-Tmus9_va9mI,635
 pymammotion/aliyun/model/session_by_authcode_response.py,sha256=0owdNcGFIP7rsVqLIf9rT-iOtvWmKCt2AW0cUUXwFiQ,427
 pymammotion/aliyun/model/stream_subscription_response.py,sha256=7d0i8cNMAMX7aQjd2yebMDdqQkugcCzk-SD6oVtf18M,333
+pymammotion/aliyun/regions.py,sha256=ctlRGrmdE4-xgItl9slCANYOV502qVN5lkAU4lj92sk,2518
 pymammotion/aliyun/tea/core.py,sha256=Vnv4zclqxFdJcvCl013pAXz1MiU13WaHA0m7J_-nVX4,10147
 pymammotion/aliyun/tmp_constant.py,sha256=M4Hq_lrGB3LZdX6R2XohRPFoK1NDnNV-pTJwJcJ9838,6650
 pymammotion/bluetooth/__init__.py,sha256=LAl8jqZ1fPh-3mLmViNQsP3s814C1vsocYUa6oSaXt0,36
@@ -33,7 +34,7 @@ pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
 pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTGc47QTEpp8DD0,1103
 pymammotion/data/model/generate_route_information.py,sha256=pgjqURwmEIzjCMbl4Z5JDDkfxyUAdry1KhPfyir3-mU,777
-pymammotion/data/model/hash_list.py,sha256=8HqUIz2_lVen-2iZwsWNz54odfErRS6mUCrKK861_wA,11628
+pymammotion/data/model/hash_list.py,sha256=kB2p6OWIouEL2gD67JFxQSWkzUrG33-Kcg84E84ZZKg,12083
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
 pymammotion/data/model/mowing_modes.py,sha256=bBbRhDe-imZsXDR0TN0emQv6BiIkAlXJFb5isPEjgDk,1078
 pymammotion/data/model/plan.py,sha256=wGlcJT-w0EdbWK9jI838TCOm_MABFg7WoR664VB8RWg,2880
@@ -45,7 +46,7 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 pymammotion/data/mqtt/event.py,sha256=r14gzZVxmlGVAwFdZQ1CUsMZFHHwRKnbt2VHnjugP28,5123
 pymammotion/data/mqtt/properties.py,sha256=pX5JRVmmpVO04CSPm5xAGcSWA_OeLd0JnBagLsfiSEc,3755
 pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
-pymammotion/data/state_manager.py,sha256=H3xHcLorw4xBtDAhyigl5rd1SYkLaSTBB9qQ6XQV9SM,8646
+pymammotion/data/state_manager.py,sha256=MiRnTzwHZ9lOZE_K-IjNPrtTu_MX75neUTTIQT2VBv4,9355
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -67,10 +68,10 @@ pymammotion/mammotion/commands/messages/video.py,sha256=YQGIxKx2prA0X01ovNmMkX6Y
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
-pymammotion/mammotion/devices/base.py,sha256=w7ZucgZkOBdpPajrJs-W4oZpoDRpTDYgCCdVlwOP-uo,11901
+pymammotion/mammotion/devices/base.py,sha256=FeESaqNcHqQ_4Ew8Hq2BCQQZQeS9M8lOvw8zBJLka2k,12435
 pymammotion/mammotion/devices/mammotion.py,sha256=ffzwsQqO9zDwMElWYMsxi-J5_rGaOOOHdAm5D3DXprc,13671
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=B1tpnC8vrbXGKhFq-l5LR86EcCvd6iHuW5kOkhpjwgY,19541
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=_huNqjEmQr6zHtMK4j4Gep_f-jPCcufXe_vfs8F55dk,13809
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=nIuOW22Une1Zk1tN691jGUv_eqQJA8K2LuC9ohPUHAk,19612
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=GSa9FPG2Ob7eP7L_WqV5Wk9LzL6dKbhFJsBTyLJBguI,13874
 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
@@ -119,7 +120,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.4.22.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.22.dist-info/METADATA,sha256=nyYzsPUltG7Qm3TLQ4EryiDU7BJmUjnt5jhW4COfrFc,3834
-pymammotion-0.4.22.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-pymammotion-0.4.22.dist-info/RECORD,,
+pymammotion-0.4.25.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.25.dist-info/METADATA,sha256=8-x044y_IVdK-evDfPwVGiFTZhXCxWJMGsWOak2SoqY,3834
+pymammotion-0.4.25.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+pymammotion-0.4.25.dist-info/RECORD,,