bluetooth-sensor-state-data 1.6.2__tar.gz → 1.7.1__tar.gz

{bluetooth_sensor_state_data-1.6.2 → bluetooth_sensor_state_data-1.7.1}/PKG-INFO

@@ -1,21 +1,21 @@
 Metadata-Version: 2.1
 Name: bluetooth-sensor-state-data
-Version: 1.6.2
+Version: 1.7.1
 Summary: Models for storing and converting Bluetooth Sensor State Data
 Home-page: https://github.com/bluetooth-devices/bluetooth-sensor-state-data
-License: Apache Software License 2.0
 Author: J. Nick Koston
 Author-email: nick@koston.org
 Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
-Classifier: License :: Other/Proprietary License
+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: Topic :: Software Development :: Libraries
 Provides-Extra: docs
 Requires-Dist: Sphinx (>=5.0,<6.0) ; extra == "docs"

{bluetooth_sensor_state_data-1.6.2 → bluetooth_sensor_state_data-1.7.1}/pyproject.toml

@@ -1,9 +1,8 @@
 [tool.poetry]
 name = "bluetooth-sensor-state-data"
-version = "1.6.2"
+version = "1.7.1"
 description = "Models for storing and converting Bluetooth Sensor State Data"
 authors = ["J. Nick Koston <nick@koston.org>"]
-license = "Apache Software License 2.0"
 readme = "README.md"
 repository = "https://github.com/bluetooth-devices/bluetooth-sensor-state-data"
 documentation = "https://bluetooth-sensor-state-data.readthedocs.io"
@@ -13,6 +12,7 @@ classifiers = [
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Topic :: Software Development :: Libraries",
+    "License :: OSI Approved :: Apache Software License",
 ]
 packages = [
     { include = "bluetooth_sensor_state_data", from = "src" },

{bluetooth_sensor_state_data-1.6.2 → bluetooth_sensor_state_data-1.7.1}/src/bluetooth_sensor_state_data/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "1.6.2"
+__version__ = "1.7.1"
 
 from abc import abstractmethod
 
@@ -18,9 +18,7 @@ class BluetoothData(SensorData):
     def __init__(self) -> None:
         """Initialize the class."""
         super().__init__()
-        self._last_manufacturer_data_set_by_source: dict[
-            str, set[tuple[int, bytes]]
-        ] = {}
+        self._last_manufacturer_data_by_source: dict[str, dict[int, bytes]] = {}
 
     def changed_manufacturer_data(
         self, data: BluetoothServiceInfo, exclude_ids: set[int] | None = None
@@ -32,30 +30,27 @@ class BluetoothData(SensorData):
         """
         manufacturer_data = data.manufacturer_data
         source = data.source
+        last_manufacturer_data = self._last_manufacturer_data_by_source.get(source)
 
-        last_manufacturer_data_set = (
-            self._last_manufacturer_data_set_by_source.setdefault(source, set())
-        )
         if exclude_ids:
             # If there are specific manufacturer data IDs to exclude,
             # then remove them from the set of manufacturer data.
-            manufacturer_data_set = {
-                key_val
-                for key_val in manufacturer_data.items()
-                if key_val[0] not in exclude_ids
+            new_manufacturer_data = {
+                k: v for k, v in manufacturer_data.items() if k not in exclude_ids
             }
         else:
-            manufacturer_data_set = set(manufacturer_data.items())
-        self._last_manufacturer_data_set_by_source[source] = manufacturer_data_set
+            new_manufacturer_data = manufacturer_data
 
-        if not last_manufacturer_data_set:
+        self._last_manufacturer_data_by_source[source] = manufacturer_data
+
+        if not last_manufacturer_data:
             # If there is no previous data and there is only one value
             # return it
             return (
-                dict(manufacturer_data_set) if len(manufacturer_data_set) == 1 else {}
+                new_manufacturer_data.copy() if len(new_manufacturer_data) == 1 else {}
             )
 
-        return dict(manufacturer_data_set - last_manufacturer_data_set)
+        return dict(new_manufacturer_data.items() - last_manufacturer_data.items())
 
     @abstractmethod
     def _start_update(self, data: BluetoothServiceInfo) -> None: