solax-py-library 1.0.0.20__py3-none-any.whl → 1.0.0.21__py3-none-any.whl

solax_py_library/snap_shot/types/address.py

@@ -1,39 +1,39 @@
-from enum import IntEnum
-
-
-class SnapshotMCUSource(IntEnum):
-    MCU_SOURCE_MDSP = 0
-    MCU_SOURCE_SDSP = 1
-
-
-class SnapshotExportDevice(IntEnum):
-    EXPORT_DEVICE_UART = 0
-    EXPORT_DEVICE_USB = 1
-
-
-class SnapshotStartResult(IntEnum):
-    SNAPSHOT_START_START = 0xAAAA
-    SNAPSHOT_START_SUCCESS = 0xA5A5
-    SNAPSHOT_START_FAILED = 0x5A5A
-    SNAPSHOT_START_STOP = 0xBBBB
-
-
-class SnapshotRegisterAddress(IntEnum):
-    SNAPSHOT_REGISTERADDRESS_MCUSOURCE = 0x4011
-    SNAPSHOT_REGISTERADDRESS_EXPORTDEVICE = 0x4012
-    SNAPSHOT_REGISTERADDRESS_START = 0x4013
-    SNAPSHOT_REGISTERADDRESS_TOTALNUMBER = 0x4070
-    SNAPSHOT_REGISTERADDRESS_SNAPSHOTINDEX = 0x4071
-    SNAPSHOT_REGISTERADDRESS_PACKDATASTATUS = 0x4072
-    SNAPSHOT_REGISTERADDRESS_DATASIZE = 0x4073
-    SNAPSHOT_REGISTERADDRESS_CHANNELNUMBER = 0x4074
-    SNAPSHOT_REGISTERADDRESS_CHANNELDATASIZE = 0x4075
-    SNAPSHOT_REGISTERADDRESS_PACKINDEX = 0x407F
-    SNAPSHOT_REGISTERADDRESS_PACKDATA = 0x4080
-
-
-class CommandType(IntEnum):
-    ACK = 0x80  # 接收应答
-    TOTAL_PACKETS = 0x81  # 上报总包数
-    DATA_PACKET = 0x82  # 具体分包数据
-    ERROR = 0x83  # 报错应答
+from enum import IntEnum
+
+
+class SnapshotMCUSource(IntEnum):
+    MCU_SOURCE_MDSP = 0
+    MCU_SOURCE_SDSP = 1
+
+
+class SnapshotExportDevice(IntEnum):
+    EXPORT_DEVICE_UART = 0
+    EXPORT_DEVICE_USB = 1
+
+
+class SnapshotStartResult(IntEnum):
+    SNAPSHOT_START_START = 0xAAAA
+    SNAPSHOT_START_SUCCESS = 0xA5A5
+    SNAPSHOT_START_FAILED = 0x5A5A
+    SNAPSHOT_START_STOP = 0xBBBB
+
+
+class SnapshotRegisterAddress(IntEnum):
+    SNAPSHOT_REGISTERADDRESS_MCUSOURCE = 0x4011
+    SNAPSHOT_REGISTERADDRESS_EXPORTDEVICE = 0x4012
+    SNAPSHOT_REGISTERADDRESS_START = 0x4013
+    SNAPSHOT_REGISTERADDRESS_TOTALNUMBER = 0x4070
+    SNAPSHOT_REGISTERADDRESS_SNAPSHOTINDEX = 0x4071
+    SNAPSHOT_REGISTERADDRESS_PACKDATASTATUS = 0x4072
+    SNAPSHOT_REGISTERADDRESS_DATASIZE = 0x4073
+    SNAPSHOT_REGISTERADDRESS_CHANNELNUMBER = 0x4074
+    SNAPSHOT_REGISTERADDRESS_CHANNELDATASIZE = 0x4075
+    SNAPSHOT_REGISTERADDRESS_PACKINDEX = 0x407F
+    SNAPSHOT_REGISTERADDRESS_PACKDATA = 0x4080
+
+
+class CommandType(IntEnum):
+    ACK = 0x80  # 接收应答
+    TOTAL_PACKETS = 0x81  # 上报总包数
+    DATA_PACKET = 0x82  # 具体分包数据
+    ERROR = 0x83  # 报错应答

solax_py_library/upload/__init__.py

@@ -1,3 +1,3 @@
-from . import api, types, core, exceptions
-
-__all__ = ["api", "core", "exceptions", "types"]
+from . import api, types, core, exceptions
+
+__all__ = ["api", "core", "exceptions", "types"]

solax_py_library/upload/api/service.py

