pymammotion 0.5.34__py3-none-any.whl → 0.5.41__py3-none-any.whl

pymammotion/utility/device_type.py

@@ -22,13 +22,31 @@ Luba2MiniProductKey = ["a1L5ZfJIxGl", "a1dCWYFLROK"]
 
 YukaProductKey = ["a1kT0TlYEza", "a1IQV0BrnXb"]
 
-YukaPlusProductKey = ["a1lNESu9VST"]
+YukaPlusProductKey = ["a1lNESu9VST", "a1zAEzmvWDa"]
 
 YukaMiniProductKey = ["a1BqmEWMRbX", "a1biqVGvxrE"]
 
 RTKProductKey = ["a1qXkZ5P39W", "a1Nc68bGZzX"]
 
-YukaMVProductKey = ["a1jFe8HzcDb"]
+YukaMVProductKey = ["a1jFe8HzcDb", "a16cz0iXgUJ", "USpE46bNTC7", "pdA6uJrBfjz"]
+
+LubaLDProductKey = ["a1jDMfG2Fgj", "a1vtZq9LUFS"]
+
+LubaVAProductKey = ["a1Ce85210Be", "a1BBOJnnjb9"]
+
+YukaMLProductKey = ["a1OWGO8WXbh", "a1s6znKxGvI"]
+
+LubaMDProductKey = ["a1T6VTFTc0C", "a14iRDqMepW"]
+
+LubaMBProductKey = ["a1pb9toor70"]
+
+RTKNBProductKey = ["a1NfZqdSREf", "a1ZuQVL7UiN"]
+
+LubaLAProductKey = ["CDYuKXTYrSP"]
+
+YukaMN100ProductKey = ["NnbeYtaEUGE"]
+
+Cm900ProductKey = ["zkRuTK9KsXG", "6DbgVh2Qs5m"]
 
 
 class DeviceType(Enum):
@@ -47,7 +65,17 @@ class DeviceType(Enum):
     LUBA_LD = (11, "Luba-LD", "HM431")
     RTK3A0 = (12, "RBSA0", "RBS03A0")
     RTK3A2 = (13, "RBSA2", "RBS03A2")
-    YUKA_MINIVP = (14, "Yuka-MV", "MN231")
+    YUKA_MINIV = (14, "Yuka-MV", "MN231")
+    LUBA_VA = (15, "Luba-VA", "HM442")
+    YUKA_ML = (16, "Yuka-ML", "MN232")
+    LUBA_MD = (17, "Luba-MD", "HM433")
+    LUBA_LA = (18, "Luba-LA", "HM432")
+    SWIMMINGPOOL_S1 = (19, "Spino-S1", "Spino-S1")
+    SWIMMINGPOOL_E1 = (20, "Spino-E1", "Spino-E1")
+    YUKA_MN100 = (21, "Ezy-VT", "MN100")
+    RTKNB = (22, "NB", "NB")
+    LUBA_MB = (23, "Luba-MB", "HM434")
+    CM900 = (24, "Kumar-MK", "KM01")
 
     def __init__(self, value: int, name: str, model: str) -> None:
         self._value = value
@@ -112,6 +140,28 @@ class DeviceType(Enum):
             return DeviceType.RTK3A0
         elif value == 13:
             return DeviceType.RTK3A2
+        elif value == 14:
+            return DeviceType.YUKA_MINIV
+        elif value == 15:
+            return DeviceType.LUBA_VA
+        elif value == 16:
+            return DeviceType.YUKA_ML
+        elif value == 17:
+            return DeviceType.LUBA_MD
+        elif value == 18:
+            return DeviceType.LUBA_LA
+        elif value == 19:
+            return DeviceType.SWIMMINGPOOL_S1
+        elif value == 20:
+            return DeviceType.SWIMMINGPOOL_E1
+        elif value == 21:
+            return DeviceType.YUKA_MN100
+        elif value == 22:
+            return DeviceType.RTKNB
+        elif value == 23:
+            return DeviceType.LUBA_MB
+        elif value == 24:
+            return DeviceType.CM900
         else:
             return DeviceType.UNKNOWN
 
@@ -156,6 +206,36 @@ class DeviceType(Enum):
                 return DeviceType.LUBA_YUKA
             elif DeviceType.LUBA.get_name() in substring2 or DeviceType.contain_luba_product_key(product_key):
                 return DeviceType.LUBA
