blueair-api 1.15.1__py3-none-any.whl → 1.16.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
+from .model_enum import ModelEnum, FeatureEnum

blueair_api/device.py

@@ -7,7 +7,7 @@ from .http_blueair import HttpBlueair
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclasses.dataclass(init=False, slots=True)
+@dataclasses.dataclass(slots=True)
 class Device(CallbacksMixin):
     api: HttpBlueair
     uuid: str | None = None
@@ -29,19 +29,7 @@ class Device(CallbacksMixin):
     filter_expired: bool | None = None
     wifi_working: bool | None = None
 
-    def __init__(
-        self,
-        api: HttpBlueair,
-        uuid: str = None,
-        name: str = None,
-        mac: str = None,
-    ):
-        self.api = api
-        self.uuid = uuid
-        self.name = name
-        self.mac = mac
-
-    async def init(self):
+    async def post_init(self):
         info = await self.api.get_info(self.uuid)
         self.timezone = info["timezone"]
         self.compatibility = info["compatibility"]
@@ -50,7 +38,7 @@ class Device(CallbacksMixin):
         self.mcu_firmware = info["mcuFirmware"]
         self.wlan_driver = info["wlanDriver"]
         self.room_location = info["roomLocation"]
-        _LOGGER.debug(f"init blueair device: {self}")
+        _LOGGER.debug(f"post_init blueair device: {self}")
 
     async def refresh(self):
         _LOGGER.debug("Requesting current attributes...")

blueair_api/device_aws.py

@@ -8,7 +8,8 @@ from .util import convert_api_array_to_dict, safely_get_json_value
 
 _LOGGER = logging.getLogger(__name__)
 
-@dataclasses.dataclass(init=False, slots=True)
+
+@dataclasses.dataclass(slots=True)
 class DeviceAws(CallbacksMixin):
     api: HttpAwsBlueair
     uuid: str = None
@@ -45,23 +46,8 @@ class DeviceAws(CallbacksMixin):
     water_shortage: bool = None
     auto_regulated_humidity: int = None
 
-    def __init__(
-        self,
-        api: HttpAwsBlueair,
-        uuid: str = None,
-        name_api: str = None,
-        mac: str = None,
-        type_name: str = None,
-    ):
-        self.api = api
-        self.uuid = uuid
-        self.name_api = name_api
-        self.mac = mac
-        self.type_name = type_name
-        _LOGGER.debug(f"creating blueair device aws: {self.uuid}")
-
     async def refresh(self):
-        _LOGGER.debug(f"refreshing blueair device aws: {self.uuid}")
+        _LOGGER.debug(f"refreshing blueair device aws: {self}")
         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)

blueair_api/model_enum.py

@@ -1,9 +1,72 @@
-from enum import StrEnum
+from enum import Enum, StrEnum
 
 
-class ModelEnum(StrEnum):
-    UNKNOWN = "Unknown"
-    HUMIDIFIER_H35I = "Blueair Humidifier H35i"
-    PROTECT_7470I = "Blueair Protect 7470i"
-    MAX_211I = "Blueair Blue Pure 211i Max"
-    MAX_311I = "Blueair Blue Pure 311i Max"
+class FeatureEnum(StrEnum):
+    TEMPERATURE = "Temperature"
+    HUMIDITY = "Humidity"
+    VOC = "VOC"
+    PM1 = "PM1"
+    PM10 = "PM10"
+    PM25 = "PM25"
+    WATER_SHORTAGE = "Water Shortage"
+    FILTER_EXPIRED = "Filter Expired"
+
+
+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,
+    ]
+    HUMIDIFIER_H35I = "Blueair Humidifier H35i", [
+        FeatureEnum.TEMPERATURE,
+        FeatureEnum.HUMIDITY,
+        FeatureEnum.WATER_SHORTAGE,
+    ]
+    PROTECT_7470I = "Blueair Protect 7470i", [
+        FeatureEnum.TEMPERATURE,
+        FeatureEnum.HUMIDITY,
+        FeatureEnum.VOC,
+        FeatureEnum.PM1,
+        FeatureEnum.PM10,
+        FeatureEnum.PM25,
+        FeatureEnum.FILTER_EXPIRED
+    ]
+    MAX_211I = "Blueair Blue Pure 211i Max", [
+        FeatureEnum.TEMPERATURE,
+        FeatureEnum.HUMIDITY,
+        FeatureEnum.VOC,
+        FeatureEnum.PM1,
+        FeatureEnum.PM10,
+        FeatureEnum.PM25,
+        FeatureEnum.FILTER_EXPIRED
+    ]
+    MAX_311I = "Blueair Blue Pure 311i Max", [
+        FeatureEnum.TEMPERATURE,
+        FeatureEnum.HUMIDITY,
+        FeatureEnum.VOC,
+        FeatureEnum.PM1,
+        FeatureEnum.PM10,
+        FeatureEnum.PM25,
+        FeatureEnum.FILTER_EXPIRED
+    ]