@@ -1,24 +1,24 @@
-from typing import Dict, Any
-
-from solax_py_library.upload.core.upload_service import upload_service_map
-from solax_py_library.exception import SolaxBaseError
-from solax_py_library.upload.types.client import UploadType, UploadData
-
-
-def upload_service(upload_type: UploadType, configuration: Dict[str, Any]):
-    """
-    upload_type: 上传类型。
-    configuration: 配置信息
-    """
-    upload_class = upload_service_map.get(upload_type)
-    if not upload_class:
-        raise SolaxBaseError
-    return upload_class(**configuration)
-
-
-async def upload(
-    upload_type: UploadType, configuration: Dict[str, Any], upload_data: UploadData
-):
-    service = upload_service(upload_type, configuration)
-    with service as s:
-        await s.upload(upload_data)
+from typing import Dict, Any
+
+from solax_py_library.upload.core.upload_service import upload_service_map
+from solax_py_library.exception import SolaxBaseError
+from solax_py_library.upload.types.client import UploadType, UploadData
+
+
+def upload_service(upload_type: UploadType, configuration: Dict[str, Any]):
+    """
+    upload_type: 上传类型。
+    configuration: 配置信息
+    """
+    upload_class = upload_service_map.get(upload_type)
+    if not upload_class:
+        raise SolaxBaseError
+    return upload_class(**configuration)
+
+
+async def upload(
+    upload_type: UploadType, configuration: Dict[str, Any], upload_data: UploadData
+):
+    service = upload_service(upload_type, configuration)
+    with service as s:
+        await s.upload(upload_data)

solax_py_library/upload/core/upload_service/ftp.py

@@ -46,7 +46,7 @@ class FTPUploadService(BaseUploadService):
 
     def _connect(self):
         try:
-            self._client = ftplib.FTP(self.host, timeout=self.timeout)
+            self._client = ftplib.FTP()
             self._client.connect(self.host, self.port, timeout=self.timeout)
         except Exception as e:
             print(e)

solax_py_library/upload/exceptions/__init__.py

@@ -1,8 +1,8 @@
-from .upload_error import ConfigurationError, ConnectError, LoginError, SendDataError
-
-__all__ = [
-    "ConnectError",
-    "LoginError",
-    "SendDataError",
-    "ConfigurationError",
-]
+from .upload_error import ConfigurationError, ConnectError, LoginError, SendDataError
+
+__all__ = [
+    "ConnectError",
+    "LoginError",
+    "SendDataError",
+    "ConfigurationError",
+]

solax_py_library/upload/exceptions/upload_error.py

@@ -1,21 +1,21 @@
-from solax_py_library.exception import SolaxBaseError
-
-
-class ConnectError(SolaxBaseError):
-    code = 0x1001
-    message = "connect error"
-
-
-class LoginError(SolaxBaseError):
-    code = 0x1002
-    message = "authentication error"
-
-
-class SendDataError(SolaxBaseError):
-    code = 0x1003
-    message = "send data error"
-
-
-class ConfigurationError(SolaxBaseError):
-    code = 0x1004
-    message = "server configuration error"
+from solax_py_library.exception import SolaxBaseError
+
+
+class ConnectError(SolaxBaseError):
+    code = 0x1001
+    message = "connect error"
+
+
+class LoginError(SolaxBaseError):
+    code = 0x1002
+    message = "authentication error"
+
+
+class SendDataError(SolaxBaseError):
+    code = 0x1003
+    message = "send data error"
+
+
+class ConfigurationError(SolaxBaseError):
+    code = 0x1004
+    message = "server configuration error"

solax_py_library/upload/test/test_ftp.py

@@ -3,7 +3,7 @@ import unittest
 
 from solax_py_library.upload.api.service import upload
 from solax_py_library.upload.core.upload_service import FTPUploadService
-from solax_py_library.upload.errors import ConnectError, LoginError
+from solax_py_library.upload.exceptions import ConnectError, LoginError
 from solax_py_library.upload.types.client import UploadType, UploadData
 from solax_py_library.upload.types.ftp import FTPFileType
 

solax_py_library/utils/common.py

@@ -1,7 +1,8 @@
 import asyncio
+from decimal import Decimal, ROUND_HALF_UP
 
 
-def retry(max_attempts=3, delay=0.5):
+def retry(max_attempts=3, delay=0.5, assign_exception=Exception):
     def decorator(func):
         async def wrapper(*args, **kwargs):
             attempts = 0
@@ -12,8 +13,26 @@ def retry(max_attempts=3, delay=0.5):
                     print(f"尝试 {attempts+1} 失败: {e}")
                     await asyncio.sleep(delay)
                     attempts += 1
