blueair-api 1.36.0__py3-none-any.whl → 1.36.2__py3-none-any.whl

blueair_api/const.py

@@ -11,17 +11,29 @@ API_KEY = "eyJhbGciOiJIUzI1NiJ9.eyJncmFudGVlIjoiYmx1ZWFpciIsImlhdCI6MTQ1MzEyNTYz
 
 AWS_APIKEYS = {
     "us": {
-        "gigyaRegion": "us1",
+        "gigyaRegion": "accounts.us1.gigya.com",
         "restApiId": "on1keymlmh",
-        "awsRegion": "us-east-2",
+        "awsRegion": "us-east-2.amazonaws.com",
         "apiKey": "3_-xUbbrIY8QCbHDWQs1tLXE-CZBQ50SGElcOY5hF1euE11wCoIlNbjMGAFQ6UwhMY",
     },
     "eu": {
-        "gigyaRegion": "eu1",
+        "gigyaRegion": "accounts.eu1.gigya.com",
         "restApiId": "hkgmr8v960",
-        "awsRegion": "eu-west-1",
+        "awsRegion": "eu-west-1.amazonaws.com",
         "apiKey": "3_qRseYzrUJl1VyxvSJANalu_kNgQ83swB1B9uzgms58--5w1ClVNmrFdsDnWVQQCl",
     },
+    "cn": {
+        "gigyaRegion": "accounts.cn1.sapcdm.cn",
+        "restApiId": "ftbkyp79si",
+        "awsRegion": "cn-north-1.amazonaws.com.cn",
+        "apiKey": "3_h3UEfJnA-zDpFPR9L4412HO7Mz2VVeN4wprbWYafPN1gX0kSnLcZ9VSfFi7bEIIU",
+    },
+    "au": {
+        "gigyaRegion": "accounts.au1.gigya.com",
+        "restApiId": "hkgmr8v960",
+        "awsRegion": "eu-west-1.amazonaws.com",
+        "apiKey": "3_Z2N0mIFC6j2fx1z2sq76R3pwkCMaMX2y9btPb0_PgI_3wfjSJoofFnBbxbtuQksN",
+    },
 }
 
 

blueair_api/device_aws.py

@@ -32,6 +32,7 @@ class DeviceAws(CallbacksMixin):
 
     api: HttpAwsBlueair = field(repr=False)
     raw_info : dict[str, Any] = field(repr=False, init=False)
+    raw_sensors : dict[str, Any] = field(repr=False, init=False)
 
     uuid : str | None = None
     name : str | None = None
@@ -81,16 +82,18 @@ class DeviceAws(CallbacksMixin):
     async def refresh(self):
         _LOGGER.debug(f"refreshing blueair device aws: {self}")
         self.raw_info = await self.api.device_info(self.name_api, self.uuid)
+        self.raw_sensors = await self.api.device_sensors(self.name_api, self.uuid)
         _LOGGER.debug(dumps(self.raw_info, indent=2))
+        if self.raw_sensors is not None:
+            _LOGGER.debug(dumps(self.raw_sensors, indent=2))
 
-        # ir.parse_json(ir.Attribute, ir.query_json(info, "configuration.da"))
         ds = ir.parse_json(ir.Sensor, ir.query_json(self.raw_info, "configuration.ds"))
         dc = ir.parse_json(ir.Control, ir.query_json(self.raw_info, "configuration.dc"))
 
-        sensor_data = ir.SensorPack(self.raw_info["sensordata"]).to_latest_value()
+        sensor_data = ir.SensorHistory(self.raw_sensors).to_latest()
 
         def sensor_data_safe_get(key):
-            return sensor_data.get(key) if key in ds else NotImplemented
+            return sensor_data.values.get(key) if key in ds else NotImplemented
 
         self.pm1 = sensor_data_safe_get("pm1")
         self.pm2_5 = sensor_data_safe_get("pm2_5")
@@ -142,7 +145,10 @@ class DeviceAws(CallbacksMixin):
         self.cool_sub_mode = states_safe_get("coolsubmode")
         self.cool_fan_speed = states_safe_get("coolfs")
         self.ap_sub_mode = states_safe_get("apsubmode")
