solax-py-library 1.0.0.2521__tar.gz → 1.0.0.2601__tar.gz

{solax_py_library-1.0.0.2521 → solax_py_library-1.0.0.2601}/PKG-INFO

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

{solax_py_library-1.0.0.2521 → solax_py_library-1.0.0.2601}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solax-py-library"
-version = "1.0.0.2521"
+version = "1.0.0.2601"
 description = "some common tool"
 authors = ["shenlvyu <13296718439@163.com>", "x5m8944pjl <371630856@qq.com>"]
 readme = "README.md"

solax_py_library-1.0.0.2601/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-1.0.0.2521 → solax_py_library-1.0.0.2601}/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-1.0.0.2521 → solax_py_library-1.0.0.2601}/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,

solax_py_library-1.0.0.2601/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-1.0.0.2601/solax_py_library/test/test_smart_scene/test_condition.py

@@ -0,0 +1,45 @@
+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.types.condition_value import CabinetValue
+
+
+class TestCondition(TestCase):
+    def test_condition(self):
+        date_condition = DateCondition(
+            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.2521/solax_py_library/test/test_smart_scene/test_condition.py

@@ -1,11 +0,0 @@
-from unittest import TestCase
-
-from solax_py_library.smart_scene.core.condition import DateCondition, BaseCondition
-
-
-class TestCondition(TestCase):
-    def test_condition(self):
-        date_condition = DateCondition(
-            update_value_function=lambda: 1,
-        )
-        assert isinstance(date_condition, BaseCondition)