solax-py-library 1.0.0.12__tar.gz → 1.0.0.13__tar.gz

{solax_py_library-1.0.0.12 → solax_py_library-1.0.0.13}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: solax-py-library
-Version: 1.0.0.12
+Version: 1.0.0.13
 Summary: some common tool
-Author: shenlvyu
-Author-email: 13296718439@163.com
+Author: x5m8944pjl
+Author-email: 371630856@qq.com
 Requires-Python: >=3.8,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8

{solax_py_library-1.0.0.12 → solax_py_library-1.0.0.13}/pyproject.toml

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

solax_py_library-1.0.0.13/solax_py_library/__init__.py

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

solax_py_library-1.0.0.13/solax_py_library/snap_shot/__init__.py

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

solax_py_library-1.0.0.13/solax_py_library/snap_shot/address.py

@@ -0,0 +1,67 @@
+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, 0x1800f, 0x1000a, 0x3801b, 0x3001e, 0x20014, 0x28011, 0x78033, 0x70036,
+             0x6003c, 0x68039, 0x40028, 0x4802d, 0x58027, 0x50022, 0xf8063, 0xf0066, 0xe006c, 0xe8069,
+             0xc0078, 0xc807d, 0xd8077, 0xd0072, 0x80050, 0x88055, 0x9805f, 0x9005a, 0xb804b, 0xb004e,
+             0xa0044, 0xa8041, 0x1f80c3, 0x1f00c6, 0x1e00cc, 0x1e80c9, 0x1c00d8, 0x1c80dd, 0x1d80d7, 0x1d00d2,
+             0x1800f0, 0x1880f5, 0x1980ff, 0x1900fa, 0x1b80eb, 0x1b00ee, 0x1a00e4, 0x1a80e1, 0x1000a0, 0x1080a5,
+             0x1180af, 0x1100aa, 0x1380bb, 0x1300be, 0x1200b4, 0x1280b1, 0x178093, 0x170096, 0x16009c, 0x168099,
+             0x140088, 0x14808d, 0x158087, 0x150082, 0x3f8183, 0x3f0186, 0x3e018c, 0x3e8189, 0x3c0198, 0x3c819d,
+             0x3d8197, 0x3d0192, 0x3801b0, 0x3881b5, 0x3981bf, 0x3901ba, 0x3b81ab, 0x3b01ae, 0x3a01a4, 0x3a81a1,
+             0x3001e0, 0x3081e5, 0x3181ef, 0x3101ea, 0x3381fb, 0x3301fe, 0x3201f4, 0x3281f1, 0x3781d3, 0x3701d6,
+             0x3601dc, 0x3681d9, 0x3401c8, 0x3481cd, 0x3581c7, 0x3501c2, 0x200140, 0x208145, 0x21814f, 0x21014a,
+             0x23815b, 0x23015e, 0x220154, 0x228151, 0x278173, 0x270176, 0x26017c, 0x268179, 0x240168, 0x24816d,
+             0x258167, 0x250162, 0x2f8123, 0x2f0126, 0x2e012c, 0x2e8129, 0x2c0138, 0x2c813d, 0x2d8137, 0x2d0132,
+             0x280110, 0x288115, 0x29811f, 0x29011a, 0x2b810b, 0x2b010e, 0x2a0104, 0x2a8101, 0x7f8303, 0x7f0306,
+             0x7e030c, 0x7e8309, 0x7c0318, 0x7c831d, 0x7d8317, 0x7d0312, 0x780330, 0x788335, 0x79833f, 0x79033a,
+             0x7b832b, 0x7b032e, 0x7a0324, 0x7a8321, 0x700360, 0x708365, 0x71836f, 0x71036a, 0x73837b, 0x73037e,
+             0x720374, 0x728371, 0x778353, 0x770356, 0x76035c, 0x768359, 0x740348, 0x74834d, 0x758347, 0x750342,
+             0x6003c0, 0x6083c5, 0x6183cf, 0x6103ca, 0x6383db, 0x6303de, 0x6203d4, 0x6283d1, 0x6783f3, 0x6703f6,
+             0x6603fc, 0x6683f9, 0x6403e8, 0x6483ed, 0x6583e7, 0x6503e2, 0x6f83a3, 0x6f03a6, 0x6e03ac, 0x6e83a9,
+             0x6c03b8, 0x6c83bd, 0x6d83b7, 0x6d03b2, 0x680390, 0x688395, 0x69839f, 0x69039a, 0x6b838b, 0x6b038e,
+             0x6a0384, 0x6a8381, 0x400280, 0x408285, 0x41828f, 0x41028a, 0x43829b, 0x43029e, 0x420294, 0x428291,
+             0x4782b3, 0x4702b6, 0x4602bc, 0x4682b9, 0x4402a8, 0x4482ad, 0x4582a7, 0x4502a2, 0x4f82e3, 0x4f02e6,
+             0x4e02ec, 0x4e82e9, 0x4c02f8, 0x4c82fd, 0x4d82f7, 0x4d02f2, 0x4802d0, 0x4882d5, 0x4982df, 0x4902da,
+             0x4b82cb, 0x4b02ce, 0x4a02c4, 0x4a82c1, 0x5f8243, 0x5f0246, 0x5e024c, 0x5e8249, 0x5c0258, 0x5c825d,
+             0x5d8257, 0x5d0252, 0x580270, 0x588275, 0x59827f, 0x59027a, 0x5b826b, 0x5b026e, 0x5a0264, 0x5a8261,
+             0x500220, 0x508225, 0x51822f, 0x51022a, 0x53823b, 0x53023e, 0x520234, 0x528231, 0x578213, 0x570216,
+             0x56021c, 0x568219, 0x540208, 0x54820d, 0x558207, 0x550202]
+
+
+class CommandType(Enum):
+    ACK = 0x80       # 接收应答
+    TOTAL_PACKETS = 0x81  # 上报总包数
+    DATA_PACKET = 0x82    # 具体分包数据
+    ERROR = 0x83     # 报错应答

