pymammotion 0.4.10__tar.gz → 0.4.11__tar.gz

{pymammotion-0.4.10 → pymammotion-0.4.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.10
+Version: 0.4.11
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -8,7 +8,6 @@ Author-email: michael@jumblesoft.co.nz
 Requires-Python: >=3.10
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiohttp (>=3.9.1,<4.0.0)

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/data/model/device.py

@@ -92,6 +92,8 @@ class MowingDevice(DataClassORJSONMixin):
                     self.location.work_zone = (
                         location.zone_hash if self.report_data.dev.sys_status == WorkMode.MODE_WORKING else 0
                     )
+                if location.bol_hash:
+                    self.map.bol_hash = location.bol_hash
 
         if toapp_report_data.fw_info:
             self.update_device_firmwares(toapp_report_data.fw_info)

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/data/model/hash_list.py

@@ -3,7 +3,7 @@ from enum import IntEnum
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
-from pymammotion.proto import NavGetCommDataAck, SvgMessageAckT
+from pymammotion.proto import NavGetCommDataAck, NavGetHashListAck, SvgMessageAckT
 
 
 class PathType(IntEnum):
@@ -78,8 +78,9 @@ class SvgMessage(DataClassORJSONMixin):
 
 @dataclass
 class FrameList(DataClassORJSONMixin):
-    total_frame: int
-    data: list[NavGetCommData | SvgMessage]
+    total_frame: int = 0
+    sub_cmd: int = 0
+    data: list[NavGetCommData | SvgMessage] = field(default_factory=list)
 
 
 @dataclass(eq=False, repr=False)
@@ -100,6 +101,7 @@ class NavGetHashListData(DataClassORJSONMixin):
 @dataclass
 class RootHashList(DataClassORJSONMixin):
     total_frame: int = 0
+    sub_cmd: int = 0
     data: list[NavGetHashListData] = field(default_factory=list)
 
 
@@ -118,12 +120,13 @@ class HashList(DataClassORJSONMixin):
     hashlist for all our hashIDs for verification
     """
 
-    root_hash_list: RootHashList = field(default_factory=RootHashList)
-    area: dict = field(default_factory=dict)  # type 0
-    path: dict = field(default_factory=dict)  # type 2
-    obstacle: dict = field(default_factory=dict)  # type 1
-    dump: dict = field(default_factory=dict)  # type 12?
-    svg: dict = field(default_factory=dict)  # type 13
+    bol_hash: str = ""
+    root_hash_lists: list[RootHashList] = field(default_factory=list)
+    area: dict[int, FrameList] = field(default_factory=dict)  # type 0
+    path: dict[int, FrameList] = field(default_factory=dict)  # type 2
+    obstacle: dict[int, FrameList] = field(default_factory=dict)  # type 1
+    dump: dict[int, FrameList] = field(default_factory=dict)  # type 12?
+    svg: dict[int, FrameList] = field(default_factory=dict)  # type 13
     area_name: list[AreaHashNameList] = field(default_factory=list)
 
     def update_hash_lists(self, hashlist: list[int]) -> None:
@@ -135,37 +138,59 @@ class HashList(DataClassORJSONMixin):
 
     @property
     def hashlist(self) -> list[int]:
-        if len(self.root_hash_list.data) == 0:
+        if not self.root_hash_lists:
             return []
-        return [i for obj in self.root_hash_list.data for i in obj.data_couple]
+        # Combine data_couple from all RootHashLists
+        return [i for root_list in self.root_hash_lists for obj in root_list.data for i in obj.data_couple]
 
     @property
     def missing_hashlist(self) -> list[int]:
         """Return missing hashlist."""
+        all_hash_ids = set(self.area.keys()).union(
+            self.path.keys(), self.obstacle.keys(), self.dump.keys(), self.svg.keys()
+        )
         return [
             i
-            for obj in self.root_hash_list.data
+            for root_list in self.root_hash_lists
+            for obj in root_list.data
             for i in obj.data_couple
-            if f"{i}"
-            not in set(self.area.keys()).union(
-                self.path.keys(), self.obstacle.keys(), self.dump.keys(), self.svg.keys()
-            )
+            if i not in all_hash_ids
         ]
 
     def update_root_hash_list(self, hash_list: NavGetHashListData) -> None:
-        self.root_hash_list.total_frame = hash_list.total_frame
-
-        for index, obj in enumerate(self.root_hash_list.data):
+        target_root_list = next(
+            (
+                rhl
+                for rhl in self.root_hash_lists
+                if rhl.total_frame == hash_list.total_frame and rhl.sub_cmd == hash_list.sub_cmd
+            ),
+            None,
+        )
+
+        if target_root_list is None:
+            # Create new RootHashList if none exists for this total_frame
+            new_root_list = RootHashList(total_frame=hash_list.total_frame, sub_cmd=hash_list.sub_cmd, data=[hash_list])
+            self.root_hash_lists.append(new_root_list)
+            return
+
+        for index, obj in enumerate(target_root_list.data):
             if obj.current_frame == hash_list.current_frame:
                 # Replace the item if current_frame matches
-                self.root_hash_list.data[index] = hash_list
+                target_root_list.data[index] = hash_list
                 return
 
         # If no match was found, append the new item
-        self.root_hash_list.data.append(hash_list)
-
-    def missing_hash_frame(self) -> list[int]:
-        return self._find_missing_frames(self.root_hash_list)
+        target_root_list.data.append(hash_list)
+
+    def missing_hash_frame(self, hash_ack: NavGetHashListAck) -> list[int]:
+        """Returns a combined list of all missing frames across all RootHashLists."""
+        missing_frames = []
+        filtered_lists = [rl for rl in self.root_hash_lists if rl.sub_cmd == hash_ack.sub_cmd]
+        for root_list in filtered_lists:
+            missing = self._find_missing_frames(root_list)
+            if missing:
+                missing_frames.extend(missing)
+        return missing_frames
 
     def missing_frame(self, hash_data: NavGetCommDataAck | SvgMessageAckT) -> list[int]:
         if hash_data.type == PathType.AREA:

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/commands/abstract_message.py

@@ -1,10 +1,14 @@
 from abc import abstractmethod
 
+from pymammotion.bluetooth.model.atomic_integer import AtomicInteger
 from pymammotion.proto import MsgCmdType, MsgDevice
 from pymammotion.utility.device_type import DeviceType
 
 
 class AbstractMessage:
+    seqs = AtomicInteger(0)
+    user_account: int = 1
+
     @abstractmethod
     def get_device_name(self) -> str:
         """Get device name."""

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/commands/mammotion_command.py

@@ -13,9 +13,10 @@ class MammotionCommand(
 ):
     """MQTT commands for Luba."""
 
-    def __init__(self, device_name: str) -> None:
+    def __init__(self, device_name: str, user_account: int) -> None:
         self._device_name = device_name
         self._product_key = ""
+        self.user_account = user_account
 
     def get_device_name(self) -> str:
         """Get device name."""

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/commands/messages/driver.py

@@ -29,9 +29,9 @@ class MessageDriver(AbstractMessage, ABC):
             rcver=self.get_msg_device(MsgCmdType.EMBED_DRIVER, MsgDevice.DEV_MAINCTL),
             msgattr=MsgAttr.REQ,
             timestamp=round(time.time() * 1000),
-            seqs=1,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             driver=driver,
         ).SerializeToString()
 

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/commands/messages/media.py

@@ -12,9 +12,9 @@ class MessageMedia(AbstractMessage, ABC):
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=self.get_msg_device(MsgCmdType.MUL, MsgDevice.SOC_MODULE_MULTIMEDIA),
             msgattr=MsgAttr.REQ,
-            seqs=1,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             mul=mul,
         )
 

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/commands/messages/navigation.py

@@ -39,9 +39,9 @@ class MessageNavigation(AbstractMessage, ABC):
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=self.get_msg_device(MsgCmdType.NAV, MsgDevice.DEV_MAINCTL),
             msgattr=MsgAttr.REQ,
-            seqs=1,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             nav=build,
             timestamp=round(time.time() * 1000),
         )

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/commands/messages/network.py

@@ -31,16 +31,15 @@ from pymammotion.proto import (
 class MessageNetwork(AbstractMessage, ABC):
     messageNavigation: MessageNavigation = MessageNavigation()
 
-    @staticmethod
-    def send_order_msg_net(build: DevNet) -> bytes:
+    def send_order_msg_net(self, build: DevNet) -> bytes:
         luba_msg = LubaMsg(
             msgtype=MsgCmdType.ESP,
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=MsgDevice.DEV_COMM_ESP,
             msgattr=MsgAttr.REQ,
-            seqs=1,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             net=build,
             timestamp=round(time.time() * 1000),
         )

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/commands/messages/ota.py

@@ -6,15 +6,17 @@ from pymammotion.proto import GetInfoReq, InfoType, LubaMsg, MctlOta, MsgAttr, M
 
 
 class MessageOta(AbstractMessage, ABC):
+    """Message OTA class."""
+
     def send_order_msg_ota(self, ota):
         luba_msg = LubaMsg(
             msgtype=MsgCmdType.EMBED_OTA,
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=self.get_msg_device(MsgCmdType.EMBED_OTA, MsgDevice.DEV_MAINCTL),
-            msgattr=MsgAttr.MSG_ATTR_REQ,
-            seqs=1,
+            msgattr=MsgAttr.REQ,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             ota=ota,
         )
 

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/commands/messages/system.py

@@ -36,25 +36,24 @@ class MessageSystem(AbstractMessage, ABC):
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=self.get_msg_device(MsgCmdType.EMBED_SYS, MsgDevice.DEV_MAINCTL),
             sys=sys,
-            seqs=1,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             timestamp=round(time.time() * 1000),
         )
 
         return luba_msg.SerializeToString()
 
-    @staticmethod
-    def send_order_msg_sys_legacy(sys) -> bytes:
+    def send_order_msg_sys_legacy(self, sys) -> bytes:
         luba_msg = LubaMsg(
             msgtype=MsgCmdType.EMBED_SYS,
             msgattr=MsgAttr.REQ,
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=MsgDevice.DEV_MAINCTL,
             sys=sys,
-            seqs=1,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             timestamp=round(time.time() * 1000),
         )
 
@@ -315,9 +314,9 @@ class MessageSystem(AbstractMessage, ABC):
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=MsgDevice.DEV_MAINCTL,
             msgattr=MsgAttr.REQ,
-            seqs=1,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             sys=mctl_sys,
             timestamp=round(time.time() * 1000),
         )
@@ -351,9 +350,9 @@ class MessageSystem(AbstractMessage, ABC):
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=MsgDevice.DEV_MAINCTL,
             msgattr=MsgAttr.REQ,
-            seqs=1,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             sys=mctl_sys,
             timestamp=round(time.time() * 1000),
         )

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/commands/messages/video.py

@@ -15,9 +15,9 @@ class MessageVideo(AbstractMessage, ABC):
             sender=MsgDevice.DEV_MOBILEAPP,
             rcver=self.get_msg_device(MsgCmdType.MUL, MsgDevice.SOC_MODULE_MULTIMEDIA),
             mul=mul,
-            seqs=1,
+            seqs=self.seqs.increment_and_get() & 255,
             version=1,
-            subtype=1,
+            subtype=self.user_account,
             timestamp=round(time.time() * 1000),
         )
 

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/devices/base.py

@@ -45,18 +45,18 @@ class MammotionBaseDevice:
 
     async def datahash_response(self, hash_ack: NavGetHashListAck) -> None:
         """Handle datahash responses."""
-        current_frame = hash_ack.current_frame
 
-        missing_frames = self.mower.map.missing_hash_frame()
+        missing_frames = self.mower.map.missing_hash_frame(hash_ack)
         if len(missing_frames) == 0:
             if len(self.mower.map.missing_hashlist) > 0:
                 data_hash = self.mower.map.missing_hashlist.pop()
                 return await self.queue_command("synchronize_hash_data", hash_num=data_hash)
             return
 
-        if current_frame != missing_frames[0] - 1:
-            current_frame = missing_frames[0] - 1
-        await self.queue_command("get_hash_response", total_frame=hash_ack.total_frame, current_frame=current_frame)
+        for frame in missing_frames:
+            await self.queue_command(
+                "get_hash_response", sub_cmd=hash_ack.sub_cmd, total_frame=hash_ack.total_frame, current_frame=frame - 1
+            )
 
     async def commdata_response(self, common_data: NavGetCommDataAck | SvgMessageAckT) -> None:
         """Handle common data responses."""
@@ -80,6 +80,7 @@ class MammotionBaseDevice:
             region_data.hash = common_data.data_hash if isinstance(common_data, SvgMessageAckT) else common_data.hash
             region_data.action = common_data.action if isinstance(common_data, NavGetCommDataAck) else None
             region_data.type = common_data.type
+            region_data.sub_cmd = common_data.sub_cmd
             region_data.total_frame = total_frame
             region_data.current_frame = current_frame
             await self.queue_command("get_regional_data", regional_data=region_data)
@@ -210,7 +211,6 @@ class MammotionBaseDevice:
         await self.queue_command("read_plan", sub_cmd=2, plan_index=0)
 
         await self.queue_command("get_all_boundary_hash_list", sub_cmd=0)
-        await self.queue_command("get_hash_response", total_frame=1, current_frame=1)
         if len(self.mower.map.missing_hashlist) > 0:
             data_hash = self.mower.map.missing_hashlist.pop()
             await self.queue_command("synchronize_hash_data", hash_num=data_hash)
@@ -218,6 +218,7 @@ class MammotionBaseDevice:
         # sub_cmd 3 is job hashes??
         # sub_cmd 4 is dump location (yuka)
         # jobs list
+        #
         # hash_list_result = await self._send_command_with_args("get_all_boundary_hash_list", sub_cmd=3)
 
     async def async_read_settings(self) -> None:

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -82,7 +82,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         self._write_char: BleakGATTCharacteristic | int | str | UUID = 0
         self._disconnect_timer: asyncio.TimerHandle | None = None
         self._message: BleMessage | None = None
-        self._commands: MammotionCommand = MammotionCommand(device.name)
+        self._commands: MammotionCommand = MammotionCommand(device.name, 1)
         self.command_queue = asyncio.Queue()
         self._expected_disconnect = False
         self._connect_lock = asyncio.Lock()

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -164,7 +164,10 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self.iot_id = cloud_device.iotId
         self.device = cloud_device
         self._command_futures = {}
-        self._commands: MammotionCommand = MammotionCommand(cloud_device.deviceName)
+        self._commands: MammotionCommand = MammotionCommand(
+            cloud_device.deviceName,
+            int(mqtt.cloud_client.mammotion_http.response.data.get("userInformation").get("userAccount")),
+        )
         self.currentID = ""
         self._mqtt.mqtt_message_event.add_subscribers(self._parse_message_for_device)
         self._mqtt.mqtt_properties_event.add_subscribers(self._parse_message_properties_for_device)
@@ -329,9 +332,9 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             fut: MammotionFuture = self.dequeue_by_iot_id(self._mqtt.waiting_queue, self.iot_id)
             if fut is None:
                 return
-            while fut.fut.cancelled() and len(self._mqtt.waiting_queue) > 0:
+            while fut is None or fut.fut.cancelled() and len(self._mqtt.waiting_queue) > 0:
                 fut = self.dequeue_by_iot_id(self._mqtt.waiting_queue, self.iot_id)
-            if not fut.fut.cancelled():
+            if fut is not None and not fut.fut.cancelled():
                 fut.resolve(cast(bytes, binary_data))
 
     @property

{pymammotion-0.4.10 → pymammotion-0.4.11}/pymammotion/proto/__init__.py

@@ -892,7 +892,7 @@ class NavGetCommData(betterproto.Message):
     sub_cmd: int = betterproto.int32_field(2)
     action: int = betterproto.int32_field(3)
     type: int = betterproto.int32_field(4)
-    hash: int = betterproto.fixed64_field(5)
+    hash: int = betterproto.int64_field(5)
     paternal_hash_a: int = betterproto.int64_field(6)
     paternal_hash_b: int = betterproto.int64_field(7)
     total_frame: int = betterproto.int32_field(8)

{pymammotion-0.4.10 → pymammotion-0.4.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.10"
+version     = "0.4.11"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -21,7 +21,7 @@ packages = [{include = "pymammotion"}]
 
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.13"
+python = ">=3.11,<3.13"
 bleak = ">=0.21.0"
 protobuf = ">=4.23.1"
 py-jsonic = "^0.0.2"
@@ -63,9 +63,10 @@ ruff = "^0.9.3"
 pre-commit = "^3.8.0"
 mypy = "^1.11.2"
 autotyping = "^24.3.0"
+ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.4.10"
+current_version = "0.4.11"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true