solax-py-library 1.0.0.34__tar.gz → 1.0.0.36__tar.gz

{solax_py_library-1.0.0.34 → solax_py_library-1.0.0.36}/PKG-INFO

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

{solax_py_library-1.0.0.34 → solax_py_library-1.0.0.36}/pyproject.toml

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

{solax_py_library-1.0.0.34 → solax_py_library-1.0.0.36}/solax_py_library/smart_scene/core/condition/cabinet_condition.py

@@ -1,5 +1,7 @@
 from collections import defaultdict
 
+from tornado.log import app_log
+
 from solax_py_library.smart_scene.core.condition.base import BaseCondition
 from solax_py_library.smart_scene.types.condition import (
     CabinetConditionItemData,
@@ -28,6 +30,9 @@ class CabinetCondition(BaseCondition):
             if data.childType == CabinetConditionType.cabinetSoc:
                 if self.value[cabinet_sn].soc is None:
                     continue
+                app_log.info(
+                    f"meet_cabinet_soc: {self.value[cabinet_sn].soc}, data_value: {condition_data[0]}"
+                )
                 if data.childData.function.function()(
                     self.value[cabinet_sn].soc,
                     condition_data[0],
@@ -39,6 +44,9 @@ class CabinetCondition(BaseCondition):
                     alarm_info = cabinet_value.alarm_info(device_type)
                     if not alarm_info:
                         continue
+                    app_log.info(
+                        f"meet_cabinet_alarm: {alarm_info}, data_value: {alarm_info[alarm_type-1]}"
+                    )
                     if alarm_info[alarm_type - 1] is True:
                         return True
         return False

{solax_py_library-1.0.0.34 → solax_py_library-1.0.0.36}/solax_py_library/smart_scene/core/condition/date_condition.py

@@ -1,3 +1,5 @@
+from tornado.log import app_log
+
 from solax_py_library.smart_scene.core.condition.base import BaseCondition
 from solax_py_library.smart_scene.types.condition import (
     DateConditionItemData,
@@ -16,6 +18,9 @@ class DateCondition(BaseCondition):
         if data.childType == DateConditionType.time:
             date = data.childData.data[0]
             hour, minute = date.split(":")
+            app_log.info(
+                f"meet_time: {self.value.get('hour')}, {self.value.get('minute')}, data_value: {date}"
+            )
             if int(hour) == self.value.get("hour") and int(minute) == self.value.get(
                 "minute"
             ):

{solax_py_library-1.0.0.34 → solax_py_library-1.0.0.36}/solax_py_library/smart_scene/core/condition/price_condition.py

@@ -1,5 +1,7 @@
 from datetime import datetime
 
+from tornado.log import app_log
+
 from solax_py_library.smart_scene.core.condition.base import BaseCondition
 from solax_py_library.smart_scene.types.condition import (
     PriceConditionItemData,
@@ -26,6 +28,7 @@ class ElePriceCondition(BaseCondition):
             return False
         if price[index] is None:
             return False
+        app_log.info(f"meet_func_price: {price[index]}, data_value: {data_value[0]}")
         return function_value.function()(price[index], data_value[0])
 
     def meet_func_highest_price(self, data_value, index) -> bool:
@@ -37,6 +40,7 @@ class ElePriceCondition(BaseCondition):
             base = max(price[0:96]) - value
         else:  # 比最高电价低X%
             base = round(max(price[0:96]) * (1 - value / 100), 4)
+        app_log.info(f"meet_func_highest_price: {base}, data_value: {price[index]}")
         if price[index] <= base:
             return True
         else:
@@ -48,9 +52,10 @@ class ElePriceCondition(BaseCondition):
         if None in price[0:96]:
             return False
         if unit == SmartSceneUnit.NUM:  # 比最低电价高X元
-            base = value - min(price[0:96])
+            base = value + min(price[0:96])
         else:  # 比最低电价高X%
             base = round(min(price[0:96]) * (1 + value / 100), 4)
+        app_log.info(f"meet_func_lowest_price: {base}, data_value: {price[index]}")
         if price[index] >= base:
             return True
         else:

{solax_py_library-1.0.0.34 → solax_py_library-1.0.0.36}/solax_py_library/smart_scene/core/condition/system_condition.py

@@ -1,3 +1,5 @@
+from tornado.log import app_log
+
 from solax_py_library.smart_scene.core.condition.base import BaseCondition
 from solax_py_library.smart_scene.types.condition import (
     SystemConditionItemData,
@@ -22,14 +24,21 @@ class SystemCondition(BaseCondition):
             compare_value = self.value.get("grid_active_power")
             if compare_value < 0:
                 return False
+            app_log.info(
+                f"meet_system_system_export_power: {compare_value}, data_value: {child_data.data[0]}"
+            )
         elif data.childType == SystemConditionType.systemImportPower:
             compare_value = self.value.get("grid_active_power")
             if compare_value > 0:
                 return False
+            app_log.info(
+                f"meet_system_system_import_power: {compare_value}, data_value: {child_data.data[0]}"
+            )
         elif data.childType == SystemConditionType.systemSoc:
             compare_value = self.value.get("system_soc")
+            app_log.info(
+                f"meet_system_soc: {compare_value}, data_value: {child_data.data[0]}"
+            )
         if compare_value is None:
             return False
-        return function_value.function()(
-            abs(compare_value), child_data.data[0]
-        )
+        return function_value.function()(abs(compare_value), child_data.data[0])

{solax_py_library-1.0.0.34 → solax_py_library-1.0.0.36}/solax_py_library/smart_scene/core/condition/weather_condition.py

@@ -1,3 +1,5 @@
+from tornado.log import app_log
+
 from solax_py_library.smart_scene.core.condition.base import BaseCondition
 from solax_py_library.smart_scene.types.condition import (
     WeatherConditionItemData,
@@ -33,6 +35,9 @@ class WeatherCondition(BaseCondition):
         if child_type == WeatherConditionType.irradiance:
             return self.meet_func_irradiance(function_value, data_value, index)
         elif child_type == WeatherConditionType.temperature:
+            app_log.info(
+                f"meet_temperature: {self.value[child_type]['valueList'][index]}, data_value: {data_value[0]}"
+            )
             return function_value.function()(
                 self.value[child_type]["valueList"][index],
                 data_value[0],
@@ -60,6 +65,9 @@ class WeatherCondition(BaseCondition):
         if not meet_flag:
             return False
         # 2. 再判断当前太阳辐照度
+        app_log.info(
+            f"meet_irradiance: {self.value['irradiance']['valueList'][index]}, data_value: {irradiance}"
+        )
         return function_value.function()(
             self.value["irradiance"]["valueList"][index], irradiance
         )

{solax_py_library-1.0.0.34 → solax_py_library-1.0.0.36}/solax_py_library/smart_scene/types/condition.py

@@ -160,7 +160,7 @@ class SystemConditionItemData(ConditionItemData):
             )
 
     def check_param(self, ctx):
-        soc_low_limit = ctx.pop("soc_low_limit", 5)
+        soc_low_limit = ctx.get("soc_low_limit", 5)
         if self.childType == SystemConditionType.systemSoc:
             soc = self.childData.data[0]
             if soc < soc_low_limit or soc > 100:
@@ -201,7 +201,7 @@ class CabinetConditionItemData(ConditionItemData):
             )
 
     def check_param(self, ctx):
-        soc_low_limit = ctx.pop("soc_low_limit", 5)
+        soc_low_limit = ctx.get("soc_low_limit", 5)
         if self.childType == CabinetConditionType.cabinetSoc:
             soc = self.childData.data[0]
             if soc < soc_low_limit or soc > 100: