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

solax_py_library/device/types/device.py

@@ -0,0 +1,16 @@
+from enum import IntEnum
+
+
+class DeviceType(IntEnum):
+    EMS_TYPE = 100
+    PCS_TYPE = 1
+    BMS_TYPE = 2  # 电池簇
+    ELM_TYPE = 3
+    EVC_TYPE = 4
+    IO_TYPE = 5
+    ESS_TYPE = 6  # 机柜
+    CELL_TYPE = 7  # 单体
+    AIRCONDITIONER_TYPE = 501
+    FIRE_SAFETY_TYPE = 502
+    COLD_TYPE = 503
+    DEHUMIDIFY_TYPE = 504

solax_py_library/smart_scene/constant/message_entry.py

@@ -173,4 +173,7 @@ MESSAGE_ENTRY = {
     "cabinetAlarm": {"zh_CN": "机柜发生{}", "en_US": "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"},
 }

solax_py_library/smart_scene/core/condition/cabinet_condition.py

@@ -7,6 +7,7 @@ from solax_py_library.smart_scene.types.condition import (
     ConditionType,
 )
 from solax_py_library.device.types.alarm import AlarmLevel
+from solax_py_library.smart_scene.types.condition_value import CabinetValue
 
 
 class CabinetCondition(BaseCondition):
@@ -15,30 +16,32 @@ class CabinetCondition(BaseCondition):
     def __init__(self, update_value_function, **kwargs):
         super().__init__(update_value_function, **kwargs)
         self.value = defaultdict(
-            lambda: {
-                "soc": 0,
-                "alarm_level": {
-                    AlarmLevel.EMERGENCY: False,
-                    AlarmLevel.NORMAL: False,
-                    AlarmLevel.TIPS: False,
-                },
-            }
+            lambda: CabinetValue
         )
 
     def meet_func(self, data: CabinetConditionItemData, ctx):
         if not self.value:
             return False
         cabinet = ctx["cabinet"] or []
+        condition_data = data.childData.data
         for cabinet_sn in cabinet:
+            cabinet_value = self.value[cabinet_sn]
+            if not cabinet_value:
+                continue
             if data.childType == CabinetConditionType.cabinetSoc:
-                if self.value[cabinet_sn]["soc"] is None:
-                    return False
+                if self.value[cabinet_sn].soc is None:
+                    continue
                 if data.childData.function.function()(
-                    compare_value=self.value[cabinet_sn]["soc"],
-                    base_value=data.childData.data[0],
+                    compare_value=self.value[cabinet_sn].soc,
+                    base_value=condition_data[0],
                 ):
                     return True
             elif data.childType == CabinetConditionType.cabinetAlarm:
-                if self.value[cabinet_sn]["alarm_level"][data.childData.data[0]]:
-                    return True
+                alarm_type = condition_data[-1]
+                for device_type in condition_data[:-1]:
+                    alarm_info = cabinet_value.alarm_info(device_type)
+                    if not alarm_info:
+                        continue
+                    if alarm_info[alarm_type-1] is True:
+                        return True
         return False

solax_py_library/smart_scene/types/condition.py

@@ -163,7 +163,7 @@ class CabinetConditionItemData(BaseModel):
     def _check_child_data(cls, value, values):
         child_type = values.get("childType")
         if child_type == CabinetConditionType.cabinetAlarm:
-            assert value.data[0] in {
+            assert value.data[-1] in {
                 AlarmLevel.TIPS,
                 AlarmLevel.NORMAL,
                 AlarmLevel.EMERGENCY,
@@ -181,7 +181,7 @@ class CabinetConditionItemData(BaseModel):
             )
         elif self.childType == CabinetConditionType.cabinetAlarm:
             return MESSAGE_ENTRY[self.childType][lang].format(
-                MESSAGE_ENTRY[str(data[0])][lang], lang
+                MESSAGE_ENTRY[str(AlarmLevel(data[0]))][lang], lang
             )
 
 

solax_py_library/smart_scene/types/condition_value.py

@@ -0,0 +1,30 @@
+from typing import List
+
+from pydantic import BaseModel, Field
+
+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])
+
+    def alarm_info(self, device_type):
+        if device_type == DeviceType.EMS_TYPE:
+            return self.cabinet_alarm
+        elif device_type == DeviceType.PCS_TYPE:
+            return self.pcs_alarm
+        elif device_type == DeviceType.IO_TYPE:
+            return self.io_alarm
+        elif device_type == DeviceType.BMS_TYPE:
+            return self.bms_alarm
+        elif device_type == DeviceType.AIRCONDITIONER_TYPE:
+            return self.air_alarm
+        elif device_type == DeviceType.COLD_TYPE:
+            return self.liquid_alarm
+        return None

solax_py_library/test/test_smart_scene/test_condition.py

@@ -1,6 +1,10 @@
 from unittest import TestCase
 
-from solax_py_library.smart_scene.core.condition import DateCondition, BaseCondition
+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.types.condition_value import CabinetValue
 
 
 class TestCondition(TestCase):
@@ -9,3 +13,33 @@ class TestCondition(TestCase):
             update_value_function=lambda: 1,
         )
         assert isinstance(date_condition, BaseCondition)
+
+    def test_cabinet_condition(self):
+        cabinet_condition = CabinetCondition(
+            update_value_function=lambda: {
+                "SN1": CabinetValue(
+                    soc=0,
+                    io_alarm=[False, True, False],
+                ),
+            },
+        )
+        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
+

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

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

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

@@ -8,12 +8,13 @@ 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/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=Ah2yDNpsf1W4HKD-tCzK6xtew0H5TLN7ko7kSsXgcng,8973
+solax_py_library/smart_scene/constant/message_entry.py,sha256=r-hSUQItc0xEgodXtDct7AltFHQZxj5KH6ZP_ioZtAQ,9191
 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
@@ -21,7 +22,7 @@ solax_py_library/smart_scene/core/action/ems_action.py,sha256=sML6qasFoqOktTvEcH
 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=HEVifO3rHk2ElfSCEB0MzVdfrFWlkwqjt6tFhtJ8CLY,1581
+solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=mLouKmO9VywSYlnha5lfAAOyPZUUWjEpvUEWEvx0HyQ,1803
 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
@@ -34,7 +35,8 @@ solax_py_library/smart_scene/exceptions/smart_scene.py,sha256=69khvoFm1Eki4NBT45
 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=xJGv4Xv-kRzMYzlj6y6Q3eeMSVLwoOY9V-denlyicik,9552
+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/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
@@ -50,7 +52,7 @@ 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=w-REUzkaDrq9acye2qZeAbTQb8bpgAykLfylsLvNrx8,331
+solax_py_library/test/test_smart_scene/test_condition.py,sha256=gnNliXSLqDsEj-J2-xgBYagxNI5rJlBZSfbkOR7AJZE,1664
 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
@@ -75,6 +77,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.2520.dist-info/METADATA,sha256=hFMhtvXGObFpFJqqCcPozH4MEG3kM2vLcwATWYcJDJQ,1827
-solax_py_library-1.0.0.2520.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.2520.dist-info/RECORD,,
+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,,