solax-py-library 1.0.0.35__py3-none-any.whl → 1.0.0.37__py3-none-any.whl

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/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:

{solax_py_library-1.0.0.35.dist-info → solax_py_library-1.0.0.37.dist-info}/METADATA

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

{solax_py_library-1.0.0.35.dist-info → solax_py_library-1.0.0.37.dist-info}/RECORD

@@ -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
@@ -36,7 +36,7 @@ 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=l2OITe3098-5zrYZSI64yL_YdSXn_FhbMh8h_8wRYBU,12934
-solax_py_library/smart_scene/types/condition.py,sha256=D96A0u8tTWmirTmVPtt5b_ewOCf8ntv0DBrSC0Myf_Y,9714
+solax_py_library/smart_scene/types/condition.py,sha256=FSI4JjL2TAeKeyMvTifWv9opha-gCraLhwj5h08vuUo,9714
 solax_py_library/smart_scene/types/condition_value.py,sha256=CxeDRGWJWZQZTG8KegZBTA6a4ZOCu2CUWyUJBkj94II,1242
 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
@@ -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.35.dist-info/METADATA,sha256=SmaLJ0BHGvrviqF8uhznZxMhpkBtCVNWzZE8XvKBQM0,1825
-solax_py_library-1.0.0.35.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.35.dist-info/RECORD,,
+solax_py_library-1.0.0.37.dist-info/METADATA,sha256=okDozYBii5woAqsJ67PwV25DCLndCbi9a94JAveH3y4,1825
+solax_py_library-1.0.0.37.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.37.dist-info/RECORD,,