-            raise SnapshotTimeoutError(f"操作失败 {max_attempts} 次")
+            raise assign_exception(f"操作失败 {max_attempts} 次")
 
         return wrapper
 
     return decorator
+
+
+def round_value(value, decimal_places=0):
+    """
+    实现四舍五入 代替round函数 遇到5向上取整
+    @param value: 传入数值
+    @param decimal_places: 保留几位小数
+    @return:
+    """
+    if isinstance(value, int):
+        return value
+    else:
+        # 优化小数位 Decimal函数太耗时 曲线数据直接使用round函数
+        # rounded_value = ("{:.%df}" % decimal_places).format(value)
+        rounded_value = Decimal(str(value)).quantize(
+            Decimal("1e-" + str(decimal_places)), rounding=ROUND_HALF_UP
+        )
+        return float(rounded_value)

solax_py_library/utils/struct_util.py

@@ -0,0 +1,30 @@
+import copy
+import struct
+from typing import List
+
+
+def unpack(data: List, data_format, reversed=False):
+    """
+    :param data: 数据字节, 入参均是由modbus读取到的list[uint16]进行转换
+    :param data_format:  数据格式
+    :param reversed:  是否翻转大小端
+    """
+    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]
+    return struct.unpack(struct_format, to_pack_data)

{solax_py_library-1.0.0.20.dist-info → solax_py_library-1.0.0.21.dist-info}/METADATA

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

solax_py_library-1.0.0.21.dist-info/RECORD

