PySwitchbot 2.0.1__tar.gz → 2.2.0__tar.gz

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 2.0.1
+Version: 2.2.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 2.0.1
+Version: 2.2.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/PySwitchbot.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ switchbot/helpers.py
 switchbot/models.py
 switchbot/utils.py
 switchbot/adv_parsers/__init__.py
+switchbot/adv_parsers/_sensor_th.py
 switchbot/adv_parsers/air_purifier.py
 switchbot/adv_parsers/art_frame.py
 switchbot/adv_parsers/blind_tilt.py
@@ -45,6 +46,7 @@ switchbot/adv_parsers/remote.py
 switchbot/adv_parsers/roller_shade.py
 switchbot/adv_parsers/smart_thermostat_radiator.py
 switchbot/adv_parsers/vacuum.py
+switchbot/adv_parsers/weather_station.py
 switchbot/const/__init__.py
 switchbot/const/air_purifier.py
 switchbot/const/climate.py

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/setup.py

@@ -20,7 +20,7 @@ setup(
         "cryptography>=39.0.0",
         "pyOpenSSL>=23.0.0",
     ],
-    version="2.0.1",
+    version="2.2.0",
     description="A library to communicate with Switchbot",
     long_description=long_description,
     long_description_content_type="text/markdown",

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/switchbot/__init__.py

@@ -18,16 +18,20 @@ from .const import (
     ClimateMode,
     ColorMode,
     FanMode,
+    HorizontalOscillationAngle,
     HumidifierAction,
     HumidifierMode,
     HumidifierWaterLevel,
     LockStatus,
+    NightLightState,
     SmartThermostatRadiatorMode,
+    StandingFanMode,
     StripLightColorMode,
     SwitchbotAccountConnectionError,
     SwitchbotApiError,
     SwitchbotAuthenticationError,
     SwitchbotModel,
+    VerticalOscillationAngle,
 )
 from .devices.air_purifier import SwitchbotAirPurifier
 from .devices.art_frame import SwitchbotArtFrame
@@ -44,12 +48,15 @@ from .devices.device import (
     fetch_cloud_devices,
 )
 from .devices.evaporative_humidifier import SwitchbotEvaporativeHumidifier
-from .devices.fan import SwitchbotFan
+from .devices.fan import SwitchbotFan, SwitchbotStandingFan
 from .devices.humidifier import SwitchbotHumidifier
 from .devices.keypad_vision import SwitchbotKeypadVision
 from .devices.light_strip import (
+    SwitchbotCandleWarmerLamp,
     SwitchbotLightStrip,
+    SwitchbotPermanentOutdoorLight,
     SwitchbotRgbicLight,
+    SwitchbotRgbicNeonLight,
     SwitchbotStripLight3,
 )
 from .devices.lock import SwitchbotLock
