solax-py-library 1.0.0.2601__py3-none-any.whl → 1.0.0.2901__py3-none-any.whl

solax_py_library/device/types/device.py

@@ -14,3 +14,13 @@ class DeviceType(IntEnum):
     FIRE_SAFETY_TYPE = 502
     COLD_TYPE = 503
     DEHUMIDIFY_TYPE = 504
+
+    def __str__(self):
+        return {
+            DeviceType.PCS_TYPE: "pcs",
+            DeviceType.BMS_TYPE: "bms",
+            DeviceType.ELM_TYPE: "elm",
+            DeviceType.IO_TYPE: "io",
+            DeviceType.AIRCONDITIONER_TYPE: "air_conditioner",
+            DeviceType.COLD_TYPE: "liquid_cooling_unit",
+        }.get(self)

solax_py_library/smart_scene/constant/message_entry.py

@@ -159,21 +159,33 @@ MESSAGE_ENTRY = {
     "duration": {"zh_CN": "持续： {}秒", "en_US": "last: {} seconds"},
     "systemSoc": {"zh_CN": "系统soc {} {}%", "en_US": "system soc {} {}%"},
     "systemImportPower": {
-        "zh_CN": "电价买电功率 {} {}KW",
-        "en_US": "system soc {} {}KW",
+        "zh_CN": "电网买电功率 {} {}KW",
+        "en_US": "Grid import power {} {}KW",
     },
     "systemExportPower": {
-        "zh_CN": "电价馈电功率 {} {}KW",
-        "en_US": "system soc {} {}KW",
+        "zh_CN": "电网馈电功率 {} {}KW",
+        "en_US": "Grid export power {} {}KW",
     },
     "cabinetSoc": {"zh_CN": "机柜soc {} {}%", "en_US": "cabinet soc {} {}%"},
     "EMERGENCY": {"zh_CN": "紧急告警", "en_US": "Emergency alarm"},
     "TIPS": {"zh_CN": "状态提醒", "en_US": "State Tips"},
     "NORMAL": {"zh_CN": "普通告警", "en_US": "Normal alarm"},
-    "cabinetAlarm": {"zh_CN": "机柜发生{}", "en_US": "cabinet occurs {}"},
+    "cabinetAlarm": {
+        "zh_CN": "机柜下属({})设备发生{}",
+        "en_US": "The equipments({}) under the cabinet occurs {}",
+    },
     "OR": {"zh_CN": "满足任一条件", "en_US": "Meet any of the conditions"},
     "AND": {"zh_CN": "满足所有条件", "en_US": "Meet all conditions"},
     "tips_alarm": {"zh_CN": "状态提醒", "en_US": "Alarm tips"},
     "normal_alarm": {"zh_CN": "普通告警", "en_US": "Normal alarm"},
     "emergency_alarm": {"zh_CN": "紧急告警", "en_US": "Emergency alarm"},
+    "pcs": {"zh_CN": "逆变器", "en_US": "Inverter"},
+    "bms": {"zh_CN": "电池", "en_US": "Battery"},
+    "elm": {
+        "zh_CN": "电表",
+        "en_US": "Meter",
+    },
+    "io": {"zh_CN": "IO模块", "en_US": "IO Module"},
+    "air_conditioner": {"zh_CN": "空调", "en_US": "Air conditioner"},
+    "liquid_cooling_unit": {"zh_CN": "液冷机组", "en_US": "Liquid Cooling Unit"},
 }

solax_py_library/smart_scene/core/action/base.py

@@ -1,6 +1,5 @@
 class BaseAction(object):
-    def __init__(self, smart_scene_service, do_funcs, **kwargs):
-        self.smart_scene_service = smart_scene_service
+    def __init__(self, do_funcs, **kwargs):
         self.do_func_map = do_funcs
 
     def do_func(self, scene_id, data):

solax_py_library/smart_scene/core/condition/cabinet_condition.py

@@ -6,7 +6,6 @@ from solax_py_library.smart_scene.types.condition import (
     CabinetConditionType,
     ConditionType,
 )
-from solax_py_library.device.types.alarm import AlarmLevel
 from solax_py_library.smart_scene.types.condition_value import CabinetValue
 
 
@@ -15,9 +14,7 @@ class CabinetCondition(BaseCondition):
 
     def __init__(self, update_value_function, **kwargs):
         super().__init__(update_value_function, **kwargs)
-        self.value = defaultdict(
-            lambda: CabinetValue
-        )
+        self.value = defaultdict(lambda: CabinetValue)
 
     def meet_func(self, data: CabinetConditionItemData, ctx):
         if not self.value:
