solax-py-library 1.0.0.2517__tar.gz → 1.0.0.2519__tar.gz

{solax_py_library-1.0.0.2517 → solax_py_library-1.0.0.2519}/PKG-INFO

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

{solax_py_library-1.0.0.2517 → solax_py_library-1.0.0.2519}/pyproject.toml

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

{solax_py_library-1.0.0.2517 → solax_py_library-1.0.0.2519}/solax_py_library/smart_scene/core/action/base.py

@@ -7,4 +7,4 @@ class BaseAction(object):
         child_data = data.childData
         child_type = data.childType
         do_func = self.do_func_map.get(child_type)
-        return do_func(child_data, scene_id)
+        return do_func(scene_id, child_data.data)

{solax_py_library-1.0.0.2517 → solax_py_library-1.0.0.2519}/solax_py_library/smart_scene/core/condition/price_condition.py

@@ -18,24 +18,25 @@ class ElePriceCondition(BaseCondition):
     def __init__(self, update_value_function, **kwargs):
         super().__init__(update_value_function, **kwargs)
         self.buy = None
-        self.unit = None
 
     def meet_func_price(self, function_value: ConditionFunc, data_value, index) -> bool:
         """电价条件的判定"""
-        if index < 0 or index > len(self.value):
+        price = self.value["price"]
+        if index < 0 or index > len(price):
             return False
-        if self.value[index] is None:
+        if price[index] is None:
             return False
-        return function_value.function()(self.value[index], data_value[0])
+        return function_value.function()(price[index], data_value[0])
 
     def meet_func_highest_price(self, data_value, index) -> bool:
         value, unit = data_value
-        if None in self.value[0:96]:
+        price = self.value["price"]
+        if None in price[0:96]:
             return False
         if unit == SmartSceneUnit.NUM:  # 比最高电价低X元
-            base = max(self.value[0:96]) - value
+            base = max(price[0:96]) - value
         else:  # 比最高电价低X%
-            base = round(max(self.value[0:96]) * (1 - value / 100), 4)
+            base = round(max(price[0:96]) * (1 - value / 100), 4)
         if self.value[index] <= base:
             return True
         else:
@@ -43,27 +44,32 @@ class ElePriceCondition(BaseCondition):
 
     def meet_func_lowest_price(self, data_value, index) -> bool:
         value, unit = data_value
-        if None in self.value[0:96]:
+        price = self.value["price"]
+        if None in price[0:96]:
             return False
         if unit == SmartSceneUnit.NUM:  # 比最低电价高X元
-            base = value - min(self.value[0:96])
+            base = value - min(price[0:96])
         else:  # 比最低电价高X%
-            base = round(min(self.value[0:96]) * (1 + value / 100), 4)
-        if self.value[index] >= base:
+            base = round(min(price[0:96]) * (1 + value / 100), 4)
+        if price[index] >= base:
             return True
         else:
             return False
 
     def meet_func_highest_or_lowest_hours(self, data_value, index, reverse) -> bool:
         sort_index, start_index = get_highest_or_lowest_value(
-            data_value[0], data_value[1], data_value[2], self.value, reverse=reverse
+            data_value[0],
+            data_value[1],
+            data_value[2],
+            self.value["price"],
+            reverse=reverse,
         )
         if sort_index and index - start_index in sort_index:
             return True
         return False
 
     def meet_func(self, data: PriceConditionItemData, ctx):
-        if not self.value:
+        if not self.value or not self.value.get("price"):
             # 未获取到价格数据，直接返回
             return False
         child_data = data.childData

{solax_py_library-1.0.0.2517 → solax_py_library-1.0.0.2519}/solax_py_library/smart_scene/types/action.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import List, Union
+from typing import List, Union, Any
 
 from pydantic import BaseModel
 
@@ -29,7 +29,11 @@ class DoControl(BaseModel):
 
 
 class ActionChildData(BaseModel):
-    data: List[Union[DoControl, float, int]]
+    data: List[Any]
+
+
+class SystemActionChildData(ActionChildData):
+    ...
 
 
 class SystemActionItemData(BaseModel):
@@ -133,9 +137,13 @@ class SystemActionItemData(BaseModel):
         return ""
 
 
+class EmsActionChildData(ActionChildData):
+    data: List[DoControl]
+
+
 class EmsActionItemData(BaseModel):
     childType: EmsActionType
-    childData: ActionChildData
+    childData: EmsActionChildData
 
     def to_text(self, lang, cabinet_type):
         if self.childType == EmsActionType.DoControl: