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

solax_py_library/upload/core/data_adapter/csv.py

@@ -1,26 +1,26 @@
-import csv
-import tempfile
-from typing import Any, Union, List, Dict
-
-from solax_py_library.upload.core.data_adapter.base import BaseDataAdapter
-
-
-class CSVDataAdapter(BaseDataAdapter):
-    @classmethod
-    def parse_data(cls, data: Union[List[List[Any]], List[Dict[str, Any]]]):
-        with tempfile.NamedTemporaryFile(
-            delete=False, mode="w", newline="", encoding="utf-8-sig"
-        ) as temp_file:
-            if isinstance(data[0], list):
-                writer = csv.writer(temp_file)
-                writer.writerows(data)
-            else:
-                headers = list(data[0].keys())
-                writer = csv.DictWriter(temp_file, fieldnames=headers)
-                writer.writeheader()
-                writer.writerows(data)
-
-            temp_file_path = temp_file.name
-            temp_file.seek(0)
-
-        return temp_file_path
+import csv
+import tempfile
+from typing import Any, Union, List, Dict
+
+from solax_py_library.upload.core.data_adapter.base import BaseDataAdapter
+
+
+class CSVDataAdapter(BaseDataAdapter):
+    @classmethod
+    def parse_data(cls, data: Union[List[List[Any]], List[Dict[str, Any]]]):
+        with tempfile.NamedTemporaryFile(
+            delete=False, mode="w", newline="", encoding="utf-8-sig"
+        ) as temp_file:
+            if isinstance(data[0], list):
+                writer = csv.writer(temp_file)
+                writer.writerows(data)
+            else:
+                headers = list(data[0].keys())
+                writer = csv.DictWriter(temp_file, fieldnames=headers)
+                writer.writeheader()
+                writer.writerows(data)
+
+            temp_file_path = temp_file.name
+            temp_file.seek(0)
+
+        return temp_file_path

solax_py_library/upload/core/upload_service/__init__.py

@@ -1,15 +1,15 @@
-from .base import BaseUploadService
-from .ftp import FTPUploadService
-
-
-upload_service_map = {}
-
-
-def _register(upload_obj):
-    upload_service_map[upload_obj.upload_type] = upload_obj
-
-
-_register(FTPUploadService)
-
-
-__all__ = ["BaseUploadService", "FTPUploadService"]
+from .base import BaseUploadService
+from .ftp import FTPUploadService
+
+
+upload_service_map = {}
+
+
+def _register(upload_obj):
+    upload_service_map[upload_obj.upload_type] = upload_obj
+
+
+_register(FTPUploadService)
+
+
+__all__ = ["BaseUploadService", "FTPUploadService"]

solax_py_library/upload/core/upload_service/base.py

@@ -1,43 +1,43 @@
-from abc import ABCMeta, abstractmethod
-
-from solax_py_library.upload.types.client import UploadData
-
-
-class BaseUploadService(metaclass=ABCMeta):
-    upload_type = None
-
-    def __init__(self, **kwargs) -> None:
-        self._client = None
-        self._is_connect = False
-        self.timeout = 5
-
-    @abstractmethod
-    def connect(self):
-        ...
-
-    async def upload(self, data: UploadData):
-        upload_data = self._parse(data.build_data())
-        return self._upload(upload_data)
-
-    @abstractmethod
-    def close(self):
-        ...
-
-    @property
-    def is_connect(self):
-        return self._is_connect
-
-    def __enter__(self):
-        self.connect()
-        return self
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.close()
-
-    @abstractmethod
-    def _upload(self, data):
-        ...
-
-    @abstractmethod
-    def _parse(self, upload_data: UploadData):
-        ...
+from abc import ABCMeta, abstractmethod
+
+from solax_py_library.upload.types.client import UploadData
+
+
+class BaseUploadService(metaclass=ABCMeta):
+    upload_type = None
+
+    def __init__(self, **kwargs) -> None:
+        self._client = None
+        self._is_connect = False
+        self.timeout = 5
+
+    @abstractmethod
+    def connect(self):
+        ...
+
+    async def upload(self, data: UploadData):
+        upload_data = self._parse(data.build_data())
+        return self._upload(upload_data)
+
+    @abstractmethod
+    def close(self):
+        ...
+
+    @property
+    def is_connect(self):
+        return self._is_connect
+
+    def __enter__(self):
+        self.connect()
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.close()
+
+    @abstractmethod
+    def _upload(self, data):
+        ...
+
+    @abstractmethod
+    def _parse(self, upload_data: UploadData):
+        ...

