solax-py-library 1.0.0.29__py3-none-any.whl → 1.0.0.31__py3-none-any.whl

solax_py_library/smart_scene/core/condition/cabinet_condition.py

@@ -29,8 +29,8 @@ class CabinetCondition(BaseCondition):
                 if self.value[cabinet_sn].soc is None:
                     continue
                 if data.childData.function.function()(
-                    compare_value=self.value[cabinet_sn].soc,
-                    base_value=condition_data[0],
+                    self.value[cabinet_sn].soc,
+                    condition_data[0],
                 ):
                     return True
             elif data.childType == CabinetConditionType.cabinetAlarm:

solax_py_library/smart_scene/core/condition/system_condition.py

@@ -31,5 +31,5 @@ class SystemCondition(BaseCondition):
         if compare_value is None:
             return False
         return function_value.function()(
-            compare_value=abs(compare_value), base_value=child_data.data[0]
+            abs(compare_value), child_data.data[0]
         )

solax_py_library/smart_scene/types/condition.py

@@ -164,7 +164,7 @@ class SystemConditionItemData(ConditionItemData):
         if self.childType == SystemConditionType.systemSoc:
             soc = self.childData.data[0]
             if soc < soc_low_limit or soc > 100:
-                return SocLimit.message, {"low_limit": soc_low_limit}
+                return SocLimit, {"low_limit": soc_low_limit}
 
 
 class CabinetConditionItemData(ConditionItemData):
@@ -205,7 +205,7 @@ class CabinetConditionItemData(ConditionItemData):
         if self.childType == CabinetConditionType.cabinetSoc:
             soc = self.childData.data[0]
             if soc < soc_low_limit or soc > 100:
-                return SocLimit.message, {"low_limit": soc_low_limit}
+                return SocLimit, {"low_limit": soc_low_limit}
 
 
 class DateConditionItemData(ConditionItemData):

{solax_py_library-1.0.0.29.dist-info → solax_py_library-1.0.0.31.dist-info}/METADATA

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

{solax_py_library-1.0.0.29.dist-info → solax_py_library-1.0.0.31.dist-info}/RECORD

@@ -22,10 +22,10 @@ solax_py_library/smart_scene/core/action/ems_action.py,sha256=sML6qasFoqOktTvEcH
 solax_py_library/smart_scene/core/action/system_action.py,sha256=oGXq3yXS9nKcGjJActjk0R2Wr3AoO9uoyRPyuiM053g,204
 solax_py_library/smart_scene/core/condition/__init__.py,sha256=1nN-N52Oq7LKdn6ApKGtSZq5fB1qJzJq8BOKOumfQvY,475
 solax_py_library/smart_scene/core/condition/base.py,sha256=saj7dc0Su2Wi_Lx04cesHFgIPDyQUwvHuDElcaDOIHU,596
-solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=HhOmFGs6srnC4oO5h1p3Z09Y9LPeywi1KaL5dG0pJf8,1724
+solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=3WfF5mxnNuJcQ9O0-5IDkfah7oodKWrvXRV3lftZNNg,1699
 solax_py_library/smart_scene/core/condition/date_condition.py,sha256=Xhca6VjoM8Bq-I-dFj1RPLTTzbBL81ORkBnR8D-YqUw,772
 solax_py_library/smart_scene/core/condition/price_condition.py,sha256=IkgoB5YhpMxgFVkabilcBXtkjsqae01kkjF3tH10CK0,4006
-solax_py_library/smart_scene/core/condition/system_condition.py,sha256=q5KDQdK6wjEvq0__WwBR4Sk-59yA2aIAgxTf1xjxJQk,1338
+solax_py_library/smart_scene/core/condition/system_condition.py,sha256=FnAhbQ1mGKPbmOR3IDybRig7sPTPg1-byu1a6Y-WPhQ,1313
 solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=ZoP5QM0kswQCrb1N22_W358BnhgDc6eXp9XPR5WKAgs,2363
 solax_py_library/smart_scene/core/service/__init__.py,sha256=wWzHSN2XaHnI-TNtCJWWRHnNC7s3-2GNQo9y0K_PC4Q,69
 solax_py_library/smart_scene/core/service/check.py,sha256=qoNixyjgwHRdb0HnU3UcZDEOeI9t0PxvjZcbgvB79Vs,1031
@@ -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=etBD6hQHxyhtYucvIhKp0F1rTnaC6D2IEwQyzyuTzgY,9730
+solax_py_library/smart_scene/types/condition.py,sha256=D96A0u8tTWmirTmVPtt5b_ewOCf8ntv0DBrSC0Myf_Y,9714
 solax_py_library/smart_scene/types/condition_value.py,sha256=by5R3sVNOJCrghLLaNT54jiTqZYT7YvQQ4q9ovIXkqQ,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.29.dist-info/METADATA,sha256=4jVVYgos5GjqYl6S09nOz8zK2dh08mxJBg3O7w9dRjU,1825
-solax_py_library-1.0.0.29.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.29.dist-info/RECORD,,
+solax_py_library-1.0.0.31.dist-info/METADATA,sha256=21GQ4TeEHKB5rnRoiIJH--VAwuQIJmT6unSNMsL-xdQ,1825
+solax_py_library-1.0.0.31.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.31.dist-info/RECORD,,