blueair_api/stub.py

@@ -37,7 +37,7 @@ async def testing():
     try:
         api, devices = await get_devices(username=username, password=password)
         for device in devices:
-            await device.init()
+            await device.post_init()
             await device.refresh()
             logger.debug(device)
     finally:

{blueair_api-1.15.1.dist-info → blueair_api-1.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blueair_api
-Version: 1.15.1
+Version: 1.16.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.15.1.dist-info → blueair_api-1.16.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
-blueair_api/__init__.py,sha256=gk2CZWEnEo4FlP7VcJsDs1kujZ_ryXF5H9n3Kd-4WWo,313
+blueair_api/__init__.py,sha256=GucsIENhTF4AVxPn4Xyr4imUxJJ8RO8RYt1opHCF2hQ,326
 blueair_api/callbacks.py,sha256=eqgfe1qN_NNWOp2qNSP123zQJxh_Ie6vZXp5EHp6ePc,757
 blueair_api/const.py,sha256=fRth29dQT1dguM7L4ij8pDefB_vBrevAHqTdfNvSugs,1048
-blueair_api/device.py,sha256=qabW3IH5AUslWpXdCS5S-QtL8e2tJrIHqzgQ2XxKQ8A,2603
-blueair_api/device_aws.py,sha256=Wu_-qZ2U8M3J8ngtJvZf8-nHcdZhsnGaoUwIcT6B1PU,5675
+blueair_api/device.py,sha256=ogpUE0nH7s4o3rXHkioixm8S_jC79pYya0opLkTbc0c,2362
+blueair_api/device_aws.py,sha256=8UYMInVnBI4nvfKO3ldtI18u99soCM-0FG3Vec8R89c,5272
 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=tTPX0tHHERH-mKL5gIe4LgAi3crqRflfkoQLv2jZ8Kw,257
-blueair_api/stub.py,sha256=04RBMbv3ZdfJzmZISj3grf43AYU7ia0parL0UKDfeXI,1273
+blueair_api/model_enum.py,sha256=mNhdtt6XwSAe6ux9FtWVZ8DM1k7O1jcTjM1fYylRLUY,1924
+blueair_api/stub.py,sha256=yJLfmrHjAH0XKl9HVTkKt-Ks9bG6Uhlkn3H2Jf3REJQ,1278
 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.15.1.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
-blueair_api-1.15.1.dist-info/METADATA,sha256=GivMlQ7_rTbpvCNXZTJzcK7Eg7FT-dnxXqAe14o2Q38,1995
-blueair_api-1.15.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-blueair_api-1.15.1.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
-blueair_api-1.15.1.dist-info/RECORD,,
+blueair_api-1.16.0.dist-info/LICENSE,sha256=W6UV41yCe1R_Avet8VtsxwdJar18n40b3MRnbEMHZmI,1066
+blueair_api-1.16.0.dist-info/METADATA,sha256=pfD_isWd7rxEOXzhVvbhoR-AmdEpk9YwcRiWOkvZt14,1995
+blueair_api-1.16.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+blueair_api-1.16.0.dist-info/top_level.txt,sha256=-gn0jNtmE83qEu70uMW5F4JrXnHGRfuFup1EPWF70oc,12
+blueair_api-1.16.0.dist-info/RECORD,,