blueair-api 1.36.0__tar.gz → 1.36.1__tar.gz

{blueair_api-1.36.0 → blueair_api-1.36.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blueair_api
-Version: 1.36.0
+Version: 1.36.1
 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.0 → blueair_api-1.36.1}/pyproject.toml

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

{blueair_api-1.36.0 → blueair_api-1.36.1}/src/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-1.36.0 → blueair_api-1.36.1}/src/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-1.36.0 → blueair_api-1.36.1}/src/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-1.36.0 → blueair_api-1.36.1}/src/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: typing.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)
+        if len(self) > 0:
+            return self[0]
+        else:
+            return SensorRecord(values={},  timestamp=0)
+
+
+
 ########################
 # SenML RFC8428
 

{blueair_api-1.36.0 → blueair_api-1.36.1}/src/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-1.36.0 → blueair_api-1.36.1}/src/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 → blueair_api-1.36.1}/src/blueair_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blueair_api
-Version: 1.36.0
+Version: 1.36.1
 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.0 → blueair_api-1.36.1}/tests/test_device_aws.py

@@ -97,6 +97,13 @@ class DeviceAwsTestBase(IsolatedAsyncioTestCase):
             "states": [],
            })
 
+        async def fake_sensors(device_name, device_uuid):
+            return [{
+                "datapoints": [],
+                "sensors": []
+            }]
+
+        self.api.device_sensors.side_effect = fake_sensors
         self.api.device_info.side_effect = self.device_info_helper.device_info
         self.api.set_device_info.side_effect = self.device_info_helper.set_device_info
 
@@ -409,8 +416,8 @@ class H35iTest(DeviceAwsTestBase):
             assert device.pm2_5 is NotImplemented
             assert device.pm10 is NotImplemented
             assert device.tVOC is NotImplemented
-            assert device.temperature == 19
-            assert device.humidity == 50
+            assert device.temperature is None
+            assert device.humidity is None
             assert device.name == "Bedroom"
             assert device.firmware == "1.0.1"
             assert device.mcu_firmware == "1.0.1"
@@ -437,7 +444,7 @@ class H35iTest(DeviceAwsTestBase):
             assert device.heat_fan_speed is NotImplemented
             assert device.cool_sub_mode is NotImplemented
             assert device.cool_fan_speed is NotImplemented
-            assert device.fan_speed_0 is NotImplemented
+            assert device.fan_speed_0 is None
             assert device.temperature_unit is NotImplemented
 
 
@@ -459,7 +466,7 @@ class Max311iTest(DeviceAwsTestBase):
             assert device.model == ModelEnum.MAX_311I
 
             assert device.pm1 is NotImplemented
-            assert device.pm2_5 == 0
+            assert device.pm2_5 is None
             assert device.pm10 is NotImplemented
             assert device.tVOC is NotImplemented
             assert device.temperature is NotImplemented
@@ -490,7 +497,7 @@ class Max311iTest(DeviceAwsTestBase):
             assert device.heat_fan_speed is NotImplemented
             assert device.cool_sub_mode is NotImplemented
             assert device.cool_fan_speed is NotImplemented
-            assert device.fan_speed_0 is NotImplemented
+            assert device.fan_speed_0 is None
             assert device.temperature_unit is NotImplemented
 
 
@@ -513,11 +520,11 @@ class T10iTest(DeviceAwsTestBase):
             assert device.model == ModelEnum.T10I
 
             assert device.pm1 is NotImplemented
-            assert device.pm2_5 == 0
+            assert device.pm2_5 is None
             assert device.pm10 is NotImplemented
             assert device.tVOC is NotImplemented
-            assert device.temperature == 18
-            assert device.humidity == 28
+            assert device.temperature is None
+            assert device.humidity is None
             assert device.name == "Allen's Office"
             assert device.firmware == "1.0.4"
             assert device.mcu_firmware == "1.0.4"
