blueair-api 1.33.1__py3-none-any.whl → 1.34.0__py3-none-any.whl

blueair_api/__init__.py

@@ -4,4 +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, FeatureEnum
+from .model_enum import ModelEnum

blueair_api/device.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from .callbacks import CallbacksMixin
 from .http_blueair import HttpBlueair
 from .util import transform_data_points, safely_get_json_value, convert_none_to_not_implemented
@@ -32,7 +34,7 @@ class Device(CallbacksMixin):
         return device
 
     api: HttpBlueair = field(repr=False)
-    raw_info : dict[str: any] = field(repr=False, init=False)
+    raw_info: dict[str, Any] = field(repr=False, init=False)
 
     uuid: str | None = None
     name: str | None = None

blueair_api/device_aws.py

@@ -1,4 +1,6 @@
-import logging
+from typing import Any
+
+from logging import getLogger
 from json import dumps
 
 from .callbacks import CallbacksMixin
@@ -7,7 +9,7 @@ from .model_enum import ModelEnum
 from . import intermediate_representation_aws as ir
 from dataclasses import dataclass, field
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = getLogger(__name__)
 
 type AttributeType[T] = T | None
 
@@ -29,7 +31,7 @@ class DeviceAws(CallbacksMixin):
         return device_aws
 
     api: HttpAwsBlueair = field(repr=False)
-    raw_info : dict[str: any] = field(repr=False, init=False)
+    raw_info : dict[str, Any] = field(repr=False, init=False)
 
     uuid : str | None = None
     name : str | None = None
@@ -247,4 +249,6 @@ class DeviceAws(CallbacksMixin):
             return ModelEnum.MAX_411I
         if self.sku == "112124":
             return ModelEnum.T10I
+        if self.sku == "109539":
+            return ModelEnum.MAX_311I_PLUS
         return ModelEnum.UNKNOWN

blueair_api/http_aws_blueair.py

@@ -1,14 +1,14 @@
-from typing import Any
 import functools
-import logging
 
+from logging import getLogger
+from typing import Any
 from aiohttp import ClientSession, ClientResponse, FormData
-from .const import AWS_APIKEYS
 
+from .const import AWS_APIKEYS
 from .util_http import request_with_logging
 from .errors import SessionError, LoginError
 
-_LOGGER = logging.getLogger(__name__)
+_LOGGER = getLogger(__name__)
 
 
 def request_with_active_session(func):

blueair_api/model_enum.py

@@ -1,90 +1,13 @@
-from enum import Enum, StrEnum
-
-
-class FeatureEnum(StrEnum):
-    TEMPERATURE = "Temperature"
-    HUMIDITY = "Humidity"
-    VOC = "VOC"
-    PM1 = "PM1"
-    PM10 = "PM10"
-    PM25 = "PM25"
-    WATER_SHORTAGE = "Water Shortage"
-    FILTER_EXPIRED = "Filter Expired"
-    CHILD_LOCK = "Child Lock"
-
-
-class ModelEnum(Enum):
-    def __new__(cls, *args, **kwds):
-        value = len(cls.__members__) + 1
-        obj = object.__new__(cls)
-        obj._value_ = value
-        return obj
-
-    def __init__(self,
-                 name,
-                 supported_features):
-        self.model_name = name
-        self.supported_features = supported_features
-
-    def supports_feature(self, supported_features) -> bool:
-        return supported_features in self.supported_features
-
-    UNKNOWN = "Unknown", [
-        FeatureEnum.TEMPERATURE,
-        FeatureEnum.HUMIDITY,
-        FeatureEnum.WATER_SHORTAGE,
-        FeatureEnum.VOC,
-        FeatureEnum.PM1,
-        FeatureEnum.PM10,
-        FeatureEnum.PM25,
-        FeatureEnum.FILTER_EXPIRED,
-        FeatureEnum.CHILD_LOCK,
-    ]
-    HUMIDIFIER_H35I = "Blueair Humidifier H35i", [
-        FeatureEnum.TEMPERATURE,
-        FeatureEnum.HUMIDITY,
-        FeatureEnum.WATER_SHORTAGE,
-    ]
-    PROTECT_7440I = "Blueair Protect 7440i", [
-        FeatureEnum.TEMPERATURE,
-        FeatureEnum.HUMIDITY,
-        FeatureEnum.VOC,
-        FeatureEnum.PM1,
-        FeatureEnum.PM10,
-        FeatureEnum.PM25,
-        FeatureEnum.FILTER_EXPIRED,
-        FeatureEnum.CHILD_LOCK,
-    ]
-    PROTECT_7470I = "Blueair Protect 7470i", [
-        FeatureEnum.TEMPERATURE,
-        FeatureEnum.HUMIDITY,
-        FeatureEnum.VOC,
-        FeatureEnum.PM1,
-        FeatureEnum.PM10,
-        FeatureEnum.PM25,
-        FeatureEnum.FILTER_EXPIRED,
-        FeatureEnum.CHILD_LOCK,
-    ]
-    MAX_211I = "Blueair Blue Pure 211i Max", [
-        FeatureEnum.PM1,
-        FeatureEnum.PM10,
-        FeatureEnum.PM25,
-        FeatureEnum.FILTER_EXPIRED,
-        FeatureEnum.CHILD_LOCK,
-    ]
-    MAX_311I = "Blueair Blue Pure 311i Max", [
-        FeatureEnum.PM25,
-        FeatureEnum.FILTER_EXPIRED,
-        FeatureEnum.CHILD_LOCK,
-    ]
-    MAX_411I = "Blueair Blue Pure 411i Max", [
-        FeatureEnum.PM25,
-        FeatureEnum.FILTER_EXPIRED,
-        FeatureEnum.CHILD_LOCK,
-    ]
-    T10I = "T10i ComfortPure 3-in-1 Filter/Heater/Fan", [
-        FeatureEnum.TEMPERATURE,
-        FeatureEnum.HUMIDITY,
-        FeatureEnum.PM25,
-        FeatureEnum.FILTER_EXPIRED,
-    ]
+from enum import StrEnum
+
+
+class ModelEnum(StrEnum):
+    UNKNOWN = "Unknown"
+    HUMIDIFIER_H35I = "Blueair Humidifier H35i"
+    PROTECT_7440I = "Blueair Protect 7440i"
+    PROTECT_7470I = "Blueair Protect 7470i"
+    MAX_211I = "Blueair Blue Pure 211i Max"
+    MAX_311I = "Blueair Blue Pure 311i Max"
+    MAX_311I_PLUS = "Blueair Blue Pure 311i+ Max"
+    MAX_411I = "Blueair Blue Pure 411i Max"
+    T10I = "T10i ComfortPure 3-in-1 Filter/Heater/Fan"