@@ -76,11 +83,14 @@ __all__ = [
     "ColorMode",
     "FanMode",
     "GetSwitchbotDevices",
+    "HorizontalOscillationAngle",
     "HumidifierAction",
     "HumidifierMode",
     "HumidifierWaterLevel",
     "LockStatus",
+    "NightLightState",
     "SmartThermostatRadiatorMode",
+    "StandingFanMode",
     "StripLightColorMode",
     "SwitchBotAdvertisement",
     "Switchbot",
@@ -93,6 +103,7 @@ __all__ = [
     "SwitchbotBaseLight",
     "SwitchbotBlindTilt",
     "SwitchbotBulb",
+    "SwitchbotCandleWarmerLamp",
     "SwitchbotCeilingLight",
     "SwitchbotCurtain",
     "SwitchbotDevice",
@@ -108,17 +119,21 @@ __all__ = [
     "SwitchbotModel",
     "SwitchbotModel",
     "SwitchbotOperationError",
+    "SwitchbotPermanentOutdoorLight",
     "SwitchbotPlugMini",
     "SwitchbotPlugMini",
     "SwitchbotRelaySwitch",
     "SwitchbotRelaySwitch2PM",
     "SwitchbotRgbicLight",
+    "SwitchbotRgbicNeonLight",
     "SwitchbotRollerShade",
     "SwitchbotSmartThermostatRadiator",
+    "SwitchbotStandingFan",
     "SwitchbotStripLight3",
     "SwitchbotSupportedType",
     "SwitchbotSupportedType",
     "SwitchbotVacuum",
+    "VerticalOscillationAngle",
     "close_stale_connections",
     "close_stale_connections_by_address",
     "fetch_cloud_devices",

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/switchbot/adv_parser.py

@@ -20,7 +20,7 @@ from .adv_parsers.ceiling_light import process_woceiling
 from .adv_parsers.climate_panel import process_climate_panel
 from .adv_parsers.contact import process_wocontact
 from .adv_parsers.curtain import process_wocurtain
-from .adv_parsers.fan import process_fan
+from .adv_parsers.fan import process_fan, process_standing_fan
 from .adv_parsers.hub2 import process_wohub2
 from .adv_parsers.hub3 import process_hub3
 from .adv_parsers.hubmini_matter import process_hubmini_matter
@@ -28,7 +28,12 @@ from .adv_parsers.humidifier import process_evaporative_humidifier, process_wohu
 from .adv_parsers.keypad import process_wokeypad
 from .adv_parsers.keypad_vision import process_keypad_vision, process_keypad_vision_pro
 from .adv_parsers.leak import process_leak
-from .adv_parsers.light_strip import process_light, process_rgbic_light, process_wostrip
+from .adv_parsers.light_strip import (
+    process_candle_warmer_lamp,
+    process_light,
+    process_rgbic_light,
+    process_wostrip,
+)
 from .adv_parsers.lock import (
     process_lock2,
     process_locklite,
@@ -49,6 +54,7 @@ from .adv_parsers.remote import process_woremote
 from .adv_parsers.roller_shade import process_worollershade
 from .adv_parsers.smart_thermostat_radiator import process_smart_thermostat_radiator
 from .adv_parsers.vacuum import process_vacuum, process_vacuum_k
+from .adv_parsers.weather_station import process_weather_station
 from .const import SwitchbotModel
 from .models import SwitchBotAdvertisement
 from .utils import format_mac_upper
@@ -69,7 +75,7 @@ class SwitchbotSupportedType(TypedDict):
 
     modelName: SwitchbotModel
     modelFriendlyName: str
-    func: Callable[[bytes, bytes | None], dict[str, bool | int]]
+    func: Callable[[bytes | None, bytes | None], dict[str, bool | int | str | None]]
     manufacturer_id: int | None
     manufacturer_data_length: int | None
 
@@ -611,6 +617,18 @@ SUPPORTED_TYPES: dict[str | bytes, SwitchbotSupportedType] = {
         "func": process_light,
         "manufacturer_id": 2409,
     },
+    b"\x00\x11\x22\xb8": {
+        "modelName": SwitchbotModel.CANDLE_WARMER_LAMP,
+        "modelFriendlyName": "Candle Warmer Lamp",
+        "func": process_candle_warmer_lamp,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x11\x22\xb8": {
+        "modelName": SwitchbotModel.CANDLE_WARMER_LAMP,
+        "modelFriendlyName": "Candle Warmer Lamp",
+        "func": process_candle_warmer_lamp,
+        "manufacturer_id": 2409,
+    },
     b"\x00\x10\xd0\xb1": {
         "modelName": SwitchbotModel.STRIP_LIGHT_3,
         "modelFriendlyName": "Strip Light 3",
@@ -659,6 +677,42 @@ SUPPORTED_TYPES: dict[str | bytes, SwitchbotSupportedType] = {
         "func": process_rgbic_light,
         "manufacturer_id": 2409,
     },
+    b"\x00\x10\xd0\xb7": {
+        "modelName": SwitchbotModel.PERMANENT_OUTDOOR_LIGHT,
+        "modelFriendlyName": "Permanent Outdoor Light",
+        "func": process_rgbic_light,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x10\xd0\xb7": {
+        "modelName": SwitchbotModel.PERMANENT_OUTDOOR_LIGHT,
+        "modelFriendlyName": "Permanent Outdoor Light",
+        "func": process_rgbic_light,
+        "manufacturer_id": 2409,
+    },
+    b"\x00\x10\xd0\xb5": {
+        "modelName": SwitchbotModel.RGBIC_NEON_WIRE_ROPE_LIGHT,
+        "modelFriendlyName": "RGBIC Neon Wire Rope Light",
+        "func": process_wostrip,
+        "manufacturer_id": 2409,
+    },
+    b"\x00\x10\xd0\xb6": {
+        "modelName": SwitchbotModel.RGBIC_NEON_ROPE_LIGHT,
+        "modelFriendlyName": "RGBIC Neon Rope Light",
+        "func": process_wostrip,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x10\xd0\xb5": {
+        "modelName": SwitchbotModel.RGBIC_NEON_WIRE_ROPE_LIGHT,
+        "modelFriendlyName": "RGBIC Neon Wire Rope Light",
+        "func": process_wostrip,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x10\xd0\xb6": {
+        "modelName": SwitchbotModel.RGBIC_NEON_ROPE_LIGHT,
+        "modelFriendlyName": "RGBIC Neon Rope Light",
+        "func": process_wostrip,
+        "manufacturer_id": 2409,
+    },
     b"\x00\x10\xfb\xa8": {
         "modelName": SwitchbotModel.K11_VACUUM,
         "modelFriendlyName": "K11+ Vacuum",
@@ -791,6 +845,30 @@ SUPPORTED_TYPES: dict[str | bytes, SwitchbotSupportedType] = {
         "func": process_wolock_pro,
         "manufacturer_id": 2409,
     },
+    b"\x00\x11\x07\x60": {
+        "modelName": SwitchbotModel.STANDING_FAN,
+        "modelFriendlyName": "Standing Fan",
+        "func": process_standing_fan,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x11\x07\x60": {
+        "modelName": SwitchbotModel.STANDING_FAN,
+        "modelFriendlyName": "Standing Fan",
+        "func": process_standing_fan,
+        "manufacturer_id": 2409,
+    },
+    b"\x00\x10\x53\xb0": {
+        "modelName": SwitchbotModel.WEATHER_STATION,
+        "modelFriendlyName": "Weather Station",
+        "func": process_weather_station,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x10\x53\xb0": {
+        "modelName": SwitchbotModel.WEATHER_STATION,
+        "modelFriendlyName": "Weather Station",
+        "func": process_weather_station,
+        "manufacturer_id": 2409,
+    },
 }
 
 _SWITCHBOT_MODEL_TO_CHAR: defaultdict[SwitchbotModel, list[str | bytes]] = defaultdict(

pyswitchbot-2.2.0/switchbot/adv_parsers/_sensor_th.py

@@ -0,0 +1,36 @@
+"""Shared temperature/humidity decoding helpers for T/H sensors."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from ..helpers import celsius_to_fahrenheit
+
+
+def decode_temp_humidity(temp_data: bytes, battery: int | None) -> dict[str, Any]:
+    """
+    Decode temperature/humidity/fahrenheit-flag from a 3-byte payload.
+
+    Layout (bytes after company ID, for SwitchBot T/H sensors):
+        byte 0: bits[3:0] = temperature decimal (0.1 °C units)
+        byte 1: bit[7] = temperature sign (1 = positive), bits[6:0] = integer °C
+        byte 2: bit[7] = fahrenheit-display flag, bits[6:0] = humidity %
+    """
+    _temp_sign = 1 if temp_data[1] & 0b10000000 else -1
+    _temp_c = _temp_sign * (
+        (temp_data[1] & 0b01111111) + ((temp_data[0] & 0b00001111) / 10)
+    )
+    _temp_f = celsius_to_fahrenheit(_temp_c)
+    _temp_f = (_temp_f * 10) / 10
+    humidity = temp_data[2] & 0b01111111
+
+    if _temp_c == 0 and humidity == 0 and battery == 0:
+        return {}
+
+    return {
+        "temp": {"c": _temp_c, "f": _temp_f},
+        "temperature": _temp_c,
+        "fahrenheit": bool(temp_data[2] & 0b10000000),
+        "humidity": humidity,
+        "battery": battery,
+    }

pyswitchbot-2.2.0/switchbot/adv_parsers/fan.py

@@ -0,0 +1,55 @@
+"""Fan adv parser."""
+
+from __future__ import annotations
+
+from ..const.fan import FanMode, StandingFanMode
+
+_FAN_MODE_MAP: dict[int, str] = {m.value: m.name.lower() for m in FanMode}
+_STANDING_FAN_MODE_MAP: dict[int, str] = {
+    m.value: m.name.lower() for m in StandingFanMode
+}
+
+
+def _parse_fan(
+    mfr_data: bytes | None, mode_map: dict[int, str]
+) -> dict[str, bool | int | str | None]:
+    """Shared fan advertisement parse, parameterized on the mode map."""
+    if mfr_data is None:
+        return {}
+
+    device_data = mfr_data[6:]
+
+    _seq_num = device_data[0]
+    _isOn = bool(device_data[1] & 0b10000000)
+    _mode = (device_data[1] & 0b01110000) >> 4
+    _nightLight = (device_data[1] & 0b00001100) >> 2
+    _oscillate_left_and_right = bool(device_data[1] & 0b00000010)
+    _oscillate_up_and_down = bool(device_data[1] & 0b00000001)
+    _battery = device_data[2] & 0b01111111
+    _speed = device_data[3] & 0b01111111
+
+    return {
+        "sequence_number": _seq_num,
+        "isOn": _isOn,
+        "mode": mode_map.get(_mode),
+        "nightLight": _nightLight,
+        "oscillating": _oscillate_left_and_right or _oscillate_up_and_down,
+        "oscillating_horizontal": _oscillate_left_and_right,
+        "oscillating_vertical": _oscillate_up_and_down,
+        "battery": _battery,
+        "speed": _speed,
+    }
+
+
+def process_fan(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, bool | int | str | None]:
+    """Process Circulator Fan services data (modes 1-4)."""
+    return _parse_fan(mfr_data, _FAN_MODE_MAP)
+
+
+def process_standing_fan(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, bool | int | str | None]:
+    """Process Standing Fan services data (modes 1-5; adds CUSTOM_NATURAL)."""
+    return _parse_fan(mfr_data, _STANDING_FAN_MODE_MAP)

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/switchbot/adv_parsers/light_strip.py

@@ -21,6 +21,21 @@ def process_wostrip(
     }
 
 
+def process_candle_warmer_lamp(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, bool | int]:
+    """Process Candle Warmer Lamp services data."""
+    if mfr_data is None:
+        return {}
+    return {
+        "sequence_number": mfr_data[6],
+        "isOn": bool(mfr_data[7] & 0b10000000),
+        "brightness": mfr_data[7] & 0b01111111,
+        "delay": bool(mfr_data[8] & 0b10000000),
+        "network_state": (mfr_data[8] & 0b01110000) >> 4,
+    }
+
+
 def process_light(
     data: bytes | None, mfr_data: bytes | None, cw_offset: int = 16
 ) -> dict[str, bool | int]:

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/switchbot/adv_parsers/meter.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import struct
 from typing import Any
 
-from ..helpers import celsius_to_fahrenheit
+from ._sensor_th import decode_temp_humidity
 
 CO2_UNPACK = struct.Struct(">H").unpack_from
 
@@ -13,7 +13,7 @@ CO2_UNPACK = struct.Struct(">H").unpack_from
 def process_wosensorth(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process woSensorTH/Temp sensor services data."""
     temp_data: bytes | None = None
-    battery: bytes | None = None
+    battery: int | None = None
 
     if mfr_data:
         temp_data = mfr_data[8:11]
@@ -26,25 +26,7 @@ def process_wosensorth(data: bytes | None, mfr_data: bytes | None) -> dict[str,
     if not temp_data:
         return {}
 
-    _temp_sign = 1 if temp_data[1] & 0b10000000 else -1
-    _temp_c = _temp_sign * (
-        (temp_data[1] & 0b01111111) + ((temp_data[0] & 0b00001111) / 10)
-    )
-    _temp_f = celsius_to_fahrenheit(_temp_c)
-    _temp_f = (_temp_f * 10) / 10
-    humidity = temp_data[2] & 0b01111111
-
-    if _temp_c == 0 and humidity == 0 and battery == 0:
-        return {}
-
-    return {
-        # Data should be flat, but we keep the original structure for now
-        "temp": {"c": _temp_c, "f": _temp_f},
-        "temperature": _temp_c,
-        "fahrenheit": bool(temp_data[2] & 0b10000000),
-        "humidity": humidity,
-        "battery": battery,
-    }
+    return decode_temp_humidity(temp_data, battery)
 
 
 def process_wosensorth_c(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:

pyswitchbot-2.2.0/switchbot/adv_parsers/weather_station.py

@@ -0,0 +1,40 @@
+"""Weather Station parser."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from ._sensor_th import decode_temp_humidity
+
+
+def process_weather_station(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, Any]:
+    """
+    Process Weather Station advertisement data.
+
+    Manufacturer data layout (mfr_id=2409, after company ID stripped by bleak):
+        Byte 0-5: MAC address
+        Byte 6:   Sequence number
+        Byte 7:   Battery (bit7=charging, bit6-0=level%)
+        Byte 8:   Temp alarm(bit7-6), Humidity alarm(bit5-4), Temp decimal(bit3-0)
+        Byte 9:   Temp sign(bit7: 0=neg,1=pos), Temp integer(bit6-0)
+        Byte 10:  Fahrenheit flag(bit7), Humidity(bit6-0)
+    """
+    temp_data: bytes | None = None
+    battery: int | None = None
+
+    if mfr_data and len(mfr_data) >= 11:
+        temp_data = mfr_data[8:11]
+        battery = mfr_data[7] & 0b01111111
+
+    if data and len(data) >= 6:
+        if not temp_data:
+            temp_data = data[3:6]
+        if battery is None:
+            battery = data[2] & 0b01111111
+
+    if not temp_data:
+        return {}
+
+    return decode_temp_humidity(temp_data, battery)

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/switchbot/const/__init__.py

@@ -10,7 +10,13 @@ from .evaporative_humidifier import (
     HumidifierMode,
     HumidifierWaterLevel,
 )
-from .fan import FanMode
+from .fan import (
+    FanMode,
+    HorizontalOscillationAngle,
+    NightLightState,
+    StandingFanMode,
+    VerticalOscillationAngle,
+)
 from .light import (
     BulbColorMode,
     CeilingLightColorMode,
@@ -80,6 +86,7 @@ class SwitchbotModel(StrEnum):
     ROLLER_SHADE = "Roller Shade"
     HUBMINI_MATTER = "HubMini Matter"
     CIRCULATOR_FAN = "Circulator Fan"
+    STANDING_FAN = "Standing Fan"
     K20_VACUUM = "K20 Vacuum"
     S10_VACUUM = "S10 Vacuum"
     K10_VACUUM = "K10+ Vacuum"
@@ -96,9 +103,13 @@ class SwitchbotModel(StrEnum):
     RELAY_SWITCH_2PM = "Relay Switch 2PM"
     STRIP_LIGHT_3 = "Strip Light 3"
     FLOOR_LAMP = "Floor Lamp"
+    CANDLE_WARMER_LAMP = "Candle Warmer Lamp"
     PLUG_MINI_EU = "Plug Mini (EU)"
     RGBICWW_STRIP_LIGHT = "RGBICWW Strip Light"
     RGBICWW_FLOOR_LAMP = "RGBICWW Floor Lamp"
+    PERMANENT_OUTDOOR_LIGHT = "Permanent Outdoor Light"
+    RGBIC_NEON_ROPE_LIGHT = "RGBIC Neon Rope Light"
+    RGBIC_NEON_WIRE_ROPE_LIGHT = "RGBIC Neon Wire Rope Light"
     K11_VACUUM = "K11+ Vacuum"
     CLIMATE_PANEL = "Climate Panel"
     SMART_THERMOSTAT_RADIATOR = "Smart Thermostat Radiator"
@@ -110,6 +121,7 @@ class SwitchbotModel(StrEnum):
     LOCK_VISION_PRO = "Lock Vision Pro"
     LOCK_VISION = "Lock Vision"
     LOCK_PRO_WIFI = "Lock Pro Wifi"
+    WEATHER_STATION = "Weather Station"
 
 
 __all__ = [
@@ -124,14 +136,18 @@ __all__ = [
     "ClimateMode",
     "ColorMode",
     "FanMode",
+    "HorizontalOscillationAngle",
     "HumidifierAction",
     "HumidifierMode",
     "HumidifierWaterLevel",
     "LockStatus",
+    "NightLightState",
     "SmartThermostatRadiatorMode",
+    "StandingFanMode",
     "StripLightColorMode",
     "SwitchbotAccountConnectionError",
     "SwitchbotApiError",
     "SwitchbotAuthenticationError",
     "SwitchbotModel",
+    "VerticalOscillationAngle",
 ]

pyswitchbot-2.2.0/switchbot/const/fan.py

@@ -0,0 +1,62 @@
+from __future__ import annotations
+
+from enum import Enum
+
+
+class FanMode(Enum):
+    NORMAL = 1
+    NATURAL = 2
+    SLEEP = 3
+    BABY = 4
+
+    @classmethod
+    def get_modes(cls) -> list[str]:
+        return [mode.name.lower() for mode in cls]
+
+
+class StandingFanMode(Enum):
+    NORMAL = 1
+    NATURAL = 2
+    SLEEP = 3
+    BABY = 4
+    CUSTOM_NATURAL = 5
+
+    @classmethod
+    def get_modes(cls) -> list[str]:
+        return [mode.name.lower() for mode in cls]
+
+
+class NightLightState(Enum):
+    """Standing Fan night-light command values."""
+
+    LEVEL_1 = 1
+    LEVEL_2 = 2
+    OFF = 3
+
+
+class HorizontalOscillationAngle(Enum):
+    """
+    Horizontal oscillation angle command values.
+
+    For the horizontal axis the device byte is the same as the
+    user-facing angle in degrees.
+    """
+
+    ANGLE_30 = 30
+    ANGLE_60 = 60
+    ANGLE_90 = 90
+
+
+class VerticalOscillationAngle(Enum):
+    """
+    Vertical oscillation angle command values.
+
+    The Standing Fan uses a different byte encoding on the vertical axis
+    than on the horizontal one. Byte 0x5A (decimal 90) is interpreted as
+    an axis halt, so 90° maps to byte 0x5F (95). 30° and 60° match their
+    degree values.
+    """
+
+    ANGLE_30 = 30
+    ANGLE_60 = 60
+    ANGLE_90 = 95

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/switchbot/const/light.py

@@ -6,6 +6,7 @@ class ColorMode(Enum):
     COLOR_TEMP = 1
     RGB = 2
     EFFECT = 3
+    BRIGHTNESS = 4
 
 
 class StripLightColorMode(Enum):

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/switchbot/devices/air_purifier.py

@@ -5,8 +5,6 @@ from __future__ import annotations
 import logging
 from typing import Any, ClassVar
 
-from bleak.backends.device import BLEDevice
-
 from ..adv_parsers.air_purifier import get_air_purifier_mode
 from ..const import SwitchbotModel
 from ..const.air_purifier import AirPurifierMode, AirQualityLevel
@@ -40,6 +38,7 @@ READ_LED_STATUS_COMMAND = "570f4d07"
 class SwitchbotAirPurifier(SwitchbotSequenceBaseLight, SwitchbotEncryptedDevice):
     """Representation of a Switchbot Air Purifier."""
 
+    _model = SwitchbotModel.AIR_PURIFIER_US
     _turn_on_command = f"{COMMAND_HEAD}010100"
     _turn_off_command = f"{COMMAND_HEAD}010000"
     _open_child_lock_command = f"{COMMAND_HEAD}0301"
@@ -78,30 +77,6 @@ class SwitchbotAirPurifier(SwitchbotSequenceBaseLight, SwitchbotEncryptedDevice)
         }
     )
 
-    def __init__(
-        self,
-        device: BLEDevice,
-        key_id: str,
-        encryption_key: str,
-        interface: int = 0,
-        model: SwitchbotModel = SwitchbotModel.AIR_PURIFIER_US,
-        **kwargs: Any,
-    ) -> None:
-        super().__init__(device, key_id, encryption_key, model, interface, **kwargs)
-
-    @classmethod
-    async def verify_encryption_key(
-        cls,
-        device: BLEDevice,
-        key_id: str,
-        encryption_key: str,
-        model: SwitchbotModel = SwitchbotModel.AIR_PURIFIER_US,
-        **kwargs: Any,
-    ) -> bool:
-        return await super().verify_encryption_key(
-            device, key_id, encryption_key, model, **kwargs
-        )
-
     @property
     def color_modes(self) -> set[ColorMode]:
         """Return the supported color modes."""

{pyswitchbot-2.0.1 → pyswitchbot-2.2.0}/switchbot/devices/art_frame.py

@@ -3,8 +3,6 @@
 import logging
 from typing import Any
 
-from bleak.backends.device import BLEDevice
-
 from ..const import SwitchbotModel
 from .device import (
     SwitchbotEncryptedDevice,
@@ -20,30 +18,8 @@ COMMAND_SET_IMAGE = "570F7A02{}"
 class SwitchbotArtFrame(SwitchbotSequenceDevice, SwitchbotEncryptedDevice):
     """Representation of a Switchbot Art Frame."""
 
-    def __init__(
-        self,
-        device: BLEDevice,
-        key_id: str,
-        encryption_key: str,
-        interface: int = 0,
-        model: SwitchbotModel = SwitchbotModel.ART_FRAME,
-        **kwargs: Any,
-    ) -> None:
-        super().__init__(device, key_id, encryption_key, model, interface, **kwargs)
-        self.response_flag = True
-
-    @classmethod
-    async def verify_encryption_key(
-        cls,
-        device: BLEDevice,
-        key_id: str,
-        encryption_key: str,
-        model: SwitchbotModel = SwitchbotModel.ART_FRAME,
-        **kwargs: Any,
-    ) -> bool:
-        return await super().verify_encryption_key(
-            device, key_id, encryption_key, model, **kwargs
-        )
+    _model = SwitchbotModel.ART_FRAME
+    response_flag: bool = True
 
     async def get_basic_info(self) -> dict[str, Any] | None:
         """Get device basic settings."""