@@ -42,6 +39,6 @@ class CabinetCondition(BaseCondition):
                     alarm_info = cabinet_value.alarm_info(device_type)
                     if not alarm_info:
                         continue
-                    if alarm_info[alarm_type-1] is True:
+                    if alarm_info[alarm_type - 1] is True:
                         return True
         return False

solax_py_library/smart_scene/core/condition/weather_condition.py

@@ -21,10 +21,14 @@ class WeatherCondition(BaseCondition):
         function_value = child_data.function
         data_value = child_data.data
         nearest_time, right_time = get_rounded_times()
-        if nearest_time not in self.value["timeList"]:
-            time_now = right_time
-        else:
-            time_now = nearest_time
+        if (
+            nearest_time not in self.value["timeList"]
+            and right_time not in self.value["timeList"]
+        ):
+            return False
+        time_now = (
+            right_time if nearest_time not in self.value["timeList"] else nearest_time
+        )
         index = self.value["timeList"].index(time_now)
         if child_type == WeatherConditionType.irradiance:
             return self.meet_func_irradiance(function_value, data_value, index)

solax_py_library/smart_scene/core/service/check.py

@@ -0,0 +1,33 @@
+from typing import List, Dict, Any
+
+from solax_py_library.smart_scene.types.action import SmartSceneAction, ActionType
+from solax_py_library.smart_scene.types.condition import (
+    SmartSceneCondition,
+    ConditionType,
+)
+
+
+def action_param_check(actions: List[SmartSceneAction], ctx: Dict[str, Any]):
+    """动作里的参数范围判定"""
+    for action in actions:
+        if action.type != ActionType.system:
+            continue
+        for action_data in action.data:
+            ret = action_data.check_param(ctx)
+            if ret is not None:
+                return ret
+    return True
+
+
+def condition_param_check(condition: SmartSceneCondition, ctx: Dict[str, Any]):
+    for condition_data in condition.value:
+        if condition_data.type not in [
+            ConditionType.systemCondition,
+            ConditionType.cabinet,
+        ]:
+            continue
+        for data in condition_data.data:
+            ret = data.check_param(ctx)
+            if ret is not None:
+                return ret
+    return True

solax_py_library/smart_scene/types/action.py

@@ -1,10 +1,28 @@
-from enum import Enum
+from enum import Enum, IntEnum
 from typing import List, Union, Any
 
 from pydantic import BaseModel
 
 from solax_py_library.device.constant.cabinet import TRENE_CABINET_ENUM
 from solax_py_library.smart_scene.constant.message_entry import MESSAGE_ENTRY
+from solax_py_library.smart_scene.exceptions.smart_scene import (
+    ExportLimitNum,
+    ImportLimitNum,
+    ImportOnlyPositive,
+    PowerLimitNum,
+    SocLimit,
+    ActivePowerLimitNum,
+    ReactivePowerLimitNum,
+    EnergyLimit,
+    BatteryPowerLimitNum,
+    PvOnlyGe0,
+    ExportLimitPercent,
+)
+
+
+class SmartSceneUnit(IntEnum):
+    PERCENT = 1
+    NUM = 2
 
 
 class ActionType(str, Enum):
@@ -36,7 +54,12 @@ class SystemActionChildData(ActionChildData):
     ...
 
 
-class SystemActionItemData(BaseModel):
+class ActionItemData(BaseModel):
+    def check_param(self, ctx):
+        ...
+
+
+class SystemActionItemData(ActionItemData):
     childType: SystemActionType
     childData: SystemActionChildData
 
@@ -136,12 +159,163 @@ class SystemActionItemData(BaseModel):
             return MESSAGE_ENTRY[work_mode[value_data[0]]][lang]
         return ""
 
