solax-py-library 1.0.0.14__py3-none-any.whl → 1.0.0.16__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

@@ -1,86 +1,97 @@
-import ftplib
-import os
-
-from .base import BaseUploadService
-from solax_py_library.upload.types.client import UploadType
-from solax_py_library.upload.core.data_adapter import CSVDataAdapter
-from solax_py_library.upload.types.ftp import (
-    FTPServiceConfig,
-    FTPFileType,
-    FTPData,
-    FTPParsedData,
-)
-from solax_py_library.upload.errors.upload_error import (
-    SendDataError,
-    ConnectError,
-    ConfigurationError,
-)
-
-
-class FTPUploadService(BaseUploadService):
-    upload_type = UploadType.FTP
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        config = self._init_config(**kwargs)
-        self.host = config.host
-        self.port = config.port
-        self.user = config.user
-        self.password = config.password
-        self.remote_path = config.remote_path
-
-    def _init_config(self, **kwargs):
-        try:
-            return FTPServiceConfig(**kwargs)
-        except Exception as e:
-            print(e)
-            raise ConfigurationError
-
-    def connect(self):
-        if self._client is not None:
-            self.close()
-        try:
-            self._client = ftplib.FTP(self.host, timeout=self.timeout)
-            self._client.connect(self.host, self.port, timeout=self.timeout)
-            self._client.login(self.user, self.password)
-            print(f"Connected to {self.host}")
-            self._is_connect = True
-        except Exception as e:
-            print(e)
-            raise ConnectError
-
-    def close(self):
-        if self._client:
-            self._client.quit()
-            self._client = None
-            self._is_connect = False
-            print("Connection closed.")
-
-    def _parse(self, upload_data: FTPData) -> FTPParsedData:
-        if upload_data.file_type == FTPFileType.CSV:
-            parsed_data = CSVDataAdapter.parse_data(upload_data.data)
-        else:
-            raise NotImplementedError
-        return FTPParsedData(
-            file_name=upload_data.file_name + FTPFileType.get_file_suffix(upload_data.file_type),
-            file_path=parsed_data,
-        )
-
-    def _upload(self, data: FTPParsedData):
-        try:
-            if not self._is_connect:
-                raise ConnectError(message="not connect yet")
-            with open(data.file_path, "rb") as f:
-                self._client.storbinary(
-                    f"STOR {self._build_remote_file(data.file_name)}", f
-                )
-            print(f"Successfully uploaded to {data.file_name}")
-        except Exception as e:
-            print(e)
-            raise SendDataError
-        finally:
-            if os.path.exists(data.file_path):
-                os.remove(data.file_path)
-
-    def _build_remote_file(self, file_name):
-        return os.path.join(self.remote_path, file_name)
+import ftplib
+import os
+
+from .base import BaseUploadService
+from solax_py_library.upload.types.client import UploadType
+from solax_py_library.upload.core.data_adapter import CSVDataAdapter
+from solax_py_library.upload.types.ftp import (
+    FTPServiceConfig,
+    FTPFileType,
+    FTPData,
+    FTPParsedData,
+)
+from solax_py_library.upload.errors.upload_error import (
+    SendDataError,
+    ConnectError,
+    LoginError,
+    ConfigurationError,
+)
+
+
+class FTPUploadService(BaseUploadService):
+    upload_type = UploadType.FTP
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        config = self._init_config(**kwargs)
+        self.host = config.host
+        self.port = config.port
+        self.user = config.user
+        self.password = config.password
+        self.remote_path = config.remote_path
+
+    def _init_config(self, **kwargs):
+        try:
+            return FTPServiceConfig(**kwargs)
+        except Exception as e:
+            print(e)
+            raise ConfigurationError
+
+    def connect(self):
+        if self._client is not None:
+            self.close()
+        self._connect()
+        self._login()
+        self._is_connect = True
+
+    def _connect(self):
+        try:
+            self._client = ftplib.FTP(self.host, timeout=self.timeout)
+            self._client.connect(self.host, self.port, timeout=self.timeout)
+        except Exception as e:
+            print(e)
+            raise ConnectError
+
+    def _login(self):
+        try:
+            self._client.login(self.user, self.password)
+        except Exception as e:
+            print(e)
+            raise LoginError
+
+    def close(self):
+        if self._client:
+            self._client.quit()
+            self._client = None
+            self._is_connect = False
+            print("Connection closed.")
+
+    def _parse(self, upload_data: FTPData) -> FTPParsedData:
+        if upload_data.file_type == FTPFileType.CSV:
+            parsed_data = CSVDataAdapter.parse_data(upload_data.data)
+        else:
+            raise NotImplementedError
+        return FTPParsedData(
+            file_name=upload_data.file_name
+            + FTPFileType.get_file_suffix(upload_data.file_type),
+            file_path=parsed_data,
+        )
+
+    def _upload(self, data: FTPParsedData):
+        try:
+            if not self._is_connect:
+                raise ConnectError(message="not connect yet")
+            with open(data.file_path, "rb") as f:
+                self._client.storbinary(
+                    f"STOR {self._build_remote_file(data.file_name)}", f
+                )
+            print(f"Successfully uploaded to {data.file_name}")
+        except Exception as e:
+            print(e)
+            raise SendDataError
+        finally:
+            if os.path.exists(data.file_path):
+                os.remove(data.file_path)
+
+    def _build_remote_file(self, file_name):
+        return os.path.join(self.remote_path, file_name)

solax_py_library/upload/errors/__init__.py

@@ -1,10 +1,10 @@
-from .base import UploadBaseError
-from .upload_error import ConfigurationError, ConnectError, LoginError, SendDataError
-
-__all__ = [
-    "UploadBaseError",
-    "ConnectError",
-    "LoginError",
-    "SendDataError",
-    "ConfigurationError",
-]
+from .base import UploadBaseError
+from .upload_error import ConfigurationError, ConnectError, LoginError, SendDataError
+
+__all__ = [
+    "UploadBaseError",
+    "ConnectError",
+    "LoginError",
+    "SendDataError",
+    "ConfigurationError",
+]

solax_py_library/upload/errors/base.py

@@ -1,10 +1,10 @@
-class UploadBaseError(Exception):
-    code = 0x1000
-    message = "upload error"
-
-    def __init__(self, *args, message=None):
-        super().__init__(*args)
-        self.message = message or self.message
-
-    def __str__(self):
-        return self.message
+class UploadBaseError(Exception):
+    code = 0x1000
+    message = "upload error"
+
+    def __init__(self, *args, message=None):
+        super().__init__(*args)
+        self.message = message or self.message
+
+    def __str__(self):
+        return self.message

solax_py_library/upload/errors/upload_error.py

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

solax_py_library/upload/test/test_ftp.py

@@ -1,40 +1,81 @@
-import asyncio
-import unittest
-
-from solax_py_library.upload.api.service import upload
-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_ftp_upload(self):
-        ftp_config = {
-            "host": "10.1.31.181",  # 测试host
-            "port": 21,
-            "user": "solax",
-            "password": "123456",
-            "remote_path": "/xixi",
-        }
-        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="new_file",
-                        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.errors 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(self):
+        ftp_config = {
+            "host": "10.1.31.181",  # 测试host
+            "port": 21,
+            "user": "solax",
+            "password": "123456",
+            "remote_path": "/xixi",
+        }
+        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="new_file",
+                        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)