@@ -0,0 +1,46 @@
+solax_py_library/__init__.py,sha256=zLUfOeLUGy1sFFu4tZI8cDlfuEATRZ3VcYywVhPLObE,35
+solax_py_library/device/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/device/constant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/device/constant/inverter_model_info.py,sha256=Ujnwv79qycOTV_zqqr21wKXXj_lGLgrA56X_-Vjuxqw,18049
+solax_py_library/device/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/device/core/interver/__init__.py,sha256=gnERg9RssRoZvfylG5CgXT8XiwwCf5hQ5_phch6lQM8,1189
+solax_py_library/device/core/interver/base.py,sha256=8Zexb1ELWQkD_3LzYyEK7Oro0z71nl2m72RSA5w0bZQ,7406
+solax_py_library/device/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/device/types/inverter_config.py,sha256=8oNO0PkoBrvCe9XnKpuz8QSs7A0jpW2l-vG6IttV0lA,953
+solax_py_library/device/types/modbus_point.py,sha256=vukTJhqw7ZxFs4T2hbo975ZW0-oMUIKSF6CLF9muhoU,610
+solax_py_library/exception.py,sha256=1NNSqi--RC_sEv_1uJ1z01QVBIs8lNe1YemzND_Vluo,267
+solax_py_library/snap_shot/__init__.py,sha256=50fik3nxjnQoLIFEecc6c557pRtpQ1OxAqjp5HFgfe0,84
+solax_py_library/snap_shot/constant/__init__.py,sha256=vFoN2ZJWjhpXBQ4BU9vUa9GnvRYA6253bcTZ_nec7AQ,70
+solax_py_library/snap_shot/constant/crc_table.py,sha256=mTRYF3f7SxvVcVfFNHsgMMiXj2A_GGjRWfWXv4TSMNs,3824
+solax_py_library/snap_shot/core/__init__.py,sha256=7OIXci81vNuQKqfQWWq2aMYEJI-sv6YrURHXnwXoLZM,112
+solax_py_library/snap_shot/core/base_modbus.py,sha256=hd8047JdB97X9sF3ZzzjR8YjUNV7qWc0T6xtJEg5Pvs,417
+solax_py_library/snap_shot/core/parser.py,sha256=pIpQBMkS79BrSvdl2WPGCbVcaGAn0eACCkkdkCKHCvE,7928
+solax_py_library/snap_shot/core/snap_shot.py,sha256=W5m9K5VDIgPiyzv8BoxqfnzZgXvtlFWkuSXqURo-6uE,10471
+solax_py_library/snap_shot/exceptions/__init__.py,sha256=PZt5-dSRyBmRVjgBrFseZ_vpOLb8gThRnTtlw4bWP9Y,115
+solax_py_library/snap_shot/exceptions/snap_shot.py,sha256=8afTk1Y09Pu47yA1yOvu7kxxxZavob1yvDBYlI0WP9w,163
+solax_py_library/snap_shot/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/snap_shot/types/__init__.py,sha256=wQRjRVD-bBTAAoVPh69XgmDQfl-pVmS1DzZYhphixlg,305
+solax_py_library/snap_shot/types/address.py,sha256=8bheI03XMXXMNr7rFHkf9ZdacyGeQgc63bGP9bsojck,1187
+solax_py_library/upload/__init__.py,sha256=V8QbJ1xmaJZBHWRxBo_OzIrs50Y56QsH9T7qn3kY3M8,96
+solax_py_library/upload/api/__init__.py,sha256=ASShe-YQxP0aA3B_I8EmpWKXIdXPWvaANifrzlYrFEk,84
+solax_py_library/upload/api/service.py,sha256=FSAz-WWHRG72vE45gu73n0hheyXuB94GQdgSMfqusOA,787
+solax_py_library/upload/core/__init__.py,sha256=XMcnyDzCfsLwWaTAZt9-an7TuwYFqVNSt9W1_QRUrwA,89
+solax_py_library/upload/core/data_adapter/__init__.py,sha256=9CXepLZSOjZMfNjyYKAWQCWZt353kTL_0tFBlIeUIOo,116
+solax_py_library/upload/core/data_adapter/base.py,sha256=Va-SEe0eL3gobhNOnzHGkYBLIwf5RVawQdYRHHXg9g0,170
+solax_py_library/upload/core/data_adapter/csv.py,sha256=8nlnV_43mMAR3re50MQJymzT5HYpZOo7eSeMsEfnEVE,861
+solax_py_library/upload/core/upload_service/__init__.py,sha256=uA-UeH31rDNxByeZwvPhNFHPV_-J8JyCev8geuc---k,269
+solax_py_library/upload/core/upload_service/base.py,sha256=dxCBVtPxDhN7oRTjnwnjtc2XAF4hyIz9HsYCJePlggg,912
+solax_py_library/upload/core/upload_service/ftp.py,sha256=3_H7m4o1yLil7FyFA4eA0XXvRXhvGo3sm9567Bno5n4,2896
+solax_py_library/upload/exceptions/__init__.py,sha256=iSPPPHBP_aG9-9OCR_tCrGihL-uEIpSwvi9JZxSYbUk,194
+solax_py_library/upload/exceptions/upload_error.py,sha256=sqJvooTZxM9eKqFUV5-sI101xw24ubEdyUZq4mG8sbM,446
+solax_py_library/upload/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/upload/test/test_ftp.py,sha256=m4MSl3BDOXHYplpjuDNvFLnb5uIsRV-zoxdoIx_Kgs4,2609
+solax_py_library/upload/types/__init__.py,sha256=og9KBpYbcs36_S1izURj3vyHeuNOLJQrD9GpxK_JJaw,244
+solax_py_library/upload/types/client.py,sha256=fG674_QEpOw3ibO171lcxJ0cz27yGR_sd3zgiyr4yuI,492
+solax_py_library/upload/types/ftp.py,sha256=9kCeLB0g5Je19v4ifz8YYEsGOhJL1lKBO2C6V2VBndc,679
+solax_py_library/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+solax_py_library/utils/common.py,sha256=bfnZcX9uM-PjJrYAFv1UMmZgt6bGR7MaOd7jRPNHGxw,1238
+solax_py_library/utils/struct_util.py,sha256=ER0F6W_QCGM98NItGbQLmdZtbPn1UAZ-qh2tnqHi004,943
+solax_py_library-1.0.0.21.dist-info/METADATA,sha256=odty7CefHj06sC_GrqU-4uwcUZzVOCKLYQW2R0iUK4E,1790
+solax_py_library-1.0.0.21.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.21.dist-info/RECORD,,

solax_py_library-1.0.0.20.dist-info/RECORD