+    def check_param(self, ctx):
+        if self.childType == SystemActionType.exportControl:
+            export_power_top_limit = ctx.pop("export_power_top_limit")
+            switch = self.childData.data[0]
+            if not switch:
+                return
+            _, _, value, unit = self.childData.data
+            if unit == SmartSceneUnit.NUM:
+                if value > export_power_top_limit or value < 0:
+                    return ExportLimitNum, {"up_limit": export_power_top_limit}
+            else:
+                if value > 0 or value < 110:
+                    return ExportLimitPercent, {}
+        elif self.childType == SystemActionType.importControl:
+            import_power_top_limit = ctx.pop("import_power_top_limit", None)
+            total_power_top_limit = ctx.pop("total_power_top_limit", None)
+            switch = self.childData.data[0]
+            if not switch:
+                return
+            value = self.childData.data[-1]
+            if import_power_top_limit is not None:
+                if value > total_power_top_limit or value < 0:
+                    return (
+                        ImportLimitNum.message,
+                        {"up_limit": import_power_top_limit},
+                    )
+            else:
+                if value < 0:
+                    return ImportOnlyPositive.message, {}
+        elif self.childType == SystemActionType.workMode:
+            work_mode = self.childData.data[0]
+            total_power_top_limit = ctx.pop("total_power_top_limit")
+            total_energy_top_limit = ctx.pop("total_energy_top_limit")
+            soc_low_limit = ctx.pop("soc_low_limit")
+            if work_mode == 3:  # 手动模式
+                if self.childData.data[1] in [3, 4]:  # 强充或强放
+                    _, _, power, soc = self.childData.data
+                    if power <= 0 or power > total_power_top_limit:
+                        return (
+                            PowerLimitNum.message,
+                            {"low_limit": 0, "up_limit": total_power_top_limit},
+                        )
+                    if soc > 100 or soc < soc_low_limit:
+                        return (
+                            SocLimit.message,
+                            {"low_limit": soc_low_limit},
+                        )
+            elif work_mode == 16:  # VPP模式
+                vpp_mode = self.childData.data[1]
+                if vpp_mode == 1:
+                    (
+                        _,
+                        _,
+                        active_power,
+                        reactive_power,
+                    ) = self.childData.data
+                    if (
+                        active_power < -total_power_top_limit
+                        or active_power > total_power_top_limit
+                    ):
+                        return (
+                            ActivePowerLimitNum.message,
+                            {
+                                "low_limit": -total_power_top_limit,
+                                "up_limit": total_power_top_limit,
+                            },
+                        )
+                    if (
+                        reactive_power < -total_power_top_limit
+                        or reactive_power > total_power_top_limit
+                    ):
+                        return (
+                            ReactivePowerLimitNum.message,
+                            {
+                                "low_limit": -total_power_top_limit,
+                                "up_limit": total_power_top_limit,
+                            },
+                        )
+                elif vpp_mode == 2:
+                    _, _, energy, power = self.childData.data
+                    if energy < 0 or energy > total_energy_top_limit:
+                        return (
+                            EnergyLimit.message,
+                            {"up_limit": total_energy_top_limit},
+                        )
+                    if power < -total_power_top_limit or power > total_power_top_limit:
+                        return (
+                            PowerLimitNum.message,
+                            {
+                                "low_limit": -total_power_top_limit,
+                                "up_limit": total_power_top_limit,
+                            },
+                        )
+                elif vpp_mode == 3:
+                    _, _, soc, power = self.childData.data
+                    if soc < soc_low_limit or soc > 100:
+                        return (
+                            SocLimit.message,
+                            {"low_limit": soc_low_limit},
+                        )
+                    if power < -total_power_top_limit or power > total_power_top_limit:
+                        return (
+                            PowerLimitNum.message,
+                            {
+                                "low_limit": -total_power_top_limit,
+                                "up_limit": total_power_top_limit,
+                            },
+                        )
+                elif vpp_mode == 4:
+                    _, _, power = self.childData.data
+                    if power < -total_power_top_limit or power > total_power_top_limit:
+                        return (
+                            BatteryPowerLimitNum.message,
+                            {
+                                "low_limit": -total_power_top_limit,
+                                "up_limit": total_power_top_limit,
+                            },
+                        )
+                elif vpp_mode == 8:
+                    _, _, pv_power, bms_power = self.childData.data
+                    if pv_power < 0:
+                        return (PvOnlyGe0.message, {})
+                    elif (
+                        bms_power < -total_power_top_limit
+                        or bms_power > total_power_top_limit
+                    ):
+                        return (
+                            BatteryPowerLimitNum.message,
+                            {
+                                "low_limit": -total_power_top_limit,
+                                "up_limit": total_power_top_limit,
+                            },
+                        )
+                elif vpp_mode == 9:
+                    _, _, pv_power, bms_power, soc = self.childData.data
+                    if pv_power < 0:
+                        return (PvOnlyGe0.message, {})
+                    if (
+                        bms_power < -total_power_top_limit
+                        or bms_power > total_power_top_limit
+                    ):
+                        return (
+                            BatteryPowerLimitNum.message,
+                            {
+                                "low_limit": -total_power_top_limit,
+                                "up_limit": total_power_top_limit,
+                            },
+                        )
+                    if soc < soc_low_limit or soc > 100:
+                        return SocLimit.message, {"low_limit": soc_low_limit}
+
 
 class EmsActionChildData(ActionChildData):
     data: List[DoControl]
 
 
