python-mobius 0.10.1__py3-none-any.whl → 0.10.2__py3-none-any.whl

mobius/__init__.py

@@ -87,7 +87,7 @@ from .mob import (
     MAX_PUMP_PRIMITIVE_SIZE,
 )
 
-__version__ = "0.10.1"
+__version__ = "0.10.2"
 
 __all__ = [
     "__version__",

mobius/device.py

@@ -1842,7 +1842,7 @@ class MobiusDevice:
             return None
         return raw
 
-    async def discover_mesh_peers(self) -> list[MeshPeer]:
+    async def discover_mesh_peers(self, raise_errors: bool = False) -> list[MeshPeer]:
         """
         Mesh peers from the ShortAddressArray/SerialNumberArray/
         DeviceModelArray (3700/3701/3702) parallel arrays, with addresses
@@ -1852,10 +1852,12 @@ class MobiusDevice:
         UnsupportedAttribute and this returns []. Whether the connected
         device lists itself is not known. Empty slots (serial
         "00000000000000") and short entries are skipped. Returns [] on any
-        failure.
+        failure, or raises it with raise_errors=True.
         """
         own_address = await self.get_own_mesh_address()
         if own_address is None:
+            if raise_errors:
+                raise IOError("own mesh address (MeshLocalAddresses) not readable")
             return []
         prefix = mesh_local_prefix_from_own_address(own_address)
 
@@ -1864,6 +1866,8 @@ class MobiusDevice:
             models_raw = await self.get_attribute(C2Attribute.DeviceModelArray, index=0, count=ALL_ELEMENTS)
             shorts_raw = await self.get_attribute(C2Attribute.ShortAddressArray, index=0, count=ALL_ELEMENTS)
         except Exception:
+            if raise_errors:
+                raise
             return []
 
         peers: list[MeshPeer] = []
@@ -1882,7 +1886,7 @@ class MobiusDevice:
             ))
         return peers
 
-    async def discover_networked_thread_devices(self) -> list[MeshPeer]:
+    async def discover_networked_thread_devices(self, raise_errors: bool = False) -> list[MeshPeer]:
         """
         Every device on this device's Thread mesh, including itself, from
         MLPrefix (2128) and NetworkedThreadDevices (1001). Supported more
@@ -1896,7 +1900,8 @@ class MobiusDevice:
           12-13  model id, i16 LE
           14-27  serial, ASCII
         Empty slots are all zeros and are skipped, as are entries of any
-        other length. Returns [] on any failure.
+        other length. Returns [] on any failure, or raises it with
+        raise_errors=True.
         """
         try:
             mlprefix_raw = await self.get_attribute(C2Attribute.MLPrefix)
@@ -1904,8 +1909,15 @@ class MobiusDevice:
                 C2Attribute.NetworkedThreadDevices, index=0, count=ALL_ELEMENTS,
             )
         except Exception:
+            if raise_errors:
+                raise
             return []
         if not mlprefix_raw or len(mlprefix_raw[0]) != 24:
+            if raise_errors:
+                raise IOError(
+                    f"unexpected MLPrefix: {mlprefix_raw[0].hex() if mlprefix_raw else 'empty'} "
+                    f"(expected 24 bytes)"
+                )
             return []
         prefix = mesh_local_prefix_from_mlprefix(mlprefix_raw[0])
 
@@ -1928,18 +1940,35 @@ class MobiusDevice:
             ))
         return peers
 
-    async def discover_mesh_peers_auto(self) -> list[MeshPeer]:
+    async def discover_mesh_peers_auto(self, raise_errors: bool = False) -> list[MeshPeer]:
         """
         discover_networked_thread_devices(), falling back to
         discover_mesh_peers() when it finds nothing. The recommended entry
         point. mobius.discovery.discover_mesh_peers_via_direct_connect() is
         the remaining fallback, but it needs scan results and has to be
         called explicitly.
+
+        raise_errors=True: a failure raises instead of looking like an
+        empty mesh. The fallback is then only tried when
+        NetworkedThreadDevices can't be read (an MXM hub), and the error
+        raised names both attempts.
         """