-        self.fan_speed_0 = states_safe_get("fsp0")
+        if states_safe_get("fsp0") is NotImplemented:
+            self.fan_speed_0 = sensor_data_safe_get("fsp0")
+        else:
+            self.fan_speed_0 = states_safe_get("fsp0")
         self.temperature_unit = states_safe_get("tu")
 
         self.publish_updates()

blueair_api/http_aws_blueair.py

@@ -3,6 +3,7 @@ import functools
 from logging import getLogger
 from typing import Any
 from aiohttp import ClientSession, ClientResponse, FormData
+from datetime import datetime, timedelta
 
 from .const import AWS_APIKEYS
 from .util_http import request_with_logging
@@ -92,9 +93,9 @@ class HttpAwsBlueair:
     @request_with_errors
     @request_with_logging
     async def _get_request_with_logging_and_errors_raised(
-        self, url: str, headers: dict | None = None
+        self, url: str, headers: dict | None = None, params: dict | None = None
     ) -> ClientResponse:
-        return await self.api_session.get(url=url, headers=headers)
+        return await self.api_session.get(url=url, headers=headers, params=params)
 
     @request_with_errors
     @request_with_logging
@@ -111,7 +112,7 @@ class HttpAwsBlueair:
 
     async def refresh_session(self) -> None:
         _LOGGER.debug("refresh_session")
-        url = f"https://accounts.{AWS_APIKEYS[self.region]['gigyaRegion']}.gigya.com/accounts.login"
+        url = f"https://{AWS_APIKEYS[self.region]['gigyaRegion']}/accounts.login"
         form_data = FormData()
         form_data.add_field("apikey", AWS_APIKEYS[self.region]["apiKey"])
         form_data.add_field("loginID", self.username)
@@ -130,7 +131,7 @@ class HttpAwsBlueair:
         _LOGGER.debug("refresh_jwt")
         if self.session_token is None or self.session_secret is None:
             await self.refresh_session()
-        url = f"https://accounts.{AWS_APIKEYS[self.region]['gigyaRegion']}.gigya.com/accounts.getJWT"
+        url = f"https://{AWS_APIKEYS[self.region]['gigyaRegion']}/accounts.getJWT"
         form_data = FormData()
         form_data.add_field("oauth_token", self.session_token)
         form_data.add_field("secret", self.session_secret)
@@ -147,7 +148,7 @@ class HttpAwsBlueair:
         _LOGGER.debug("refresh_access_token")
         if self.jwt is None:
             await self.refresh_jwt()
-        url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}.amazonaws.com/prod/c/login"
+        url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}/prod/c/login"
         headers = {"idtoken": self.jwt}
         response: ClientResponse = (
             await self._post_request_with_logging_and_errors_raised(
@@ -167,7 +168,7 @@ class HttpAwsBlueair:
     @request_with_active_session
     async def devices(self) -> dict[str, Any]:
         _LOGGER.debug("devices")
-        url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}.amazonaws.com/prod/c/registered-devices"
+        url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}/prod/c/registered-devices"
         headers = {
             "Authorization": f"Bearer {await self.get_access_token()}",
         }
@@ -179,10 +180,30 @@ class HttpAwsBlueair:
         response_json = await response.json()
         return response_json["devices"]
 
+    @request_with_active_session
+    async def device_sensors(self, device_name, device_uuid, duration: timedelta = timedelta(hours=10)):
+        url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}/prod/c/{device_name}/r/telemetry/5m/historical"
+        headers = {
+            "Authorization": f"Bearer {await self.get_access_token()}",
+        }
+        params = {
+            "did": device_uuid,
+            "from": int((datetime.now()-duration).timestamp()),
+            "to": int(datetime.now().timestamp()),
+            "s": ["pm1", "pm2_5", "pm10", "tVOC", "hcho", "h", "t", "fsp0"]
+        }
+        response: ClientResponse = (
+            await self._get_request_with_logging_and_errors_raised(
+                url=url, headers=headers, params=params
+            )
+        )
+        response_json = await response.json()
+        return response_json
+
     @request_with_active_session
     async def device_info(self, device_name, device_uuid) -> dict[str, Any]:
         _LOGGER.debug("device_info")
-        url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}.amazonaws.com/prod/c/{device_name}/r/initial"
+        url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}/prod/c/{device_name}/r/initial"
         headers = {
             "Authorization": f"Bearer {await self.get_access_token()}",
         }
