solax-py-library 1.0.0.16__tar.gz → 1.0.0.18__tar.gz

{solax_py_library-1.0.0.16 → solax_py_library-1.0.0.18}/PKG-INFO

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

{solax_py_library-1.0.0.16 → solax_py_library-1.0.0.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solax-py-library"
-version = "1.0.0.16"
+version = "1.0.0.18"
 description = "some common tool"
 authors = ["shenlvyu <13296718439@163.com>", "x5m8944pjl <371630856@qq.com>"]
 readme = "README.md"

solax_py_library-1.0.0.18/solax_py_library/__init__.py

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

solax_py_library-1.0.0.16/solax_py_library/upload/errors/base.py → solax_py_library-1.0.0.18/solax_py_library/exception.py

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

solax_py_library-1.0.0.18/solax_py_library/snap_shot/__init__.py

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

solax_py_library-1.0.0.18/solax_py_library/snap_shot/constant/__init__.py

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

solax_py_library-1.0.0.16/solax_py_library/snap_shot/address.py → solax_py_library-1.0.0.18/solax_py_library/snap_shot/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-1.0.0.18/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-1.0.0.16/solax_py_library/snap_shot/core.py → solax_py_library-1.0.0.18/solax_py_library/snap_shot/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-1.0.0.18/solax_py_library/snap_shot/exceptions/__init__.py

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

solax_py_library-1.0.0.18/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-1.0.0.18/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-1.0.0.18/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-1.0.0.18/solax_py_library/upload/__init__.py

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

{solax_py_library-1.0.0.16/solax_py_library/upload/errors → solax_py_library-1.0.0.18/solax_py_library/upload/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-1.0.0.16/solax_py_library/upload/errors → solax_py_library-1.0.0.18/solax_py_library/upload/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-1.0.0.16/solax_py_library/snap_shot/untils.py → solax_py_library-1.0.0.18/solax_py_library/utils/common.py

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

{solax_py_library-1.0.0.16/solax_py_library/snap_shot → solax_py_library-1.0.0.18/solax_py_library/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/solax_py_library/__init__.py

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

solax_py_library-1.0.0.16/solax_py_library/snap_shot/__init__.py

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

solax_py_library-1.0.0.16/solax_py_library/snap_shot/exceptions.py

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

solax_py_library-1.0.0.16/solax_py_library/upload/__init__.py

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