-class EmsActionItemData(BaseModel):
+class EmsActionItemData(ActionItemData):
     childType: EmsActionType
     childData: EmsActionChildData
 

solax_py_library/smart_scene/types/condition.py

@@ -2,10 +2,12 @@ import operator
 from enum import IntEnum, Enum
 from typing import Optional, List, Union, Any
 
-from pydantic import BaseModel, validator, root_validator
+from pydantic import BaseModel, validator
 
 from solax_py_library.device.types.alarm import AlarmLevel
+from solax_py_library.device.types.device import DeviceType
 from solax_py_library.smart_scene.constant.message_entry import MESSAGE_ENTRY
+from solax_py_library.smart_scene.exceptions.smart_scene import SocLimit
 
 
 class LogicFunc(IntEnum):
@@ -82,7 +84,12 @@ class ConditionItemChildData(BaseModel):
     data: List[Any]
 
 
-class PriceConditionItemData(BaseModel):
+class ConditionItemData(BaseModel):
+    def check_param(self, ctx):
+        ...
+
+
+class PriceConditionItemData(ConditionItemData):
     childType: PriceConditionType
     childData: ConditionItemChildData
 
@@ -122,7 +129,7 @@ class PriceConditionItemData(BaseModel):
             return MESSAGE_ENTRY[self.childType][lang].format(data[0], data[1], data[2])
 
 
-class SystemConditionItemData(BaseModel):
+class SystemConditionItemData(ConditionItemData):
     childType: SystemConditionType
     childData: ConditionItemChildData
 
@@ -135,8 +142,6 @@ class SystemConditionItemData(BaseModel):
         }:
             assert 0 <= value.data[0] <= 100000, ValueError
             value.data[0] = round(value.data[0], 2)  # 功率保留两位小数
-        elif child_type == SystemConditionType.systemSoc:
-            assert 5 <= value.data[0] <= 100, ValueError
         return value
 
     def to_text(self, lang, unit):
@@ -154,8 +159,15 @@ class SystemConditionItemData(BaseModel):
                 MESSAGE_ENTRY[str(func.value)][lang], data[0]
             )
 
+    def check_param(self, ctx):
+        soc_low_limit = ctx.pop("soc_low_limit", 5)
+        if self.childType == SystemConditionType.systemSoc:
+            soc = self.childData.data[0]
+            if soc < soc_low_limit or soc > 100:
+                return SocLimit.message, {"low_limit": soc_low_limit}
+
 
-class CabinetConditionItemData(BaseModel):
+class CabinetConditionItemData(ConditionItemData):
     childType: CabinetConditionType
     childData: ConditionItemChildData
 
@@ -168,8 +180,6 @@ class CabinetConditionItemData(BaseModel):
                 AlarmLevel.NORMAL,
                 AlarmLevel.EMERGENCY,
             }, ValueError
-        if child_type == CabinetConditionType.cabinetSoc:
-            assert 0 <= value.data[0] <= 100, ValueError
         return value
 
     def to_text(self, lang, unit):
@@ -181,16 +191,29 @@ class CabinetConditionItemData(BaseModel):
             )
         elif self.childType == CabinetConditionType.cabinetAlarm:
             return MESSAGE_ENTRY[self.childType][lang].format(
-                MESSAGE_ENTRY[str(AlarmLevel(data[0]))][lang], lang
+                ",".join(
+                    [
+                        MESSAGE_ENTRY[str(DeviceType(device_type))][lang]
+                        for device_type in data[:-1]
+                    ]
+                ),
+                MESSAGE_ENTRY[str(AlarmLevel(data[-1]))][lang],
             )
 
+    def check_param(self, ctx):
+        soc_low_limit = ctx.pop("soc_low_limit", 5)
+        if self.childType == CabinetConditionType.cabinetSoc:
+            soc = self.childData.data[0]
+            if soc < soc_low_limit or soc > 100:
+                return SocLimit.message, {"low_limit": soc_low_limit}
+
 
-class DateConditionItemData(BaseModel):
+class DateConditionItemData(ConditionItemData):
     childType: DateConditionType
     childData: ConditionItemChildData
 
     @validator("childData", always=True)
-    def check_param(cls, value, values):
+    def _check_child_data(cls, value, values):
         child_type = values.get("childType")
         data = value.data
         if child_type == DateConditionType.time:
@@ -206,7 +229,7 @@ class DateConditionItemData(BaseModel):
             return MESSAGE_ENTRY[self.childType][lang] + "/" + self.childData.data[0]
 
 
-class WeatherConditionItemData(BaseModel):
+class WeatherConditionItemData(ConditionItemData):
     childType: WeatherConditionType
     childData: ConditionItemChildData
 
@@ -265,24 +288,6 @@ class SmartSceneCondition(BaseModel):
     operation: LogicFunc
     value: List[ConditionItem]
 
-    @root_validator
-    def _root_check(cls, values):
-        if values.get("operation") == LogicFunc.OR:
-            new_value = []
-            for item in values.get("value"):
-                if item.type != ConditionType.date:
-                    new_value.append(item)
-                    continue
-                new_data = []
-                for date_item in item.data:
-                    if date_item.childType != DateConditionType.duration:
-                        new_data.append(date_item)
-                item.data = new_data
-                if item.data:
-                    new_value.append(item)
-            values["value"] = new_value
-        return values
-
     def to_text(self, lang, unit):
         ret = {"operation": [MESSAGE_ENTRY[self.operation.name][lang]]}
         for v in self.value:

solax_py_library/smart_scene/types/condition_value.py

@@ -7,12 +7,12 @@ from solax_py_library.device.types.device import DeviceType
 
 class CabinetValue(BaseModel):
     soc: int = None
-    cabinet_alarm: List[bool] = Field(default_factory=lambda :[False, False, False])
-    pcs_alarm:  List[bool] = Field(default_factory=lambda :[False, False, False])
-    io_alarm:  List[bool] = Field(default_factory=lambda :[False, False, False])
-    bms_alarm:  List[bool] = Field(default_factory=lambda :[False, False, False])
-    air_alarm:  List[bool] = Field(default_factory=lambda :[False, False, False])
-    liquid_alarm:  List[bool] = Field(default_factory=lambda :[False, False, False])
+    cabinet_alarm: List[bool] = Field(default_factory=lambda: [False, False, False])
+    pcs_alarm: List[bool] = Field(default_factory=lambda: [False, False, False])
+    io_alarm: List[bool] = Field(default_factory=lambda: [False, False, False])
+    bms_alarm: List[bool] = Field(default_factory=lambda: [False, False, False])
+    air_alarm: List[bool] = Field(default_factory=lambda: [False, False, False])
+    liquid_alarm: List[bool] = Field(default_factory=lambda: [False, False, False])
 
     def alarm_info(self, device_type):
         if device_type == DeviceType.EMS_TYPE:

solax_py_library/test/test_smart_scene/test_check_func.py

@@ -0,0 +1,83 @@
+from unittest import TestCase
+
+from solax_py_library.smart_scene.core.service.check import (
+    condition_param_check,
+    action_param_check,
+)
+from solax_py_library.smart_scene.types.action import (
+    SmartSceneAction,
+    ActionType,
+    SystemActionType,
+    SystemActionItemData,
+    SystemActionChildData,
+)
+from solax_py_library.smart_scene.types.condition import (
+    SmartSceneCondition,
+    ConditionItem,
+    ConditionType,
+    SystemConditionItemData,
+    LogicFunc,
+    SystemConditionType,
+    ConditionItemChildData,
+    CabinetConditionItemData,
+    CabinetConditionType,
+    ConditionFunc,
+)
+
+
+class TestCheckFunc(TestCase):
+    def test_check_condition_func(self):
+        con = SmartSceneCondition(
+            operation=LogicFunc.AND,
+            value=[
+                ConditionItem(
+                    type=ConditionType.systemCondition,
+                    data=[
+                        SystemConditionItemData(
+                            childType=SystemConditionType.systemSoc,
+                            childData=ConditionItemChildData(
+                                data=[101], function=ConditionFunc.EQ
+                            ),
+                        ),
+                    ],
+                    cabinet=None,
+                ),
+                ConditionItem(
+                    type=ConditionType.cabinet,
+                    data=[
+                        CabinetConditionItemData(
+                            childType=CabinetConditionType.cabinetSoc,
+                            childData=ConditionItemChildData(
+                                data=[4], function=ConditionFunc.EQ
+                            ),
+                        )
+                    ],
+                    cabinet=["1", "2"],
+                ),
+            ],
+        )
+        ret = condition_param_check(con, ctx={"soc_low_limit": 10})
+        assert ret is not None
+
+    def test_check_action_func(self):
+        action = [
+            SmartSceneAction(
+                type=ActionType.system,
+                data=[
+                    SystemActionItemData(
+                        childType=SystemActionType.importControl,
+                        childData=SystemActionChildData(data=[1, -10]),
+                    )
+                ],
+            )
+        ]
+        ret = action_param_check(
+            actions=action,
+            ctx={
+                "cabinet_type": 3,
+                "total_power": 1,
+                "total_power_except_solar_inv": 1,
+                "total_energy": 1,
+            },
+        )
+        assert ret is not None