-        peers = await self.discover_networked_thread_devices()
-        if peers:
-            return peers
-        return await self.discover_mesh_peers()
+        if not raise_errors:
+            peers = await self.discover_networked_thread_devices()
+            if peers:
+                return peers
+            return await self.discover_mesh_peers()
+
+        try:
+            return await self.discover_networked_thread_devices(raise_errors=True)
+        except Exception as networked_error:
+            try:
+                return await self.discover_mesh_peers(raise_errors=True)
+            except Exception as arrays_error:
+                raise IOError(
+                    f"NetworkedThreadDevices: {networked_error or type(networked_error).__name__}; "
+                    f"peer arrays: {arrays_error or type(arrays_error).__name__}"
+                ) from networked_error
 
     async def get_firmware_versions(self, model: Optional[Model] = None) -> dict:
         """{label: version} for every firmware component (FirmwareVersion,

{python_mobius-0.10.1.dist-info → python_mobius-0.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-mobius
-Version: 0.10.1
+Version: 0.10.2
 Summary: Reverse-engineered Python client for the Mobius BLE protocol (EcoTech Marine VorTech/Radion, AquaIllumination, Neptune Systems, NYOS)
 Project-URL: Homepage, https://code.r3pek.org/r3pek/python-mobius
 Project-URL: Documentation, https://code.r3pek.org/r3pek/python-mobius/src/branch/main/documentation

{python_mobius-0.10.1.dist-info → python_mobius-0.10.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
-mobius/__init__.py,sha256=eObxukBi0TREh8e0TD74L5CzOxSma-dPaj9YAB_8QAc,8555
+mobius/__init__.py,sha256=ownwnGpQ6cybzgLY8bzjmBG4D7JOQ1bw_m9hMPMdvA8,8555
 mobius/checksums.py,sha256=PB9RqvaZu9AqfT6tU6NI2qbbZXrqaHUnow3Qi_6UFHs,5191
 mobius/cli.py,sha256=tyft0SzbuLgbmzps-Ym1hCzcr6A9D5MsALkg6o4ynBs,57876
 mobius/coap.py,sha256=-XV3kI4q-JoL8r0oLFNnHAdZAc_yUP-aICagKh-qbf4,4862
 mobius/constants.py,sha256=pcG9Su_b81pmMA_GxR41lZz9UM9BjtV0T6nuslMICko,41138
 mobius/crc.py,sha256=LOCHZe3a1UnR5thdpZ4S4SFP8BdmoMEnhDNiNMd0iJI,2508
-mobius/device.py,sha256=tY4vSTiqHExwgfxQA2Z8FOGWS5RMUn1Zq6HAp0mdk-E,131600
+mobius/device.py,sha256=1awCx8TIzSFHHEnkGMbuItbpQtAt1DINdmSnLJqENWI,133014
 mobius/device_status.py,sha256=XclYijAknrgT8SdSW4XvyBemWHUQqw6UPE4tmwq6Yug,15658
 mobius/discovery.py,sha256=poNeXGekB44cpHOFbGyps9d4mwW_hJptmJODwSMTUSg,7176
 mobius/dump.py,sha256=eQBYoi8J6CxRd2ojgWK5QoB8z416oywLRTBnnh0pLwo,9253
@@ -19,8 +19,8 @@ mobius/relay.py,sha256=trGkWQSarwURF05gXHeb5jTJ9UvWbQGu8NarEP6sRqE,10107
 mobius/scenes.py,sha256=VLfDdTKSv3qTsBt2bJGg8iPtUkfNEmNgu0TTtYT6jJE,4274
 mobius/schedule.py,sha256=si9uJdYOj5vh6owuxxMyMyZRY0-tAmCPt3s6ROAeRww,13243
 mobius/timezone.py,sha256=Q7oPKtCdEYcEHXLx4lt-VPq6KH-MNgQwVnDtIXJV-kQ,2267
-python_mobius-0.10.1.dist-info/METADATA,sha256=B1lQHhsAB0OH_ViOqQChhl4_zJ1o496C73dFM8Cc8t4,5829
-python_mobius-0.10.1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-python_mobius-0.10.1.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
-python_mobius-0.10.1.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
-python_mobius-0.10.1.dist-info/RECORD,,
+python_mobius-0.10.2.dist-info/METADATA,sha256=O31L0MYu8ryhtqYYdQoXfTE9B23dqI4H2OJrWVH5EZI,5829
+python_mobius-0.10.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+python_mobius-0.10.2.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
+python_mobius-0.10.2.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
+python_mobius-0.10.2.dist-info/RECORD,,