solax-py-library 1.0.0.2514__py3-none-any.whl → 1.0.0.2516__py3-none-any.whl

solax_py_library/smart_scene/core/action/base.py

@@ -1,9 +1,10 @@
-# class BaseAction(object):
-#     def __init__(self, smart_scene_service):
-#         self.smart_scene_service = smart_scene_service
-#         self.device_service = DeviceService()
-#         self.ems_tcp_service = EMSTcpService()
-#
-#
-#
-#
+class BaseAction(object):
+    def __init__(self, smart_scene_service, do_funcs, **kwargs):
+        self.smart_scene_service = smart_scene_service
+        self.do_func_map = do_funcs
+
+    def do_func(self, scene_id, data):
+        child_data = data.childData
+        child_type = data.childType
+        do_func = self.do_func_map.get(child_type)
+        return do_func(child_data, scene_id)

solax_py_library/smart_scene/core/action/ems_action.py

@@ -1,19 +1,6 @@
-#
-# class EMS1000Action(BaseAction):
-#     def __init__(self, smart_scene_service):
-#         super().__init__(smart_scene_service)
-#         self.do_func = self.do_ems1000_action
-#         self.cabinet_type = None
-#
-#     def do_ems1000_action(self, scene_id, data: EmsActionItemData):
-#         if data.childType == "DoControl":
-#             ret = self.do_control(data.childData.data)
-#         else:
-#             ret = False
-#         return ret
-#
-#     def do_control(self, data):
-#         app_log.info("执行: DO控制")
-#         self.smart_scene_service.ems_do_control(data)
-#         return True
-#
+from solax_py_library.smart_scene.core.action.base import BaseAction
+from solax_py_library.smart_scene.types.action import ActionType
+
+
+class EMS1000Action(BaseAction):
+    action_type = ActionType.EMS1000

solax_py_library/smart_scene/core/action/system_action.py

