blueair-api 1.26.2__py3-none-any.whl → 1.26.3__py3-none-any.whl

blueair_api/callbacks.py

@@ -22,6 +22,6 @@ class CallbacksMixin:
     def publish_updates(self) -> None:
         if not hasattr(self, "_callbacks"):
             self._setup_callbacks()
-        _LOGGER.debug(f"{self.name} publishing updates")
+        _LOGGER.debug(f"{id(self)} publishing updates")
         for callback in self._callbacks:
             callback()

blueair_api/device.py

@@ -70,7 +70,7 @@ class Device(CallbacksMixin):
         else:
             self.brightness = 0
         if "child_lock" in attributes:
-            self.child_lock = bool(attributes["child_lock"])
+            self.child_lock = attributes["child_lock"] == "1"
         if "night_mode" in attributes:
             self.night_mode = bool(attributes["night_mode"])
         self.fan_speed = int(attributes["fan_speed"])

blueair_api/device_aws.py

@@ -9,7 +9,7 @@ from . import intermediate_representation_aws as ir
 
 _LOGGER = logging.getLogger(__name__)
 
-type AttributeType[T] = T | None | type[NotImplemented]
+type AttributeType[T] = T | None
 
 @dataclasses.dataclass(slots=True)
 class DeviceAws(CallbacksMixin):

blueair_api/http_aws_blueair.py

@@ -1,3 +1,5 @@
+from typing import Any
+import functools
 import logging
 
 from aiohttp import ClientSession, ClientResponse, FormData
@@ -10,7 +12,8 @@ _LOGGER = logging.getLogger(__name__)
 
 
 def request_with_active_session(func):
-    async def request_with_active_session_wrapper(*args, **kwargs):
+    @functools.wraps(func)
+    async def request_with_active_session_wrapper(*args, **kwargs) -> ClientResponse:
         _LOGGER.debug("session")
         try:
             return await func(*args, **kwargs)
@@ -28,7 +31,8 @@ def request_with_active_session(func):
 
 
 def request_with_errors(func):
-    async def request_with_errors_wrapper(*args, **kwargs):
+    @functools.wraps(func)
+    async def request_with_errors_wrapper(*args, **kwargs) -> ClientResponse:
         _LOGGER.debug("checking for errors")
         response: ClientResponse = await func(*args, **kwargs)
         status_code = response.status
@@ -53,6 +57,7 @@ def request_with_errors(func):
             else:
                 _LOGGER.debug("session error")
                 raise SessionError(response_text)
+        raise ValueError(f"unknown status code {status_code}")
 
     return request_with_errors_wrapper
 
@@ -63,7 +68,7 @@ class HttpAwsBlueair:
         username: str,
         password: str,
         region: str = "us",
-        client_session: ClientSession = None,
+        client_session: ClientSession | None = None,
     ):
         self.username = username
         self.password = password
@@ -87,7 +92,7 @@ class HttpAwsBlueair:
     @request_with_errors
     @request_with_logging
     async def _get_request_with_logging_and_errors_raised(
-        self, url: str, headers: dict = None
+        self, url: str, headers: dict | None = None
     ) -> ClientResponse:
         return await self.api_session.get(url=url, headers=headers)
 
@@ -96,15 +101,15 @@ class HttpAwsBlueair:
     async def _post_request_with_logging_and_errors_raised(
         self,
         url: str,
-        json_body: dict = None,
-        form_data: FormData = None,
-        headers: dict = None,
+        json_body: dict | None = None,
+        form_data: FormData | None = None,
+        headers: dict | None = None,
     ) -> ClientResponse:
         return await self.api_session.post(
             url=url, data=form_data, json=json_body, headers=headers
         )
 
-    async def refresh_session(self):
+    async def refresh_session(self) -> None:
         _LOGGER.debug("refresh_session")
         url = f"https://accounts.{AWS_APIKEYS[self.region]['gigyaRegion']}.gigya.com/accounts.login"
         form_data = FormData()
@@ -121,7 +126,7 @@ class HttpAwsBlueair:
         self.session_token = response_json["sessionInfo"]["sessionToken"]
         self.session_secret = response_json["sessionInfo"]["sessionSecret"]
 