@@ -212,7 +233,7 @@ class HttpAwsBlueair:
         self, device_uuid, service_name, action_verb, action_value
     ) -> bool:
         _LOGGER.debug("set_device_info")
-        url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}.amazonaws.com/prod/c/{device_uuid}/a/{service_name}"
+        url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}/prod/c/{device_uuid}/a/{service_name}"
         headers = {
             "Authorization": f"Bearer {await self.get_access_token()}",
         }

blueair_api/intermediate_representation_aws.py

@@ -1,5 +1,5 @@
 import typing
-from typing import Any, TypeVar
+from typing import Any
 from collections.abc import Iterable
 import dataclasses
 import base64
@@ -85,7 +85,7 @@ class Attribute:
 class Sensor:
     """DeviceSensor(ds); seems to define a sensor.
 
-    We never directly access these objects. Thos this defines
+    We never directly access these objects. Though this defines
     the schema for 'h', 't', 'pm10' etc that gets returned in
     the sensor_data senml SensorPack.
     """
@@ -115,6 +115,36 @@ class Control:
     d: str | None = None  # device info json path
 
 
+@dataclasses.dataclass
+class SensorRecord:
+    values: dict[str, int]
+    timestamp: float | None
+
+
+class SensorHistory(list[SensorRecord]):
+    def __init__(self, response):
+        sensors = response[0]["sensors"]
+        datapoints = response[0]["datapoints"]
+        sensor_records = []
+        for datapoint in datapoints:
+            values = {}
+            for idx, sensor in enumerate(sensors):
+                if datapoint[idx+1] is not None:
+                    values[sensor] = int(datapoint[idx+1])
+            sensor_records.append(SensorRecord(timestamp=int(datapoint[0]), values=values))
+        super().__init__(sensor_records)
+
+    def to_latest(self) -> SensorRecord:
+        def key(e):
+            return e.timestamp
+        self.sort(key=key, reverse=True)
+        if len(self) > 0:
+            return self[0]
+        else:
+            return SensorRecord(values={},  timestamp=0)
+
+
+
 ########################
 # SenML RFC8428
 

blueair_api/stub.py

@@ -8,7 +8,7 @@ import sys
 
 path_root = Path(__file__).parents[2]
 sys.path.append(str(path_root))
-from src.blueair_api import get_devices, get_aws_devices, DeviceAws
+from src.blueair_api import get_devices, get_aws_devices
 
 
 logger = logging.getLogger("src.blueair_api")

blueair_api/util_http.py

@@ -12,6 +12,9 @@ def request_with_logging(func):
         headers = kwargs.get("headers")
         if headers is not None:
             request_message = request_message + f"headers: {headers}"
