blueair-api 1.22.0__py3-none-any.whl → 1.23.0__py3-none-any.whl

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/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/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.dist-info → blueair_api-1.23.0.dist-info}/METADATA

@@ -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.dist-info → blueair_api-1.23.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
 blueair_api/__init__.py,sha256=GucsIENhTF4AVxPn4Xyr4imUxJJ8RO8RYt1opHCF2hQ,326
 blueair_api/callbacks.py,sha256=eqgfe1qN_NNWOp2qNSP123zQJxh_Ie6vZXp5EHp6ePc,757
 blueair_api/const.py,sha256=fRth29dQT1dguM7L4ij8pDefB_vBrevAHqTdfNvSugs,1048
-blueair_api/device.py,sha256=EiVEKmt0UJX_CcxBlBDADy55j-ormykXnRt5BMch0vs,2780
+blueair_api/device.py,sha256=XhEfo2qb3WHN_6c67ZSXMnzToZesh6pyGnCGa2uTncU,3685
 blueair_api/device_aws.py,sha256=tqrpUyrgsuTa6eu_Q9ycqJj41HH2NgDuq6T5amU25V0,5871
 blueair_api/errors.py,sha256=lJ_iFU_W6zQfGRi_wsMhWDw-fAVPFeCkCbT1erIlYQQ,233
 blueair_api/http_aws_blueair.py,sha256=m_qoCFOYICCu_U_maBvkmOha3YmNtxxtPYyapVBGKNc,17821
-blueair_api/http_blueair.py,sha256=Hs6U3SwO7gLgzoa55vWDaTLbw463kaS2VvGLSmAVJrQ,9409
+blueair_api/http_blueair.py,sha256=n9F5fvEROIyAkqDMM22l84PB7ZoeEkWbj2YuCZpeDNg,9411
 blueair_api/model_enum.py,sha256=C42DpLsHO2QLez-qfrFHZnr9QaNPPcnsISm4SoRnvoY,2194
 blueair_api/stub.py,sha256=sTWyRSDObzrXpZToAgDmZhCk3q8SsGN35h-kzMOqSOc,1272
-blueair_api/util.py,sha256=3L9-vfHfN1vUBYU0BA9ruYyNPUTmS21D-uI-Jyo5x6U,1672
+blueair_api/util.py,sha256=4g8dTlxawBYKslOJS7WCWss0670mtUc53c3L8NiPTsM,2201
 blueair_api/util_bootstrap.py,sha256=Vewg7mT1qSRgzOOJDrpXrVhGwcFPRnMrqhJVSIB-0AA,1688
 blueair_api/util_http.py,sha256=45AJG3Vb6LMVzI0WV22AoSyt64f_Jj3KpOAwF5M6EFE,1327
-blueair_api-1.22.0.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
-blueair_api-1.22.0.dist-info/METADATA,sha256=dSLlzi10TPJhi17iP75kL9Dchq1iaYfrCV4FPf2-8ME,1995
-blueair_api-1.22.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-blueair_api-1.22.0.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
-blueair_api-1.22.0.dist-info/RECORD,,
+blueair_api-1.23.0.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
+blueair_api-1.23.0.dist-info/METADATA,sha256=hr1z37I41YsNcIw4IhoW1KDj9_CSmVRN-iPjKT5fHW0,1995
+blueair_api-1.23.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+blueair_api-1.23.0.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
+blueair_api-1.23.0.dist-info/RECORD,,