blueair-api 1.33.2__tar.gz → 1.34.1__tar.gz

{blueair_api-1.33.2 → blueair_api-1.34.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: blueair_api
-Version: 1.33.2
+Version: 1.34.1
 Summary: Blueair Api Wrapper
 Author-email: Brendan Dahl <dahl.brendan@gmail.com>
 Project-URL: Homepage, https://github.com/dahlb/blueair_api
@@ -17,6 +17,7 @@ Requires-Python: <4,>=3.12.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.8.1
+Dynamic: license-file
 
 [![GitHub Release][releases-shield]][releases]
 [![GitHub Activity][commits-shield]][commits]

{blueair_api-1.33.2 → blueair_api-1.34.1}/pyproject.toml

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

{blueair_api-1.33.2 → blueair_api-1.34.1}/src/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-1.33.2 → blueair_api-1.34.1}/src/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-1.33.2 → blueair_api-1.34.1}/src/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
@@ -241,10 +243,12 @@ class DeviceAws(CallbacksMixin):
             return ModelEnum.PROTECT_7470I
         if self.sku == "110059":
             return ModelEnum.MAX_211I
-        if self.sku == "110092":
+        if self.sku in ["110092", "110829"]:
             return ModelEnum.MAX_311I
         if self.sku == "110057":
             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-1.33.2 → blueair_api-1.34.1}/src/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-1.34.1/src/blueair_api/model_enum.py

@@ -0,0 +1,13 @@
+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-1.33.2 → blueair_api-1.34.1}/src/blueair_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: blueair_api
-Version: 1.33.2
+Version: 1.34.1
 Summary: Blueair Api Wrapper
 Author-email: Brendan Dahl <dahl.brendan@gmail.com>
 Project-URL: Homepage, https://github.com/dahlb/blueair_api
@@ -17,6 +17,7 @@ Requires-Python: <4,>=3.12.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.8.1
+Dynamic: license-file
 
 [![GitHub Release][releases-shield]][releases]
 [![GitHub Activity][commits-shield]][commits]

{blueair_api-1.33.2 → blueair_api-1.34.1}/tests/test_device_aws.py

@@ -440,6 +440,60 @@ class H35iTest(DeviceAwsTestBase):
             assert device.fan_speed_0 is NotImplemented
             assert device.temperature_unit is NotImplemented
 
+
+class Max311iTest(DeviceAwsTestBase):
+    """Tests for H35i."""
+
+    def setUp(self):
+        super().setUp()
+        with open(resources.files().joinpath('device_info/max_311i.json')) as sample_file:
+            info = json.load(sample_file)
+        self.device_info_helper.info.update(info)
+
+    async def test_attributes(self):
+        await self.device.refresh()
+        self.api.device_info.assert_awaited_with("fake-name-api", "fake-uuid")
+
+        with assert_fully_checked(self.device) as device:
+
+            assert device.model == ModelEnum.MAX_311I
+
+            assert device.pm1 is NotImplemented
+            assert device.pm2_5 == 0
+            assert device.pm10 is NotImplemented
+            assert device.tVOC is NotImplemented
+            assert device.temperature is NotImplemented
+            assert device.humidity is NotImplemented
+            assert device.name == "Loft"
+            assert device.firmware == "1.0.4"
+            assert device.mcu_firmware == "1.0.4"
+            assert device.serial_number == "111082900302313210005018"
+            assert device.sku == "110829"
+
+            assert device.standby is False
+            assert device.night_mode is False
+            assert device.germ_shield is NotImplemented
+            assert device.brightness == 35
+            assert device.child_lock is True
+            assert device.fan_speed == 11
+            assert device.fan_auto_mode is True
+            assert device.filter_usage_percentage == 12
+            assert device.wifi_working is True
+            assert device.wick_usage_percentage is NotImplemented
+            assert device.auto_regulated_humidity is NotImplemented
+            assert device.water_shortage is NotImplemented
+            assert device.wick_dry_mode is NotImplemented
+            assert device.main_mode is NotImplemented
+            assert device.ap_sub_mode is NotImplemented
+            assert device.heat_temp is NotImplemented
+            assert device.heat_sub_mode is NotImplemented
+            assert device.heat_fan_speed is NotImplemented
+            assert device.cool_sub_mode is NotImplemented
+            assert device.cool_fan_speed is NotImplemented
+            assert device.fan_speed_0 is NotImplemented
+            assert device.temperature_unit is NotImplemented
+
+
 class T10iTest(DeviceAwsTestBase):
     """Tests for T10i."""
 
@@ -546,3 +600,57 @@ class Protect7470iTest(DeviceAwsTestBase):
             assert device.ap_sub_mode is NotImplemented
             assert device.fan_speed_0 is NotImplemented
             assert device.temperature_unit is NotImplemented
+
+
+class Max211iTest(DeviceAwsTestBase):
+    """Tests for Max 211i."""
+
+    def setUp(self):
+        super().setUp()
+        with open(resources.files().joinpath('device_info/max_211i.json')) as sample_file:
+            info = json.load(sample_file)
+        self.device_info_helper.info.update(info)
+
+    async def test_attributes(self):
+
+        await self.device.refresh()
+        self.api.device_info.assert_awaited_with("fake-name-api", "fake-uuid")
+
+        with assert_fully_checked(self.device) as device:
+
+            assert device.model == ModelEnum.MAX_211I
+
+            assert device.pm1 == 0
+            assert device.pm2_5 == 0
+            assert device.pm10 == 0
+            assert device.tVOC is NotImplemented
+            assert device.temperature is NotImplemented
+            assert device.humidity is NotImplemented
+            assert device.name == "Bedroom Purifier"
+            assert device.firmware == "1.1.6"
+            assert device.mcu_firmware == "1.1.6"
+            assert device.serial_number == "111005900201111210085956"
+            assert device.sku == "110059"
+
+            assert device.standby is False
+            assert device.night_mode is False
+            assert device.germ_shield is NotImplemented
+            assert device.brightness == 0
+            assert device.child_lock is False
+            assert device.fan_speed == 15
+            assert device.fan_auto_mode is False
+            assert device.filter_usage_percentage == 55
+            assert device.wifi_working is True
+            assert device.wick_usage_percentage is NotImplemented
+            assert device.auto_regulated_humidity is NotImplemented
+            assert device.water_shortage is NotImplemented
+            assert device.wick_dry_mode is NotImplemented
+            assert device.main_mode is NotImplemented
+            assert device.heat_temp is NotImplemented
+            assert device.heat_sub_mode is NotImplemented
+            assert device.heat_fan_speed is NotImplemented
+            assert device.cool_sub_mode is NotImplemented
+            assert device.cool_fan_speed is NotImplemented
+            assert device.ap_sub_mode is NotImplemented
+            assert device.fan_speed_0 is NotImplemented
+            assert device.temperature_unit is NotImplemented

blueair_api-1.33.2/src/blueair_api/model_enum.py

@@ -1,90 +0,0 @@
-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,
-    ]