+            elif DeviceType.SPINO.get_name() in substring2:
+                return DeviceType.SPINO
+            elif DeviceType.RTK3A1.get_name() in substring2:
+                return DeviceType.RTK3A1
+            elif DeviceType.RTK3A0.get_name() in substring2:
+                return DeviceType.RTK3A0
+            elif DeviceType.RTK3A2.get_name() in substring2:
+                return DeviceType.RTK3A2
+            elif DeviceType.YUKA_MINIV.get_name() in substring2:
+                return DeviceType.YUKA_MINIV
+            elif DeviceType.LUBA_VA.get_name() in substring2:
+                return DeviceType.LUBA_VA
+            elif DeviceType.YUKA_ML.get_name() in substring2:
+                return DeviceType.YUKA_ML
+            elif DeviceType.LUBA_MD.get_name() in substring2:
+                return DeviceType.LUBA_MD
+            elif DeviceType.LUBA_LA.get_name() in substring2:
+                return DeviceType.LUBA_LA
+            elif DeviceType.SWIMMINGPOOL_S1.get_name() in substring2:
+                return DeviceType.SWIMMINGPOOL_S1
+            elif DeviceType.SWIMMINGPOOL_E1.get_name() in substring2:
+                return DeviceType.SWIMMINGPOOL_E1
+            elif DeviceType.YUKA_MN100.get_name() in substring2:
+                return DeviceType.YUKA_MN100
+            elif DeviceType.RTKNB.get_name() in substring2:
+                return DeviceType.RTKNB
+            elif DeviceType.LUBA_MB.get_name() in substring2:
+                return DeviceType.LUBA_MB
+            elif DeviceType.CM900.get_name() in substring2:
+                return DeviceType.CM900
             else:
                 return DeviceType.UNKNOWN
         except Exception:
@@ -252,6 +332,9 @@ class DeviceType(Enum):
             or DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_VP.get_value()
             or DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_MINI.get_value()
             or DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_MINI2.get_value()
+            or DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_MINIV.get_value()
+            or DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_ML.get_value()
+            or DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_MN100.get_value()
         )
 
     @staticmethod
@@ -268,6 +351,7 @@ class DeviceType(Enum):
         return (
             DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_MINI.get_value()
             or DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_MINI2.get_value()
+            or DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_MINIV.get_value()
             or DeviceType.value_of_str(device_name).get_value() == DeviceType.YUKA_VP.get_value()
             or DeviceType.value_of_str(device_name).get_value() == DeviceType.LUBA_MN.get_value()
             or DeviceType.value_of_str(device_name).get_value() == DeviceType.LUBA_VP.get_value()
@@ -301,6 +385,7 @@ class DeviceType(Enum):
             or DeviceType.RTK3A0.get_value() == device_type.get_value()
             or DeviceType.RTK3A1.get_value() == device_type.get_value()
             or DeviceType.RTK3A2.get_value() == device_type.get_value()
+            or DeviceType.RTKNB.get_value() == device_type.get_value()
         )
 
     @staticmethod

pymammotion/utility/mur_mur_hash.py

@@ -2,113 +2,158 @@ import struct
 
 
 class MurMurHashUtil:
+    MASK_32 = 0xFFFFFFFF
+    MULTIPLIER = 1540483477
+
     @staticmethod
-    def get_unsigned_int(i):
-        return i & 0xFFFFFFFF
+    def get_unsigned_int(i: int) -> int:
+        """Convert signed int to unsigned (32-bit)"""
+        return i & MurMurHashUtil.MASK_32
 
     @staticmethod
-    def hash(byte_arr: bytes):
-        # Create a bytearray view with little endian order
-        position = 0
-        remaining_bytes = len(byte_arr)
+    def hash(data: bytes) -> int:
+        """MurmurHash2 64-bit implementation"""
+        pos = 0
+        data_len = len(data)
 
-        # Initial values
-        remaining = remaining_bytes ^ 97
+        remaining = data_len ^ 97
         j = 0
 
         # Process 8 bytes at a time