solax_py_library-1.0.0.13/solax_py_library/snap_shot/base_modbus.py

@@ -0,0 +1,14 @@
+from abc import ABC, abstractmethod
+from typing import  List
+
+class ModbusClientBase(ABC):
+    @abstractmethod
+    def read_registers(self, address: int, quantity_of_x: int) -> List[int]:
+        """抽象读取寄存器方法"""
+        pass
+
+    @abstractmethod
+    def write_registers(self, address: int, values: List[int]) -> bool:
+        """抽象写入寄存器方法"""
+        pass
+

solax_py_library-1.0.0.13/solax_py_library/snap_shot/core.py

@@ -0,0 +1,219 @@
+from typing import Dict, Optional, List
+import asyncio
+
+from .base_modbus import ModbusClientBase
+from .address import *
+from .untils import retry
+
+
+class SnapshotCore:
+    def __init__(self, modbus_client: ModbusClientBase, snap_except=None):
+        self.modbus = modbus_client
+        self.all_snap_shot_data: Dict[int, List[int]] = {}
+        self.snap_except = snap_except
+
+    def __getitem__(self, index: int) -> Optional[List[int]]:
+        return self.all_snap_shot_data.get(index)
+
+    async def __aiter__(self):
+        for key in self.all_snap_shot_data:
+            yield key, self.all_snap_shot_data[key]
+
+    @property
+    def all_snap_data(self):
+        return self.all_snap_shot_data.copy()
+
+    @retry(max_attempts=3, delay=0.5)
+    async def _set_MCU_source(self):
+        print("step 1  设置芯片源")
+        result = await self.modbus.write_registers(SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_MCUSOURCE.value,
+                                                   [SnapshotMCUSource.MCU_SOURCE_MDSP.value])
+        print(f'step 1  设置芯片源回复:0x{result[0]:04x}')
+
+    @retry(max_attempts=3, delay=0.5)
+    async def _set_export_device(self):  # 设置输出设备
+        print("setp 2  设置导出设备")
+
+        result = await self.modbus.write_registers(SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_EXPORTDEVICE.value,
+                                                   [SnapshotExportDevice.EXPORT_DEVICE_UART.value])
+        print(f'setp 2  设置导出设备：0x{result[0]:04x}')
+
+    @retry(max_attempts=3, delay=0.5)
+    async def _get_snapshot_total_number(self) -> int:  # 取得快照总数
+        print("step 3  获取快照总数")
+        try_number = 3
+        number = 0
+        result = [0]
+        while number < try_number:
+            result = await self.modbus.read_registers(
+                SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_TOTALNUMBER.value, 1)
+            print(f"step 3  获取快照总数 :{result}")
+            if result[0] > 0:
+                break
+            number += 1
+        return result[0]
+
+    @retry(max_attempts=3, delay=0.5)
+    async def _start_snap_shot(self):  # 获取快照开始结果
+        print("第4步  录播开始")
+        result = False
+        readresultcnt = 0
+        while readresultcnt < 3:
+            result = await self.modbus.write_registers(
+                SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_START.value,
+                [SnapshotStartResult.SNAPSHOT_START_START.value])
+            print(f' 设置录播开始{result}')
+            await asyncio.sleep(1)
+            response = await self.modbus.read_registers(
+                SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_START.value, 1)
+            print(f'录波读取设置变量:{response}')
+
+            if response[0] == SnapshotStartResult.SNAPSHOT_START_SUCCESS.value:
+                print(f'设置录播开始成功')
+                result = True
+                break
+            else:
+                print(f'设置录播开始失败')
+                result = False
+                readresultcnt += 1
+
+        return result
+
+    @retry(max_attempts=3, delay=0.5)
+    async def _get_snapshot_dataPara(self):  # 取得快照数据参数  数据总数  通道数  通道数据深度
+        print("step 5  获取快照数据参数")
+        result = await self.modbus.read_registers(SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_DATASIZE.value, 3)
+        print(f"step 5  获取快照数据参数:{result}")
+        return result[0]
+
+    @retry(max_attempts=3, delay=0.5)
+    async def _get_Single_snap_shot_data(self, index: int, DataNumber: int):  # 获取单个快照数据
+        readdatanum = 0
+        packindex = 0
+
+        await self._set_snap_shot_data_index(index)  # 设置快照索引
+        while readdatanum < DataNumber:
+            if await self._get_data_pack_read_state() == False:  # 获取数据包读取状态
+                raise self.snap_except('读取数据包错误')
+
+            siglepackdatanum = DataNumber - readdatanum
+            if siglepackdatanum > 256:
+                siglepackdatanum = 256
+            print(f"第{index}次快照，第{packindex}包，读取数据个数：{siglepackdatanum}")
+
+            await self._get_data_pack_index()  # 取得数据包索引
+            once_data = await self._get_data_pack(siglepackdatanum)  # 获取快照数据的单个pack
+            self.all_snap_shot_data.setdefault(index, []).extend(once_data)
+
+            await self._clear_data_pack_read_state()  # 清除数据包读取状态  让下位机切pack
+            readdatanum += siglepackdatanum
+            packindex += 1
+            # print(f'self.all_snap_shot_data:{self.all_snap_shot_data}')
+
+    @retry(max_attempts=3, delay=0.5)  #
+    async def _set_snap_shot_data_index(self, index: int):  # 设置快照数据索引
+        print("step 6  设置快照索引")
+        result = await self.modbus.write_registers(
+            SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_SNAPSHOTINDEX.value, [index])
+        print(f'step 6 设置快照索引返回值：0x{result[0]:04x}')
+
+    @retry(max_attempts=3, delay=0.5)
+    async def _get_data_pack_read_state(self):  # 取得数据包就绪状态
+        #print(f'取得数据包就绪状态')
+        readcnt = 0
+        result = False
+        while readcnt < 100:
+            result = await self.modbus.read_registers(
+                SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_PACKDATASTATUS.value, 1)
+            status = result[0]
+            if (status == 1):
+                #print(f'数据包就绪状态为：{status}，数据包就绪')
+                result = True
+                break
+            else:
+                #print(f'数据包就绪状态为：{status}，数据包未就绪')
+                readcnt += 1
+                await asyncio.sleep(0.5)
+        return result
+
+    @retry(max_attempts=5, delay=0.2)
+    async def _get_data_pack_index(self):  # 取得数据包索引
+        # print(f'获取数据包索引')
+        result = await self.modbus.read_registers(
+            SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_PACKINDEX.value, 1)
+        packnum = result[0]
+        # print(f'当前数据包的索引：{packnum}')
+        return packnum
+
+    @retry(max_attempts=3, delay=0.5)
+    async def _get_data_pack(self, register_num: int) -> List:  # 取得快照数据包
+        #print(f'取得快照数据包')
+        DataPack = []
+        if register_num >= 256:
+            response = await self.get_data_pack_h_address(64)
+            DataPack.extend(response)
+            response = await self._get_data_pack_l_address(64)
+            DataPack.extend(response)
+        elif register_num >= 64 and register_num < 256:
+            response = await self.get_data_pack_h_address(64)
+            DataPack.extend(response)
+            response = await self._get_data_pack_l_address((register_num - 128) // 2)
+            DataPack.extend(response)
+        else:
+            response = await self.get_data_pack_h_address(register_num // 2)
+            DataPack.extend(response)
+
+        # print(f'获取快照数据包返回值：{DataPack}')
+        return DataPack
+
+    @retry(max_attempts=3, delay=0.5)
+    async def get_data_pack_h_address(self, register_num: int) -> List:  # 取得数据包大小
+        data = await self.modbus.read_registers(
+            SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_PACKDATA.value, register_num)
+        return data
+
+    @retry(max_attempts=3, delay=0.5)
+    async def _get_data_pack_l_address(self, register_num: int) -> List:  # 取得数据包大小
+        data = await self.modbus.read_registers(
+            SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_PACKDATA.value + 64, register_num)
+        return data
+
+    @retry(max_attempts=5, delay=0.2)
+    async def _clear_data_pack_read_state(self):  # 清除数据包读取状态
+        # print(f'清除数据包读取状态')
+        response = await self.modbus.write_registers(
+            SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_PACKDATASTATUS.value, [0])
+        # print(f'清除数据包就绪状态返回值：{response}')
+
+    @classmethod
+    async def start(cls, modbus_client, snap_shot_index: int = 0, snap_exception=None):
+        """启动故障录波
+        snap_shot_index : 代表第几个故障 如果传0 就默认读取所有故障
+        """
+        #print'start.................................')
+        instance = cls(modbus_client, snap_exception)
+        try:
+            # 第一步 设置快照芯片源
+            await instance._set_MCU_source()
+            # 第二步 设置导出设备
+            await instance._set_export_device()
+            # 第三步 获取设备总数
+            total_number = await instance._get_snapshot_total_number()
+            if total_number < 1:
+                return instance.snap_except("无效的故障录波总数")
+            # 第四步 开始录波
+            await instance._start_snap_shot()
+            # 第5步 获取快照数据参数
+            total_data_length = await instance._get_snapshot_dataPara()
+            # 第六步 读数据
+            # for index in range(1, total_number + 1):
+            #     await instance._get_Single_snap_shot_data(index, total_data_length)
+            await instance._get_Single_snap_shot_data(1, total_data_length)
+
+            return instance.all_snap_data
+
+        except Exception as e:
+            return instance.snap_except(f"故障录波失败:{e}")
+
+    async def __aenter__(self):
+        return self

solax_py_library-1.0.0.13/solax_py_library/snap_shot/exceptions.py

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

solax_py_library-1.0.0.13/solax_py_library/snap_shot/parser.py

@@ -0,0 +1,224 @@
+import re
+import struct
+
+from .address import CRC_Table, CommandType
+
+
+class Parser:
+    def parse(self, char16):
+        """
+        :return:
+        """
+        task_id = self.ascii_to_str(char16[12: 76])  # task_id
+        device_type = int(char16[76: 78])  # 设备类型
+        device_sn = self.ascii_to_str(char16[78: 118])  # 设备SN
+        business_type = int(char16[118: 120])
+        data = char16[120:]
+        return {
+            "task_id": task_id, "sn": device_sn, "device_type": device_type,
+            "business_type": business_type, "message": char16, "data": data
+        }
+
+    def ascii_to_str(self, data: str):
+        """阿斯科码转字符串"""
+        pattern = re.compile('.{2}')
+        message = '\\u00' + '\\u00'.join(pattern.findall(data))
+        message = message.replace("\\u0000", "")
+        message = bytes(message, encoding='utf-8').decode("unicode-escape")
+        return message
+
+    def upload_data(self, big_data: bytes, task_id: str, upload_data):
+        business_type = 1  # 1 代表调试信息
+        data_type = 0  # 0代表故障录波
+
+        # 分片上传（每包1K）
+        chunk_size = 1024
+        total_chunks = (len(big_data) + chunk_size - 1) // chunk_size
+
+        # 遍历分片并构造数据包
+        for chunk_idx, chunk_data in self.data_chunk_generator(big_data, chunk_size):
+            frame = self.build_data_packet_frame(
+                task_id=task_id,
+                business_type=business_type,
+                data_type=data_type,
+                total_packets=total_chunks,
+                current_packet=chunk_idx,
+                chunk_data=chunk_data
+            )
+
+            print(f"发送包 {chunk_idx + 1}/{total_chunks}, 长度={len(frame)} 字节")
+            upload_data(frame)
+
+    def data_chunk_generator(self, data: bytes, chunk_size: int = 1024):
+        """
+        将大数据按固定包大小分片
+        :param data: 原始数据字节流
+        :param chunk_size: 每包最大字节数（默认1024）
+        :yield: (当前包序号, 分片数据)
+        """
+        total = len(data)
+        if total == 0:
+            yield (0, b'')  # 空数据单独处理
+            return
+
+        total_chunks = (total + chunk_size - 1) // chunk_size
+
+        for i in range(total_chunks):
+            start = i * chunk_size
+            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:
+        """
+        构建接收应答帧（指令类型 0x80）
+        :param task_id: 任务ID（32字节）
+        :param business_type: 业务类型（0或1）
+        :param ack_code: 0-成功，1-失败，2-执行中
+        """
+        # 固定字段
+        header = bytes([0x24, 0x24])
+        func_code = bytes([0x05, 0x07])  # 主功能码5 + 子功能码7
+
+        # 数据域
+        task_bytes = task_id.encode('ascii')[:32].ljust(32, b'\x00')
+        business_byte = bytes([business_type])
+        cmd_byte = bytes([CommandType.ACK.value])
+        ack_byte = bytes([ack_code])
+        data_part = task_bytes + business_byte + cmd_byte + ack_byte
+
+        # 计算长度（功能码2字节 + 数据域37字节 + CRC2字节 = 41）
+        frame_length = len(func_code) + len(data_part) + 2
+        length_bytes = struct.pack('<H', frame_length)
+
+        # 构建临时帧并计算CRC
+        temp_frame = header + length_bytes + func_code + data_part
+        crc = self.crc(temp_frame.hex()).upper()
+        full_frame = temp_frame + bytes.fromhex(crc)
+        return full_frame
+
+    def build_total_packets_frame(
+            self,
+            task_id: str,
+            business_type: int,
+            data_type: int,
+            total_packets: int
+    ) -> bytes:
+        """
+        构建上报总包数帧（指令类型 0x81）
+        :param total_packets: 总包数（若为0，平台停止接收）
+        """
+        header = bytes([0x24, 0x24])
+        func_code = bytes([0x05, 0x07])
+
+        # 数据域
+        task_bytes = task_id.encode('ascii')[:32].ljust(32, b'\x00')
+        business_byte = bytes([business_type])
+        cmd_byte = bytes([CommandType.TOTAL_PACKETS.value])
+        data_length = struct.pack('<H', 2)  # 数据长度固定2字节
+        data_type_byte = bytes([data_type])
+        total_packets_bytes = struct.pack('<H', total_packets)
+
+        data_part = (
+                task_bytes + business_byte + cmd_byte +
+                data_length + data_type_byte + total_packets_bytes
+        )
+
+        # 计算长度
+        frame_length = len(func_code) + len(data_part) + 2
+        length_bytes = struct.pack('<H', frame_length)
+
+        # 附加CRC
+        temp_frame = header + length_bytes + func_code + data_part
+        crc = self.crc(temp_frame.hex()).upper()
+        return temp_frame + bytes.fromhex(crc)
+
+    def build_data_packet_frame(
+            self,
+            task_id: str,
+            business_type: int,
+            data_type: int,
+            total_packets: int,
+            current_packet: int,
+            chunk_data: bytes
+    ) -> bytes:
+        """
+        构建具体分包数据帧（指令类型 0x82）
+        """
+        header = bytes([0x24, 0x24])
+        func_code = bytes([0x05, 0x07])
+
+        # 数据域
+        task_bytes = task_id.encode('ascii')[:32].ljust(32, b'\x00')
+        business_byte = bytes([business_type])
+        cmd_byte = bytes([CommandType.DATA_PACKET.value])
+        data_type_byte = bytes([data_type])
+        total_packets_bytes = struct.pack('<H', total_packets)
+        current_packet_bytes = struct.pack('<H', current_packet)
+        data_length = struct.pack('<H', len(chunk_data))
+
+        data_part = (
+                task_bytes + business_byte + cmd_byte + data_type_byte +
+                total_packets_bytes + current_packet_bytes + data_length + chunk_data
+        )
+
+        # 计算长度
+        frame_length = len(func_code) + len(data_part) + 2
+        length_bytes = struct.pack('<H', frame_length)
+
+        # 附加CRC
+        temp_frame = header + length_bytes + func_code + data_part
+        crc = self.crc(temp_frame.hex()).upper()
+        return temp_frame + bytes.fromhex(crc)
+
+    def build_error_frame(
+            self,
+            task_id: str,
+            business_type: int,
+            error_type: int
+    ) -> bytes:
+        """
+        构建报错应答帧（指令类型 0x83）
+
+        """
+        header = bytes([0x24, 0x24])
+        func_code = bytes([0x05, 0x07])
+
+        # 数据域
+        task_bytes = task_id.encode('ascii')[:32].ljust(32, b'\x00')
+        business_byte = bytes([business_type])
+        cmd_byte = bytes([CommandType.ERROR.value])
+        error_byte = bytes([error_type])
+        data_part = task_bytes + business_byte + cmd_byte + error_byte
+
+        # 计算长度
+        frame_length = len(func_code) + len(data_part) + 2
+        length_bytes = struct.pack('<H', frame_length)
+
+        # 附加CRC
+        temp_frame = header + length_bytes + func_code + data_part
+        crc = self.crc(temp_frame.hex()).upper()
+        return temp_frame + bytes.fromhex(crc)
+
+
+
+    def crc(self, message):
+        """获取校验位, message: 除去校验位"""
+        crc = 0
+        i = 0
+        length = len(message) // 2
+        while length > 0:
+            crc &= 0xffffffff
+            da = crc // 256
+            da &= 0xff
+            crc <<= 8
+            crc ^= CRC_Table[da ^ int(message[i:i + 2], 16)]
+            i += 2
+            length -= 1
+        return f"{crc & 0xffff:04x}"

solax_py_library-1.0.0.13/solax_py_library/snap_shot/untils.py

@@ -0,0 +1,17 @@
+from .exceptions import SnapshotTimeoutError
+import asyncio
+
+def retry(max_attempts=3, delay=0.5):
+    def decorator(func):
+        async def wrapper(*args, **kwargs):
+            attempts = 0
+            while attempts < max_attempts:
+                try:
+                    return await func(*args, **kwargs)
+                except Exception as e:
+                    print(f"尝试 {attempts+1} 失败: {e}")
+                    await asyncio.sleep(delay)
+                    attempts += 1
+            raise SnapshotTimeoutError(f"操作失败 {max_attempts} 次")
+        return wrapper
+    return decorator

{solax_py_library-1.0.0.12 → solax_py_library-1.0.0.13}/solax_py_library/upload/__init__.py

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

{solax_py_library-1.0.0.12 → solax_py_library-1.0.0.13}/solax_py_library/upload/api/__init__.py

@@ -1,3 +1,3 @@
-from .service import upload, upload_service
-
-__all__ = ["upload", "upload_service"]
+from .service import upload, upload_service
+
+__all__ = ["upload", "upload_service"]

{solax_py_library-1.0.0.12 → solax_py_library-1.0.0.13}/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.upload.errors.base import UploadBaseError
-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 UploadBaseError
-    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.upload.errors.base import UploadBaseError
+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 UploadBaseError
+    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-1.0.0.12 → solax_py_library-1.0.0.13}/solax_py_library/upload/core/__init__.py

@@ -1,3 +1,3 @@
-from . import upload_service, data_adapter
-
-__all__ = ["upload_service", "data_adapter"]
+from . import upload_service, data_adapter
+
+__all__ = ["upload_service", "data_adapter"]

{solax_py_library-1.0.0.12 → solax_py_library-1.0.0.13}/solax_py_library/upload/core/data_adapter/__init__.py

@@ -1,5 +1,5 @@
-from .base import BaseDataAdapter
-from .csv import CSVDataAdapter
-
-
-__all__ = ["BaseDataAdapter", "CSVDataAdapter"]
+from .base import BaseDataAdapter
+from .csv import CSVDataAdapter
+
+
+__all__ = ["BaseDataAdapter", "CSVDataAdapter"]