blueair-api 1.30.2__tar.gz → 1.31.1__tar.gz

{blueair_api-1.30.2 → blueair_api-1.31.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: blueair_api
-Version: 1.30.2
+Version: 1.31.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.30.2 → blueair_api-1.31.1}/pyproject.toml

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

{blueair_api-1.30.2 → blueair_api-1.31.1}/src/blueair_api/device.py

@@ -1,14 +1,13 @@
-import dataclasses
-import logging
-
 from .callbacks import CallbacksMixin
 from .http_blueair import HttpBlueair
 from .util import transform_data_points, safely_get_json_value
+from dataclasses import dataclass, field
+from logging import getLogger
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = getLogger(__name__)
 
 
-@dataclasses.dataclass(slots=True)
+@dataclass(slots=True)
 class Device(CallbacksMixin):
     @classmethod
     async def create_device(cls, api, uuid, name, mac, refresh=False):
@@ -33,6 +32,8 @@ class Device(CallbacksMixin):
         return device
 
     api: HttpBlueair
+    raw_info : dict[str: any] = field(repr=False, init=False)
+
     uuid: str | None = None
     name: str | None = None
     timezone: str | None = None
@@ -63,7 +64,9 @@ class Device(CallbacksMixin):
 
     async def refresh(self):
         _LOGGER.debug("Requesting current attributes...")
+        self.raw_info = {}
         attributes = await self.api.get_attributes(self.uuid)
+        self.raw_info["attributes"] = attributes
         _LOGGER.debug(f"result: {attributes}")
         if "brightness" in attributes:
             self.brightness = int(attributes["brightness"])
@@ -94,7 +97,9 @@ class Device(CallbacksMixin):
         else:
             self.wifi_working = False
         if self.compatibility != "sense+":
-            for data_point in transform_data_points(await self.api.get_data_points_since(self.uuid)):
+            datapoints = transform_data_points(await self.api.get_data_points_since(self.uuid))
+            self.raw_info["datapoints"] = datapoints
+            for data_point in datapoints:
                 _LOGGER.debug(data_point)
                 self.pm25 = safely_get_json_value(data_point, "pm25", int)
                 self.pm10 = safely_get_json_value(data_point, "pm10", int)

{blueair_api-1.30.2 → blueair_api-1.31.1}/src/blueair_api/device_aws.py

@@ -1,4 +1,3 @@
-import dataclasses
 import logging
 from json import dumps
 
@@ -6,12 +5,13 @@ from .callbacks import CallbacksMixin
 from .http_aws_blueair import HttpAwsBlueair
 from .model_enum import ModelEnum
 from . import intermediate_representation_aws as ir
+from dataclasses import dataclass, field
 
 _LOGGER = logging.getLogger(__name__)
 
 type AttributeType[T] = T | None
 
-@dataclasses.dataclass(slots=True)
+@dataclass(slots=True)
 class DeviceAws(CallbacksMixin):
     @classmethod
     async def create_device(cls, api, uuid, name, mac, type_name, refresh=False):
@@ -29,6 +29,8 @@ class DeviceAws(CallbacksMixin):
         return device_aws
 
     api: HttpAwsBlueair
+    raw_info : dict[str: any] = field(repr=False, init=False)
+
     uuid : str | None = None
     name : str | None = None
     name_api : str | None = None
@@ -66,14 +68,14 @@ class DeviceAws(CallbacksMixin):
 
     async def refresh(self):
         _LOGGER.debug(f"refreshing blueair device aws: {self}")
-        info = await self.api.device_info(self.name_api, self.uuid)
-        _LOGGER.debug(dumps(info, indent=2))
+        self.raw_info = await self.api.device_info(self.name_api, self.uuid)
+        _LOGGER.debug(dumps(self.raw_info, indent=2))
 
         # ir.parse_json(ir.Attribute, ir.query_json(info, "configuration.da"))
-        ds = ir.parse_json(ir.Sensor, ir.query_json(info, "configuration.ds"))
-        dc = ir.parse_json(ir.Control, ir.query_json(info, "configuration.dc"))
+        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(info["sensordata"]).to_latest_value()
+        sensor_data = ir.SensorPack(self.raw_info["sensordata"]).to_latest_value()
 
         def sensor_data_safe_get(key):
             return sensor_data.get(key) if key in ds else NotImplemented
@@ -88,7 +90,7 @@ class DeviceAws(CallbacksMixin):
         def info_safe_get(path):
             # directly reads for the schema. If the schema field is
             # undefined, it is NotImplemented, not merely unavailable.
-            value = ir.query_json(info, path)
+            value = ir.query_json(self.raw_info, path)
             if value is None:
                 return NotImplemented
             return value
@@ -99,7 +101,7 @@ class DeviceAws(CallbacksMixin):
         self.serial_number = info_safe_get("configuration.di.ds")
         self.sku = info_safe_get("configuration.di.sku")
 
-        states = ir.SensorPack(info["states"]).to_latest_value()
+        states = ir.SensorPack(self.raw_info["states"]).to_latest_value()
 
         def states_safe_get(key):
             return states.get(key) if key in dc else NotImplemented
@@ -185,4 +187,3 @@ class DeviceAws(CallbacksMixin):
         if self.sku == "112124":
             return ModelEnum.T10I
         return ModelEnum.UNKNOWN
-

{blueair_api-1.30.2 → blueair_api-1.31.1}/src/blueair_api.egg-info/PKG-INFO

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