solax-py-library 1.0.0.36__py3-none-any.whl → 1.0.0.38__py3-none-any.whl

solax_py_library/smart_scene/constant/message_entry.py

@@ -159,17 +159,17 @@ MESSAGE_ENTRY = {
     "duration": {"zh_CN": "持续: {}秒", "en_US": "Last: {} seconds"},
     "systemSoc": {"zh_CN": "系统SOC {} {}%", "en_US": "System SOC {} {}%"},
     "systemImportPower": {
-        "zh_CN": "电网买电功率 {} {}KW",
-        "en_US": "Grid import power {} {}KW",
+        "zh_CN": "电网买电功率 {} {}kW",
+        "en_US": "Grid import power {} {}kW",
     },
     "systemExportPower": {
-        "zh_CN": "电网馈电功率 {} {}KW",
-        "en_US": "Grid export power {} {}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"},
+    "NORMAL": {"zh_CN": "一般告警", "en_US": "Normal alarm"},
     "cabinetAlarm": {
         "zh_CN": "机柜下属({})设备发生{}",
         "en_US": "The equipments({}) under the cabinet occurs {}",

solax_py_library/smart_scene/core/condition/price_condition.py

@@ -36,10 +36,14 @@ class ElePriceCondition(BaseCondition):
         price = self.value["price"]
         if None in price[0:96]:
             return False
+        max_num = max(price[0:96])
         if unit == SmartSceneUnit.NUM:  # 比最高电价低X元
-            base = max(price[0:96]) - value
+            base = max_num - value
         else:  # 比最高电价低X%
-            base = round(max(price[0:96]) * (1 - value / 100), 4)
+            if max_num < 0:
+                base = round(max_num * (1 + value / 100), 4)
+            else:
+                base = round(max_num * (1 - value / 100), 4)
         app_log.info(f"meet_func_highest_price: {base}, data_value: {price[index]}")
         if price[index] <= base:
             return True
@@ -51,10 +55,14 @@ class ElePriceCondition(BaseCondition):
         price = self.value["price"]
         if None in price[0:96]:
             return False
+        min_num = min(price[0:96])
         if unit == SmartSceneUnit.NUM:  # 比最低电价高X元
-            base = value + min(price[0:96])
+            base = min_num + value
         else:  # 比最低电价高X%
-            base = round(min(price[0:96]) * (1 + value / 100), 4)
+            if min_num < 0:
+                base = round(min_num * (1 - value / 100), 4)
+            else:
+                base = round(min_num * (1 + value / 100), 4)
         app_log.info(f"meet_func_lowest_price: {base}, data_value: {price[index]}")
         if price[index] >= base:
             return True

{solax_py_library-1.0.0.36.dist-info → solax_py_library-1.0.0.38.dist-info}/METADATA

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

{solax_py_library-1.0.0.36.dist-info → solax_py_library-1.0.0.38.dist-info}/RECORD

@@ -14,7 +14,7 @@ solax_py_library/device/types/modbus_point.py,sha256=YmXe92gWXL_voVXDJE5zzNzr6dp
 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=LMlaiK9XsGa7Aaj4KASbNIyZiUnIPNcpz7Vz-BHkZ5w,9717
+solax_py_library/smart_scene/constant/message_entry.py,sha256=cbu2xC5lkhQGvsyDS6ckgQf23tGeCbTJ53a-0s9HuWw,9717
 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=GlZQTi7ub0fREV5BUZQUTARw3mleWWsKHOA7eFPVoJs,319
@@ -24,7 +24,7 @@ solax_py_library/smart_scene/core/condition/__init__.py,sha256=1nN-N52Oq7LKdn6Ap
 solax_py_library/smart_scene/core/condition/base.py,sha256=saj7dc0Su2Wi_Lx04cesHFgIPDyQUwvHuDElcaDOIHU,596
 solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=Umum_DvUo6xQDqci4SyiFXw8mpNrkn4l2HdZ4XPVC8c,2039
 solax_py_library/smart_scene/core/condition/date_condition.py,sha256=ipJo8hvAgeANEwYUSa_O2j4ORc-xhDrJOSuQDMa8-9M,948
-solax_py_library/smart_scene/core/condition/price_condition.py,sha256=WEZbVc9RXqayRZS5rFsvBKOKMTOXwEwFhq8KRM5RWbY,4289
+solax_py_library/smart_scene/core/condition/price_condition.py,sha256=yMVRX3gLP7CUYmS-oXRI8GBqoHM8Pi86wht_i8LCQWk,4545
 solax_py_library/smart_scene/core/condition/system_condition.py,sha256=lEC0N7pZolRkYRcuDfer5jZIvzOGe2ej4oBDlRD8OLQ,1734
 solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=PkHxQzHwJLZiMsLL4xW8zvghRoQ32TV3vzkNyoF82Ak,2684
 solax_py_library/smart_scene/core/service/__init__.py,sha256=wWzHSN2XaHnI-TNtCJWWRHnNC7s3-2GNQo9y0K_PC4Q,69
@@ -79,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.36.dist-info/METADATA,sha256=TY5e4eFPeqQPmBfTxtq_p0fcvkIJOjYQXJawzawbZuk,1825
-solax_py_library-1.0.0.36.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.36.dist-info/RECORD,,
+solax_py_library-1.0.0.38.dist-info/METADATA,sha256=Un7XTZI5S8Cfzc1ZdSsoxEHk8Gv3CbZsAbm09DyrrXE,1825
+solax_py_library-1.0.0.38.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.38.dist-info/RECORD,,