sok-ble 0.1.5__py3-none-any.whl → 0.1.8__py3-none-any.whl

sok_ble/exceptions.py

@@ -8,4 +8,3 @@ class BLEConnectionError(SokError):
 
 class InvalidResponseError(SokError):
     """Raised when an invalid response is received."""
-

sok_ble/sok_bluetooth_device.py

@@ -10,8 +10,8 @@ from contextlib import asynccontextmanager
 from typing import AsyncIterator, Optional
 
 import async_timeout
-from bleak import BleakError
 from bleak.backends.device import BLEDevice
+from bleak.exc import BleakError
 
 from sok_ble.const import UUID_RX, UUID_TX, _sok_command
 from sok_ble.exceptions import BLEConnectionError
@@ -26,6 +26,7 @@ try:
     )
 except Exception:  # pragma: no cover - optional dependency
     from bleak import BleakClient as BleakClientWithServiceCache
+
     establish_connection = None  # type: ignore[misc]
 
 
@@ -54,6 +55,8 @@ class SokBluetoothDevice:
         """Connect to the device and yield a BLE client."""
         logger.debug("Connecting to %s", self._ble_device.address)
         last_err: Exception | None = None
+        client: BleakClientWithServiceCache | None = None
+
         for attempt in range(3):
             try:
                 if establish_connection:
@@ -65,7 +68,8 @@ class SokBluetoothDevice:
                     )
                 else:
                     client = BleakClientWithServiceCache(
-                        self._ble_device, adapter=self._adapter
+                        self._ble_device,
+                        adapter=self._adapter,
                     )
                     await client.connect()
 
@@ -73,15 +77,7 @@ class SokBluetoothDevice:
                 async with async_timeout.timeout(5):
                     _ = client.services
                 await asyncio.sleep(0.15)
-
-                try:
-                    yield client
-                finally:
-                    await client.disconnect()
-                    logger.debug(
-                        "Disconnected from %s", self._ble_device.address
-                    )
-                return
+                break
             except (BleakError, asyncio.TimeoutError) as err:
                 last_err = err
                 logger.debug(
@@ -91,10 +87,17 @@ class SokBluetoothDevice:
                     err,
                 )
                 await asyncio.sleep(0.5)
