Merge branch 'main' into koan/cache-human-readable-name

Author: bdraco

bench/test_calculate_distance_meters.py

@@ -0,0 +1,22 @@
+from bluetooth_data_tools import calculate_distance_meters
+
+_CLOSE_POWER = -4
+_CLOSE_RSSI = -3
+
+_FAR_POWER = -59
+_FAR_RSSI = -60
+
+_ZERO_POWER = 59
+_ZERO_RSSI = 0
+
+
+def test_calculate_distance_meters_close(benchmark):
+    benchmark(lambda: calculate_distance_meters(_CLOSE_POWER, _CLOSE_RSSI))
+
+
+def test_calculate_distance_meters_far(benchmark):
+    benchmark(lambda: calculate_distance_meters(_FAR_POWER, _FAR_RSSI))
+
+
+def test_calculate_distance_meters_zero(benchmark):
+    benchmark(lambda: calculate_distance_meters(_ZERO_POWER, _ZERO_RSSI))

bench/test_human_readable_name.py

@@ -0,0 +1,13 @@
+from bluetooth_data_tools import human_readable_name
+
+_NAME = "Living Room Sensor"
+_LOCAL_NAME = "RZSS"
+_ADDRESS = "AA:BB:CC:DD:EE:FF"
+
+
+def test_human_readable_name_with_name(benchmark):
+    benchmark(lambda: human_readable_name(_NAME, _LOCAL_NAME, _ADDRESS))
+
+
+def test_human_readable_name_local_only(benchmark):
+    benchmark(lambda: human_readable_name(None, _LOCAL_NAME, _ADDRESS))

bench/test_parse_gap.py

@@ -1,4 +1,5 @@
 from bluetooth_data_tools import parse_advertisement_data
+from bluetooth_data_tools.gap import _parse_advertisement_data
 
 #  cythonize -X language_level=3 -a -i  src/bluetooth_data_tools/gap.py
 
@@ -83,3 +84,14 @@
 
 def test_parse_advertisement_data(benchmark):
     benchmark(lambda: parse_advertisement_data(advs))
+
+
+def test_parse_advertisement_data_bytes_cache_fallthrough(benchmark):
+    advs_as_single_tuple = (b"".join(advs),)
+    parse_advertisement_data(advs_as_single_tuple)
+
+    def run():
+        _parse_advertisement_data.cache_clear()
+        parse_advertisement_data(advs_as_single_tuple)
+
+    benchmark(run)

bench/test_uint128_bytes_as_uuid.py

@@ -0,0 +1,15 @@
+from bluetooth_data_tools.gap import _uint128_bytes_as_uuid
+
+_UUID_BYTES = bytes(range(16))
+
+
+def test_uint128_bytes_as_uuid_cached(benchmark):
+    benchmark(lambda: _uint128_bytes_as_uuid(_UUID_BYTES))
+
+
+def test_uint128_bytes_as_uuid_uncached(benchmark):
+    def run():
+        _uint128_bytes_as_uuid.cache_clear()
+        _uint128_bytes_as_uuid(_UUID_BYTES)
+
+    benchmark(run)

docs/conf.py

@@ -7,7 +7,7 @@
 project = "bluetooth-data-tools"
 copyright = "2023, J. Nick Koston"
 author = "J. Nick Koston"
-release = "1.29.15"
+release = "1.29.16"
 
 # General configuration
 extensions = [

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "bluetooth-data-tools"
-version = "1.29.15"
+version = "1.29.16"
 license = "Apache-2.0"
 description = "Tools for converting bluetooth data and packets"
 authors = [{ name = "J. Nick Koston", email = "nick@koston.org" }]

src/bluetooth_data_tools/__init__.py

@@ -21,7 +21,7 @@
     short_address,
 )
 
-__version__ = "1.29.15"
+__version__ = "1.29.16"
 
 
 __all__ = [

src/bluetooth_data_tools/gap.pxd

@@ -7,9 +7,6 @@ cdef dict _EMPTY_MANUFACTURER_DATA
 cdef dict _EMPTY_SERVICE_DATA
 cdef list _EMPTY_SERVICE_UUIDS
 
-cdef object from_bytes
-cdef object from_bytes_little
-
 cdef object _cached_uint16_int_as_uuid
 cdef object _cached_uint32_int_as_uuid
 cdef object _cached_uint128_bytes_as_uuid

src/bluetooth_data_tools/gap.py

@@ -3,7 +3,7 @@
 import logging
 from collections.abc import Iterable
 from enum import IntEnum
-from functools import lru_cache, partial
+from functools import lru_cache
 from typing import TYPE_CHECKING
 
 BLE_UUID = "0000-1000-8000-00805f9b34fb"
@@ -75,9 +75,6 @@ class BLEGAPType(IntEnum):
     TYPE_MANUFACTURER_SPECIFIC_DATA = 0xFF
 
 
-from_bytes = int.from_bytes
-from_bytes_little = partial(from_bytes, byteorder="little")
-
 # Signed-fold constants for the one-byte TX Power Level decode.
 # A uint8 value at or above _INT8_SIGN_THRESHOLD is negative when interpreted
 # as int8, and recovers its signed value via subtraction of _INT8_RANGE.
@@ -113,9 +110,11 @@ class BLEGAPType(IntEnum):
 
 @lru_cache(maxsize=256)
 def _uint128_bytes_as_uuid(uint128_bytes: bytes_) -> str:
-    """Convert an integer to a UUID str."""
-    int_value = from_bytes_little(uint128_bytes)
-    hex = f"{int_value:032x}"
+    """Convert 16 little-endian bytes to a canonical UUID str."""
+    # bytes.hex() is a single C call; reversing the 16-byte slice yields the
+    # big-endian hex form directly, skipping the int.from_bytes + format-spec
+    # round-trip used previously (~40% faster on the cache-miss path).
+    hex = uint128_bytes[::-1].hex()
     return f"{hex[:8]}-{hex[8:12]}-{hex[12:16]}-{hex[16:20]}-{hex[20:]}"
 
 

tests/benchmarks/test_calculate_distance_meters.py

@@ -0,0 +1,27 @@
+from pytest_codspeed import BenchmarkFixture
+
+from bluetooth_data_tools import calculate_distance_meters
+
+# Close: ratio < 1, takes the pow(ratio, 10) branch.
+_CLOSE_POWER = -4
+_CLOSE_RSSI = -3
+
+# Far: ratio > 1, takes the 0.89976 * pow(ratio, 7.7095) + 0.111 branch.
+_FAR_POWER = -59
+_FAR_RSSI = -60
+
+# Zero rssi short circuits to None before any pow call.
+_ZERO_POWER = 59
+_ZERO_RSSI = 0
+
+
+def test_calculate_distance_meters_close(benchmark: BenchmarkFixture) -> None:
+    benchmark(lambda: calculate_distance_meters(_CLOSE_POWER, _CLOSE_RSSI))
+
+
+def test_calculate_distance_meters_far(benchmark: BenchmarkFixture) -> None:
+    benchmark(lambda: calculate_distance_meters(_FAR_POWER, _FAR_RSSI))
+
+
+def test_calculate_distance_meters_zero(benchmark: BenchmarkFixture) -> None:
+    benchmark(lambda: calculate_distance_meters(_ZERO_POWER, _ZERO_RSSI))