solax_py_library/upload/core/upload_service/ftp.py

@@ -79,6 +79,7 @@ class FTPUploadService(BaseUploadService):
         try:
             if not self._is_connect:
                 raise ConnectError(message="not connect yet")
+            # self._client.set_pasv(False)
             self._cwd_folder()
             with open(data.file_path, "rb") as f:
                 self._client.storbinary(f"STOR {data.file_name}", f)

solax_py_library/upload/test/test_ftp.py

@@ -1,113 +1,113 @@
-import asyncio
-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.exceptions import ConnectError, LoginError
-from solax_py_library.upload.types.client import UploadType, UploadData
-from solax_py_library.upload.types.ftp import FTPFileType
-
-
-class FTPTest(unittest.TestCase):
-    def test_connect(self):
-        ftp_config = {
-            "host": "10.1.31.181",  # 测试host
-            "port": 21,
-            "user": "solax",
-            "password": "123456",
-            "remote_path": "/xixi",
-        }
-        ftp = FTPUploadService(**ftp_config)
-        ftp.connect()
-
-    def test_connect_error_1(self):
-        ftp_config = {
-            "host": "10.1.31.182",  # 测试host
-            "port": 21,
-            "user": "solax",
-            "password": "123456",
-            "remote_path": "/xixi",
-        }
-        ftp = FTPUploadService(**ftp_config)
-        try:
-            ftp.connect()
-        except ConnectError:
-            ...
-
-    def test_connect_error_2(self):
-        ftp_config = {
-            "host": "10.1.31.181",  # 测试host
-            "port": 21,
-            "user": "solax123",
-            "password": "123456",
-            "remote_path": "/xixi",
-        }
-        ftp = FTPUploadService(**ftp_config)
-        try:
-            ftp.connect()
-        except LoginError:
-            ...
-
-    def test_ftp_upload_to_windows(self):
-        ftp_config = {
-            "host": "10.1.31.181",  # 测试host
-            "port": 21,
-            "user": "solax",
-            "password": "123456",
-            "remote_path": "嘻嘻",
-        }
-        asyncio.run(
-            upload(
-                upload_type=UploadType.FTP,
-                configuration=ftp_config,
-                upload_data=UploadData(
-                    upload_type=UploadType.FTP,
-                    data=dict(
-                        file_type=FTPFileType.CSV,
-                        file_name="中文",
-                        data=[
-                            {
-                                "EMS1000序列号": "XMG11A011L",
-                                "EMS1000本地时间": "2025-02-11 15:39:10",
-                                "EMS1000版本号": "V007.11.1",
-                                "电站所在国家和地区": None,
-                                "电站所在当前时区": None,
-                                "电站系统类型": None,
-                            }
-                        ],
-                    ),
-                ),
-            )
-        )
-
-    def test_ftp_upload_to_linux(self):
-        ftp_config = {
-            "host": "920729yofx76.vicp.fun",  # 测试host
-            "port": 59477,
-            "user": "test",
-            "password": "test123456",
-            "remote_path": "test",
-        }
-        asyncio.run(
-            upload(
-                upload_type=UploadType.FTP,
-                configuration=ftp_config,
-                upload_data=UploadData(
-                    upload_type=UploadType.FTP,
-                    data=dict(
-                        file_type=FTPFileType.CSV,
-                        file_name="中文",
-                        data=[
-                            {
-                                "EMS1000序列号": "XMG11A011L",
-                                "EMS1000本地时间": "2025-02-11 15:39:10",
-                                "EMS1000版本号": "V007.11.1",
-                                "电站所在国家和地区": None,
-                                "电站所在当前时区": None,
-                                "电站系统类型": None,
-                            }
-                        ],
-                    ),
-                ),
-            )
-        )
+import asyncio
+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.exceptions import ConnectError, LoginError
+from solax_py_library.upload.types.client import UploadType, UploadData
+from solax_py_library.upload.types.ftp import FTPFileType
+
+
+class FTPTest(unittest.TestCase):
+    def test_connect(self):
+        ftp_config = {
+            "host": "10.1.31.181",  # 测试host
+            "port": 21,
+            "user": "solax",
+            "password": "123456",
+            "remote_path": "/xixi",
+        }
+        ftp = FTPUploadService(**ftp_config)
+        ftp.connect()
+
+    def test_connect_error_1(self):
+        ftp_config = {
+            "host": "10.1.31.182",  # 测试host
+            "port": 21,
+            "user": "solax",
+            "password": "123456",
+            "remote_path": "/xixi",
+        }
+        ftp = FTPUploadService(**ftp_config)
+        try:
+            ftp.connect()
+        except ConnectError:
+            ...
+
+    def test_connect_error_2(self):
+        ftp_config = {
+            "host": "10.1.31.181",  # 测试host
+            "port": 21,
+            "user": "solax123",
+            "password": "123456",
+            "remote_path": "/xixi",
+        }
+        ftp = FTPUploadService(**ftp_config)
+        try:
+            ftp.connect()
+        except LoginError:
+            ...
+
+    def test_ftp_upload_to_windows(self):
+        ftp_config = {
+            "host": "10.1.31.181",  # 测试host
+            "port": 21,
+            "user": "solax",
+            "password": "123456",
+            "remote_path": "嘻嘻",
+        }
+        asyncio.run(
+            upload(
+                upload_type=UploadType.FTP,
+                configuration=ftp_config,
+                upload_data=UploadData(
+                    upload_type=UploadType.FTP,
+                    data=dict(
+                        file_type=FTPFileType.CSV,
+                        file_name="中文",
+                        data=[
+                            {
+                                "EMS1000序列号": "XMG11A011L",
+                                "EMS1000本地时间": "2025-02-11 15:39:10",
+                                "EMS1000版本号": "V007.11.1",
+                                "电站所在国家和地区": None,
+                                "电站所在当前时区": None,
+                                "电站系统类型": None,
+                            }
+                        ],
+                    ),
+                ),
+            )
+        )
+
+    def test_ftp_upload_to_linux(self):
+        ftp_config = {
+            "host": "920729yofx76.vicp.fun",  # 测试host
+            "port": 59477,
+            "user": "test",
+            "password": "test123456",
+            "remote_path": "test",
+        }
+        asyncio.run(
+            upload(
+                upload_type=UploadType.FTP,
+                configuration=ftp_config,
+                upload_data=UploadData(
+                    upload_type=UploadType.FTP,
+                    data=dict(
+                        file_type=FTPFileType.CSV,
+                        file_name="中文",
+                        data=[
+                            {
+                                "EMS1000序列号": "XMG11A011L",
+                                "EMS1000本地时间": "2025-02-11 15:39:10",
+                                "EMS1000版本号": "V007.11.1",
+                                "电站所在国家和地区": None,
+                                "电站所在当前时区": None,
+                                "电站系统类型": None,
+                            }
+                        ],
+                    ),
+                ),
+            )
+        )