@@ -566,12 +573,12 @@ class Protect7470iTest(DeviceAwsTestBase):
 
             assert device.model == ModelEnum.PROTECT_7470I
 
-            assert device.pm1 == 0
-            assert device.pm2_5 == 0
-            assert device.pm10 == 0
-            assert device.tVOC == 59
-            assert device.temperature == 23
-            assert device.humidity == 46
+            assert device.pm1 is None
+            assert device.pm2_5 is None
+            assert device.pm10 is None
+            assert device.tVOC is None
+            assert device.temperature is None
+            assert device.humidity is None
             assert device.name == "air filter in room"
             assert device.firmware == "2.1.1"
             assert device.mcu_firmware == "1.0.12"
@@ -598,7 +605,7 @@ class Protect7470iTest(DeviceAwsTestBase):
             assert device.cool_sub_mode is NotImplemented
             assert device.cool_fan_speed is NotImplemented
             assert device.ap_sub_mode is NotImplemented
-            assert device.fan_speed_0 is NotImplemented
+            assert device.fan_speed_0 is None
             assert device.temperature_unit is NotImplemented
 
 
@@ -620,9 +627,9 @@ class Max211iTest(DeviceAwsTestBase):
 
             assert device.model == ModelEnum.MAX_211I
 
-            assert device.pm1 == 0
-            assert device.pm2_5 == 0
-            assert device.pm10 == 0
+            assert device.pm1 is None
+            assert device.pm2_5 is None
+            assert device.pm10 is None
             assert device.tVOC is NotImplemented
             assert device.temperature is NotImplemented
             assert device.humidity is NotImplemented
@@ -652,5 +659,5 @@ class Max211iTest(DeviceAwsTestBase):
             assert device.cool_sub_mode is NotImplemented
             assert device.cool_fan_speed is NotImplemented
             assert device.ap_sub_mode is NotImplemented
-            assert device.fan_speed_0 is NotImplemented
+            assert device.fan_speed_0 is None
             assert device.temperature_unit is NotImplemented

{blueair_api-1.36.0 → blueair_api-1.36.1}/tests/test_intermediate_representation_aws.py

@@ -5,6 +5,78 @@ import pytest
 
 from blueair_api import intermediate_representation_aws as ir
 
+
+class SensorHistoryTest(TestCase):
+    def test_history_simple(self):
+        sh = ir.SensorHistory([
+                {
+                    "datapoints": [
+                        [
+                            "1",
+                            "4",
+                            "5",
+                            "6",
+                            "42",
+                            None,
+                            "51",
+                            "27",
+                            "87"
+                        ],
+                        [
+                            "3",
+                            "1",
+                            "2",
+                            "3",
+                            "43",
+                            None,
+                            "50",
+                            "24",
+                            "91"
+                        ],
+                    ],
+                    "sensors": [
+                      "pm1",
+                      "pm2_5",
+                      "pm10",
+                      "tVOC",
+                      "hcho",
+                      "h",
+                      "t",
+                      "fsp0"
+                    ],
+                    "start": "1746401990",
+                    "end": "1746409190",
+                    "did": "1d528642-56a9"
+                  }
+                ])
+        assert sh[0].timestamp == 1
+        assert sh[0].values == {
+            "pm1": 4,
+            "pm2_5": 5,
+            "pm10": 6,
+            "tVOC": 42,
+            "h": 51,
+            "t": 27,
+            "fsp0": 87
+        }
+        assert sh[1].timestamp == 3
+        assert sh[1].values == {
+            "pm1": 1,
+            "pm2_5": 2,
+            "pm10": 3,
+            "tVOC": 43,
+            "h": 50,
+            "t": 24,
+            "fsp0": 91
+        }
+
+        assert sh.to_latest().timestamp == 1
+
+#        assert latest['v'].timestamp == 1
+#        assert latest['v'].value == 1
+#        assert isinstance(latest['v'].value, float)
+
+
 class SensorPackTest(TestCase):
 
   def testSimple(self):