@@ -1,36 +0,0 @@
-solax_py_library/__init__.py,sha256=4wrB7TuGOQaYHQvdn574G4JrcOnH6l8RNSR6AtKAiKc,34
-solax_py_library/exception.py,sha256=ygAccdTqJctRrdt9bu6-vqZP5KadfKVS_1tjt4KcRn8,257
-solax_py_library/snap_shot/__init__.py,sha256=Ex12q6BCkdU-3OP-f-ehGCetJJWnoZ7KxhEDd_lXh6M,81
-solax_py_library/snap_shot/constant/__init__.py,sha256=UNfjAlx1wovXc1oH74af9oIe2TljwCCiTzNXzWgtUms,65
-solax_py_library/snap_shot/constant/crc_table.py,sha256=D-pSxpf1XDzu7YR8LmbnzdLRvI8exDL2dyDh7RRc4Io,3566
-solax_py_library/snap_shot/core/__init__.py,sha256=R0jkbwcJ3PPVyIGLVXvqRHDFTkq1NWBOPk0sa-FCVT8,178
-solax_py_library/snap_shot/core/base_modbus.py,sha256=EdDSRvRC2a4IE_LGvjxGznqi6AX5x4O0_Wn1IkHzIpA,403
-solax_py_library/snap_shot/core/parser.py,sha256=74YG14zOopW2am6BQX0zF3NnWTN21pkYcW7gFP1ssko,7703
-solax_py_library/snap_shot/core/snap_shot.py,sha256=XbzR4yeCgMlLlcy8gEX58xFIc8agCZN7VDXE6SjlDr4,9931
-solax_py_library/snap_shot/exceptions/__init__.py,sha256=9wLhmIelRKCXvlymcu3EewasVVYuPu4QQxTDLjGj6NQ,112
-solax_py_library/snap_shot/exceptions/snap_shot.py,sha256=-oxxh_lUhfZwtggJ4zfNBPdkhdGPvcVvDezNlj4nFfY,154
-solax_py_library/snap_shot/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/snap_shot/types/__init__.py,sha256=g9ybB88TntvAMGIhLgJ31Xxn26zluSfI496bg-apSTU,290
-solax_py_library/snap_shot/types/address.py,sha256=JhyB-t2OnKuE8akKk120sojCNXv4_OlLLuWsl5ChFZ8,1148
-solax_py_library/upload/__init__.py,sha256=XhZar7BKaRN0XcdPl4QffWr488L3UWvuq5syT8nX2OU,93
-solax_py_library/upload/api/__init__.py,sha256=ASShe-YQxP0aA3B_I8EmpWKXIdXPWvaANifrzlYrFEk,84
-solax_py_library/upload/api/service.py,sha256=-APuz86t4loCkjzaxq02kuKrB6jxaPV-Tz1V__j6cY0,763
-solax_py_library/upload/core/__init__.py,sha256=XMcnyDzCfsLwWaTAZt9-an7TuwYFqVNSt9W1_QRUrwA,89
-solax_py_library/upload/core/data_adapter/__init__.py,sha256=9CXepLZSOjZMfNjyYKAWQCWZt353kTL_0tFBlIeUIOo,116
-solax_py_library/upload/core/data_adapter/base.py,sha256=Va-SEe0eL3gobhNOnzHGkYBLIwf5RVawQdYRHHXg9g0,170
-solax_py_library/upload/core/data_adapter/csv.py,sha256=8nlnV_43mMAR3re50MQJymzT5HYpZOo7eSeMsEfnEVE,861
-solax_py_library/upload/core/upload_service/__init__.py,sha256=uA-UeH31rDNxByeZwvPhNFHPV_-J8JyCev8geuc---k,269
-solax_py_library/upload/core/upload_service/base.py,sha256=dxCBVtPxDhN7oRTjnwnjtc2XAF4hyIz9HsYCJePlggg,912
-solax_py_library/upload/core/upload_service/ftp.py,sha256=Up0_fm-udf8H9u6iy74V6-4IF2OIjTYhyeVsFeAp0x0,2927
-solax_py_library/upload/exceptions/__init__.py,sha256=12D68_mODfJkVFa1f65QgPUn8bvD5BDAeiHgNgU0258,186
-solax_py_library/upload/exceptions/upload_error.py,sha256=V2_yEMLj9KQEkdQ0Cm1DOogbjZWGb4p8RVnFx7D9yLY,425
-solax_py_library/upload/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/upload/test/test_ftp.py,sha256=tqc7Ag10PqgRewpMsBBG-mfezGK8lsxz3HbKOwQSORQ,2605
-solax_py_library/upload/types/__init__.py,sha256=og9KBpYbcs36_S1izURj3vyHeuNOLJQrD9GpxK_JJaw,244
-solax_py_library/upload/types/client.py,sha256=fG674_QEpOw3ibO171lcxJ0cz27yGR_sd3zgiyr4yuI,492
-solax_py_library/upload/types/ftp.py,sha256=9kCeLB0g5Je19v4ifz8YYEsGOhJL1lKBO2C6V2VBndc,679
-solax_py_library/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/utils/common.py,sha256=MY4Iab1o-jv7JoImcDiRDW12-MTXgwYym8yt_PofqRY,571
-solax_py_library-1.0.0.20.dist-info/METADATA,sha256=3_07XsIfWNwjj_061W3x8zzs4PAmyfGCjMFkzZB_BCg,1790
-solax_py_library-1.0.0.20.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.20.dist-info/RECORD,,