blueair-api 1.10.0__py3-none-any.whl → 1.12.0__py3-none-any.whl

blueair_api/__init__.py

@@ -4,3 +4,4 @@ from .http_aws_blueair import HttpAwsBlueair
 from .util_bootstrap import get_devices, get_aws_devices
 from .device import Device
 from .device_aws import DeviceAws
+from .model_enum import ModelEnum

blueair_api/const.py

@@ -1,7 +1,6 @@
 from collections.abc import Mapping
 from typing_extensions import TypedDict
 
-
 SENSITIVE_FIELD_NAMES = [
     "username",
     "password",
@@ -10,13 +9,6 @@ SENSITIVE_FIELD_NAMES = [
 # The BlueAir API uses a fixed API key.
 API_KEY = "eyJhbGciOiJIUzI1NiJ9.eyJncmFudGVlIjoiYmx1ZWFpciIsImlhdCI6MTQ1MzEyNTYzMiwidmFsaWRpdHkiOi0xLCJqdGkiOiJkNmY3OGE0Yi1iMWNkLTRkZDgtOTA2Yi1kN2JkNzM0MTQ2NzQiLCJwZXJtaXNzaW9ucyI6WyJhbGwiXSwicXVvdGEiOi0xLCJyYXRlTGltaXQiOi0xfQ.CJsfWVzFKKDDA6rWdh-hjVVVE9S3d6Hu9BzXG9htWFw"  # noqa: E501
 
-
-class MeasurementBundle(TypedDict):
-    sensors: list[str]
-    datapoints: list[list[int | float]]
-
-MeasurementList = list[Mapping[str, int | float]]
-
 AWS_APIKEYS = {
     "us": {
         "gigyaRegion": "us1",
@@ -31,3 +23,11 @@ AWS_APIKEYS = {
         "apiKey": "3_qRseYzrUJl1VyxvSJANalu_kNgQ83swB1B9uzgms58--5w1ClVNmrFdsDnWVQQCl",
     },
 }
+
+
+class MeasurementBundle(TypedDict):
+    sensors: list[str]
+    datapoints: list[list[int | float]]
+
+
+MeasurementList = list[Mapping[str, int | float]]

blueair_api/device.py

@@ -37,7 +37,7 @@ class Device(CallbacksMixin):
         self.uuid = uuid
         self.name = name
         self.mac = mac
-        _LOGGER.debug(f"creating blueair device: {self.name}")
+        _LOGGER.debug(f"creating blueair device: {self}")
 
     async def init(self):
         info = await self.api.get_info(self.uuid)

blueair_api/device_aws.py

@@ -2,6 +2,7 @@ import logging
 
 from .callbacks import CallbacksMixin
 from .http_aws_blueair import HttpAwsBlueair
+from .model_enum import ModelEnum
 from .util import convert_api_array_to_dict, safely_get_json_value
 
 _LOGGER = logging.getLogger(__name__)
@@ -12,6 +13,9 @@ class DeviceAws(CallbacksMixin):
     name: str = None
     name_api: str = None
     mac: str = None
+    type_name: str = None
+
+    sku: str = None
     firmware: str = None
     mcu_firmware: str = None
     serial_number: str = None
@@ -36,7 +40,7 @@ class DeviceAws(CallbacksMixin):
     # i35
     wick_usage: int = None  # percentage
     wick_dry_mode: bool = None
-    wshortage: bool = None
+    water_shortage: bool = None
     auto_regulated_humidity: int = None
 
     def __init__(
@@ -55,6 +59,7 @@ class DeviceAws(CallbacksMixin):
         _LOGGER.debug(f"creating blueair device aws: {self.uuid}")
 
     async def refresh(self):
+        _LOGGER.debug(f"refreshing blueair device aws: {self.uuid}")
         info = await self.api.device_info(self.name_api, self.uuid)
         sensor_data = convert_api_array_to_dict(info["sensordata"])
         self.pm1 = safely_get_json_value(sensor_data, "pm1", int)
@@ -68,6 +73,7 @@ class DeviceAws(CallbacksMixin):
         self.firmware = safely_get_json_value(info, "configuration.di.cfv")
         self.mcu_firmware = safely_get_json_value(info, "configuration.di.mfv")
         self.serial_number = safely_get_json_value(info, "configuration.di.ds")
+        self.sku = safely_get_json_value(info, "configuration.di.sku")
 
         states = convert_api_array_to_dict(info["states"])
         self.running = safely_get_json_value(states, "standby") is False
@@ -85,6 +91,7 @@ class DeviceAws(CallbacksMixin):
         self.water_shortage = safely_get_json_value(states, "wshortage", bool)
 
         self.publish_updates()
+        _LOGGER.debug(f"refreshed blueair device aws: {self}")
 
     async def set_brightness(self, value: int):
         self.brightness = value
@@ -126,11 +133,20 @@ class DeviceAws(CallbacksMixin):
         await self.api.set_device_info(self.uuid, "wickdrys", "vb", value)
         self.publish_updates()
 
+    @property
+    def model(self) -> ModelEnum:
+        if self.sku == "111633":
+            return ModelEnum.HUMIDIFIER_I35
+        if self.sku == "105826":
+            return ModelEnum.PROTECT_7470I
+        return ModelEnum.UNKNOWN
+
     def __repr__(self):
         return {
             "uuid": self.uuid,
             "name": self.name,
             "type_name": self.type_name,
+            "sku": self.sku,
             "name_api": self.name_api,
             "mac": self.mac,
             "firmware": self.firmware,

blueair_api/model_enum.py

@@ -0,0 +1,7 @@
+from enum import StrEnum
+
+
+class ModelEnum(StrEnum):
+    UNKNOWN = "Unknown"
+    HUMIDIFIER_I35 = "Blueair Humidifier i35"
+    PROTECT_7470I = "Blueair Protect 7470i"

blueair_api/util_bootstrap.py

@@ -32,7 +32,6 @@ async def get_devices(
             uuid=device["uuid"],
             name=device["name"],
             mac=device["mac"],
-            type_name=device["type"],
         )
 
     devices = map(create_device, api_devices)
@@ -62,7 +61,10 @@ async def get_aws_devices(
             uuid=device["uuid"],
             name_api=device["name"],
             mac=device["mac"],
+            type_name=device["type"],
         )
 
-    devices = map(create_device, api_devices)
-    return (api, list(devices))
+
+    devices = list(map(create_device, api_devices))
+
+    return (api, devices)

{blueair_api-1.10.0.dist-info → blueair_api-1.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blueair_api
-Version: 1.10.0
+Version: 1.12.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.12.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+blueair_api/__init__.py,sha256=gk2CZWEnEo4FlP7VcJsDs1kujZ_ryXF5H9n3Kd-4WWo,313
+blueair_api/callbacks.py,sha256=6hzAAbdq-FQYTgc5RVBQCiqJz3PaBHkIgAkg0P2NZ8U,725
+blueair_api/const.py,sha256=fRth29dQT1dguM7L4ij8pDefB_vBrevAHqTdfNvSugs,1048
+blueair_api/device.py,sha256=ekx-smhX6n-evnrh87y1FTSMwSoPa-lQKJNyvTutnSA,3188
+blueair_api/device_aws.py,sha256=JxVStSXvNC2x3KR6s8nCP78mOWZ0tgyWcZRbKkLQKi8,6657
+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=ieDvjs0_DHSJzseO_qdvLIxdrUUHuTgSHjWb6u-_gRs,7350
+blueair_api/model_enum.py,sha256=rTZgB3HWI3N7BkyZHKez80wu4WD04D1myYMjGFGvyPA,167
+blueair_api/stub.py,sha256=04RBMbv3ZdfJzmZISj3grf43AYU7ia0parL0UKDfeXI,1273
+blueair_api/util.py,sha256=3L9-vfHfN1vUBYU0BA9ruYyNPUTmS21D-uI-Jyo5x6U,1672
+blueair_api/util_bootstrap.py,sha256=1IQXZ0_nbRiLYnrnmyQcDMdZ7vi4i_CV78vFRxXCPWY,1602
+blueair_api/util_http.py,sha256=45AJG3Vb6LMVzI0WV22AoSyt64f_Jj3KpOAwF5M6EFE,1327
+blueair_api-1.12.0.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
+blueair_api-1.12.0.dist-info/METADATA,sha256=xQRJFjYD8Z9Y_ZNBWUN15Rn8ViMz-otW8a-92eJ2X0k,1997
+blueair_api-1.12.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+blueair_api-1.12.0.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
+blueair_api-1.12.0.dist-info/RECORD,,

{blueair_api-1.10.0.dist-info → blueair_api-1.12.0.dist-info}/WHEEL

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

blueair_api-1.10.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-blueair_api/__init__.py,sha256=TSAR2ntyFQWyGdKNR1iEsJJmQbNMOvnw-xdVONMHdA8,279
-blueair_api/callbacks.py,sha256=6hzAAbdq-FQYTgc5RVBQCiqJz3PaBHkIgAkg0P2NZ8U,725
-blueair_api/const.py,sha256=RJtIjEyi4VaAtlnjjBaEdndAtDNUjsm-c78o83CIjgk,1048
-blueair_api/device.py,sha256=8fzC97FeyCvjML-73ls-vQPs2_aTNX9o-Ywk7ZTVoNI,3193
-blueair_api/device_aws.py,sha256=0fPs4o335YgQiJ-0lMNQp400LnlSMepbASRliEw3hgk,6104
-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=ieDvjs0_DHSJzseO_qdvLIxdrUUHuTgSHjWb6u-_gRs,7350
-blueair_api/stub.py,sha256=04RBMbv3ZdfJzmZISj3grf43AYU7ia0parL0UKDfeXI,1273
-blueair_api/util.py,sha256=3L9-vfHfN1vUBYU0BA9ruYyNPUTmS21D-uI-Jyo5x6U,1672
-blueair_api/util_bootstrap.py,sha256=OMv4ouaiEClM6A0PVAEIGCoe7ySkHbs8F8rFUpoe6-Y,1600
-blueair_api/util_http.py,sha256=45AJG3Vb6LMVzI0WV22AoSyt64f_Jj3KpOAwF5M6EFE,1327
-blueair_api-1.10.0.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
-blueair_api-1.10.0.dist-info/METADATA,sha256=6oEm6hMOG8C2HUp9qSC9PaAypxfbOOrmOAUIGf2rTaw,1997
-blueair_api-1.10.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-blueair_api-1.10.0.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
-blueair_api-1.10.0.dist-info/RECORD,,