solax-py-library 1.0.0.22__py3-none-any.whl → 1.0.0.24__py3-none-any.whl

solax_py_library/snap_shot/core/__init__.py

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

solax_py_library/snap_shot/core/parser.py

@@ -1,225 +1,261 @@
-import re
-import struct
-
-from solax_py_library.snap_shot.types.address import CommandType
-from solax_py_library.snap_shot.constant.crc_table import CRC_Table
-
-
-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])
-
-    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}"
+import re
+import struct
+
+from solax_py_library.snap_shot.types.address import CommandType
+from solax_py_library.snap_shot.constant.crc_table import CRC_Table
+
+
+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, key: int, big_data: bytes, task_id: str, snap_upload_data):
+        business_type = 1  # 1 代表调试信息
+        data_type = 0  # 0代表故障录波
+
+        # 分片上传（每包10K）
+        chunk_size = 10240
+        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=key,
+                chunk_data=chunk_data,
+            )
+            snap_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])
+
+    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_response_all_pack_number(
+        self, task_id: str, business_type: int, total_packets: int
+    ) -> bytes:
+        """
+        回复上传总报数
+        :param task_id: 任务ID（32字节）
+        :param business_type: 业务类型1
+        :param total_packets: 总书记包数
+        """
+        # 固定字段
+        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.TOTAL_PACKETS.value])
+        data_length = struct.pack("<H", 3)
+        data_type_byte = bytes([7])  # 和云平台约定故障录波就传7
+        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()
+        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/snap_shot/core/snap_shot.py

@@ -6,6 +6,7 @@ from solax_py_library.snap_shot.exceptions import SnapshotTimeoutError
 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
+from .parser import Parser
 
 
 class SnapshotCore:
@@ -107,6 +108,11 @@ class SnapshotCore:
         packindex = 0
 
         await self._set_snap_shot_data_index(index)  # 设置快照索引
+        # 把每次录波参数数量 和参数数据点数量假如的头部
+        param_number = await self.modbus.read_registers(
+            SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_CHANNELNUMBER.value, 2
+        )
+        self.all_snap_shot_data.setdefault(index, []).extend(param_number)
         while readdatanum < DataNumber:
             if await self._get_data_pack_read_state() is False:  # 获取数据包读取状态
                 raise self.snap_except("读取数据包错误")
@@ -114,7 +120,7 @@ class SnapshotCore:
             siglepackdatanum = DataNumber - readdatanum
             if siglepackdatanum > 256:
                 siglepackdatanum = 256
-            print(f"第{index}次快照，第{packindex}包，读取数据个数：{siglepackdatanum}")
+            # print(f"第{index}次快照，第{packindex}包，读取数据个数：{siglepackdatanum}")
 
             await self._get_data_pack_index()  # 取得数据包索引
             once_data = await self._get_data_pack(
@@ -143,6 +149,7 @@ class SnapshotCore:
         # print(f'取得数据包就绪状态')
         readcnt = 0
         result = False
+        # print(f"readcnt:{readcnt}")
         while readcnt < 100:
             result = await self.modbus.read_registers(
                 SnapshotRegisterAddress.SNAPSHOT_REGISTERADDRESS_PACKDATASTATUS.value, 1
@@ -186,7 +193,7 @@ class SnapshotCore:
             response = await self.get_data_pack_h_address(register_num // 2)
             DataPack.extend(response)
 
-        # print(f'获取快照数据包返回值：{DataPack}')
+        print(f"获取快照数据包返回值：{DataPack}")
         return DataPack
 
     @retry(max_attempts=3, delay=0.5, assign_exception=SnapshotTimeoutError)
@@ -218,11 +225,18 @@ class SnapshotCore:
         # print(f'清除数据包就绪状态返回值：{response}')
 
     @classmethod
-    async def start(cls, modbus_client, snap_shot_index: int = 0, snap_exception=None):
+    async def start(
+        cls,
+        modbus_client,
+        snap_shot_index: int = 0,
+        snap_exception=None,
+        snap_upload_data=None,
+        task_id="",
+    ):
         """启动故障录波
         snap_shot_index : 代表第几个故障 如果传0 就默认读取所有故障
         """
-        # print'start.................................')
+        print("start.................................")
         instance = cls(modbus_client, snap_exception)
         try:
             # 第一步 设置快照芯片源
@@ -231,6 +245,10 @@ class SnapshotCore:
             await instance._set_export_device()
             # 第三步 获取设备总数
             total_number = await instance._get_snapshot_total_number()
+            total_number_message = Parser().build_response_all_pack_number(
+                task_id, 1, total_number
+            )
+            snap_upload_data(total_number_message)
             if total_number < 1:
                 return instance.snap_except("无效的故障录波总数")
             # 第四步 开始录波
@@ -238,9 +256,9 @@ class SnapshotCore:
             # 第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)
+            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
 

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/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/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"]

solax_py_library/upload/core/data_adapter/base.py

@@ -1,9 +1,9 @@
-from abc import ABCMeta, abstractmethod
-
-
-class BaseDataAdapter(metaclass=ABCMeta):
-    data_type = None
-
-    @abstractmethod
-    def parse_data(self, data):
-        ...
+from abc import ABCMeta, abstractmethod
+
+
+class BaseDataAdapter(metaclass=ABCMeta):
+    data_type = None
+
+    @abstractmethod
+    def parse_data(self, data):
+        ...