blueair-api 1.22.0__tar.gz → 1.23.0__tar.gz

{blueair_api-1.22.0 → blueair_api-1.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blueair_api
-Version: 1.22.0
+Version: 1.23.0
 Summary: Blueair Api Wrapper
 Author-email: Brendan Dahl <dahl.brendan@gmail.com>
 Project-URL: Homepage, https://github.com/dahlb/blueair_api

{blueair_api-1.22.0 → blueair_api-1.23.0}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "blueair_api"
-version = "1.22.0"
+version = "1.23.0"
 authors = [
   { name="Brendan Dahl", email="dahl.brendan@gmail.com" },
 ]

{blueair_api-1.22.0 → blueair_api-1.23.0}/src/blueair_api/device.py

@@ -3,6 +3,7 @@ import logging
 
 from .callbacks import CallbacksMixin
 from .http_blueair import HttpBlueair
+from .util import transform_data_points, safely_get_json_value
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -51,11 +52,18 @@ class Device(CallbacksMixin):
     filter_expired: bool | None = None
     wifi_working: bool | None = None
 
+    pm1: int | None = None
+    pm10: int | None = None
+    pm25: int | None = None
+    voc: int | None = None
+    co2: int | None = None
+    temperature: float | None = None
+    humidity: float | None = None
+    all_pollution: float | None = None
+
     async def refresh(self):
         _LOGGER.debug("Requesting current attributes...")
         attributes = await self.api.get_attributes(self.uuid)
-        _data_points = await self.api.get_current_data_point(self.uuid)
-        _data_points2 = await self.api.get_data_points_since(self.uuid)
         _LOGGER.debug(f"result: {attributes}")
         if "brightness" in attributes:
             self.brightness = int(attributes["brightness"])
@@ -73,6 +81,16 @@ class Device(CallbacksMixin):
             self.wifi_working = attributes["wifi_status"] == "1"
         else:
             self.wifi_working = False
+        for data_point in transform_data_points(await self.api.get_data_points_since(self.uuid)):
+            _LOGGER.debug(data_point)
+            self.pm25 = safely_get_json_value(data_point, "pm25", int)
+            self.pm10 = safely_get_json_value(data_point, "pm10", int)
+            self.pm1 = safely_get_json_value(data_point, "pm1", int)
+            self.voc = safely_get_json_value(data_point, "voc", int)
+            self.co2 = safely_get_json_value(data_point, "co2", int)
+            self.temperature = safely_get_json_value(data_point, "temperature", int)
+            self.humidity = safely_get_json_value(data_point, "humidity", int)
+            self.all_pollution = safely_get_json_value(data_point, "all_pollution", int)
         _LOGGER.debug(f"refreshed blueair device: {self}")
         self.publish_updates()
 

{blueair_api-1.22.0 → blueair_api-1.23.0}/src/blueair_api/http_blueair.py

@@ -186,7 +186,7 @@ class HttpBlueair:
         available device information.
 
         Note: the data for this API call is only updated once every 5 minutes.
-        Calling it more often will return the same respone from the server and
+        Calling it more often will return the same response from the server and
         should be avoided to limit server load.
         """
         url = f"https://{await self.get_home_host()}/v2/device/{device_uuid}/datapoint/0/last/0/"
@@ -209,7 +209,7 @@ class HttpBlueair:
         together. The minimum sample period size is 300 (5 minutes).
 
         Note: the data for the most recent data point is only updated once
-        every 5 minutes.  Calling it more often will return the same respone
+        every 5 minutes.  Calling it more often will return the same response
         from the server and should be avoided to limit server load.
         """
         url = f"https://{await self.get_home_host()}/v2/device/{device_uuid}/datapoint/{seconds_ago}/last/{sample_period}/"

{blueair_api-1.22.0 → blueair_api-1.23.0}/src/blueair_api/util.py

@@ -51,3 +51,22 @@ def safely_get_json_value(json, key, callable_to_cast=None):
     if callable_to_cast is not None and value is not None:
         value = callable_to_cast(value)
     return value
+
+
+def transform_data_points(data):
+    """Transform a measurement list response from the Blueair API to a more pythonic data structure."""
+    key_mapping = {
+        "time": "timestamp",
+        "pm": "pm25",
+        "pm1": "pm1",
+        "pm10": "pm10",
+        "tmp": "temperature",
+        "hum": "humidity",
+        "co2": "co2",
+        "voc": "voc",
+        "allpollu": "all_pollution",
+    }
+
+    keys = [key_mapping[key] for key in data["sensors"]]
+
+    return [dict(zip(keys, values)) for values in data["datapoints"]]

{blueair_api-1.22.0 → blueair_api-1.23.0}/src/blueair_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blueair_api
-Version: 1.22.0
+Version: 1.23.0
 Summary: Blueair Api Wrapper
 Author-email: Brendan Dahl <dahl.brendan@gmail.com>
 Project-URL: Homepage, https://github.com/dahlb/blueair_api