bluetooth-sensor-state-data 1.7.2__tar.gz → 1.8.0__tar.gz

{bluetooth_sensor_state_data-1.7.2 → bluetooth_sensor_state_data-1.8.0}/PKG-INFO

@@ -1,26 +1,25 @@
 Metadata-Version: 2.3
 Name: bluetooth-sensor-state-data
-Version: 1.7.2
+Version: 1.8.0
 Summary: Models for storing and converting Bluetooth Sensor State Data
 License: Apache-2.0
 Author: J. Nick Koston
 Author-email: nick@koston.org
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Provides-Extra: docs
-Requires-Dist: Sphinx (>=5,<7) ; extra == "docs"
-Requires-Dist: home-assistant-bluetooth (>=1.3.0)
+Requires-Dist: Sphinx (>=5,<8) ; extra == "docs"
+Requires-Dist: bluetooth-data-tools (>=1.28.0)
+Requires-Dist: habluetooth (>=3.42.0)
 Requires-Dist: myst-parser (>=0.18,<3.1) ; extra == "docs"
 Requires-Dist: sensor-state-data (>=2.0)
 Requires-Dist: sphinx-rtd-theme (>=1,<4) ; extra == "docs"

{bluetooth_sensor_state_data-1.7.2 → bluetooth_sensor_state_data-1.8.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "bluetooth-sensor-state-data"
-version = "1.7.2"
+version = "1.8.0"
 license = "Apache-2.0"
 description = "Models for storing and converting Bluetooth Sensor State Data"
 authors = [{ name = "J. Nick Koston", email = "nick@koston.org" }]
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 dynamic = ["classifiers", "dependencies", "optional-dependencies"]
 
 [project.urls]
@@ -27,14 +27,15 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = ">=3.11,<3.14"
 
 # Documentation Dependencies
-Sphinx = {version = ">=5,<7", optional = true}
+Sphinx = {version = ">=5,<8", optional = true}
 sphinx-rtd-theme = {version = ">=1,<4", optional = true}
 myst-parser = {version = ">=0.18,<3.1", optional = true}
-home-assistant-bluetooth = ">=1.3.0"
 sensor-state-data = ">=2.0"
+bluetooth-data-tools = ">=1.28.0"
+habluetooth = ">=3.42.0"
 
 [tool.poetry.extras]
 docs = [
@@ -45,12 +46,13 @@ docs = [
 
 [tool.poetry.dev-dependencies]
 pytest = "^8.3"
-pytest-cov = "^6.0"
+pytest-cov = "^6.1"
+
 
 [tool.semantic_release]
 branch = "main"
-version_toml = "pyproject.toml:project.version"
-version_variable = "src/bluetooth_sensor_state_data/__init__.py:__version__"
+version_toml = ["pyproject.toml:project.version"]
+version_variables = ["src/bluetooth_sensor_state_data/__init__.py:__version__"]
 build_command = "pip install poetry && poetry build"
 
 [tool.pytest.ini_options]

{bluetooth_sensor_state_data-1.7.2 → bluetooth_sensor_state_data-1.8.0}/src/bluetooth_sensor_state_data/__init__.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
-__version__ = "1.7.2"
+__version__ = "1.8.0"
 
 from abc import abstractmethod
 
-from home_assistant_bluetooth import BluetoothServiceInfo
+from bluetooth_data_tools import parse_advertisement_data_bytes
+from habluetooth import BluetoothServiceInfo, BluetoothServiceInfoBleak
 from sensor_state_data import DeviceClass, SensorData, SensorUpdate, Units
 
 SIGNAL_STRENGTH_KEY = DeviceClass.SIGNAL_STRENGTH.value
@@ -21,13 +22,30 @@ class BluetoothData(SensorData):
         self._last_manufacturer_data_by_source: dict[str, dict[int, bytes]] = {}
 
     def changed_manufacturer_data(
-        self, data: BluetoothServiceInfo, exclude_ids: set[int] | None = None
+        self,
+        data: BluetoothServiceInfo | BluetoothServiceInfoBleak,
+        exclude_ids: set[int] | None = None,
     ) -> dict[int, bytes]:
         """Find changed manufacturer data.
 
         This function is not re-entrant. It must only
         be called once per update.
         """
+        if hasattr(data, "raw") and data.raw:
+            # If we have the raw data we don't need to work out
+            # which one is the newest.
+            _, _, _, changed_manufacturer_data, _ = parse_advertisement_data_bytes(
+                data.raw
+            )
+            if exclude_ids:
+                # If there are specific manufacturer data IDs to exclude,
+                # then remove them from the set of manufacturer data.
+                return {
+                    k: v
+                    for k, v in changed_manufacturer_data.items()
+                    if k not in exclude_ids
+                }
+            return changed_manufacturer_data
         manufacturer_data = data.manufacturer_data
         source = data.source
         last_manufacturer_data = self._last_manufacturer_data_by_source.get(source)
@@ -53,15 +71,19 @@ class BluetoothData(SensorData):
         return dict(new_manufacturer_data.items() - last_manufacturer_data.items())
 
     @abstractmethod
-    def _start_update(self, data: BluetoothServiceInfo) -> None:
+    def _start_update(
+        self, data: BluetoothServiceInfo | BluetoothServiceInfoBleak
+    ) -> None:
         """Update the data."""
 
-    def supported(self, data: BluetoothServiceInfo) -> bool:
+    def supported(self, data: BluetoothServiceInfo | BluetoothServiceInfoBleak) -> bool:
         """Return True if the device is supported."""
         self._start_update(data)
         return bool(self._device_id_to_type)
 
-    def update(self, data: BluetoothServiceInfo) -> SensorUpdate:
+    def update(
+        self, data: BluetoothServiceInfo | BluetoothServiceInfoBleak
+    ) -> SensorUpdate:
         """Update a device."""
         # Ensure events from previous
         # updates are not carried over