-    async def refresh_jwt(self):
+    async def refresh_jwt(self) -> None:
         _LOGGER.debug("refresh_jwt")
         if self.session_token is None or self.session_secret is None:
             await self.refresh_session()
@@ -138,7 +143,7 @@ class HttpAwsBlueair:
         response_json = await response.json(content_type="text/javascript")
         self.jwt = response_json["id_token"]
 
-    async def refresh_access_token(self):
+    async def refresh_access_token(self) -> None:
         _LOGGER.debug("refresh_access_token")
         if self.jwt is None:
             await self.refresh_jwt()
@@ -152,14 +157,15 @@ class HttpAwsBlueair:
         response_json = await response.json()
         self.access_token = response_json["access_token"]
 
-    async def get_access_token(self):
+    async def get_access_token(self) -> str:
         _LOGGER.debug("get_access_token")
         if self.access_token is None:
             await self.refresh_access_token()
+        assert self.access_token is not None
         return self.access_token
 
     @request_with_active_session
-    async def devices(self):
+    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"
         headers = {
@@ -174,15 +180,8 @@ class HttpAwsBlueair:
         return response_json["devices"]
 
     @request_with_active_session
-    async def device_info(self, device_name, device_uuid):
+    async def device_info(self, device_name, device_uuid) -> dict[str, Any]:
         _LOGGER.debug("device_info")
-        """
-        sample; [{'id': '1b41a7c6-8f02-42fa-9af8-868dad9be98a', 'configuration': {'df': {'a': 877, 'ot': 'G4Filter', 'alg': 'FilterAlg1'}, 'di': {'cfv': '2.1.1', 'cma': '3c:61:05:45:56:98', 'mt': '2', 'name': 'sage', 'sku': '105826', 'mfv': '1.0.12', 'ofv': '2.1.1', 'hw': 'high_1.5', 'ds': '110582600000110110016855'}, '_ot': 'CmConfig', '_f': False, '_it': 'urn:blueair:openapi:version:healthprotect:0.0.5', '_eid': 'f8cb142f-c77d-11eb-b045-c98ff4f5a769', '_sc': 'Instance', 'ds': {'tVOC': {'tf': 'senml+json', 'ot': 'TVOC', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/tVOC', 'ttl': 0, 'n': 'tVOC', 'fe': True}, 'fu0': {'tf': 'senml+json', 'ot': 'FU', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/fu0', 'ttl': -1, 'n': 'fu0', 'fe': True}, 'ledb': {'tf': 'senml+json', 'ot': 'Led', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/ledb', 'ttl': 0, 'n': 'ledb', 'fe': True}, 'co2': {'tf': 'senml+json', 'ot': 'Co2', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/co2', 'ttl': 0, 'n': 'co2', 'fe': True}, 'pm2_5c': {'tf': 'senml+json', 'ot': 'PMParticleCount', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/pm2_5c', 'ttl': 0, 'n': 'pm2_5c', 'fe': True}, 'sb': {'tf': 'senml+json', 'ot': 'Standby', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/sb', 'ttl': -1, 'n': 'sb', 'fe': True}, 'ss0': {'tf': 'senml+json', 'ot': 'SafetySwitch', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/ss0', 'ttl': -1, 'n': 'ss0', 'fe': True}, 'rt1s': {'tf': 'senml+json', 'ot': 'RT1s', 'e': True, 'i': 1000, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/1s', 'sn': ['pm1', 'pm2_5', 'pm10', 't', 'h', 'tVOC', 'rssi'], 'ttl': 0, 'n': 'rt1s', 'fe': True}, 'rt5s': {'tf': 'senml+json', 'ot': 'RT5s', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/5s', 'sn': ['pm1', 'pm2_5', 'pm10', 't', 'h', 'tVOC', 'rssi'], 'ttl': -1, 'n': 'rt5s', 'fe': True}, 'pm1': {'tf': 'senml+json', 'ot': 'PM1', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/pm1', 'ttl': 0, 'n': 'pm1', 'fe': True}, 'pm2_5': {'tf': 'senml+json', 'ot': 'PM2_5', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/pm2_5', 'ttl': 0, 'n': 'pm2_5', 'fe': True}, 'pm10c': {'tf': 'senml+json', 'ot': 'PMParticleCount', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/pm10c', 'ttl': 0, 'n': 'pm10c', 'fe': True}, 'sp': {'tf': 'senml+json', 'ot': 'SensorBoxPresense', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/sp', 'ttl': -1, 'n': 'sp', 'fe': True}, 'rssi': {'tf': 'senml+json', 'ot': 'RSSI', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/rssi', 'ttl': 0, 'n': 'rssi', 'fe': True}, 'chl': {'tf': 'senml+json', 'ot': 'ChildLock', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/chl', 'ttl': -1, 'n': 'chl', 'fe': True}, 'fp0': {'tf': 'senml+json', 'ot': 'FilterPresence', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/fp0', 'ttl': -1, 'n': 'fp0', 'fe': True}, 'pm10': {'tf': 'senml+json', 'ot': 'PM10', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/pm10', 'ttl': 0, 'n': 'pm10', 'fe': True}, 'h': {'tf': 'senml+json', 'ot': 'Humidity', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/h', 'ttl': 0, 'n': 'h', 'fe': True}, 'is': {'tf': 'senml+json', 'ot': 'IonizerState', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/is', 'ttl': -1, 'n': 'is', 'fe': True}, 'gs': {'tf': 'senml+json', 'ot': 'GermShield', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/gs', 'ttl': -1, 'n': 'gs', 'fe': True}, 'am': {'tf': 'senml+json', 'ot': 'AutoMode', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/am', 'ttl': -1, 'n': 'am', 'fe': True}, 'tVOCbaseline': {'t': 0, 'e': False, 'ot': 'TVOCbaseline', 'i': 60000, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/TVOCbaseline', 'ttl': 600, 'n': 'tVOCbaseline', 'fe': True}, 'rt5m': {'tf': 'senml+json', 'ot': 'RT5m', 'e': True, 'i': 300000, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/5m', 'sn': ['pm1', 'pm2_5', 'pm10', 't', 'h', 'tVOC'], 'ttl': 0, 'n': 'rt5m', 'fe': True}, 't': {'tf': 'senml+json', 'ot': 'Temperature', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/t', 'ttl': 0, 'n': 't', 'fe': True}, 'pm1c': {'tf': 'senml+json', 'ot': 'PMParticleCount', 'e': False, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/pm1c', 'ttl': 0, 'n': 'pm1c', 'fe': True}, 'b5m': {'tf': 'senml+json', 'th': ['5kb', '4h'], 'ot': 'Batch5m', 'e': True, 'i': 300000, 'tn': '$aws/rules/telemetry_ingest_rule/d/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/batch/b5m', 'sn': ['pm1', 'pm2_5', 'pm10', 't', 'h', 'tVOC', 'fsp0'], 'ttl': -1, 'n': 'b5m', 'fe': True}, 'fsp0': {'st': 'fsp0', 'tf': 'senml+json', 't': 10, 'ot': 'Fanspeed', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/fsp0', 'sn': ['fsp0'], 'ttl': -1, 'n': 'fsp0', 'fe': True}, 'nm': {'tf': 'senml+json', 'ot': 'NightMode', 'e': True, 'i': 0, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/s/nm', 'ttl': -1, 'n': 'nm', 'fe': True}}, '_r': 'us-east-2', '_s': {'sig': 'f812cd40acae289ad965c159051abadb28ed6c8b1eb2df917fedaa135f5a69d2', 'salg': 'SHA256'}, '_t': 'Diff', '_v': 1655924801, '_cas': 1623062101, '_id': '1b41a7c6-8f02-42fa-9af8-868dad9be98a', 'fc': {'pwd': '9102revreSyrotcaF', 'ssid': 'BAFactory', 'url': ' '}, 'da': {'reboot': {'p': False, 'a': False, 'ot': 'Reboot', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/reboot', 'n': 'reboot', 'fe': True}, 'uitest': {'a': 'off', 'ot': 'UiTest', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/uitest', 'n': 'uitest', 'fe': True}, 'ledb': {'p': True, 'a': 0, 'tf': 'senml+json', 'ot': 'LedBrightness', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/ledb', 'n': 'ledb', 'fe': True}, 'chl': {'p': True, 'a': False, 'tf': 'senml+json', 'ot': 'ChildLock', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/chl', 'n': 'chl', 'fe': True}, 'sflu': {'p': False, 'a': False, 'ot': 'SensorFlush', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/sflu', 'n': 'sflu', 'fe': True}, 'buttontest': {'p': False, 'a': False, 'ot': 'ButtonTest', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/buttontest', 'n': 'buttontest', 'fe': True}, 'is': {'p': True, 'a': False, 'tf': 'senml+json', 'ot': 'IonizerState', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/is', 'n': 'is', 'fe': True}, 'gs': {'p': True, 'a': False, 'tf': 'senml+json', 'ot': 'GermShield', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/gs', 'n': 'gs', 'fe': True}, 'am': {'p': True, 'a': False, 'tf': 'senml+json', 'ot': 'AutoMode', 'e': True, 'amt': 'PM', 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/am', 'n': 'am', 'fe': True}, 'tVOCbaseline': {'a': 0, 'ot': 'TVOCbaseline', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/tVOCbaseline', 'n': 'tVOCbaseline', 'fe': True}, 'sb': {'p': True, 'a': False, 'tf': 'senml+json', 'sbt': 'sensor_on', 'ot': 'Standby', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/sb', 'n': 'sb', 'fe': True}, 'fsp0': {'p': True, 'st': 'fsp0', 'a': 20, 'tf': 'senml+json', 'ot': 'Fanspeed', 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/fsp0', 'n': 'fsp0', 'fe': True}, 'nm': {'p': True, 'maxfsp': 25, 'a': False, 'tf': 'senml+json', 'nmt': 'PM', 'ot': 'NightMode', 'ledb': 12, 'e': True, 'tn': 'd/1b41a7c6-8f02-42fa-9af8-868dad9be98a/a/nm', 'n': 'nm', 'fe': True}}, 'dc': {'cfv': {'d': 'di.cfv', 't': 'integer', 'v': 0, 'n': 'cfv'}, 'germshield': {'a': 'gs', 's': 'gs', 't': 'boolean', 'v': False, 'n': 'germshield'}, 'filterusage': {'s': 'fu0', 't': 'integer', 'v': 0, 'n': 'filterusage'}, 'brightness': {'a': 'ledb', 's': 'ledb', 't': 'integer', 'v': 100, 'n': 'brightness'}, 'standby': {'a': 'sb', 's': 'sb', 't': 'boolean', 'v': False, 'n': 'standby'}, 'fanspeed': {'a': 'fsp0', 's': 'fsp0', 't': 'integer', 'v': 11, 'n': 'fanspeed'}, 'nightmode': {'a': 'nm', 's': 'nm', 't': 'boolean', 'v': False, 'n': 'nightmode'}, 'childlock': {'a': 'chl', 's': 'chl', 't': 'boolean', 'v': False, 'n': 'childlock'}, 'safetyswitch': {'s': 'ss0', 't': 'boolean', 'v': True, 'n': 'safetyswitch'}, 'mfv': {'d': 'di.mfv', 't': 'integer', 'v': 0, 'n': 'mfv'}, 'ofv': {'d': 'di.ofv', 't': 'integer', 'v': 0, 'n': 'ofv'}, 'automode': {'a': 'am', 's': 'am', 't': 'boolean', 'v': False, 'n': 'automode'}}}, 'alarms': [], 'events': [], 'sensordata': [{'v': '0', 'n': 'pm1', 't': 1656198091}, {'v': '0', 'n': 'pm2_5', 't': 1656198091}, {'v': '0', 'n': 'pm10', 't': 1656198091}, {'v': '23', 'n': 't', 't': 1656198091}, {'v': '45', 'n': 'h', 't': 1656198091}, {'v': '170', 'n': 'tVOC', 't': 1656198091}, {'v': '11', 'n': 'fsp0', 't': 1656198091}], 'states': [{'n': 'cfv', 'v': 33554689, 't': 1656203510}, {'n': 'germshield', 'vb': True, 't': 1656203510}, {'n': 'filterusage', 'v': 1, 't': 1656203510}, {'n': 'brightness', 'v': 0, 't': 1656203510}, {'n': 'standby', 'vb': False, 't': 1656203510}, {'n': 'fanspeed', 'v': 11, 't': 1656203510}, {'n': 'nightmode', 'vb': False, 't': 1656203510}, {'n': 'childlock', 'vb': False, 't': 1656203510}, {'n': 'safetyswitch', 'vb': True, 't': 1656203510}, {'n': 'mfv', 'v': 16777228, 't': 1656203510}, {'n': 'ofv', 'v': 33554689, 't': 1656203510}, {'n': 'automode', 'vb': False, 't': 1656203510}, {'t': 1656203510, 'vb': True, 'n': 'online'}], 'welcomehome': {'setting': []}, 'fleet_info': []}]
-
-        :param device_name:
-        :param device_uuid:
-        :return:
-        """
         url = f"https://{AWS_APIKEYS[self.region]['restApiId']}.execute-api.{AWS_APIKEYS[self.region]['awsRegion']}.amazonaws.com/prod/c/{device_name}/r/initial"
         headers = {
             "Authorization": f"Bearer {await self.get_access_token()}",
@@ -211,7 +210,7 @@ class HttpAwsBlueair:
     @request_with_active_session
     async def set_device_info(
         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}"
         headers = {

blueair_api/http_blueair.py

@@ -1,3 +1,4 @@
+from typing import Any
 import logging
 
 from aiohttp import ClientSession, ClientResponse
@@ -6,6 +7,7 @@ import base64
 from .util_http import request_with_logging
 from .const import API_KEY
 from .errors import LoginError
+from typing import Optional
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -15,9 +17,9 @@ class HttpBlueair:
         self,
         username: str,
         password: str,
-        home_host: str = None,
-        auth_token: str = None,
-        client_session: ClientSession = None,
+        home_host: str | None = None,
+        auth_token: str | None = None,
+        client_session: ClientSession | None = None,
     ):
         self.username = username
         self.password = password
@@ -44,13 +46,13 @@ class HttpBlueair:
 
     @request_with_logging
     async def _get_request_with_logging_and_errors_raised(
-        self, url: str, headers: dict = None
+        self, url: str, headers: dict | None = None
     ) -> ClientResponse:
         return await self.api_session.get(url=url, headers=headers)
 
     @request_with_logging
     async def _post_request_with_logging_and_errors_raised(
-        self, url: str, json_body: dict, headers: dict = None
+        self, url: str, json_body: dict, headers: dict | None = None
     ) -> ClientResponse:
         return await self.api_session.post(url=url, json=json_body, headers=headers)
 
@@ -99,7 +101,7 @@ class HttpBlueair:
         else:
             raise LoginError("invalid password")
 
-    async def get_devices(self) -> list[dict[str, any]]:
+    async def get_devices(self) -> list[dict[str, Any]]:
         """
         Fetch a list of devices.
 
@@ -123,7 +125,7 @@ class HttpBlueair:
         return await response.json()
 
     # Note: refreshes every 5 minutes
-    async def get_attributes(self, device_uuid: str) -> dict[str, any]:
+    async def get_attributes(self, device_uuid: str) -> dict[str, Any]:
         """
         Fetch a list of attributes for the provided device ID.
 
@@ -154,7 +156,7 @@ class HttpBlueair:
         return attributes
 
     # Note: refreshes every 5 minutes, timestamps are in seconds
-    async def get_info(self, device_uuid: str) -> dict[str, any]:
+    async def get_info(self, device_uuid: str) -> dict[str, Any]:
         """
         Fetch device information for the provided device ID.
 
@@ -178,7 +180,7 @@ class HttpBlueair:
         return await response.json()
 
     # Note: refreshes every 5 minutes, timestamps are in seconds
-    async def get_current_data_point(self, device_uuid: str) -> dict[str, any]:
+    async def get_current_data_point(self, device_uuid: str) -> dict[str, Any]:
         """
         Fetch device information for the provided device ID.
 
@@ -201,7 +203,7 @@ class HttpBlueair:
         )
         return await response.json()
 
-    async def get_data_points_since(self, device_uuid: str, seconds_ago: int = 0, sample_period: int = 300) -> dict[str, any]:
+    async def get_data_points_since(self, device_uuid: str, seconds_ago: int = 0, sample_period: int = 300) -> dict[str, Any]:
         """
         Fetch the list of data points between a relative timestamp (in seconds) and the current time.
 

blueair_api/intermediate_representation_aws.py

@@ -1,57 +1,62 @@
+import typing
 from typing import Any, TypeVar
 from collections.abc import Iterable
 import dataclasses
 import base64
 
-type ScalarType = str | float | bool
+type ScalarType = str | float | bool | int | None
 type MappingType = dict[str, "ObjectType"]
 type SequenceType = list["ObjectType"]
 type ObjectType = ScalarType | MappingType | SequenceType
 
 
-def query_json(jsonobj: ObjectType, path: str):
+def query_json(jsonobj: ObjectType, path: str) -> ObjectType:
     value = jsonobj
     segs = path.split(".")
-    for i, seg in enumerate(segs[:-1]):
-        if not isinstance(value, dict | list):
-            raise KeyError(
-                f"cannot resolve path segment on a scalar "
-                f"when resolving segment {i}:{seg} of {path}.")
+    for i, seg in enumerate(segs):
         if isinstance(value, list):
             value = value[int(seg)]
-        else:
-            try:
+        elif isinstance(value, dict):
+            if seg in value:
                 value = value[seg]
-            except KeyError:
+            elif i == len(segs) - 1:
+                # last segment returns None if it is not found.
+                value = None
+            else:
                 raise KeyError(
+                    f"cannot resolve path segment on a scalar "
+                    f"when resolving segment {i}:{seg} of {path}. "
+                    f"available keys are {value.keys()}.")
+        else:
+            raise KeyError(
                 f"cannot resolve path segment on a scalar "
-                f"when resolving segment {i}:{seg} of {path}. "
-                f"available keys are {value.keys()}.")
-
-    # last segment returns None if it is not found.
-    return value.get(segs[-1])
-
+                f"when resolving segment {i}:{seg} of {path}.")
+    return value
 
 def parse_json[T](kls: type[T], jsonobj: MappingType) -> dict[str, T]:
     """Parses a json mapping object to dict.
 
     The key is preserved. The value is parsed as dataclass type kls.
     """
+    assert dataclasses.is_dataclass(kls)
     result = {}
     fields = dataclasses.fields(kls)
 
     for key, value in jsonobj.items():
-        a = dict(value)  # make a copy.
-        kwargs = {}
+        if not isinstance(value, dict):
+            raise TypeError("expecting mapping value to be dict.")
+        extra_fields = dict(value)  # make extra_fields copy.
+        kwargs : dict[str, Any] = {}
         for field in fields:
             if field.name == "extra_fields":
-                continue
-            if field.default is dataclasses.MISSING:
-                kwargs[field.name] = a.pop(field.name)
+                kwargs[field.name] = extra_fields
+            elif field.default is dataclasses.MISSING:
+                kwargs[field.name] = extra_fields.pop(field.name)
             else:
-                kwargs[field.name] = a.pop(field.name, field.default)
+                kwargs[field.name] = extra_fields.pop(field.name, field.default)
 
-        result[key] = kls(**kwargs, extra_fields=a)
+        obj = kls(**kwargs)
+        result[key] = typing.cast(T, obj)
     return result
 
 
@@ -118,7 +123,7 @@ class Record:
     """A RFC8428 SenML record, resolved to Python types."""
     name: str
     unit: str | None
-    value: ScalarType
+    value: float | bool | str | bytes
     timestamp: float | None
     integral: float | None
 
@@ -131,9 +136,11 @@ class SensorPack(list[Record]):
         for record in stream:
             rs = None
             rt = None
-            rn = 0
+            rn : str
             ru = None
+            rv : float | bool | str | bytes
             for label, value in record.items():
+                assert isinstance(value, str | int | float | bool)
                 match label:
                     case 'bn' | 'bt' | 'bu' | 'bv' | 'bs' | 'bver':
                         raise ValueError("TODO: base fields not supported. c.f. RFC8428, 4.1")
@@ -148,29 +155,29 @@ class SensorPack(list[Record]):
                     case 'vs':
                         rv = str(value)
                     case 'vd':
-                        rv = bytes(base64.b64decode(value))
+                        rv = bytes(base64.b64decode(str(value)))
                     case 'n':
                         rn = str(value)
                     case 'u':
                         ru = str(value)
-                    case 't':
-                        rn = float(value)
             seq.append(Record(name=rn, unit=ru, value=rv, integral=rs, timestamp=rt))
         super().__init__(seq)
 
-    def to_latest_value(self) -> dict[str, ScalarType]:
+    def to_latest_value(self) -> dict[str, str | bool | float | bytes]:
         return {rn : record.value for rn, record in self.to_latest().items()}
 
     def to_latest(self) -> dict[str, Record]:
-        latest = {}
+        latest : dict[str, Record] = {}
         for record in self:
             rn = record.name
             if record.name not in latest:
                 latest[rn] = record
-            elif record.timestamp is None:
+                continue
+            lt = latest[record.name].timestamp
+            if record.timestamp is None:
                 latest[rn] = record
-            elif latest[record.name].timestamp is None:
+            elif lt is None:
                 latest[rn] = record
-            elif latest[record.name].timestamp < record.timestamp:
+            elif lt < record.timestamp:
                 latest[rn] = record
         return latest

blueair_api/util.py

@@ -1,3 +1,4 @@
+from typing import Any
 import logging
 
 from .const import SENSITIVE_FIELD_NAMES
@@ -5,7 +6,7 @@ from .const import SENSITIVE_FIELD_NAMES
 _LOGGER = logging.getLogger(__name__)
 
 
-def clean_dictionary_for_logging(dictionary: dict[str, any]) -> dict[str, any]:
+def clean_dictionary_for_logging(dictionary: dict[str, Any]) -> dict[str, Any]:
     mutable_dictionary = dictionary.copy()
     for key in dictionary:
         if key.lower() in SENSITIVE_FIELD_NAMES:
@@ -26,17 +27,6 @@ def clean_dictionary_for_logging(dictionary: dict[str, any]) -> dict[str, any]:
     return mutable_dictionary
 
 
-def convert_api_array_to_dict(array):
-    dictionary = {}
-    for obj in array:
-        if "v" in obj:
-            dictionary[obj["n"]] = obj["v"]
-        else:
-            if "vb" in obj:
-                dictionary[obj["n"]] = obj["vb"]
-    return dictionary
-
-
 def safely_get_json_value(json, key, callable_to_cast=None):
     value = json
     for x in key.split("."):

blueair_api/util_bootstrap.py

@@ -6,6 +6,7 @@ from .http_blueair import HttpBlueair
 from .http_aws_blueair import HttpAwsBlueair
 from .device import Device
 from .device_aws import DeviceAws
+from typing import Optional
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -13,10 +14,10 @@ _LOGGER = logging.getLogger(__name__)
 async def get_devices(
     username: str,
     password: str,
-    home_host: str = None,
-    auth_token: str = None,
-    client_session: ClientSession = None,
-) -> (HttpBlueair, list[Device]):
+    home_host: str | None = None,
+    auth_token: str | None = None,
+    client_session: ClientSession | None = None,
+) -> tuple[HttpBlueair, list[Device]]:
     api = HttpBlueair(
         client_session=client_session,
         username=username,
@@ -43,8 +44,8 @@ async def get_aws_devices(
     username: str,
     password: str,
     region: str = "us",
-    client_session: ClientSession = None,
-) -> (HttpAwsBlueair, list[Device]):
+    client_session: ClientSession | None = None,
+) -> tuple[HttpAwsBlueair, list[Device]]:
     api = HttpAwsBlueair(
         username=username,
         password=password,

{blueair_api-1.26.2.dist-info → blueair_api-1.26.3.dist-info}/METADATA

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

blueair_api-1.26.3.dist-info/RECORD

@@ -0,0 +1,19 @@
+blueair_api/__init__.py,sha256=GucsIENhTF4AVxPn4Xyr4imUxJJ8RO8RYt1opHCF2hQ,326
+blueair_api/callbacks.py,sha256=fvrJsqH5eDRxWOGWiZkF2uLU4n2ve0zzU17ERqWbHP8,756
+blueair_api/const.py,sha256=q1smSEhwyYvuQiR867lToFm-mGV-d3dNJvN0NJgscbU,1037
+blueair_api/device.py,sha256=t2KrTsdPH9FJZqCcLSm_3eQGHtbNuVcwK3OyzgCpwJ0,3835
+blueair_api/device_aws.py,sha256=FYz1YtJQMTUfzZ-__kdOGe5HtO8MTUygX-XdRsYejWg,7356
+blueair_api/errors.py,sha256=lJ_iFU_W6zQfGRi_wsMhWDw-fAVPFeCkCbT1erIlYQQ,233
+blueair_api/http_aws_blueair.py,sha256=jztGyoH0iC7aCJ2oGf9hnEeHFOie3YikFvwtWo3W2w4,8536
+blueair_api/http_blueair.py,sha256=cTtiHNTlZKFQTh7cvfRqA_P1lGEpvMXvjM5o6_qEN2U,9497
+blueair_api/intermediate_representation_aws.py,sha256=DJWxHFP9yVll0O6kxHWjKscIlu-7genc3f7ZvwV5YdA,6137
+blueair_api/model_enum.py,sha256=Z9Ne4icNEjbGNwdHJZSDibcKJKwv-W1BRpZx01RGFuY,2480
+blueair_api/stub.py,sha256=sTWyRSDObzrXpZToAgDmZhCk3q8SsGN35h-kzMOqSOc,1272
+blueair_api/util.py,sha256=7MrB2DLqUVOlBQuhv7bRmUXvcGcsjXiV3M0H3LloiOo,1962
+blueair_api/util_bootstrap.py,sha256=RNIKrMWMBSUad4loYGwEVIKVxQ1_LVhXNQtUwuaquyo,1754
+blueair_api/util_http.py,sha256=45AJG3Vb6LMVzI0WV22AoSyt64f_Jj3KpOAwF5M6EFE,1327
+blueair_api-1.26.3.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
+blueair_api-1.26.3.dist-info/METADATA,sha256=fUmIeTOXwfjXBWUh5sN24dhgek6fhOK-jylC-6izNAg,1995
+blueair_api-1.26.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+blueair_api-1.26.3.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
+blueair_api-1.26.3.dist-info/RECORD,,

blueair_api-1.26.2.dist-info/RECORD

@@ -1,19 +0,0 @@
-blueair_api/__init__.py,sha256=GucsIENhTF4AVxPn4Xyr4imUxJJ8RO8RYt1opHCF2hQ,326
-blueair_api/callbacks.py,sha256=eqgfe1qN_NNWOp2qNSP123zQJxh_Ie6vZXp5EHp6ePc,757
-blueair_api/const.py,sha256=q1smSEhwyYvuQiR867lToFm-mGV-d3dNJvN0NJgscbU,1037
-blueair_api/device.py,sha256=Ey8FIDnRwyVWSdLqfHxlCQSOFFaI_l_oVfvqpPIoTvI,3834
-blueair_api/device_aws.py,sha256=c8dZQ9rbljeYBjzXelcnhwQWIJ0dw3JACLFRzxD7s38,7379
-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=n9F5fvEROIyAkqDMM22l84PB7ZoeEkWbj2YuCZpeDNg,9411
-blueair_api/intermediate_representation_aws.py,sha256=TteTMuy1UQ2L0vpGF2Te8v_E1Ageg0QTp6ZM_UUZ9dI,5667
-blueair_api/model_enum.py,sha256=Z9Ne4icNEjbGNwdHJZSDibcKJKwv-W1BRpZx01RGFuY,2480
-blueair_api/stub.py,sha256=sTWyRSDObzrXpZToAgDmZhCk3q8SsGN35h-kzMOqSOc,1272
-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.26.2.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
-blueair_api-1.26.2.dist-info/METADATA,sha256=1hD8KxOs0fsLvrEVOorTCf9_tQkPUDJQIot3OpTaeAU,1995
-blueair_api-1.26.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-blueair_api-1.26.2.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
-blueair_api-1.26.2.dist-info/RECORD,,