+        params = kwargs.get("params")
+        if params is not None:
+            request_message = request_message + f"params: {params}"
         json_body = kwargs.get("json_body")
         if json_body is not None:
             request_message = (

{blueair_api-1.36.0.dist-info → blueair_api-1.36.2.dist-info}/METADATA

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

blueair_api-1.36.2.dist-info/RECORD

@@ -0,0 +1,19 @@
+blueair_api/__init__.py,sha256=gk2CZWEnEo4FlP7VcJsDs1kujZ_ryXF5H9n3Kd-4WWo,313
+blueair_api/callbacks.py,sha256=fvrJsqH5eDRxWOGWiZkF2uLU4n2ve0zzU17ERqWbHP8,756
+blueair_api/const.py,sha256=x-2ae2faZqsalYCuqA_ZpGSZSu0_x_rTrvikagnM9PU,1585
+blueair_api/device.py,sha256=4mjoYGOiVGi_yw5ZRnpgwSRcV9q68nseC6VgdCDyWAQ,5554
+blueair_api/device_aws.py,sha256=ClvpDKT9prv4d15j1fdF1S4gtdH810ZF-iKRN6WXbr0,10506
+blueair_api/errors.py,sha256=lJ_iFU_W6zQfGRi_wsMhWDw-fAVPFeCkCbT1erIlYQQ,233
+blueair_api/http_aws_blueair.py,sha256=4-qrtqYkXHejUhImyDisnLJ-6sDf_YZkzD_Nv-KcBUw,9450
+blueair_api/http_blueair.py,sha256=IMnKXs9S0Z-t1GVshSItjNr9tTdtXjh7-T-tHpsbzhE,11752
+blueair_api/intermediate_representation_aws.py,sha256=g4S7TsRxJd4uh-0k8ByvgG36AXDiPPbDtlHn5ZOTk_A,7035
+blueair_api/model_enum.py,sha256=gH82gAnnxnK7JFIHbfjkFXFA3p_hSmujvvuQ0GQyzm4,494
+blueair_api/stub.py,sha256=J1BXHUzRR4P32q9WkbucmMqzAjqxS722NSMK4TLZG8o,1176
+blueair_api/util.py,sha256=2FerJEliR4AQc8nBeAMXb7nyl-CPhUszaHxFcVq4p0s,2105
+blueair_api/util_bootstrap.py,sha256=oo6qqEYUxWb4wLLivk7ofB0YFrKsTZo5tW0U2wc3-D0,1757
+blueair_api/util_http.py,sha256=LohO13eBk7_MCfBRg3tMKjLklDTr87RC6Q8vLffwX1M,1464
+blueair_api-1.36.2.dist-info/licenses/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
+blueair_api-1.36.2.dist-info/METADATA,sha256=7KSURW4i0JNyKUMtJEaawYDY-T0Ab4EMQHz8lisv_O0,2017
+blueair_api-1.36.2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+blueair_api-1.36.2.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
+blueair_api-1.36.2.dist-info/RECORD,,

{blueair_api-1.36.0.dist-info → blueair_api-1.36.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

blueair_api-1.36.0.dist-info/RECORD

@@ -1,19 +0,0 @@
-blueair_api/__init__.py,sha256=gk2CZWEnEo4FlP7VcJsDs1kujZ_ryXF5H9n3Kd-4WWo,313
-blueair_api/callbacks.py,sha256=fvrJsqH5eDRxWOGWiZkF2uLU4n2ve0zzU17ERqWbHP8,756
-blueair_api/const.py,sha256=q1smSEhwyYvuQiR867lToFm-mGV-d3dNJvN0NJgscbU,1037
-blueair_api/device.py,sha256=4mjoYGOiVGi_yw5ZRnpgwSRcV9q68nseC6VgdCDyWAQ,5554
-blueair_api/device_aws.py,sha256=J3HhuCnqSQhArgjBQfg3FdIl2lI8EKQp24OFxeA7GNY,10210
-blueair_api/errors.py,sha256=lJ_iFU_W6zQfGRi_wsMhWDw-fAVPFeCkCbT1erIlYQQ,233
-blueair_api/http_aws_blueair.py,sha256=f5HhjaYiBS8RMPjYgVJLOkk4Yqas2euh6hAkHr6H6Uc,8543
-blueair_api/http_blueair.py,sha256=IMnKXs9S0Z-t1GVshSItjNr9tTdtXjh7-T-tHpsbzhE,11752
-blueair_api/intermediate_representation_aws.py,sha256=DJWxHFP9yVll0O6kxHWjKscIlu-7genc3f7ZvwV5YdA,6137
-blueair_api/model_enum.py,sha256=gH82gAnnxnK7JFIHbfjkFXFA3p_hSmujvvuQ0GQyzm4,494
-blueair_api/stub.py,sha256=tWJJLIhKf39P1gRAXfJk6L8cBJI9fVK3Uk9pj2_Teaw,1187
-blueair_api/util.py,sha256=2FerJEliR4AQc8nBeAMXb7nyl-CPhUszaHxFcVq4p0s,2105
-blueair_api/util_bootstrap.py,sha256=oo6qqEYUxWb4wLLivk7ofB0YFrKsTZo5tW0U2wc3-D0,1757
-blueair_api/util_http.py,sha256=45AJG3Vb6LMVzI0WV22AoSyt64f_Jj3KpOAwF5M6EFE,1327
-blueair_api-1.36.0.dist-info/licenses/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
-blueair_api-1.36.0.dist-info/METADATA,sha256=oj2k2pxbF40Bezigu942MVToRz2h5Zi5817HK2YXbDc,2017
-blueair_api-1.36.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-blueair_api-1.36.0.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
-blueair_api-1.36.0.dist-info/RECORD,,