PySwitchbot 0.68.4__tar.gz → 0.70.0__tar.gz

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/PKG-INFO

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

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/PySwitchbot.egg-info/PKG-INFO

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

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/PySwitchbot.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ switchbot/discovery.py
 switchbot/enum.py
 switchbot/helpers.py
 switchbot/models.py
+switchbot/utils.py
 switchbot/adv_parsers/__init__.py
 switchbot/adv_parsers/air_purifier.py
 switchbot/adv_parsers/blind_tilt.py
@@ -78,6 +79,7 @@ tests/test_bulb.py
 tests/test_ceiling_light.py
 tests/test_colormode_imports.py
 tests/test_curtain.py
+tests/test_device.py
 tests/test_encrypted_device.py
 tests/test_evaporative_humidifier.py
 tests/test_fan.py
@@ -88,4 +90,5 @@ tests/test_lock.py
 tests/test_relay_switch.py
 tests/test_roller_shade.py
 tests/test_strip_light.py
+tests/test_utils.py
 tests/test_vacuum.py

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/setup.py

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

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/switchbot/__init__.py

@@ -36,11 +36,16 @@ from .devices.device import (
     SwitchbotDevice,
     SwitchbotEncryptedDevice,
     SwitchbotOperationError,
+    fetch_cloud_devices,
 )
 from .devices.evaporative_humidifier import SwitchbotEvaporativeHumidifier
 from .devices.fan import SwitchbotFan
 from .devices.humidifier import SwitchbotHumidifier
