bluetooth-sensor-state-data 1.6.1__tar.gz → 1.7.0__tar.gz

{bluetooth_sensor_state_data-1.6.1 → bluetooth_sensor_state_data-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bluetooth-sensor-state-data
-Version: 1.6.1
+Version: 1.7.0
 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
@@ -16,6 +16,7 @@ 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.1 → bluetooth_sensor_state_data-1.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bluetooth-sensor-state-data"
-version = "1.6.1"
+version = "1.7.0"
 description = "Models for storing and converting Bluetooth Sensor State Data"
 authors = ["J. Nick Koston <nick@koston.org>"]
 license = "Apache Software License 2.0"

{bluetooth_sensor_state_data-1.6.1 → bluetooth_sensor_state_data-1.7.0}/src/bluetooth_sensor_state_data/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "1.6.1"
+__version__ = "1.7.0"
 
 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:
@@ -68,6 +63,10 @@ class BluetoothData(SensorData):
 
     def update(self, data: BluetoothServiceInfo) -> SensorUpdate:
         """Update a device."""
+        # Ensure events from previous
+        # updates are not carried over
+        # as events are transient.
+        self._events_updates.clear()
         self._start_update(data)
         self.update_signal_strength(data.rssi)
         return self._finish_update()

bluetooth_sensor_state_data-1.6.1/setup.py

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-package_dir = \
-{'': 'src'}
-
-packages = \
-['bluetooth_sensor_state_data']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['home-assistant-bluetooth>=1.3.0', 'sensor-state-data>=2.0']
-
-extras_require = \
-{'docs': ['Sphinx>=5.0,<6.0',
-          'sphinx-rtd-theme>=1.0,<2.0',
-          'myst-parser>=0.18,<0.19']}
-
-setup_kwargs = {
-    'name': 'bluetooth-sensor-state-data',
-    'version': '1.6.1',
-    'description': 'Models for storing and converting Bluetooth Sensor State Data',
-    'long_description': '# bluetooth-sensor-state-data\n\n<p align="center">\n  <a href="https://github.com/bluetooth-devices/bluetooth-sensor-state-data/actions?query=workflow%3ACI">\n    <img src="https://img.shields.io/github/workflow/status/bluetooth-devices/bluetooth-sensor-state-data/CI/main?label=CI&logo=github&style=flat-square" alt="CI Status" >\n  </a>\n  <a href="https://bluetooth-sensor-state-data.readthedocs.io">\n    <img src="https://img.shields.io/readthedocs/bluetooth-sensor-state-data.svg?logo=read-the-docs&logoColor=fff&style=flat-square" alt="Documentation Status">\n  </a>\n  <a href="https://codecov.io/gh/bluetooth-devices/bluetooth-sensor-state-data">\n    <img src="https://img.shields.io/codecov/c/github/bluetooth-devices/bluetooth-sensor-state-data.svg?logo=codecov&logoColor=fff&style=flat-square" alt="Test coverage percentage">\n  </a>\n</p>\n<p align="center">\n  <a href="https://python-poetry.org/">\n    <img src="https://img.shields.io/badge/packaging-poetry-299bd7?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAASCAYAAABrXO8xAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAJJSURBVHgBfZLPa1NBEMe/s7tNXoxW1KJQKaUHkXhQvHgW6UHQQ09CBS/6V3hKc/AP8CqCrUcpmop3Cx48eDB4yEECjVQrlZb80CRN8t6OM/teagVxYZi38+Yz853dJbzoMV3MM8cJUcLMSUKIE8AzQ2PieZzFxEJOHMOgMQQ+dUgSAckNXhapU/NMhDSWLs1B24A8sO1xrN4NECkcAC9ASkiIJc6k5TRiUDPhnyMMdhKc+Zx19l6SgyeW76BEONY9exVQMzKExGKwwPsCzza7KGSSWRWEQhyEaDXp6ZHEr416ygbiKYOd7TEWvvcQIeusHYMJGhTwF9y7sGnSwaWyFAiyoxzqW0PM/RjghPxF2pWReAowTEXnDh0xgcLs8l2YQmOrj3N7ByiqEoH0cARs4u78WgAVkoEDIDoOi3AkcLOHU60RIg5wC4ZuTC7FaHKQm8Hq1fQuSOBvX/sodmNJSB5geaF5CPIkUeecdMxieoRO5jz9bheL6/tXjrwCyX/UYBUcjCaWHljx1xiX6z9xEjkYAzbGVnB8pvLmyXm9ep+W8CmsSHQQY77Zx1zboxAV0w7ybMhQmfqdmmw3nEp1I0Z+FGO6M8LZdoyZnuzzBdjISicKRnpxzI9fPb+0oYXsNdyi+d3h9bm9MWYHFtPeIZfLwzmFDKy1ai3p+PDls1Llz4yyFpferxjnyjJDSEy9CaCx5m2cJPerq6Xm34eTrZt3PqxYO1XOwDYZrFlH1fWnpU38Y9HRze3lj0vOujZcXKuuXm3jP+s3KbZVra7y2EAAAAAASUVORK5CYII=" alt="Poetry">\n  </a>\n  <a href="https://github.com/ambv/black">\n    <img src="https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square" alt="black">\n  </a>\n  <a href="https://github.com/pre-commit/pre-commit">\n    <img src="https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white&style=flat-square" alt="pre-commit">\n  </a>\n</p>\n<p align="center">\n  <a href="https://pypi.org/project/bluetooth-sensor-state-data/">\n    <img src="https://img.shields.io/pypi/v/bluetooth-sensor-state-data.svg?logo=python&logoColor=fff&style=flat-square" alt="PyPI Version">\n  </a>\n  <img src="https://img.shields.io/pypi/pyversions/bluetooth-sensor-state-data.svg?style=flat-square&logo=python&amp;logoColor=fff" alt="Supported Python versions">\n  <img src="https://img.shields.io/pypi/l/bluetooth-sensor-state-data.svg?style=flat-square" alt="License">\n</p>\n\nModels for storing and converting Bluetooth Sensor State Data\n\n## Installation\n\nInstall this via pip (or your favourite package manager):\n\n`pip install bluetooth-sensor-state-data`\n\n## Contributors ✨\n\nThanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):\n\n<!-- prettier-ignore-start -->\n<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->\n<!-- markdownlint-disable -->\n<!-- markdownlint-enable -->\n<!-- ALL-CONTRIBUTORS-LIST:END -->\n<!-- prettier-ignore-end -->\n\nThis project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!\n\n## Credits\n\nThis package was created with\n[Cookiecutter](https://github.com/audreyr/cookiecutter) and the\n[browniebroke/cookiecutter-pypackage](https://github.com/browniebroke/cookiecutter-pypackage)\nproject template.\n',
-    'author': 'J. Nick Koston',
-    'author_email': 'nick@koston.org',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'https://github.com/bluetooth-devices/bluetooth-sensor-state-data',
-    'package_dir': package_dir,
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'extras_require': extras_require,
-    'python_requires': '>=3.9,<4.0',
-}
-
-
-setup(**setup_kwargs)