solax_py_library/upload/types/__init__.py

@@ -1,11 +1,11 @@
-from .client import UploadType, UploadData
-from .ftp import FTPData, FTPParsedData, FTPFileType, FTPServiceConfig
-
-__all__ = [
-    "FTPData",
-    "FTPParsedData",
-    "FTPServiceConfig",
-    "UploadType",
-    "UploadData",
-    "FTPFileType",
-]
+from .client import UploadType, UploadData
+from .ftp import FTPData, FTPParsedData, FTPFileType, FTPServiceConfig
+
+__all__ = [
+    "FTPData",
+    "FTPParsedData",
+    "FTPServiceConfig",
+    "UploadType",
+    "UploadData",
+    "FTPFileType",
+]

solax_py_library/upload/types/client.py

@@ -1,19 +1,19 @@
-from enum import IntEnum
-from pydantic import BaseModel
-from typing import Optional, Union
-
-from solax_py_library.upload.types.ftp import FTPData
-
-
-class UploadType(IntEnum):
-    FTP = 1
-
-
-class UploadData(BaseModel):
-    data: Optional[Union[dict, FTPData]]
-    upload_type: UploadType
-
-    def build_data(self):
-        dict_obj_data = self.data if isinstance(self.data, dict) else self.data.dict()
-        if self.upload_type == UploadType.FTP:
-            return FTPData(**dict_obj_data)
+from enum import IntEnum
+from pydantic import BaseModel
+from typing import Optional, Union
+
+from solax_py_library.upload.types.ftp import FTPData
+
+
+class UploadType(IntEnum):
+    FTP = 1
+
+
+class UploadData(BaseModel):
+    data: Optional[Union[dict, FTPData]]
+    upload_type: UploadType
+
+    def build_data(self):
+        dict_obj_data = self.data if isinstance(self.data, dict) else self.data.dict()
+        if self.upload_type == UploadType.FTP:
+            return FTPData(**dict_obj_data)