solax_py_library/test/test_smart_scene/test_condition.py

@@ -1,20 +1,36 @@
 from unittest import TestCase
 
 from solax_py_library.device.types.device import DeviceType
-from solax_py_library.smart_scene.core.condition import DateCondition, BaseCondition, CabinetCondition
-from solax_py_library.smart_scene.types.condition import CabinetConditionItemData, CabinetConditionType, \
-    ConditionItemChildData
+from solax_py_library.smart_scene.core.condition import (
+    DateCondition,
+    BaseCondition,
+    CabinetCondition,
+)
+from solax_py_library.smart_scene.types.condition import (
+    CabinetConditionItemData,
+    CabinetConditionType,
+    ConditionItemChildData,
+)
 from solax_py_library.smart_scene.types.condition_value import CabinetValue
 
 
 class TestCondition(TestCase):
-    def test_condition(self):
+    def test_condition_build(self):
         date_condition = DateCondition(
             update_value_function=lambda: 1,
         )
         assert isinstance(date_condition, BaseCondition)
 
-    def test_cabinet_condition(self):
+    def test_cabinet_condition_to_text(self):
+        cabinet_condition = CabinetConditionItemData(
+            childType=CabinetConditionType.cabinetAlarm,
+            childData=ConditionItemChildData(
+                data=[DeviceType.IO_TYPE, DeviceType.COLD_TYPE, 1]
+            ),
+        )
+        print(cabinet_condition.to_text(lang="zh_CN", unit="嘻嘻"))
+
+    def test_cabinet_condition_check(self):
         cabinet_condition = CabinetCondition(
             update_value_function=lambda: {
                 "SN1": CabinetValue(
@@ -24,22 +40,27 @@ class TestCondition(TestCase):
             },
         )
         cabinet_condition.update_value()
-        assert cabinet_condition.meet_func(
-            data=CabinetConditionItemData(
-                childType=CabinetConditionType.cabinetAlarm,
-                childData=ConditionItemChildData(
-                    data=[DeviceType.IO_TYPE, DeviceType.COLD_TYPE, 1]
-                )
-            ),
-            ctx={"cabinet": ["SN1"]}
-        ) is False
-        assert cabinet_condition.meet_func(
-            data=CabinetConditionItemData(
-                childType=CabinetConditionType.cabinetAlarm,
-                childData=ConditionItemChildData(
-                    data=[DeviceType.IO_TYPE, DeviceType.COLD_TYPE, 2]
-                )
-            ),
-            ctx={"cabinet": ["SN1"]}
-        ) is True
-
+        assert (
+            cabinet_condition.meet_func(
+                data=CabinetConditionItemData(
+                    childType=CabinetConditionType.cabinetAlarm,
+                    childData=ConditionItemChildData(
+                        data=[DeviceType.IO_TYPE, DeviceType.COLD_TYPE, 1]
+                    ),
+                ),
+                ctx={"cabinet": ["SN1"]},
+            )
+            is False
+        )
+        assert (
+            cabinet_condition.meet_func(
+                data=CabinetConditionItemData(
+                    childType=CabinetConditionType.cabinetAlarm,
+                    childData=ConditionItemChildData(
+                        data=[DeviceType.IO_TYPE, DeviceType.COLD_TYPE, 2]
+                    ),
+                ),
+                ctx={"cabinet": ["SN1"]},
+            )
+            is True
+        )

{solax_py_library-1.0.0.2601.dist-info → solax_py_library-1.0.0.2901.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.2601
+Version: 1.0.0.2901
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com

{solax_py_library-1.0.0.2601.dist-info → solax_py_library-1.0.0.2901.dist-info}/RECORD

@@ -8,35 +8,36 @@ solax_py_library/device/core/interver/__init__.py,sha256=RKye2D6NawSGdL4YUp_H-Lm
 solax_py_library/device/core/interver/base.py,sha256=2TXHsjigMcIvGDLF3ZD4dw6UDrRRAk9Mq6sdBKRvydc,7191
 solax_py_library/device/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/device/types/alarm.py,sha256=kartXs_iRSV9Y3weFSsh9wMXU1_FxHZa6inHThyQCOk,358
-solax_py_library/device/types/device.py,sha256=fksdxtCyG8Bvzs5lgUHjQm_Whj0NQwQP7PLZVPiwc24,328
+solax_py_library/device/types/device.py,sha256=oGnuJXPpoOFUc3LgrwCMJSAXKX6VQYEjEd_VmU6zcBA,667
 solax_py_library/device/types/inverter_config.py,sha256=qCInNPbgsWf6yQjSw59kfQtJJWilMYUhvx_qo5qwRlU,912
 solax_py_library/device/types/modbus_point.py,sha256=YmXe92gWXL_voVXDJE5zzNzr6dpPs7Ff3ciOAW-LgPs,580
 solax_py_library/exception.py,sha256=ygAccdTqJctRrdt9bu6-vqZP5KadfKVS_1tjt4KcRn8,257
 solax_py_library/smart_scene/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/smart_scene/constant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/smart_scene/constant/message_entry.py,sha256=r-hSUQItc0xEgodXtDct7AltFHQZxj5KH6ZP_ioZtAQ,9191
+solax_py_library/smart_scene/constant/message_entry.py,sha256=4dItLHwgYjSvEb-UbhjT1l8BIbNGk9EyTNhrqD4HEBY,9667
 solax_py_library/smart_scene/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/smart_scene/core/action/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/smart_scene/core/action/base.py,sha256=CCYrlCZeb3CfGZgTWQN673VJmuYNsTbEtdZ4ERUV7RA,395
+solax_py_library/smart_scene/core/action/base.py,sha256=GlZQTi7ub0fREV5BUZQUTARw3mleWWsKHOA7eFPVoJs,319
 solax_py_library/smart_scene/core/action/ems_action.py,sha256=sML6qasFoqOktTvEcHm0vKPYCj60VcKjAFz8RAaQc2U,206
 solax_py_library/smart_scene/core/action/system_action.py,sha256=oGXq3yXS9nKcGjJActjk0R2Wr3AoO9uoyRPyuiM053g,204
 solax_py_library/smart_scene/core/condition/__init__.py,sha256=1nN-N52Oq7LKdn6ApKGtSZq5fB1qJzJq8BOKOumfQvY,475
 solax_py_library/smart_scene/core/condition/base.py,sha256=saj7dc0Su2Wi_Lx04cesHFgIPDyQUwvHuDElcaDOIHU,596
-solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=mLouKmO9VywSYlnha5lfAAOyPZUUWjEpvUEWEvx0HyQ,1803
+solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=HhOmFGs6srnC4oO5h1p3Z09Y9LPeywi1KaL5dG0pJf8,1724
 solax_py_library/smart_scene/core/condition/date_condition.py,sha256=Xhca6VjoM8Bq-I-dFj1RPLTTzbBL81ORkBnR8D-YqUw,772
 solax_py_library/smart_scene/core/condition/price_condition.py,sha256=IkgoB5YhpMxgFVkabilcBXtkjsqae01kkjF3tH10CK0,4006
 solax_py_library/smart_scene/core/condition/system_condition.py,sha256=q5KDQdK6wjEvq0__WwBR4Sk-59yA2aIAgxTf1xjxJQk,1338
-solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=Xp7l9m3NW1vyyRGaJC5_gAX4HM-iuj7OGaw5LbZ4ztU,2223
+solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=ZoP5QM0kswQCrb1N22_W358BnhgDc6eXp9XPR5WKAgs,2363
 solax_py_library/smart_scene/core/service/__init__.py,sha256=wWzHSN2XaHnI-TNtCJWWRHnNC7s3-2GNQo9y0K_PC4Q,69
+solax_py_library/smart_scene/core/service/check.py,sha256=qoNixyjgwHRdb0HnU3UcZDEOeI9t0PxvjZcbgvB79Vs,1031
 solax_py_library/smart_scene/core/service/runner.py,sha256=SwQ6jb5yFPcyHyfU-THyGDjPEMcNFUOHkvVYA9wB1EE,6201
 solax_py_library/smart_scene/exceptions/__init__.py,sha256=0hDgr70fFLQB14uorVCwbBhl1yQmZ-uBYGH5XtGm_dg,147
 solax_py_library/smart_scene/exceptions/price.py,sha256=3bnY6JzeEskUoXVzEs8bpg6hQzgbinBKY4GP4hBITWU,152
 solax_py_library/smart_scene/exceptions/smart_scene.py,sha256=69khvoFm1Eki4NBT45gVnsyWubEzF7dqnhU-unqT20g,1701
 solax_py_library/smart_scene/exceptions/weather.py,sha256=bJl1VwiIXEpLQ9VjlVrDoTAIMFqVZdRCas7dtR7eAJc,133
 solax_py_library/smart_scene/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/smart_scene/types/action.py,sha256=cYICnxLfLRWFAlOGWpS2HBw-PyaB6TNlNuEmSsme26k,5723
-solax_py_library/smart_scene/types/condition.py,sha256=l6LFLvUCqKNX8qZqLsLUOkb5K_0nVAd0lc92wZcxWns,9565
-solax_py_library/smart_scene/types/condition_value.py,sha256=H-45M4HEyBZXOToJZ2ftmV4d9hgDIWxqCaRMVGlQFXk,1247
+solax_py_library/smart_scene/types/action.py,sha256=Xne9t-g-Ob5Le06zfKO7ceP9dtdMeq7EFcFske7GbmM,13227
+solax_py_library/smart_scene/types/condition.py,sha256=etBD6hQHxyhtYucvIhKp0F1rTnaC6D2IEwQyzyuTzgY,9730
+solax_py_library/smart_scene/types/condition_value.py,sha256=by5R3sVNOJCrghLLaNT54jiTqZYT7YvQQ4q9ovIXkqQ,1242
 solax_py_library/smart_scene/types/smart_scene_content.py,sha256=C8H17QEicmDBbxN-m550njwaZyUhAL2hUhlLg3Qj1zM,6061
 solax_py_library/snap_shot/__init__.py,sha256=Ex12q6BCkdU-3OP-f-ehGCetJJWnoZ7KxhEDd_lXh6M,81
 solax_py_library/snap_shot/constant/__init__.py,sha256=UNfjAlx1wovXc1oH74af9oIe2TljwCCiTzNXzWgtUms,65
@@ -52,7 +53,8 @@ solax_py_library/snap_shot/types/__init__.py,sha256=g9ybB88TntvAMGIhLgJ31Xxn26zl
 solax_py_library/snap_shot/types/address.py,sha256=JhyB-t2OnKuE8akKk120sojCNXv4_OlLLuWsl5ChFZ8,1148
 solax_py_library/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/test/test_smart_scene/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/test/test_smart_scene/test_condition.py,sha256=gnNliXSLqDsEj-J2-xgBYagxNI5rJlBZSfbkOR7AJZE,1664
+solax_py_library/test/test_smart_scene/test_check_func.py,sha256=mVZedGT2OocqX1-qtVlVHRlimwyR3xtRwxcOGzREZAE,2584
+solax_py_library/test/test_smart_scene/test_condition.py,sha256=du1vqtwmDFPY__SNqQ-RcDjrDO6e2ZnBjNbPxWpihI4,2209
 solax_py_library/test/test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/test/test_utils/test_cloud_client.py,sha256=gOrHGXkFXpFV4kXTnjhmyJGem8VaGKw8OmXyW884oJ0,395
 solax_py_library/upload/__init__.py,sha256=XhZar7BKaRN0XcdPl4QffWr488L3UWvuq5syT8nX2OU,93
@@ -77,6 +79,6 @@ solax_py_library/utils/cloud_client.py,sha256=5dZrc5fzrNFSXqTPZd7oHt-Y9Jj6RCigB7
 solax_py_library/utils/common.py,sha256=bfnZcX9uM-PjJrYAFv1UMmZgt6bGR7MaOd7jRPNHGxw,1238
 solax_py_library/utils/struct_util.py,sha256=pL6L80GXIHasy1ZDIj89-5BzXW1BWI3TPitH7thGGIE,1577
 solax_py_library/utils/time_util.py,sha256=bY5kj9dmyOuLEQ6uYGQK7jU7y1RMiHZgevEKnkcQcSU,1461
-solax_py_library-1.0.0.2601.dist-info/METADATA,sha256=dHRe01IzV0q4TZX6yERl6cdDEWIPWXqtLQKVh75qsOM,1827
-solax_py_library-1.0.0.2601.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.2601.dist-info/RECORD,,
+solax_py_library-1.0.0.2901.dist-info/METADATA,sha256=o28wtYRXED7pZtI7DX-wNJUdvCCyXnOK4btb4JVKiUc,1827
+solax_py_library-1.0.0.2901.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.2901.dist-info/RECORD,,