@@ -1,241 +1,6 @@
-# from solax_py_library.smart_scene.core.action.base import BaseAction
-# from solax_py_library.smart_scene.types.action import SystemActionType
-# from solax_py_library.smart_scene.types.condition import SystemConditionItemData
-#
-#
-# class SystemAction(BaseAction):
-#     def __init__(self, smart_scene_service, app_log):
-#         super().__init__(smart_scene_service)
-#         self.log = app_log
-#         self.do_func = self.do_system_action
-#         self.cabinet_type = None
-#
-#     def do_system_action(self, scene_id, data: SystemConditionItemData):
-#         child_data = data.childData
-#         child_type = data.childType
-#         data = child_data.data
-#         if self.cabinet_type is None:
-#             self.cabinet_type = self.smart_scene_service.get_cabinet_type()
-#         if child_type == SystemActionType.systemSwitch:
-#             return self.system_switch(data[0], scene_id)
-#         elif child_type == SystemActionType.exportControl:
-#             return self.export_control(data, scene_id)
-#         elif child_type == SystemActionType.importControl:
-#             return self.import_control(data, scene_id)
-#         elif child_type == SystemActionType.workMode:
-#             return self.work_mode(data, scene_id)
-#         return False
-#
-#
-# class SystemSwitchAction(SystemAction):
-#     def system_switch(self, value, scene_id) -> bool:
-#         """系统开关机"""
-#         if value not in [0, 1]:
-#             value = 1
-#         if self.cabinet_type in ["TRENE"]:
-#             self.ems_tcp_service.set_trene_switch(value)
-#             return True
-#         else:
-#             master_sn = self.device_service.get_master_inv_by_device()
-#             # 如果为AELIO，则只需要操控主机
-#             if master_sn:
-#                 data = {"sn": master_sn, "switch": value}
-#                 self.log.info(f"执行: 系统开关机, data: {data}")
-#                 t = threading.Thread(
-#                     target=self.smart_scene_service.request_local_server,
-#                     args=("setSystemSwitch", data, scene_id),
-#                     daemon=True,
-#                 )
-#                 t.start()
-#         return True
-#
-#
-# class ExportControlAction(SystemAction):
-#     def export_control(self, value, scene_id) -> bool:
-#         """零输出控制"""
-#         if len(value) != 4:
-#             value.extend([1, 0, 1])
-#         data = {
-#             "isEnable": value[0],
-#             "controlMode": value[1],
-#             "exportValue": value[2],
-#             "unitType": value[3],
-#         }
-#         self.log.info(f"执行: 馈网控制, data: {data}")
-#         ret = self.smart_scene_service.request_local_server(
-#             "editOutputControl", data, scene_id
-#         )
-#         if not ret or ret["success"] is False:
-#             return False
-#         return True
-#
-#
-# class ImportControlAction(SystemAction):
-#     def import_control(self, value, scene_id) -> bool:
-#         """需量控制"""
-#         if self.cabinet_type in ["TRENE"]:
-#             if len(value) != 3:
-#                 value.extend([1, 0])
-#             data = {
-#                 "isAllowDischarge": value[1],
-#                 "demandLimitValue": value[2],
-#                 "isEnable": value[0],
-#             }
-#         else:
-#             if len(value) != 2:
-#                 value.append(0)
-#             data = {
-#                 "isAllowDischarge": 1,
-#                 "demandLimitValue": value[1],
-#                 "isEnable": value[0],
-#             }
-#         self.log.info(f"执行: 需量控制, data: {data}")
-#         ret = self.smart_scene_service.request_local_server(
-#             "editDemandControl", data, scene_id
-#         )
-#         if not ret or ret["success"] is False:
-#             return False
-#         return True
-#
-#
-# class WorkModeAction(SystemAction):
-#     def work_mode(self, value, scene_id) -> bool:
-#         # 0: self use; 1: 并网优先; 2: 备用模式; 3: 手动； 4： 削峰填谷 5： TOU（暂不用）; 16: VPP
-#         if value[0] not in [0, 1, 2, 3, 4, 16]:
-#             return False
-#         data = None
-#         if self.cabinet_type in ["AELIO"]:
-#             if value[0] in [0, 1, 2, 3, 4]:
-#                 data = {"useMode": value[0]}
-#         elif self.cabinet_type in ["TRENE"]:
-#             if value[0] in [0, 1, 3, 4]:
-#                 data = {"useMode": value[0]}
-#         else:
-#             return False
-#         if data is not None:  # 普通模式
-#             self.log.info(f"普通模式控制 data: {data}")
-#             # 手动模式
-#             if data["useMode"] == 3:
-#                 if value[1] == 5:
-#                     value.extend([0, 10])
-#                 self.smart_scene_service.set_manual_mode(
-#                     value[1], value[2], value[3], self.cabinet_type
-#                 )
-#             else:
-#                 self.smart_scene_service.request_local_server(
-#                     "setAelioUseMode", data, scene_id
-#                 )
-#         else:  # VPP模式
-#             if self.cabinet_type in ["AELIO"]:
-#                 if value[1] == 1:
-#                     reg_value_list = [1]
-#                     # 有功功率
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[2] * 1000, "int32", "little"
-#                         )
-#                     )
-#                     # 无功功率
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[3] * 1000, "int32", "little"
-#                         )
-#                     )
-#                     # 持续时间35秒, 控制超时 35s,控制类型为set
-#                     reg_value_list.extend([35, 35, 1])
-#                 elif value[1] == 2:
-#                     reg_value_list = [2, 1]
-#                     # 能量目标
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[2] * 1000, "uint32", "little"
-#                         )
-#                     )
-#                     # 功率目标
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[3] * 1000, "int32", "little"
-#                         )
-#                     )
-#                     # 控制超时 35s
-#                     reg_value_list.extend([35])
-#                 elif value[1] == 3:
-#                     # 控制类型为set，SOC：value[2]
-#                     reg_value_list = [3, 1, value[2]]
-#                     # 充放电功率目标
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[3] * 1000, "int32", "little"
-#                         )
-#                     )
-#                     # 控制超时 35s
-#                     reg_value_list.extend([35])
-#                 elif value[1] == 4:
-#                     reg_value_list = [4]
-#                     # 电池功率目标
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[2] * 1000, "int32", "little"
-#                         )
-#                     )
-#                     # 控制超时 35s, # 远程控制超时后需设备执行的模式 0xA0 关闭VPP，0xA1 默认的VPP模式
-#                     reg_value_list.extend([35, 0xA0])
-#                 elif value[1] == 5:
-#                     reg_value_list = [5]
-#                     # 控制超时 35s, # 远程控制超时后需设备执行的模式 0xA0 关闭VPP，0xA1 默认的VPP模式
-#                     reg_value_list.extend([35, 0xA0])
-#                 elif value[1] == 6:
-#                     reg_value_list = [6]
-#                     # 控制超时 35s, # 远程控制超时后需设备执行的模式 0xA0 关闭VPP，0xA1 默认的VPP模式
-#                     reg_value_list.extend([35, 0xA0])
-#                 elif value[1] == 7:
-#                     reg_value_list = [7]
-#                     # 控制超时 35s, # 远程控制超时后需设备执行的模式 0xA0 关闭VPP，0xA1 默认的VPP模式
-#                     reg_value_list.extend([35, 0xA0])
-#                 elif value[1] == 8:
-#                     # 控制类型为set，
-#                     reg_value_list = [8, 1]
-#                     # PV功率限制
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[2] * 1000, "uint32", "little"
-#                         )
-#                     )
-#                     # 电池功率限制
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[3] * 1000, "int32", "little"
-#                         )
-#                     )
-#                     # 控制超时 35s, # 远程控制超时后需设备执行的模式 0xA0 关闭VPP，0xA1 默认的VPP模式
-#                     reg_value_list.extend([35, 0xA0])
-#                 elif value[1] == 9:
-#                     # 控制类型为set，
-#                     reg_value_list = [9, 1]
-#                     # PV功率限制
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[2] * 1000, "uint32", "little"
-#                         )
-#                     )
-#                     # 电池功率限制
-#                     reg_value_list.extend(
-#                         self.smart_scene_service.struct_transform(
-#                             value[3] * 1000, "int32", "little"
-#                         )
-#                     )
-#                     # 控制超时 35s, # 远程控制超时后需设备执行的模式 0xA0 关闭VPP，0xA1 默认的VPP模式
-#                     reg_value_list.extend([value[4], 35, 0xA0])
-#                 else:
-#                     reg_value_list = []
-#                 func_name = PCSOperateFunctionName.SET_AELIO_VPP_MODE
-#                 channel = options.REDIS_WRITE_SERIAL_DEVICE
-#                 future_data = {}
-#                 future_data["func_name"] = func_name
-#                 future_data["operationMode"] = Enumeration.SINGLE_DEVICE_MODE
-#                 future_data["data"] = {"value_list": reg_value_list}
-#                 app_log.info(f"VPP模式控制 data: {future_data}")
-#                 self.smart_scene_service.request_local_redis(
-#                     channel, json.dumps(future_data)
-#                 )
-#         return True
+from solax_py_library.smart_scene.core.action.base import BaseAction
+from solax_py_library.smart_scene.types.action import ActionType
+
+
+class SystemAction(BaseAction):
+    action_type = ActionType.system