-
-        raise BLEConnectionError(
-            f"Unable to establish GATT connection to {self._ble_device.address}"
-        ) from last_err
+        else:
+            raise BLEConnectionError(
+                f"Unable to establish GATT connection to {self._ble_device.address}"
+            ) from last_err
+
+        assert client is not None
+        try:
+            yield client
+        finally:
+            await client.disconnect()
+            logger.debug("Disconnected from %s", self._ble_device.address)
 
     async def _send_command(
         self, client: BleakClientWithServiceCache, cmd: int, expected: int

sok_ble/sok_parser.py

@@ -14,19 +14,20 @@ logger = logging.getLogger(__name__)
 
 # Endian helper functions copied from the reference addon
 
+
 def get_le_short(data: Sequence[int] | bytes | bytearray, offset: int) -> int:
     """Read a little-endian signed short."""
-    return struct.unpack_from('<h', bytes(data), offset)[0]
+    return struct.unpack_from("<h", bytes(data), offset)[0]
 
 
 def get_le_ushort(data: Sequence[int] | bytes | bytearray, offset: int) -> int:
     """Read a little-endian unsigned short."""
-    return struct.unpack_from('<H', bytes(data), offset)[0]
+    return struct.unpack_from("<H", bytes(data), offset)[0]
 
 
 def get_le_int3(data: Sequence[int] | bytes | bytearray, offset: int) -> int:
     """Read a 3-byte little-endian signed integer."""
-    b0, b1, b2 = bytes(data)[offset:offset + 3]
+    b0, b1, b2 = bytes(data)[offset : offset + 3]
     val = b0 | (b1 << 8) | (b2 << 16)
     if val & 0x800000:
         val -= 0x1000000
@@ -35,7 +36,7 @@ def get_le_int3(data: Sequence[int] | bytes | bytearray, offset: int) -> int:
 
 def get_be_uint3(data: Sequence[int] | bytes | bytearray, offset: int) -> int:
     """Read a 3-byte big-endian unsigned integer."""
-    b0, b1, b2 = bytes(data)[offset:offset + 3]
+    b0, b1, b2 = bytes(data)[offset : offset + 3]
     return (b0 << 16) | (b1 << 8) | b2
 
 

{sok_ble-0.1.5.dist-info → sok_ble-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sok-ble
-Version: 0.1.5
+Version: 0.1.8
 Summary: SOK BLE battery interface library
 Project-URL: Homepage, https://github.com/IAmTheMitchell/sok-ble
 Project-URL: Bug Tracker, https://github.com/IAmTheMitchell/sok-ble/issues
@@ -19,7 +19,8 @@ Description-Content-Type: text/markdown
 
 # SOK BLE
 
-![CI](https://github.com/IAmTheMitchell/sok-ble/actions/workflows/ci.yml/badge.svg)
+![Tests](https://github.com/IAmTheMitchell/sok-ble/actions/workflows/test.yml/badge.svg)
+![Release](https://github.com/IAmTheMitchell/sok-ble/actions/workflows/release.yml/badge.svg)
 
 Python library for interacting with SOK Bluetooth-enabled batteries.
 
@@ -42,5 +43,6 @@ asyncio.run(main())
 ```
 
 ## References
+
 [@zuccaro's comment](https://github.com/Louisvdw/dbus-serialbattery/issues/350#issuecomment-1500658941)
-[Bluetooth-Devices/inkbird-ble](https://github.com/Bluetooth-Devices/inkbird-ble)
+[Bluetooth-Devices/inkbird-ble](https://github.com/Bluetooth-Devices/inkbird-ble)

sok_ble-0.1.8.dist-info/RECORD

@@ -0,0 +1,9 @@
+sok_ble/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sok_ble/const.py,sha256=mHtJTbWz_dG3v1lhZrLDzMf-QAG9v5QWlHU9ZKsyYdg,998
+sok_ble/exceptions.py,sha256=_4Fyb-2Ncct2RGjLe1em2M7_e5QcmjVJ92KxtAsbZlk,246
+sok_ble/sok_bluetooth_device.py,sha256=H2FLNtMDe-jfMxao21WAft2myErTnuZvRFsRgB7dqms,8204
+sok_ble/sok_parser.py,sha256=Wcn9oWVrHT1gLU7WB-3rUd2UpVfFwLz_gKQrDYE0H4M,4342
+sok_ble-0.1.8.dist-info/METADATA,sha256=v-Pzb7-hx_p2rI6Uo8izRQiObH36XdSDkBHbZA8c0OI,1591
+sok_ble-0.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sok_ble-0.1.8.dist-info/licenses/LICENSE,sha256=OoKRExpBDDpMbUut-KaARncGL5U8utex4D2ncZVtVF8,11346
+sok_ble-0.1.8.dist-info/RECORD,,

sok_ble-0.1.5.dist-info/RECORD

@@ -1,9 +0,0 @@
-sok_ble/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sok_ble/const.py,sha256=mHtJTbWz_dG3v1lhZrLDzMf-QAG9v5QWlHU9ZKsyYdg,998
-sok_ble/exceptions.py,sha256=7H1yUqqnrKyi3LwxRCMF7RkuGp_rgdy9j35nrMOgz44,247
-sok_ble/sok_bluetooth_device.py,sha256=agF3lfbkCiMRNrsa3MW7lAEC2njEguum0NnbhdhWntk,8143
-sok_ble/sok_parser.py,sha256=8yug65x3RdkLKbYlP-fEWiysaHByyenKV_gAzhIKeU0,4337
-sok_ble-0.1.5.dist-info/METADATA,sha256=t8cQVUp3wTjxOpZfLH2VQTx-inVP0YYdJgXKc0utC9U,1490
-sok_ble-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sok_ble-0.1.5.dist-info/licenses/LICENSE,sha256=OoKRExpBDDpMbUut-KaARncGL5U8utex4D2ncZVtVF8,11346
-sok_ble-0.1.5.dist-info/RECORD,,