blueair_api/util.py

@@ -45,6 +45,8 @@ def safely_get_json_value(json, key, callable_to_cast=None):
 def convert_none_to_not_implemented(value):
     if value is None:
         return NotImplemented
+    else:
+        return value
 
 def transform_data_points(data):
     """Transform a measurement list response from the Blueair API to a more pythonic data structure."""

{blueair_api-1.33.1.dist-info → blueair_api-1.34.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: blueair_api
-Version: 1.33.1
+Version: 1.34.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.34.0.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=q1smSEhwyYvuQiR867lToFm-mGV-d3dNJvN0NJgscbU,1037
+blueair_api/device.py,sha256=0tLlQIEKRfii_5i38tLFfhru7wgHSMlyVt7tAsRDkdg,5497
+blueair_api/device_aws.py,sha256=-BESQ9p8lOkoDPi9qfqXgdzYk0K1t3QxVpyU7jf5MEg,10115
+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=L2FpcxwkicwFXoSxknoAtD_unE-1W0Vfx2ypQRr0Nds,450
+blueair_api/stub.py,sha256=tWJJLIhKf39P1gRAXfJk6L8cBJI9fVK3Uk9pj2_Teaw,1187
+blueair_api/util.py,sha256=uWO_rSSXWO-SDzIUHrQP4JR0PlARVV2IlQAJyWiGAlE,2089
+blueair_api/util_bootstrap.py,sha256=oo6qqEYUxWb4wLLivk7ofB0YFrKsTZo5tW0U2wc3-D0,1757
+blueair_api/util_http.py,sha256=45AJG3Vb6LMVzI0WV22AoSyt64f_Jj3KpOAwF5M6EFE,1327
+blueair_api-1.34.0.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
+blueair_api-1.34.0.dist-info/METADATA,sha256=9GZDw6VHOP_PzCuMp1Zw6AC-hxWbHSGDb-NxtUuhXf0,1995
+blueair_api-1.34.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+blueair_api-1.34.0.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
+blueair_api-1.34.0.dist-info/RECORD,,

blueair_api-1.33.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-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=qD4kiYjhJdRsY9d6CZSDKqJLO_dSum3sumYLgZW8v2s,5474
-blueair_api/device_aws.py,sha256=cWpMrMzWH9hI-gkZb_Tvp2DMJPFZm3p5kt01ZHTUtGc,10008
-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=IMnKXs9S0Z-t1GVshSItjNr9tTdtXjh7-T-tHpsbzhE,11752
-blueair_api/intermediate_representation_aws.py,sha256=DJWxHFP9yVll0O6kxHWjKscIlu-7genc3f7ZvwV5YdA,6137
-blueair_api/model_enum.py,sha256=Z9Ne4icNEjbGNwdHJZSDibcKJKwv-W1BRpZx01RGFuY,2480
-blueair_api/stub.py,sha256=tWJJLIhKf39P1gRAXfJk6L8cBJI9fVK3Uk9pj2_Teaw,1187
-blueair_api/util.py,sha256=vwOSs8SxUKlO1g5XfK3WI1hgo1dUIVY-9XX13N-6y-8,2058
-blueair_api/util_bootstrap.py,sha256=oo6qqEYUxWb4wLLivk7ofB0YFrKsTZo5tW0U2wc3-D0,1757
-blueair_api/util_http.py,sha256=45AJG3Vb6LMVzI0WV22AoSyt64f_Jj3KpOAwF5M6EFE,1327
-blueair_api-1.33.1.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
-blueair_api-1.33.1.dist-info/METADATA,sha256=0RB4yt3iupoxdlYc28H8wfhaoL3kUnQkAaGMS6aV_o0,1995
-blueair_api-1.33.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-blueair_api-1.33.1.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
-blueair_api-1.33.1.dist-info/RECORD,,