solax_py_library/utils/struct_util.py

@@ -2,6 +2,18 @@ import copy
 import struct
 from typing import List
 
+format_map = {
+    "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},
+}
+
 
 def unpack(data: List, data_format, reversed=False):
     """
@@ -11,20 +23,20 @@ def unpack(data: List, data_format, reversed=False):
     """
     cur_data = copy.deepcopy(data)
     data_format = data_format.lower()
-    format_map = {
-        "int8": "bb",
-        "uint8": "BB",
-        "int16": "h",
-        "uint16": "H",
-        "int32": "i",
-        "uint32": "I",
-        "int64": "q",
-        "uint64": "Q",
-        "float": "f",
-    }
     if data_format not in format_map:
         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 pack(value, fmt, order="big"):
+    """将10进制的原始值转换为modbus协议需要的精度与类型的值"""
+    opt = "<" if order == "little" else ">"
+    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.2514.dist-info → solax_py_library-1.0.0.2516.dist-info}/METADATA

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

{solax_py_library-1.0.0.2514.dist-info → solax_py_library-1.0.0.2516.dist-info}/RECORD

@@ -16,9 +16,9 @@ solax_py_library/smart_scene/constant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 solax_py_library/smart_scene/constant/message_entry.py,sha256=Ah2yDNpsf1W4HKD-tCzK6xtew0H5TLN7ko7kSsXgcng,8973
 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=vSC3rL9qfPy41Nlds_0QcTLMbf4n-P18XUBJ3oYiNGk,237
-solax_py_library/smart_scene/core/action/ems_action.py,sha256=tasL7pUJbnmrEEokAa9Mug5eUFvHuFKGYZKNvNMdrBs,610
-solax_py_library/smart_scene/core/action/system_action.py,sha256=mVLTg9pZ7tDayLbr3I92a33snA2AGT3meUdm_XYDQEc,10839
+solax_py_library/smart_scene/core/action/base.py,sha256=bH1FZX3lVtbG4tQPIaOrwv8-htMu2CwryOPMZ8fV3Qg,390
+solax_py_library/smart_scene/core/action/ems_action.py,sha256=sML6qasFoqOktTvEcHm0vKPYCj60VcKjAFz8RAaQc2U,206
+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=HEVifO3rHk2ElfSCEB0MzVdfrFWlkwqjt6tFhtJ8CLY,1581
@@ -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=4SKx5IyAke88PGHPHDK3OEDtyGHdapGoQ1BnGR0F2ts,913
+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.2514.dist-info/METADATA,sha256=2aiCh__xWlAwyUZxGCK5qlIlz3kRyGTEO8CHz__cLG8,1827
-solax_py_library-1.0.0.2514.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.2514.dist-info/RECORD,,
+solax_py_library-1.0.0.2516.dist-info/METADATA,sha256=02VMgK-1HvITxP4Saad4ObNnSSKdxh63R-NnvWMlxks,1827
+solax_py_library-1.0.0.2516.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.2516.dist-info/RECORD,,