solax-py-library 0.1.1__tar.gz → 1.0.0.2__tar.gz

{solax_py_library-0.1.1 → solax_py_library-1.0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 0.1.1
+Version: 1.0.0.2
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com
@@ -12,6 +12,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: pydantic (>=1.10.0,<2.0.0)
+Requires-Dist: typing-extensions (==4.7.1)
 Description-Content-Type: text/markdown
 
 ### solax common module

{solax_py_library-0.1.1 → solax_py_library-1.0.0.2}/pyproject.toml

@@ -1,12 +1,14 @@
 [tool.poetry]
 name = "solax-py-library"
-version = "0.1.1"
+version = "1.0.0.2"
 description = "some common tool"
 authors = ["shenlvyu <13296718439@163.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.8"
+pydantic = "^1.10.0"
+typing-extensions = "==4.7.1"
 
 [build-system]
 requires = ["poetry-core"]

solax_py_library-1.0.0.2/solax_py_library/main.py

@@ -0,0 +1,7 @@
+import os.path
+import sys
+
+current_directory = os.path.dirname(os.path.abspath(__file__))
+parent_directory = os.path.abspath(os.path.join(current_directory, '..'))
+target_file_path = os.path.join(parent_directory, "dependency")
+sys.path.append(target_file_path)

solax_py_library-1.0.0.2/solax_py_library/upload/core/data_adapter/csv.py

@@ -0,0 +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="utf8"
+        ) 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 open(temp_file_path, "rb")

{solax_py_library-0.1.1 → solax_py_library-1.0.0.2}/solax_py_library/upload/core/upload_service/base.py

@@ -14,8 +14,8 @@ class BaseUploadService(metaclass=ABCMeta):
     def connect(self):
         ...
 
-    def upload(self, data):
-        upload_data = self._parse(data)
+    def upload(self, data: UploadData):
+        upload_data = self._parse(data.build_data())
         return self._upload(upload_data)
 
     @abstractmethod

{solax_py_library-0.1.1 → solax_py_library-1.0.0.2}/solax_py_library/upload/core/upload_service/ftp.py

@@ -4,8 +4,17 @@ import os
 from .base import BaseUploadService
 from solax_py_library.upload.types.client import UploadType, UploadData
 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
+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):
@@ -15,7 +24,7 @@ class FTPUploadService(BaseUploadService):
         super().__init__(**kwargs)
         config = self._init_config(**kwargs)
         self.host = config.host
-        self.username = config.username
+        self.user = config.user
         self.password = config.password
         self.remote_path = config.remote_path
 
@@ -31,7 +40,7 @@ class FTPUploadService(BaseUploadService):
             self.close()
         try:
             self._client = ftplib.FTP(self.host)
-            self._client.login(self.username, self.password)
+            self._client.login(self.user, self.password)
             print(f"Connected to {self.host}")
             self._is_connect = True
         except Exception as e:
@@ -45,14 +54,14 @@ class FTPUploadService(BaseUploadService):
             self._is_connect = False
             print("Connection closed.")
 
-    def _parse(self, upload_data: UploadData) -> FTPParsedData:
-        data: FTPData = upload_data.ftp_data
-        if data.file_type == FTPFileType.CSV:
-            parsed_data = CSVDataAdapter.parse_data(data.data)
+    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=data.build_full_path(self.remote_path), data=parsed_data
+            file_name=upload_data.build_full_path(self.remote_path) + upload_data.file_type.get_file_suffix(),
+            data=parsed_data
         )
 
     def _upload(self, data: FTPParsedData):

{solax_py_library-0.1.1 → solax_py_library-1.0.0.2}/solax_py_library/upload/test/test_ftp.py

@@ -9,7 +9,7 @@ class FTPTest(unittest.TestCase):
     def test_ftp_upload(self):
         ftp_config = {
             "host": "10.1.31.181",  # 测试host
-            "username": "solax",
+            "user": "solax",
             "password": "sly402",
             "remote_path": "/xixi",
         }
@@ -17,10 +17,11 @@ class FTPTest(unittest.TestCase):
             upload_type=UploadType.FTP,
             configuration=ftp_config,
             upload_data=UploadData(
-                ftp_data=FTPData(
+                upload_type=UploadType.FTP,
+                data=dict(
                     file_type=FTPFileType.CSV,
                     file_name="new_file.csv",
-                    data=[["curry", 37, "男"], ["james", 40, "男"], ["lily", 16, "女"]],
+                    data=[{'EMS1000序列号': 'XMG11A011L', 'EMS1000本地时间': '2025-02-11 15:39:10', 'EMS1000版本号': 'V007.11.1', '电站所在国家和地区': None, '电站所在当前时区': None, '电站系统类型': None}],
                 ),
             ),
         )

solax_py_library-1.0.0.2/solax_py_library/upload/types/client.py

@@ -0,0 +1,19 @@
+from enum import Enum
+from pydantic import BaseModel
+from typing import Optional, Union
+
+from solax_py_library.upload.types.ftp import FTPData
+
+
+class UploadType(str, Enum):
+    FTP = "FTP"
+
+
+class UploadData(BaseModel):
+    data: Optional[Union[dict, FTPData]]
+    upload_type: Optional[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-0.1.1 → solax_py_library-1.0.0.2}/solax_py_library/upload/types/ftp.py

@@ -6,7 +6,12 @@ from pydantic import BaseModel
 
 
 class FTPFileType(str, Enum):
-    CSV = "csv"
+    CSV = "CSV"
+
+    def get_file_suffix(self):
+        return {
+            FTPFileType.CSV: ".csv",
+        }.get(self)
 
 
 class FTPData(BaseModel):
@@ -20,7 +25,7 @@ class FTPData(BaseModel):
 
 class FTPServiceConfig(BaseModel):
     host: str
-    username: Optional[str]
+    user: Optional[str]
     password: Optional[str]
     remote_path: str
 

solax_py_library-0.1.1/solax_py_library/upload/core/data_adapter/csv.py

@@ -1,19 +0,0 @@
-import csv
-import tempfile
-
-from solax_py_library.upload.core.data_adapter.base import BaseDataAdapter
-
-
-class CSVDataAdapter(BaseDataAdapter):
-    @classmethod
-    def parse_data(cls, data):
-        with tempfile.NamedTemporaryFile(
-            delete=False, mode="w", newline="", encoding="utf8"
-        ) as temp_file:
-            writer = csv.writer(temp_file)
-            writer.writerows(data)
-
-            temp_file_path = temp_file.name
-            temp_file.seek(0)
-
-        return open(temp_file_path, "rb")

solax_py_library-0.1.1/solax_py_library/upload/types/client.py

@@ -1,13 +0,0 @@
-from enum import Enum
-from pydantic import BaseModel
-from typing import Optional
-
-from solax_py_library.upload.types.ftp import FTPData
-
-
-class UploadType(str, Enum):
-    FTP = "FTP"
-
-
-class UploadData(BaseModel):
-    ftp_data: Optional[FTPData]