-        while remaining_bytes >= 8:
-            multiplier = 1540483477
-
-            # First 4 bytes
-            unsigned_int = struct.unpack_from("<I", byte_arr, position)[0]
-            position += 4
-            unsigned_int = (MurMurHashUtil.get_unsigned_int(unsigned_int) * multiplier) & 0xFFFFFFFF
-            remaining = (
-                ((remaining * multiplier) & 0xFFFFFFFF)
-                ^ (((unsigned_int ^ (unsigned_int >> 24)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF
-            ) & 0xFFFFFFFF
-
-            # Next 4 bytes
-            unsigned_int2 = struct.unpack_from("<I", byte_arr, position)[0]
-            position += 4
-            unsigned_int2 = (MurMurHashUtil.get_unsigned_int(unsigned_int2) * multiplier) & 0xFFFFFFFF
-            j = (
-                ((j * multiplier) & 0xFFFFFFFF)
-                ^ ((((unsigned_int2 ^ (unsigned_int2 >> 24)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF)
-            ) & 0xFFFFFFFF
-
-            remaining_bytes -= 8
+        while (data_len - pos) >= 8:
+            val1 = struct.unpack_from("<i", data, pos)[0]
+            pos += 4
+
+            unsigned_int_1 = MurMurHashUtil.get_unsigned_int(val1)
+            temp1 = (unsigned_int_1 * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32
+            temp2 = (temp1 ^ (temp1 >> 24)) & MurMurHashUtil.MASK_32
+            temp3 = (temp2 * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32
+
+            remaining = ((remaining * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32) ^ temp3
+            remaining = remaining & MurMurHashUtil.MASK_32
+
+            val2 = struct.unpack_from("<i", data, pos)[0]
+            pos += 4
+
+            unsigned_int_2 = MurMurHashUtil.get_unsigned_int(val2)
+            temp1 = (unsigned_int_2 * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32
+            temp2 = (temp1 ^ (temp1 >> 24)) & MurMurHashUtil.MASK_32
+            temp3 = (temp2 * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32
+
+            j = ((j * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32) ^ temp3
+            j = j & MurMurHashUtil.MASK_32
 
         # Process remaining 4 bytes if available
-        if remaining_bytes >= 4:
-            multiplier = 1540483477
-            unsigned_int3 = struct.unpack_from("<I", byte_arr, position)[0]
-            position += 4
-            unsigned_int3 = (MurMurHashUtil.get_unsigned_int(unsigned_int3) * multiplier) & 0xFFFFFFFF
-            remaining = (
-                ((remaining * multiplier) & 0xFFFFFFFF)
-                ^ ((((unsigned_int3 ^ (unsigned_int3 >> 24)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF)
-            ) & 0xFFFFFFFF
-            remaining_bytes -= 4
-
-        # Process final 1-3 bytes if available
-        if remaining_bytes == 1:
-            j = (
-                ((j ^ (MurMurHashUtil.get_unsigned_int(byte_arr[position]) & 0xFF)) & 0xFFFFFFFF) * 1540483477
-            ) & 0xFFFFFFFF
-        elif remaining_bytes == 2:
-            j = (j ^ ((MurMurHashUtil.get_unsigned_int(byte_arr[position + 1]) & 0xFF) << 8)) & 0xFFFFFFFF
-            j = (
-                ((j ^ (MurMurHashUtil.get_unsigned_int(byte_arr[position]) & 0xFF)) & 0xFFFFFFFF) * 1540483477
-            ) & 0xFFFFFFFF
-        elif remaining_bytes == 3:
-            j = (j ^ ((MurMurHashUtil.get_unsigned_int(byte_arr[position + 2]) & 0xFF) << 16)) & 0xFFFFFFFF
-            j = (j ^ ((MurMurHashUtil.get_unsigned_int(byte_arr[position + 1]) & 0xFF) << 8)) & 0xFFFFFFFF
-            j = (
-                ((j ^ (MurMurHashUtil.get_unsigned_int(byte_arr[position]) & 0xFF)) & 0xFFFFFFFF) * 1540483477
-            ) & 0xFFFFFFFF
-
-        # Final mixing
-        multiplier = 1540483477
-        j5 = (((remaining ^ (j >> 18)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF
-        j6 = (((j ^ (j5 >> 22)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF
-        j7 = (((j5 ^ (j6 >> 17)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF
+        if (data_len - pos) >= 4:
+            val = struct.unpack_from("<i", data, pos)[0]
+            pos += 4
+
+            unsigned_int_3 = MurMurHashUtil.get_unsigned_int(val)
+            temp1 = (unsigned_int_3 * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32
+            temp2 = (temp1 ^ (temp1 >> 24)) & MurMurHashUtil.MASK_32
+            temp3 = (temp2 * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32
+
+            remaining = ((remaining * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32) ^ temp3
+            remaining = remaining & MurMurHashUtil.MASK_32
+
+        # Process tail bytes (1-3 bytes)
+        bytes_remaining = data_len - pos
+
+        if bytes_remaining == 1:
+            byte_val = data[pos] if data[pos] < 128 else data[pos] - 256
+            j = (j ^ (MurMurHashUtil.get_unsigned_int(byte_val) & 255)) & MurMurHashUtil.MASK_32
+            j = (j * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32
+
+        elif bytes_remaining == 2:
+            byte_val1 = data[pos + 1] if data[pos + 1] < 128 else data[pos + 1] - 256
+            j = (j ^ ((MurMurHashUtil.get_unsigned_int(byte_val1) & 255) << 8)) & MurMurHashUtil.MASK_32
+
+            byte_val0 = data[pos] if data[pos] < 128 else data[pos] - 256
+            j = (j ^ (MurMurHashUtil.get_unsigned_int(byte_val0) & 255)) & MurMurHashUtil.MASK_32
+            j = (j * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32
+
+        elif bytes_remaining == 3:
+            byte_val2 = data[pos + 2] if data[pos + 2] < 128 else data[pos + 2] - 256
+            j = (j ^ ((MurMurHashUtil.get_unsigned_int(byte_val2) & 255) << 16)) & MurMurHashUtil.MASK_32
+
+            byte_val1 = data[pos + 1] if data[pos + 1] < 128 else data[pos + 1] - 256
+            j = (j ^ ((MurMurHashUtil.get_unsigned_int(byte_val1) & 255) << 8)) & MurMurHashUtil.MASK_32
+
+            byte_val0 = data[pos] if data[pos] < 128 else data[pos] - 256
+            j = (j ^ (MurMurHashUtil.get_unsigned_int(byte_val0) & 255)) & MurMurHashUtil.MASK_32
+            j = (j * MurMurHashUtil.MULTIPLIER) & MurMurHashUtil.MASK_32
+
+        # Final avalanche
+        j4 = MurMurHashUtil.MULTIPLIER
+
+        j5 = remaining ^ (j >> 18)
+        j5 = (j5 & MurMurHashUtil.MASK_32) * j4
+        j5 = j5 & MurMurHashUtil.MASK_32
+
+        j6 = j ^ (j5 >> 22)
+        j6 = (j6 & MurMurHashUtil.MASK_32) * j4
+        j6 = j6 & MurMurHashUtil.MASK_32
+
+        j7 = j5 ^ (j6 >> 17)
+        j7 = (j7 & MurMurHashUtil.MASK_32) * j4
+        j7 = j7 & MurMurHashUtil.MASK_32
+
+        # Combine high and low parts
         j8 = j7 << 32
 
-        return j8 | ((((j6 ^ (j7 >> 19)) & 0xFFFFFFFF) * multiplier) & 0xFFFFFFFF)
+        low = j6 ^ (j7 >> 19)
+        low = (low & MurMurHashUtil.MASK_32) * j4
+        low = low & MurMurHashUtil.MASK_32
 
-    @staticmethod
-    def hash_unsigned(s: str | bytes) -> None:
-        if isinstance(s, str):
-            return MurMurHashUtil.read_unsigned_long(MurMurHashUtil.hash(s.encode()))
-        elif isinstance(s, bytes) or isinstance(s, bytearray):
-            return MurMurHashUtil.read_unsigned_long(MurMurHashUtil.hash(s))
-        return None
+        result = j8 | low
+
+        # Convert to signed 64-bit
+        if result > 0x7FFFFFFFFFFFFFFF:
+            result = result - 0x10000000000000000
+
+        return result
 
     @staticmethod
-    def long2bytes(value: int) -> bytes:
-        # Convert long to 8 bytes in little-endian order
-        result = bytearray(8)
-        for i in range(8):
-            result[7 - i] = (value >> (i * 8)) & 0xFF
-        return bytes(result)
+    def hash_string(s: str) -> int:
+        """Hash a string using UTF-8 encoding"""
+        return MurMurHashUtil.hash(s.encode("utf-8"))
 
     @staticmethod
     def read_unsigned_long(value: int) -> int:
+        """Convert to unsigned by masking with Long.MAX_VALUE"""
         return value & 0x7FFFFFFFFFFFFFFF
 
     @staticmethod
-    def hash_unsigned_list(long_list: list[int]):
-        byte_arr = b""
-        for i in range(len(long_list)):
-            if i == 0:
-                byte_arr = MurMurHashUtil.long2bytes(long_list[i])
-            else:
-                byte_arr += MurMurHashUtil.long2bytes(long_list[i])
+    def hash_unsigned(data) -> int:
+        """Get unsigned hash value
+        Can accept bytes or string
+        """
+        if isinstance(data, str):
+            hash_val = MurMurHashUtil.hash_string(data)
+        else:
+            hash_val = MurMurHashUtil.hash(data)
 
-        return MurMurHashUtil.read_unsigned_long(MurMurHashUtil.hash(byte_arr))
+        return MurMurHashUtil.read_unsigned_long(hash_val)
 
     @staticmethod
-    def hash_string(s: str):
-        return MurMurHashUtil.hash(s.encode())
+    def long_to_bytes(value: int) -> bytes:
+        """Convert long to bytes exactly as Java does:
+        1. Pack as big-endian (ByteBuffer default)
+        2. Reverse all bytes
+        """
+        if value < 0:
+            value = value & 0xFFFFFFFFFFFFFFFF
+
+        big_endian = struct.pack(">Q", value)
+        return big_endian[::-1]
+
+    @staticmethod
+    def hash_unsigned_list(values: list[int]) -> int:
+        """Hash a list of long values"""
+        data = b""
+
+        for val in values:
+            data += MurMurHashUtil.long_to_bytes(val)
+
+        hash_val = MurMurHashUtil.hash(data)
+        return MurMurHashUtil.read_unsigned_long(hash_val)

{pymammotion-0.5.34.dist-info → pymammotion-0.5.41.dist-info}/METADATA

@@ -1,34 +1,29 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pymammotion
-Version: 0.5.34
-Summary: 
-License: GPL-3.0
-Author: Michael Arthur
-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.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: aiohttp (>=3.9.1)
-Requires-Dist: alibabacloud-apigateway-util (>=0.0.2,<0.0.3)
-Requires-Dist: alibabacloud-iot-api-gateway (>=0.0.4,<0.0.5)
-Requires-Dist: alicloud-gateway-iot (>=1.0.0,<2.0.0)
-Requires-Dist: async-timeout (>=4.0.3,<5.0.0)
-Requires-Dist: betterproto2 (>=0.8.0,<0.9.0)
-Requires-Dist: bleak (>=0.21.0)
-Requires-Dist: bleak-retry-connector (>=3.5.0)
-Requires-Dist: crcmod (>=1.7,<2.0)
-Requires-Dist: cryptography (>=43.0.1)
-Requires-Dist: grpclib (>=0.4.8,<0.5.0)
-Requires-Dist: jsonic (>=1.0.0,<2.0.0)
-Requires-Dist: mashumaro (>=3.13,<4.0)
-Requires-Dist: numpy (>=1.26.0)
-Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: paho-mqtt (>=2.1.0,<3.0.0)
-Requires-Dist: protobuf (>=4.23.1)
-Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
+Version: 0.5.41
+Author: jLynx
+Author-email: Michael Arthur <michael@jumblesoft.co.nz>
+License-Expression: GPL-3.0
+License-File: LICENSE
+Requires-Python: <4.0,>=3.12
+Requires-Dist: aiohttp>=3.9.1
+Requires-Dist: alibabacloud-apigateway-util<0.0.3,>=0.0.2
+Requires-Dist: alibabacloud-iot-api-gateway<0.0.5,>=0.0.4
+Requires-Dist: alicloud-gateway-iot<2,>=1.0.0
+Requires-Dist: async-timeout<5,>=4.0.3
+Requires-Dist: betterproto2<0.9,>=0.8.0
+Requires-Dist: bleak-retry-connector>=3.5.0
+Requires-Dist: bleak>=0.21.0
+Requires-Dist: crcmod~=1.7
+Requires-Dist: cryptography>=43.0.1
+Requires-Dist: jsonic<2,>=1.0.0
+Requires-Dist: mashumaro~=3.13
+Requires-Dist: numpy>=1.26.0
+Requires-Dist: orjson<4,>=3.9.15
+Requires-Dist: paho-mqtt<3,>=2.1.0
+Requires-Dist: protobuf>=4.23.1
+Requires-Dist: py-jsonic<0.0.3,>=0.0.2
+Requires-Dist: pyjwt>=2.10.1
 Description-Content-Type: text/markdown
 
 # PyMammotion - Python API for Mammotion Mowers [![Discord](https://img.shields.io/discord/1247286396297678879)](https://discord.gg/vpZdWhJX8x)
@@ -97,4 +92,3 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 The trademarks "Mammotion," "Luba," and "Yuka" referenced herein are registered trademarks of their respective owners. The author of this software repository is not affiliated with, endorsed by, or connected to these trademark owners in any way.
 
-