sok-ble 0.1.6__py3-none-any.whl → 0.1.9a5__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,9 @@ from contextlib import asynccontextmanager
 from typing import AsyncIterator, Optional
 
 import async_timeout
-from bleak import BleakError
+from bleak.backends.characteristic import BleakGATTCharacteristic
 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
@@ -86,6 +87,15 @@ class SokBluetoothDevice:
                     self._ble_device.address,
                     err,
                 )
+                if client is not None:
+                    try:
+                        await asyncio.shield(client.disconnect())
+                    except (BleakError, asyncio.TimeoutError):
+                        logger.debug(
+                            "Failed to disconnect after connect error for %s",
+                            self._ble_device.address,
+                        )
+                    client = None
                 await asyncio.sleep(0.5)
         else:
             raise BLEConnectionError(
@@ -114,7 +124,7 @@ class SokBluetoothDevice:
 
                 queue: asyncio.Queue[bytes] = asyncio.Queue()
 
-                def handler(_: int, data: bytearray) -> None:
+                def handler(_: BleakGATTCharacteristic, data: bytearray) -> None:
                     queue.put_nowait(bytes(data))
 
                 await client.start_notify(UUID_RX, handler)
@@ -136,6 +146,10 @@ class SokBluetoothDevice:
                     await asyncio.sleep(0.2)
                     continue
                 raise
+        raise BleakError(
+            f"Failed to receive response 0x{expected:04X} "
+            f"from {self._ble_device.address}"
+        )
 
     async def async_update(self) -> None:
         """Poll the device for all telemetry and update attributes."""
@@ -180,13 +194,30 @@ class SokBluetoothDevice:
         parsed = SokParser.parse_all(responses)
         logger.debug("Parsed update: %s", parsed)
 
-        self.voltage = parsed["voltage"]
-        self.current = parsed["current"]
-        self.soc = parsed["soc"]
-        self.temperature = parsed["temperature"]
-        self.capacity = parsed["capacity"]
-        self.num_cycles = parsed["num_cycles"]
-        self.cell_voltages = parsed["cell_voltages"]
+        voltage = parsed.get("voltage")
+        self.voltage = voltage if isinstance(voltage, (int, float)) else None
+
+        current = parsed.get("current")
+        self.current = current if isinstance(current, (int, float)) else None
+
+        soc = parsed.get("soc")
+        self.soc = soc if isinstance(soc, int) else None
+
+        temperature = parsed.get("temperature")
+        self.temperature = (
+            temperature if isinstance(temperature, (int, float)) else None
+        )
+
+        capacity = parsed.get("capacity")
+        self.capacity = capacity if isinstance(capacity, (int, float)) else None
+
+        num_cycles = parsed.get("num_cycles")
+        self.num_cycles = num_cycles if isinstance(num_cycles, int) else None
+
+        cell_voltages = parsed.get("cell_voltages")
+        self.cell_voltages = (
+            list(cell_voltages) if isinstance(cell_voltages, list) else None
+        )
 
         self.num_samples += 1
 

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.6.dist-info → sok_ble-0.1.9a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sok-ble
-Version: 0.1.6
+Version: 0.1.9a5
 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
@@ -13,13 +13,14 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
 Requires-Dist: async-timeout>=4.0.3
-Requires-Dist: bleak-retry-connector>=3.9.0
-Requires-Dist: bleak>=0.22.3
+Requires-Dist: bleak-retry-connector>=4.4.3
+Requires-Dist: bleak>=1.0.1
 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.9a5.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=1_EsLxQbvFuqMNd8KuWJpo_2t0m9xKbmGvpdSM2XECQ,9460
+sok_ble/sok_parser.py,sha256=Wcn9oWVrHT1gLU7WB-3rUd2UpVfFwLz_gKQrDYE0H4M,4342
+sok_ble-0.1.9a5.dist-info/METADATA,sha256=1ONNyrSklbq4aOrmqOP2GWtP235FWdRPr6n1jDYj7YM,1592
+sok_ble-0.1.9a5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+sok_ble-0.1.9a5.dist-info/licenses/LICENSE,sha256=OoKRExpBDDpMbUut-KaARncGL5U8utex4D2ncZVtVF8,11346
+sok_ble-0.1.9a5.dist-info/RECORD,,

{sok_ble-0.1.6.dist-info → sok_ble-0.1.9a5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

sok_ble-0.1.6.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=Mu-DW15qwl5EKXL84Wi1KHEWFUZ-cHiTPNgz3hwNTfk,8200
-sok_ble/sok_parser.py,sha256=8yug65x3RdkLKbYlP-fEWiysaHByyenKV_gAzhIKeU0,4337
-sok_ble-0.1.6.dist-info/METADATA,sha256=QQu2sGiAFSZ2jMVWot8fm96KK1yRcxcDVusQh2TdGsQ,1490
-sok_ble-0.1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sok_ble-0.1.6.dist-info/licenses/LICENSE,sha256=OoKRExpBDDpMbUut-KaARncGL5U8utex4D2ncZVtVF8,11346
-sok_ble-0.1.6.dist-info/RECORD,,