solax-py-library 1.0.0.2515__py3-none-any.whl → 1.0.0.2517__py3-none-any.whl

solax_py_library/smart_scene/core/condition/system_condition.py

@@ -12,7 +12,7 @@ class SystemCondition(BaseCondition):
     def __init__(self, update_value_function, **kwargs):
         super().__init__(update_value_function, **kwargs)
 
-    def meet_system_condition(self, data: SystemConditionItemData, ctx):
+    def meet_func(self, data: SystemConditionItemData, ctx):
         if not self.value:
             return False
         child_data = data.childData

solax_py_library/smart_scene/core/condition/weather_condition.py

@@ -13,7 +13,7 @@ class WeatherCondition(BaseCondition):
     def __init__(self, update_value_function, **kwargs):
         super().__init__(update_value_function, **kwargs)
 
-    def meet_weather_condition(self, data: WeatherConditionItemData, ctx):
+    def meet_func(self, data: WeatherConditionItemData, ctx):
         if not self.value:
             return False
         child_data = data.childData

solax_py_library/utils/struct_util.py

@@ -3,15 +3,15 @@ import struct
 from typing import List
 
 format_map = {
-    "int8": "bb",
-    "uint8": "BB",
-    "int16": "h",
-    "uint16": "H",
-    "int32": "i",
-    "uint32": "I",
-    "int64": "q",
-    "uint64": "Q",
-    "float": "f",
+    "int8": {"format_str": "bb", "length": 1},
+    "uint8": {"format_str": "BB", "length": 1},
+    "int16": {"format_str": "h", "length": 1},
+    "uint16": {"format_str": "H", "length": 1},
+    "int32": {"format_str": "i", "length": 2},
+    "uint32": {"format_str": "I", "length": 2},
+    "int64": {"format_str": "q", "length": 4},
+    "uint64": {"format_str": "Q", "length": 4},
+    "float": {"format_str": "f", "length": 1},
 }
 
 
@@ -27,25 +27,16 @@ def unpack(data: List, data_format, reversed=False):
         raise Exception("暂不支持")
     pack_str = ("<" if reversed else ">") + "H" * len(cur_data)
     to_pack_data = struct.pack(pack_str, *cur_data)
-    struct_format = ("<" if reversed else ">") + format_map[data_format]
+    struct_format = ("<" if reversed else ">") + format_map[data_format]["format_str"]
     return struct.unpack(struct_format, to_pack_data)
 
 
-def struct_transform(value, fmt, order="big"):
+def pack(value, fmt, order="big"):
     """将10进制的原始值转换为modbus协议需要的精度与类型的值"""
     opt = "<" if order == "little" else ">"
-    try:
-        value = int(value)
-        if fmt in format_map:
-            ret = struct.pack(f"{opt}{format_map[fmt]}", value)
-            ret_list = struct.unpack(f"{opt}H", ret)
-        else:
-            ret_list = [0]
-    except Exception:
-        if "16" in fmt:
-            ret_list = [0]
-        elif "32" in fmt:
-            ret_list = [0, 0]
-        else:
-            ret_list = [0, 0, 0, 0]
+    if fmt not in format_map:
+        raise Exception("暂不支持")
+    value = int(value)
+    ret = struct.pack(f'{opt}{format_map[fmt]["format_str"]}', value)
+    ret_list = struct.unpack(f'{opt}{"H" * format_map[fmt]["length"]}', ret)
     return list(ret_list)

{solax_py_library-1.0.0.2515.dist-info → solax_py_library-1.0.0.2517.dist-info}/METADATA

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

{solax_py_library-1.0.0.2515.dist-info → solax_py_library-1.0.0.2517.dist-info}/RECORD

@@ -24,8 +24,8 @@ solax_py_library/smart_scene/core/condition/base.py,sha256=saj7dc0Su2Wi_Lx04cesH
 solax_py_library/smart_scene/core/condition/cabinet_condition.py,sha256=HEVifO3rHk2ElfSCEB0MzVdfrFWlkwqjt6tFhtJ8CLY,1581
 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=mzUnrMuG0DHCxaQQe7-rmE_vra9U6vd-1AYDKkbPPUw,3884
-solax_py_library/smart_scene/core/condition/system_condition.py,sha256=oLz0MM47bj6K1saAap3YBteK9UeejSqu5CQVdLvGE1Q,1350
-solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=OiKye007PZnocnmcrNQD6ObOEF7VyaYkdqz6D_2lNok,2236
+solax_py_library/smart_scene/core/condition/system_condition.py,sha256=q5KDQdK6wjEvq0__WwBR4Sk-59yA2aIAgxTf1xjxJQk,1338
+solax_py_library/smart_scene/core/condition/weather_condition.py,sha256=Xp7l9m3NW1vyyRGaJC5_gAX4HM-iuj7OGaw5LbZ4ztU,2223
 solax_py_library/smart_scene/core/service/__init__.py,sha256=wWzHSN2XaHnI-TNtCJWWRHnNC7s3-2GNQo9y0K_PC4Q,69
 solax_py_library/smart_scene/core/service/runner.py,sha256=SwQ6jb5yFPcyHyfU-THyGDjPEMcNFUOHkvVYA9wB1EE,6201
 solax_py_library/smart_scene/exceptions/__init__.py,sha256=0hDgr70fFLQB14uorVCwbBhl1yQmZ-uBYGH5XtGm_dg,147
@@ -73,8 +73,8 @@ solax_py_library/upload/types/ftp.py,sha256=9kCeLB0g5Je19v4ifz8YYEsGOhJL1lKBO2C6
 solax_py_library/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solax_py_library/utils/cloud_client.py,sha256=5dZrc5fzrNFSXqTPZd7oHt-Y9Jj6RCigB7aXJQMJ8sQ,9610
 solax_py_library/utils/common.py,sha256=bfnZcX9uM-PjJrYAFv1UMmZgt6bGR7MaOd7jRPNHGxw,1238
-solax_py_library/utils/struct_util.py,sha256=nlMaopAWy5bN_NGiNph0Kou5wuuYprq5lTm7h1rXJCA,1477
+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.2515.dist-info/METADATA,sha256=wXQlZNxou41J6NRtFQCV2qK8v1rzEKBUmF0J29qArW0,1827
-solax_py_library-1.0.0.2515.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.2515.dist-info/RECORD,,
+solax_py_library-1.0.0.2517.dist-info/METADATA,sha256=5Lw8G9DB_DWDqsj89QeCJCswLr-Ekz8tm4npB5LzS1I,1827
+solax_py_library-1.0.0.2517.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.2517.dist-info/RECORD,,