solax_py_library/upload/types/ftp.py

@@ -1,37 +1,37 @@
-import os
-from enum import IntEnum
-from typing import Any, Optional
-
-from pydantic import BaseModel
-
-
-class FTPFileType(IntEnum):
-    CSV = 1
-
-    @classmethod
-    def get_file_suffix(cls, value):
-        return {
-            FTPFileType.CSV: ".csv",
-        }.get(value)
-
-
-class FTPData(BaseModel):
-    file_type: FTPFileType
-    file_name: str
-    data: Any
-
-    def build_full_path(self, remote_path) -> str:
-        return os.path.join(remote_path, self.file_name)
-
-
-class FTPServiceConfig(BaseModel):
-    host: str
-    port: int
-    user: Optional[str]
-    password: Optional[str]
-    remote_path: str
-
-
-class FTPParsedData(BaseModel):
-    file_name: str
-    file_path: str
+import os
+from enum import IntEnum
+from typing import Any, Optional
+
+from pydantic import BaseModel
+
+
+class FTPFileType(IntEnum):
+    CSV = 1
+
+    @classmethod
+    def get_file_suffix(cls, value):
+        return {
+            FTPFileType.CSV: ".csv",
+        }.get(value)
+
+
+class FTPData(BaseModel):
+    file_type: FTPFileType
+    file_name: str
+    data: Any
+
+    def build_full_path(self, remote_path) -> str:
+        return os.path.join(remote_path, self.file_name)
+
+
+class FTPServiceConfig(BaseModel):
+    host: str
+    port: int
+    user: Optional[str]
+    password: Optional[str]
+    remote_path: str
+
+
+class FTPParsedData(BaseModel):
+    file_name: str
+    file_path: str

solax_py_library/utils/common.py

@@ -1,38 +1,38 @@
-import asyncio
-from decimal import Decimal, ROUND_HALF_UP
-
-
-def retry(max_attempts=3, delay=0.5, assign_exception=Exception):
-    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 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)
+import asyncio
+from decimal import Decimal, ROUND_HALF_UP
+
+
+def retry(max_attempts=3, delay=0.5, assign_exception=Exception):
+    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 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-1.0.0.23.dist-info → solax_py_library-1.0.0.24.dist-info}/METADATA

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