python-aidot 0.3.58__py3-none-any.whl → 0.3.59__py3-none-any.whl

aidot/client.py

@@ -24,6 +24,11 @@ from .const import (
     CONF_CODE,
     CONF_COUNTRY,
     CONF_DEVICE_LIST,
+    CONF_DIYS,
+    CONF_EFFECTS,
+    CONF_EFFECT_SELECTION,
+    CONF_EFFECT_SOURCE,
+    CONF_FAV_PRESETS,
     CONF_ID,
     CONF_IPADDRESS,
     CONF_PASSWORD,
@@ -48,6 +53,9 @@ from .const import (
     CONF_AES_KEY,
     CONF_FIRMWARE_VERSION,
     CONF_PRIMITIVE,
+    DEFAULT_EFFECT_SOURCE,
+    EFFECT_SOURCE_MANUAL,
+    EFFECT_SOURCE_RECOMMENDED,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -76,9 +84,13 @@ class AidotClient:
         username: str | None = None,
         password: str | None = None,
         token: dict | None = None,
+        options: dict[str, Any] | None = None,
+        effect_source: str = DEFAULT_EFFECT_SOURCE,
     ) -> None:
-        _LOGGER.info("Client Version: v0.3.57")
+        _LOGGER.info("Client Version: v0.3.59")
         self.session = session
+        self.options = options.copy() if options is not None else {}
+        self.effect_source = self.options.get(CONF_EFFECT_SOURCE, effect_source)
         self.username = username
         self.password = password
         self.country_code = country_code or DEFAULT_COUNTRY_CODE
@@ -394,7 +406,7 @@ class AidotClient:
     async def async_get_all_effects(
         self, device: dict[str, Any]
     ) -> dict[str, FavoriteEffectPrimitive]:
-        """Get all effects list."""
+        """Get all effects list and store raw effect sources on the device."""
         diy_list: list[FavoriteEffectPrimitive] = []
         fav_preset: list[FavoriteEffectPrimitive] = []
         preset_list: list[FavoriteEffectPrimitive] = []
@@ -430,7 +442,87 @@ class AidotClient:
         preset_list = [
             item for item in preset_list if item.primitiveEffectId not in fav_preset_ids
         ]
-        return self._merge_effects_by_unique_name(diy_list, fav_preset, preset_list)
+
+        device[CONF_DIYS] = diy_list
+        device[CONF_FAV_PRESETS] = fav_preset
+        device[CONF_PRESETS] = preset_list
+        return self.get_filtered_effects(device)
+
+    def get_filtered_effects(
+        self, device: dict[str, Any]
+    ) -> dict[str, FavoriteEffectPrimitive]:
+        """Get final effects for Home Assistant from raw device effect sources."""
+        diy_list = device.get(CONF_DIYS, [])
+        fav_preset = device.get(CONF_FAV_PRESETS, [])
+        preset_list = device.get(CONF_PRESETS, [])
+
+        if self.effect_source == EFFECT_SOURCE_MANUAL:
+            return self._merge_effects_by_unique_name(
+                self._filter_manual_effects(device, diy_list),
+                self._filter_manual_effects(device, fav_preset),
+                self._filter_manual_effects(device, preset_list),
+            )
+
+        return self._merge_effects_by_unique_name(
+            diy_list,
+            fav_preset,
+            self._filter_preset_list(preset_list),
+        )
+
+    def get_all_cached_effects(
+        self, device: dict[str, Any]
+    ) -> dict[str, FavoriteEffectPrimitive]:
+        """Get all effects from cached raw device effect sources."""
+        return self._merge_effects_by_unique_name(
+            device.get(CONF_DIYS, []),
+            device.get(CONF_FAV_PRESETS, []),
+            device.get(CONF_PRESETS, []),
+        )
+
+    def _filter_manual_effects(
+        self, device: dict[str, Any], effect_list: list[FavoriteEffectPrimitive]
+    ) -> list[FavoriteEffectPrimitive]:
+        """Filter effect list by manual device selection."""
+        selected_ids = self._get_manual_effect_ids(device)
+        return [
+            effect
+            for effect in effect_list
+            if self._get_effect_ids(effect) & selected_ids
+        ]
+
+    def _get_manual_effect_ids(self, device: dict[str, Any]) -> set[str]:
+        """Get manually selected effect ids for a device."""
+        effect_selection = self.options.get(CONF_EFFECT_SELECTION, {})
+        selected_ids = effect_selection.get(device.get(CONF_ID), [])
+        return {effect_id for effect_id in selected_ids if effect_id}
+
+    @staticmethod
+    def _get_effect_ids(effect: FavoriteEffectPrimitive) -> set[str]:
+        """Get selectable ids for an effect."""
+        return {
+            effect_id
+            for effect_id in (effect.primitiveEffectId, effect.favoriteId)
+            if effect_id
+        }
+
+    def _filter_preset_list(
+        self, preset_list: list[FavoriteEffectPrimitive]
+    ) -> list[FavoriteEffectPrimitive]:
+        """Filter preset effects by configured source."""
+        if self.effect_source != EFFECT_SOURCE_RECOMMENDED:
+            return preset_list
+
+        recommended = [
+            effect for effect in preset_list if self._is_recommended_effect(effect)
+        ]
+        if recommended:
+            return recommended
+        return preset_list[:10]
+
+    @staticmethod
+    def _is_recommended_effect(effect: FavoriteEffectPrimitive) -> bool:
+        """Return whether an effect should be included in recommended presets."""
+        return effect.tag not in (None, "") and effect.tag.strip() != "New"
 
     @staticmethod
     def _merge_effects_by_unique_name(
@@ -485,7 +577,7 @@ class AidotClient:
                     and CONF_AES_KEY in device
                     and device[CONF_AES_KEY][0] is not None
                 ):
-                    device[CONF_PRESETS] = await self.async_get_all_effects(device)
+                    device[CONF_EFFECTS] = await self.async_get_all_effects(device)
 
         except Exception as e:
             raise e

aidot/const.py

@@ -215,6 +215,13 @@ CONF_SET_DEV_ATTR_REQ = "setDevAttrReq"
 CONF_DIYS = "diys"
 CONF_PRESETS = "presets"
 CONF_FAV_PRESETS = "favoritePresets"
+CONF_EFFECTS = "effects"
+CONF_EFFECT_SOURCE = "effect_source"
+CONF_EFFECT_SELECTION = "effect_selection"
+EFFECT_SOURCE_ALL = "all"
+EFFECT_SOURCE_RECOMMENDED = "recommended"
+EFFECT_SOURCE_MANUAL = "manual"
+DEFAULT_EFFECT_SOURCE = EFFECT_SOURCE_ALL
 CONF_VERSION = "version"
 CONF_LIGHT_SCRIPT_FLAGS = "lightScriptFlags"
 CONF_PRIMITIVE = "primitive"

aidot/device_client.py

@@ -7,6 +7,7 @@ import time
 import json
 import asyncio
 import logging
+from ipaddress import ip_address
 from typing import TYPE_CHECKING, Any
 
 from .aes_utils import aes_encrypt, aes_decrypt_to_json
@@ -21,6 +22,7 @@ from .models.device_client_model import (
 from .const import (
     CONF_AES_KEY,
     CONF_CCT,
+    CONF_EFFECTS,
     CONF_HARDWARE_VERSION,
     CONF_ID,
     CONF_IDENTITY,
@@ -106,7 +108,7 @@ class DeviceInformation:
         self.model_id = device.get(CONF_MODEL_ID)
         self.name = device.get(CONF_NAME)
         self.hw_version = device.get(CONF_HARDWARE_VERSION)
-        self.presets = device.get(CONF_PRESETS, {})
+        self.presets = device.get(CONF_EFFECTS, device.get(CONF_PRESETS, {}))
         self.preset_names = list(self.presets)
         if CONF_PRODUCT in device and CONF_SERVICE_MODULES in device[CONF_PRODUCT]:
             for service in device[CONF_PRODUCT][CONF_SERVICE_MODULES]:
@@ -174,13 +176,28 @@ class DeviceClient(object):
         self._simpleVersion = device.get("simpleVersion")
         self._TAG = f"{self.device_id}"
         self.syncProperties = []
-        if self.info.model_id == "lk.WIFI-RGBWLight-D0006":
+        if self.info.model_id == "lk.WIFI-RGBWLight-D0006":  # 一代灯
             self.syncProperties = [CONF_ON_OFF, CONF_DIMMING, CONF_RGBW, CONF_CCT]
             self.ping_data = None
             self.heart_time = 10
+        else:
+            properties = device.get(CONF_PROPERTIES)
+            if properties is not None:
+                ip_address = self._get_valid_ip(properties.get("ipAddress"))
+                self.update_ip_address(ip_address)
 
         # _LOGGER.warning(f"{self._TAG}:{device}")
 
+    @staticmethod
+    def _get_valid_ip(ip: str | None) -> str | None:
+        """Return a valid IP address string."""
+        if not ip:
+            return None
+        try:
+            return str(ip_address(ip))
+        except ValueError:
+            return None
+
     async def connect(self, ip_address) -> None:
         _LOGGER.warning(f"{self._TAG}:connect device: {ip_address}")
         self.reader = self.writer = None

aidot/models/device_model.py

@@ -100,6 +100,7 @@ class FavoriteEffectPrimitive:
     icon: str = None
     libraryId: str = "aidot.preset"
     name: str = None
+    tag: str = None
     tags: Optional[FavoriteEffectTags] = None
     scriptSize: int = None
     secondShareFlag: bool = None

{python_aidot-0.3.58.dist-info → python_aidot-0.3.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot
-Version: 0.3.58
+Version: 0.3.59
 Summary: aidot control wifi lights
 Home-page: https://github.com/Aidot-Development-Team/python-aidot
 Author: aidotdev2024

{python_aidot-0.3.58.dist-info → python_aidot-0.3.59.dist-info}/RECORD

@@ -1,17 +1,17 @@
 aidot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aidot/aes_utils.py,sha256=bGKuC8B6-d2rrNt5Mj7M9gQsaK8C2BDtTisHSnxjgA4,1554
-aidot/client.py,sha256=t8wUYoStd7BxFQdFXmNGFEkLD8RGTgUQjrlY439WsP8,20476
-aidot/const.py,sha256=-R3eEfcM24mRr3FPgWlucutyJYR5A8N_l_81bII_YLA,12710
-aidot/device_client.py,sha256=rpiBjtfWYXXCoc7HKuvPiNtcrsbJlKsn89IX4-U0sQs,16807
+aidot/client.py,sha256=evj6AXCcduUStAk-jlMdotY3_h6B-I-cSyddoH0VjO8,24026
+aidot/const.py,sha256=Ly-OGX7Nth4ydy8Lq4JYSUg_RJ-NIoTxNkSmJnnVWP8,12957
+aidot/device_client.py,sha256=SnDcRaptYznxHR86PAJfz-iiCVp3wwygo7HwSU_eCgk,17397
 aidot/discover.py,sha256=1hGBPnPcYRvy72yty5ZMTth_mdZuAYgcSaXf6Z68jow,4944
 aidot/exceptions.py,sha256=VJl_HOxpa9B_5vEA4ORNllDPSo28BBcMlV-mF8NiAk4,663
 aidot/login_const.py,sha256=pjXF9ORsY18m_N8oR4WMfaCDBDvLzDXmmKaEmmup_BE,511
 aidot/models/__init__.py,sha256=vdiTDsMQh7TAODvDS7IMAQp1CS7fK2C_f1CKyjLycqU,849
 aidot/models/device_client_model.py,sha256=4Tjeq0L1NUp2Rf4mbGPkvMWE-lhLU8oHDVHkLxn-FRg,5116
-aidot/models/device_model.py,sha256=vZPkylsN2cpqMZgymof055aak1AFcVqtHhOGCXMj44Q,3405
+aidot/models/device_model.py,sha256=630L_eezZWfDujpPQvseRpDC5csmKuOdcymrj8ao7HU,3425
 aidot/models/discover_model.py,sha256=fQ77TbubypYFN12myHgXyXGF0yHEffHdD1HIpEwY4r8,2480
-python_aidot-0.3.58.dist-info/licenses/LICENSE,sha256=5k6Ccd7T5u39Y8730J0qr1ahoaEkd1cahwEccuUZ2Dc,1079
-python_aidot-0.3.58.dist-info/METADATA,sha256=02W5isMXvCcgz4iR5QMiLRG8UJ_aDoGQJzVKvC_64FQ,739
-python_aidot-0.3.58.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_aidot-0.3.58.dist-info/top_level.txt,sha256=_doNL2OOnXeinm1X72eH2wz26wAkZwbM47KhNB6_QzI,6
-python_aidot-0.3.58.dist-info/RECORD,,
+python_aidot-0.3.59.dist-info/licenses/LICENSE,sha256=5k6Ccd7T5u39Y8730J0qr1ahoaEkd1cahwEccuUZ2Dc,1079
+python_aidot-0.3.59.dist-info/METADATA,sha256=M4HvkuUb8JH4enM8cpwuJnTAA8ICV53Xh9s5a8vGjxY,739
+python_aidot-0.3.59.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+python_aidot-0.3.59.dist-info/top_level.txt,sha256=_doNL2OOnXeinm1X72eH2wz26wAkZwbM47KhNB6_QzI,6
+python_aidot-0.3.59.dist-info/RECORD,,