solax-py-library 1.0.0.16__py3-none-any.whl → 1.0.0.17__py3-none-any.whl

solax_py_library/__init__.py

@@ -1 +1 @@
-__all__ = ["upload"]
+__all__ = ["upload", "snap_shot"]

solax_py_library/{upload/errors/base.py → exception.py}

@@ -1,4 +1,4 @@
-class UploadBaseError(Exception):
+class SolaxBaseError(Exception):
     code = 0x1000
     message = "upload error"
 

solax_py_library/snap_shot/__init__.py

@@ -1,4 +1,3 @@
-from .core import SnapshotCore
-from .parser import Parser
+from solax_py_library.utils.parser import Parser
 
 __all__ = ["SnapshotCore", "Parser"]

solax_py_library/snap_shot/constant/__init__.py

@@ -0,0 +1,5 @@
+from .crc_table import CRC_Table
+
+__all__ = [
+    "CRC_Table",
+]

solax_py_library/snap_shot/{address.py → constant/crc_table.py}

@@ -1,37 +1,3 @@
-from enum import Enum
-
-
-class SnapshotMCUSource(Enum):
-    MCU_SOURCE_MDSP = 0
-    MCU_SOURCE_SDSP = 1
-
-
-class SnapshotExportDevice(Enum):
-    EXPORT_DEVICE_UART = 0
-    EXPORT_DEVICE_USB = 1
-
-
-class SnapshotStartResult(Enum):
-    SNAPSHOT_START_START = 0xAAAA
-    SNAPSHOT_START_SUCCESS = 0xA5A5
-    SNAPSHOT_START_FAILED = 0x5A5A
-    SNAPSHOT_START_STOP = 0xBBBB
-
-
-class SnapshotRegisterAddress(Enum):
-    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
-
-
 CRC_Table = [
     0x0000,
     0x8005,
@@ -290,10 +256,3 @@ CRC_Table = [
     0x558207,
     0x550202,
 ]
-
-
-class CommandType(Enum):
-    ACK = 0x80  # 接收应答
-    TOTAL_PACKETS = 0x81  # 上报总包数
-    DATA_PACKET = 0x82  # 具体分包数据
-    ERROR = 0x83  # 报错应答

solax_py_library/snap_shot/core/__init__.py

@@ -0,0 +1,7 @@
+from .snap_shot import SnapshotCore
+from .base_modbus import ModbusClientBase
+
+__all__ = [
+    "SnapshotCore",
+    "ModbusClientBase",
+]

solax_py_library/snap_shot/{core.py → core/snap_shot.py}

@@ -1,9 +1,9 @@
 from typing import Dict, Optional, List
 import asyncio
 
-from .base_modbus import ModbusClientBase
-from .address import *
-from .untils import retry
+from solax_py_library.snap_shot.core.base_modbus import ModbusClientBase
+from solax_py_library.snap_shot.types.address import *
+from solax_py_library.utils.common import retry
 
 
 class SnapshotCore:

solax_py_library/snap_shot/exceptions/__init__.py

@@ -0,0 +1,3 @@
+from .snap_shot import SnapshotError, SnapshotTimeoutError
+
+__all__ = ["SnapshotError", "SnapshotTimeoutError"]

solax_py_library/snap_shot/exceptions/snap_shot.py

@@ -0,0 +1,9 @@
+from solax_py_library.exception import SolaxBaseError
+
+
+class SnapshotError(SolaxBaseError):
+    ...
+
+
+class SnapshotTimeoutError(SnapshotError):
+    ...

solax_py_library/snap_shot/types/__init__.py

@@ -0,0 +1,15 @@
+from .address import (
+    SnapshotMCUSource,
+    SnapshotRegisterAddress,
+    SnapshotStartResult,
+    SnapshotExportDevice,
+    CommandType,
+)
+
+__all__ = [
+    "SnapshotMCUSource",
+    "SnapshotRegisterAddress",
+    "SnapshotStartResult",
+    "SnapshotExportDevice",
+    "CommandType",
+]

solax_py_library/snap_shot/types/address.py

@@ -0,0 +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  # 报错应答

solax_py_library/upload/{errors → exceptions}/__init__.py

@@ -1,8 +1,8 @@
-from .base import UploadBaseError
+from solax_py_library.exception import SolaxBaseError
 from .upload_error import ConfigurationError, ConnectError, LoginError, SendDataError
 
 __all__ = [
-    "UploadBaseError",
+    "SolaxBaseError",
     "ConnectError",
     "LoginError",
     "SendDataError",

solax_py_library/upload/{errors → exceptions}/upload_error.py

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

solax_py_library/{snap_shot/untils.py → utils/common.py}

@@ -1,4 +1,3 @@
-from .exceptions import SnapshotTimeoutError
 import asyncio
 
 

solax_py_library/{snap_shot → utils}/parser.py

@@ -1,7 +1,8 @@
 import re
 import struct
 
-from .address import CRC_Table, CommandType
+from solax_py_library.snap_shot.types.address import CommandType
+from solax_py_library.snap_shot.constant.crc_table import CRC_Table
 
 
 class Parser:
@@ -72,8 +73,6 @@ class Parser:
             end = start + chunk_size
             yield (i, data[start:end])
 
-    import struct
-
     def build_response_frame(
         self, task_id: str, business_type: int, ack_code: int
     ) -> bytes:

{solax_py_library-1.0.0.16.dist-info → solax_py_library-1.0.0.17.dist-info}/METADATA

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

solax_py_library-1.0.0.17.dist-info/RECORD

@@ -0,0 +1,36 @@
+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=OSDexPdSfNVCh15D4f4qFoKHlggIlq93vnAIeVfOw8Y,87
+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=t7RuU89GY58FR12jQXy-3u_np5rTftPFuaODFZqdRNU,137
+solax_py_library/snap_shot/core/base_modbus.py,sha256=EdDSRvRC2a4IE_LGvjxGznqi6AX5x4O0_Wn1IkHzIpA,403
+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=M9vBP5Q1mD-hs-voqWNXtzLDKq1FBuFHSLw6a8WhP0E,85
+solax_py_library/upload/api/__init__.py,sha256=ASShe-YQxP0aA3B_I8EmpWKXIdXPWvaANifrzlYrFEk,84
+solax_py_library/upload/api/service.py,sha256=ubFepgkG4pQwFAH_f1JJ-mU8ZZrNf9zUMyQ_wy9QN7s,774
+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=6T8jKgsKXX0Bu_wrGjeYzBnrT331fWy_y38msChqrNs,2923
+solax_py_library/upload/exceptions/__init__.py,sha256=Tm5zlI3Fn9zLZyOA4ibAXjDXkWOeSi52As-E2dBVzfU,262
+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/utils/parser.py,sha256=74YG14zOopW2am6BQX0zF3NnWTN21pkYcW7gFP1ssko,7703
+solax_py_library-1.0.0.17.dist-info/METADATA,sha256=bD_ybZjQKgD02r7UnXdESo2vO-3kezzIW7k5bAANCBU,1790
+solax_py_library-1.0.0.17.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.17.dist-info/RECORD,,

solax_py_library/snap_shot/exceptions.py

@@ -1,6 +0,0 @@
-class SnapshotError(Exception):
-    ...
-
-
-class SnapshotTimeoutError(SnapshotError):
-    ...

solax_py_library-1.0.0.16.dist-info/RECORD

@@ -1,29 +0,0 @@
-solax_py_library/__init__.py,sha256=qihwuOWhDJufT29zzCp1aGWTLNRvTWZzEjgqWCTgCmQ,21
-solax_py_library/snap_shot/__init__.py,sha256=HCjAo6p-V8rrWm-kylqZB2XPNJn64gzOeilJGlqMZOQ,96
-solax_py_library/snap_shot/address.py,sha256=3ViMOe8AcT488FjfINZm2Gx2YJ-3C4iHt0ueweA-0l4,4698
-solax_py_library/snap_shot/base_modbus.py,sha256=EdDSRvRC2a4IE_LGvjxGznqi6AX5x4O0_Wn1IkHzIpA,403
-solax_py_library/snap_shot/core.py,sha256=_dHhkOX-ROcb3wlzP0e4DdPAaKFXjjjrBqVnOa6i4Zg,9846
-solax_py_library/snap_shot/exceptions.py,sha256=q20RzO3T2PqQElKnPXCL7eqUx95Wh0aPbFtchDKnYs4,93
-solax_py_library/snap_shot/parser.py,sha256=cr-5IoE5kgB5gIZBX8jxjmPnK_mmg0_Bju0pbVsnhKU,7633
-solax_py_library/snap_shot/untils.py,sha256=oMb8yF0If-e_lqCpXc9zlia9C8pclge0PFn4hiWP9ug,616
-solax_py_library/upload/__init__.py,sha256=M9vBP5Q1mD-hs-voqWNXtzLDKq1FBuFHSLw6a8WhP0E,85
-solax_py_library/upload/api/__init__.py,sha256=ASShe-YQxP0aA3B_I8EmpWKXIdXPWvaANifrzlYrFEk,84
-solax_py_library/upload/api/service.py,sha256=ubFepgkG4pQwFAH_f1JJ-mU8ZZrNf9zUMyQ_wy9QN7s,774
-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=6T8jKgsKXX0Bu_wrGjeYzBnrT331fWy_y38msChqrNs,2923
-solax_py_library/upload/errors/__init__.py,sha256=pVAcSOXvlsPJW3PjHLBOdbl7KvntiYmz7TP0XuRwZ_A,243
-solax_py_library/upload/errors/base.py,sha256=T01ZrZHF25PWgCrOv76Vhg26hds3I1Yy8Kl2LZRKOxo,258
-solax_py_library/upload/errors/upload_error.py,sha256=9pCZzR_y3-VkBWSs5w7mMHYFRJjzVosIcxi-5SO8N1U,409
-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-1.0.0.16.dist-info/METADATA,sha256=irRVZ98ibeIBAfcpROjCKiyYR5D-KvBprRzPfuYQgR4,1790
-solax_py_library-1.0.0.16.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.16.dist-info/RECORD,,