-from .devices.light_strip import SwitchbotLightStrip, SwitchbotStripLight3
+from .devices.light_strip import (
+    SwitchbotLightStrip,
+    SwitchbotRgbicLight,
+    SwitchbotStripLight3,
+)
 from .devices.lock import SwitchbotLock
 from .devices.plug import SwitchbotPlugMini
 from .devices.relay_switch import (
@@ -92,6 +97,7 @@ __all__ = [
     "SwitchbotPlugMini",
     "SwitchbotRelaySwitch",
     "SwitchbotRelaySwitch2PM",
+    "SwitchbotRgbicLight",
     "SwitchbotRollerShade",
     "SwitchbotStripLight3",
     "SwitchbotSupportedType",
@@ -99,6 +105,7 @@ __all__ = [
     "SwitchbotVacuum",
     "close_stale_connections",
     "close_stale_connections_by_address",
+    "fetch_cloud_devices",
     "get_device",
     "parse_advertisement_data",
 ]

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/switchbot/adv_parser.py

@@ -24,7 +24,7 @@ from .adv_parsers.hubmini_matter import process_hubmini_matter
 from .adv_parsers.humidifier import process_evaporative_humidifier, process_wohumidifier
 from .adv_parsers.keypad import process_wokeypad
 from .adv_parsers.leak import process_leak
-from .adv_parsers.light_strip import process_light, process_wostrip
+from .adv_parsers.light_strip import process_light, process_rgbic_light, process_wostrip
 from .adv_parsers.lock import (
     process_lock2,
     process_locklite,
@@ -45,6 +45,7 @@ from .adv_parsers.roller_shade import process_worollershade
 from .adv_parsers.vacuum import process_vacuum, process_vacuum_k
 from .const import SwitchbotModel
 from .models import SwitchBotAdvertisement
+from .utils import format_mac_upper
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -54,6 +55,8 @@ SERVICE_DATA_ORDER = (
 )
 MFR_DATA_ORDER = (2409, 741, 89)
 
+_MODEL_TO_MAC_CACHE: dict[str, SwitchbotModel] = {}
+
 
 class SwitchbotSupportedType(TypedDict):
     """Supported type of Switchbot."""
@@ -343,6 +346,24 @@ SUPPORTED_TYPES: dict[str | bytes, SwitchbotSupportedType] = {
         "func": process_light,
         "manufacturer_id": 2409,
     },
+    "?": {
+        "modelName": SwitchbotModel.PLUG_MINI_EU,
+        "modelFriendlyName": "Plug Mini (EU)",
+        "func": process_relay_switch_1pm,
+        "manufacturer_id": 2409,
+    },
+    b"\x00\x10\xd0\xb3": {
+        "modelName": SwitchbotModel.RGBICWW_STRIP_LIGHT,
+        "modelFriendlyName": "RGBICWW Strip Light",
+        "func": process_rgbic_light,
+        "manufacturer_id": 2409,
+    },
+    b"\x00\x10\xd0\xb4": {
+        "modelName": SwitchbotModel.RGBICWW_FLOOR_LAMP,
+        "modelFriendlyName": "RGBICWW Floor Lamp",
+        "func": process_rgbic_light,
+        "manufacturer_id": 2409,
+    },
 }
 
 _SWITCHBOT_MODEL_TO_CHAR = {
@@ -365,6 +386,10 @@ def parse_advertisement_data(
     model: SwitchbotModel | None = None,
 ) -> SwitchBotAdvertisement | None:
     """Parse advertisement data."""
+    upper_mac = format_mac_upper(device.address)
+    if model is None and upper_mac in _MODEL_TO_MAC_CACHE:
+        model = _MODEL_TO_MAC_CACHE[upper_mac]
+
     service_data = advertisement_data.service_data
 
     _service_data = None
@@ -452,3 +477,8 @@ def _parse_data(
             )
 
     return data
+
+
+def populate_model_to_mac_cache(mac: str, model: SwitchbotModel) -> None:
+    """Populate the model to MAC address cache."""
+    _MODEL_TO_MAC_CACHE[mac] = model

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/switchbot/adv_parsers/light_strip.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-import struct
+from ..helpers import _UNPACK_UINT16_BE
 
 
 def process_wostrip(
@@ -21,12 +21,21 @@ def process_wostrip(
     }
 
 
-def process_light(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool | int]:
+def process_light(
+    data: bytes | None, mfr_data: bytes | None, cw_offset: int = 16
+) -> dict[str, bool | int]:
     """Support for strip light 3 and floor lamp."""
     common_data = process_wostrip(data, mfr_data)
     if not common_data:
         return {}
 
-    light_data = {"cw": struct.unpack(">H", mfr_data[16:18])[0]}
+    light_data = {"cw": _UNPACK_UINT16_BE(mfr_data, cw_offset)[0]}
 
     return common_data | light_data
+
+
+def process_rgbic_light(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, bool | int]:
+    """Support for RGBIC lights."""
+    return process_light(data, mfr_data, cw_offset=10)

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/switchbot/const/__init__.py

@@ -93,6 +93,9 @@ class SwitchbotModel(StrEnum):
     RELAY_SWITCH_2PM = "Relay Switch 2PM"
     STRIP_LIGHT_3 = "Strip Light 3"
     FLOOR_LAMP = "Floor Lamp"
+    PLUG_MINI_EU = "Plug Mini (EU)"
+    RGBICWW_STRIP_LIGHT = "RGBICWW Strip Light"
+    RGBICWW_FLOOR_LAMP = "RGBICWW Floor Lamp"
 
 
 __all__ = [

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/switchbot/const/light.py

@@ -31,4 +31,15 @@ class CeilingLightColorMode(Enum):
     UNKNOWN = 10
 
 
+class RGBICStripLightColorMode(Enum):
+    SEGMENTED = 1
+    RGB = 2
+    SCENE = 3
+    MUSIC = 4
+    CONTROLLER = 5
+    COLOR_TEMP = 6
+    EFFECT = 7
+    UNKNOWN = 10
+
+
 DEFAULT_COLOR_TEMP = 4001

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/switchbot/devices/ceiling_light.py

@@ -37,7 +37,9 @@ class SwitchbotCeilingLight(SwitchbotSequenceBaseLight):
     @property
     def color_mode(self) -> ColorMode:
         """Return the current color mode."""
-        device_mode = CeilingLightColorMode(self._get_adv_value("color_mode") or 10)
+        device_mode = CeilingLightColorMode(
+            value if (value := self._get_adv_value("color_mode")) is not None else 10
+        )
         return _CEILING_LIGHT_COLOR_MODE_MAP.get(device_mode, ColorMode.OFF)
 
     @update_after_operation

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/switchbot/devices/device.py

@@ -24,6 +24,7 @@ from bleak_retry_connector import (
 )
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 
+from ..adv_parser import populate_model_to_mac_cache
 from ..api_config import SWITCHBOT_APP_API_BASE_URL, SWITCHBOT_APP_CLIENT_ID
 from ..const import (
     DEFAULT_RETRY_COUNT,
@@ -37,9 +38,43 @@ from ..const import (
 from ..discovery import GetSwitchbotDevices
 from ..helpers import create_background_task
 from ..models import SwitchBotAdvertisement
+from ..utils import format_mac_upper
 
 _LOGGER = logging.getLogger(__name__)
 
+
+def _extract_region(userinfo: dict[str, Any]) -> str:
+    """Extract region from user info, defaulting to 'us'."""
+    if "botRegion" in userinfo and userinfo["botRegion"] != "":
+        return userinfo["botRegion"]
+    return "us"
+
+
+# Mapping from API model names to SwitchbotModel enum values
+API_MODEL_TO_ENUM: dict[str, SwitchbotModel] = {
+    "WoHand": SwitchbotModel.BOT,
+    "WoCurtain": SwitchbotModel.CURTAIN,
+    "WoHumi": SwitchbotModel.HUMIDIFIER,
+    "WoPlug": SwitchbotModel.PLUG_MINI,
+    "WoPlugUS": SwitchbotModel.PLUG_MINI,
+    "WoContact": SwitchbotModel.CONTACT_SENSOR,
+    "WoStrip": SwitchbotModel.LIGHT_STRIP,
+    "WoSensorTH": SwitchbotModel.METER,
+    "WoMeter": SwitchbotModel.METER,
+    "WoMeterPlus": SwitchbotModel.METER_PRO,
+    "WoPresence": SwitchbotModel.MOTION_SENSOR,
+    "WoBulb": SwitchbotModel.COLOR_BULB,
+    "WoCeiling": SwitchbotModel.CEILING_LIGHT,
+    "WoLock": SwitchbotModel.LOCK,
+    "WoBlindTilt": SwitchbotModel.BLIND_TILT,
+    "WoIOSensor": SwitchbotModel.IO_METER,  # Outdoor Meter
+    "WoButton": SwitchbotModel.REMOTE,  # Remote button
+    "WoLinkMini": SwitchbotModel.HUBMINI_MATTER,  # Hub Mini
+    "W1083002": SwitchbotModel.RELAY_SWITCH_1,  # Relay Switch 1
+    "W1079000": SwitchbotModel.METER_PRO,  # Meter Pro (another variant)
+    "W1102001": SwitchbotModel.STRIP_LIGHT_3,  # RGBWW Strip Light 3
+}
+
 REQ_HEADER = "570f"
 
 
@@ -164,6 +199,113 @@ class SwitchbotBaseDevice:
         self._last_full_update: float = -PASSIVE_POLL_INTERVAL
         self._timed_disconnect_task: asyncio.Task[None] | None = None
 
+    @classmethod
+    async def _async_get_user_info(
+        cls,
+        session: aiohttp.ClientSession,
+        auth_headers: dict[str, str],
+    ) -> dict[str, Any]:
+        try:
+            return await cls.api_request(
+                session, "account", "account/api/v1/user/userinfo", {}, auth_headers
+            )
+        except Exception as err:
+            raise SwitchbotAccountConnectionError(
+                f"Failed to retrieve SwitchBot Account user details: {err}"
+            ) from err
+
+    @classmethod
+    async def _get_auth_result(
+        cls,
+        session: aiohttp.ClientSession,
+        username: str,
+        password: str,
+    ) -> dict[str, Any]:
+        """Authenticate with SwitchBot API."""
+        try:
+            return await cls.api_request(
+                session,
+                "account",
+                "account/api/v1/user/login",
+                {
+                    "clientId": SWITCHBOT_APP_CLIENT_ID,
+                    "username": username,
+                    "password": password,
+                    "grantType": "password",
+                    "verifyCode": "",
+                },
+            )
+        except Exception as err:
+            raise SwitchbotAuthenticationError(f"Authentication failed: {err}") from err
+
+    @classmethod
+    async def get_devices(
+        cls,
+        session: aiohttp.ClientSession,
+        username: str,
+        password: str,
+    ) -> dict[str, SwitchbotModel]:
+        """Get devices from SwitchBot API and return formatted MAC to model mapping."""
+        try:
+            auth_result = await cls._get_auth_result(session, username, password)
+            auth_headers = {"authorization": auth_result["access_token"]}
+        except Exception as err:
+            raise SwitchbotAuthenticationError(f"Authentication failed: {err}") from err
+
+        userinfo = await cls._async_get_user_info(session, auth_headers)
+        region = _extract_region(userinfo)
+
+        try:
+            device_info = await cls.api_request(
+                session,
+                f"wonderlabs.{region}",
+                "wonder/device/v3/getdevice",
+                {
+                    "required_type": "All",
+                },
+                auth_headers,
+            )
+        except Exception as err:
+            raise SwitchbotAccountConnectionError(
+                f"Failed to retrieve devices from SwitchBot Account: {err}"
+            ) from err
+
+        items: list[dict[str, Any]] = device_info["Items"]
+        mac_to_model: dict[str, SwitchbotModel] = {}
+
+        for item in items:
+            if "device_mac" not in item:
+                continue
+
+            if (
+                "device_detail" not in item
+                or "device_type" not in item["device_detail"]
+            ):
+                continue
+
+            mac = item["device_mac"]
+            model_name = item["device_detail"]["device_type"]
+
+            # Format MAC to uppercase with colons
+            formatted_mac = format_mac_upper(mac)
+
+            # Map API model name to SwitchbotModel enum if possible
+            if model_name in API_MODEL_TO_ENUM:
+                model = API_MODEL_TO_ENUM[model_name]
+                mac_to_model[formatted_mac] = model
+                # Populate the cache
+                populate_model_to_mac_cache(formatted_mac, model)
+            else:
+                # Log the full item payload for unknown models
+                _LOGGER.debug(
+                    "Unknown model %s for device %s, full item: %s",
+                    model_name,
+                    formatted_mac,
+                    item,
+                )
+
+        return mac_to_model
+
     @classmethod
     async def api_request(
         cls,
@@ -809,34 +951,13 @@ class SwitchbotEncryptedDevice(SwitchbotDevice):
         device_mac = device_mac.replace(":", "").replace("-", "").upper()
 
         try:
-            auth_result = await cls.api_request(
-                session,
-                "account",
-                "account/api/v1/user/login",
-                {
-                    "clientId": SWITCHBOT_APP_CLIENT_ID,
-                    "username": username,
-                    "password": password,
-                    "grantType": "password",
-                    "verifyCode": "",
-                },
-            )
+            auth_result = await cls._get_auth_result(session, username, password)
             auth_headers = {"authorization": auth_result["access_token"]}
         except Exception as err:
             raise SwitchbotAuthenticationError(f"Authentication failed: {err}") from err
 
-        try:
-            userinfo = await cls.api_request(
-                session, "account", "account/api/v1/user/userinfo", {}, auth_headers
-            )
-            if "botRegion" in userinfo and userinfo["botRegion"] != "":
-                region = userinfo["botRegion"]
-            else:
-                region = "us"
-        except Exception as err:
-            raise SwitchbotAccountConnectionError(
-                f"Failed to retrieve SwitchBot Account user details: {err}"
-            ) from err
+        userinfo = await cls._async_get_user_info(session, auth_headers)
+        region = _extract_region(userinfo)
 
         try:
             device_info = await cls.api_request(
@@ -1023,3 +1144,13 @@ class SwitchbotSequenceDevice(SwitchbotDevice):
         )
         if current_state != new_state:
             create_background_task(self.update())
+
+
+async def fetch_cloud_devices(
+    session: aiohttp.ClientSession,
+    username: str,
+    password: str,
+) -> dict[str, SwitchbotModel]:
+    """Fetch devices from SwitchBot API and return MAC to model mapping."""
+    # Get devices from the API (which also populates the cache)
+    return await SwitchbotBaseDevice.get_devices(session, username, password)

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/switchbot/devices/light_strip.py

@@ -5,7 +5,7 @@ from typing import Any
 from bleak.backends.device import BLEDevice
 
 from ..const import SwitchbotModel
-from ..const.light import ColorMode, StripLightColorMode
+from ..const.light import ColorMode, RGBICStripLightColorMode, StripLightColorMode
 from .base_light import SwitchbotSequenceBaseLight
 from .device import SwitchbotEncryptedDevice
 
@@ -18,6 +18,15 @@ _STRIP_LIGHT_COLOR_MODE_MAP = {
     StripLightColorMode.COLOR_TEMP: ColorMode.COLOR_TEMP,
     StripLightColorMode.UNKNOWN: ColorMode.OFF,
 }
+_RGBICWW_STRIP_LIGHT_COLOR_MODE_MAP = {
+    RGBICStripLightColorMode.SEGMENTED: ColorMode.EFFECT,
+    RGBICStripLightColorMode.RGB: ColorMode.RGB,
+    RGBICStripLightColorMode.SCENE: ColorMode.EFFECT,
+    RGBICStripLightColorMode.MUSIC: ColorMode.EFFECT,
+    RGBICStripLightColorMode.CONTROLLER: ColorMode.EFFECT,
+    RGBICStripLightColorMode.COLOR_TEMP: ColorMode.COLOR_TEMP,
+    RGBICStripLightColorMode.UNKNOWN: ColorMode.OFF,
+}
 LIGHT_STRIP_CONTROL_HEADER = "570F4901"
 COMMON_EFFECTS = {
     "christmas": [
@@ -97,6 +106,122 @@ COMMON_EFFECTS = {
         "570F490701000503600C2B35040C",
     ],
 }
+RGBIC_EFFECTS = {
+    "romance": [
+        "570F490D01350100FF10EE",
+        "570F490D0363",
+    ],
+    "energy": [
+        "570F490D01000300ED070F34FF14FFE114",
+        "570F490D03FA",
+    ],
+    "heartbeat": [
+        "570F490D01020400FFDEADFE90FDFF9E3D",
+        "570F490D01020403FCBAFD",
+        "570F490D03FA",
+    ],
+    "party": [
+        "570F490D01030400FF8A47FF524DFF4DEE",
+        "570F490D010304034DFF8C",
+        "570F490D03FA",
+    ],
+    "dynamic": [
+        "570F490D010403004DFFFB4DFF4FFFBF4D",
+        "570F490D03FA",
+    ],
+    "mystery": [
+        "570F490D01050300F660F6F6D460C6F660",
+        "570F490D03FA",
+    ],
+    "lightning": [
+        "570F490D01340100FFD700",
+        "570F490D03FA",
+    ],
+    "rock": [
+        "570F490D01090300B0F6606864FCFFBC3D",
+        "570F490D03FA",
+    ],
+    "starlight": [
+        "570F490D010A0100FF8C00",
+        "570F490D0363",
+    ],
+    "valentine_day": [
+        "570F490D010C0300FDE0FFFFCC8AD7FF8A",
+        "570F490D03FA",
+    ],
+    "dream": [
+        "570F490D010E0300A3E5FF73F019FFA8E5",
+        "570F490D03FA",
+    ],
+    "alarm": [
+        "570F490D013E0100FF0000",
+        "570F490D03FA",
+    ],
+    "fireworks": [
+        "570F490D01110300FFAA33FFE233FF5CDF",
+        "570F490D03FA",
+    ],
+    "waves": [
+        "570F490D013D01001E90FF",
+        "570F490D03FA",
+    ],
+    "christmas": [
+        "570F490D01380400DC143C228B22DAA520",
+        "570F490D0363",
+        "570F490D0138040332CD32",
+        "570F490D0363",
+    ],
+    "rainbow": [
+        "570F490D01160600FF0000FF7F00FFFF00",
+        "570F490D03FA",
+        "570F490D0116060300FF000000FF9400D3",
+        "570F490D03FA",
+    ],
+    "game": [
+        "570F490D011A0400D05CFF668FFFFFEFD5",
+        "570F490D0363",
+        "570F490D011A0403FFC55C",
+        "570F490D0363",
+    ],
+    "halloween": [
+        "570F490D01320300FF8C009370DB32CD32",
+        "570F490D0364",
+    ],
+    "meditation": [
+        "570F490D013502001E90FF9370DB",
+        "570F490D0364",
+    ],
+    "starlit_sky": [
+        "570F490D010D010099C8FF",
+        "570F490D0364",
+    ],
+    "sleep": [
+        "570F490D01370300FF8C002E4E3E3E3E5E",
+        "570F490D0364",
+    ],
+    "movie": [
+        "570F490D013602001919704B0082",
+        "570F490D0364",
+    ],
+    "sunrise": [
+        "570F490D013F0200FFD700FF4500",
+        "570F490D03FA",
+        "570F490D03FA",
+    ],
+    "sunset": [
+        "570F490D01390300FF4500FFA500483D8B",
+        "570F490D0363",
+        "570F490D0363",
+    ],
+    "new_year": [
+        "570F490D013F0300FF0000FFD700228B22",
+        "570F490D0364",
+    ],
+    "cherry_blossom": [
+        "570F490D01400200FFB3C1FF69B4",
+        "570F490D0364",
+    ],
+}
 
 
 class SwitchbotLightStrip(SwitchbotSequenceBaseLight):
@@ -177,3 +302,44 @@ class SwitchbotStripLight3(SwitchbotEncryptedDevice, SwitchbotLightStrip):
     def color_modes(self) -> set[ColorMode]:
         """Return the supported color modes."""
         return {ColorMode.RGB, ColorMode.COLOR_TEMP}
+
+
+class SwitchbotRgbicLight(SwitchbotEncryptedDevice, SwitchbotLightStrip):
+    """Support for Switchbot RGBIC lights."""
+
+    _effect_dict = RGBIC_EFFECTS
+
+    def __init__(
+        self,
+        device: BLEDevice,
+        key_id: str,
+        encryption_key: str,
+        interface: int = 0,
+        model: SwitchbotModel = SwitchbotModel.RGBICWW_STRIP_LIGHT,
+        **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.RGBICWW_STRIP_LIGHT,
+        **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."""
+        return {ColorMode.RGB, ColorMode.COLOR_TEMP}
+
+    @property
+    def color_mode(self) -> ColorMode:
+        """Return the current color mode."""
+        device_mode = RGBICStripLightColorMode(self._get_adv_value("color_mode") or 10)
+        return _RGBICWW_STRIP_LIGHT_COLOR_MODE_MAP.get(device_mode, ColorMode.OFF)

{pyswitchbot-0.68.4 → pyswitchbot-0.70.0}/switchbot/devices/relay_switch.py

@@ -128,6 +128,7 @@ class SwitchbotRelaySwitch(SwitchbotSequenceDevice, SwitchbotEncryptedDevice):
         if self._model in (
             SwitchbotModel.RELAY_SWITCH_1PM,
             SwitchbotModel.RELAY_SWITCH_2PM,
+            SwitchbotModel.PLUG_MINI_EU,
         ):
             if channel is None:
                 adv_data["voltage"] = self._get_adv_value("voltage") or 0

pyswitchbot-0.70.0/switchbot/utils.py

@@ -0,0 +1,24 @@
+"""Utility functions for switchbot."""
+
+from functools import lru_cache
+
+
+@lru_cache(maxsize=512)
+def format_mac_upper(mac: str) -> str:
+    """Format the mac address string to uppercase with colons."""
+    to_test = mac
+
+    if len(to_test) == 17 and to_test.count(":") == 5:
+        return to_test.upper()
+
+    if len(to_test) == 17 and to_test.count("-") == 5:
+        to_test = to_test.replace("-", "")
+    elif len(to_test) == 14 and to_test.count(".") == 2:
+        to_test = to_test.replace(".", "")
+
+    if len(to_test) == 12:
+        # no : included
+        return ":".join(to_test.upper()[i : i + 2] for i in range(0, 12, 2))
+
+    # Not sure how formatted, return original
+    return mac.upper()