solax-py-library 1.0.0.7__tar.gz → 1.0.0.9__tar.gz

{solax_py_library-1.0.0.7 → solax_py_library-1.0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.7
+Version: 1.0.0.9
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com
@@ -40,7 +40,7 @@ This package provide some general modules to help us can focus on the real proje
 - upload: The module define the upload tool.It support the way by Ftp.
 
 
-#### quick start 
+#### quick start
 
 ```python
 await upload(
@@ -66,4 +66,3 @@ await upload(
 )
 ```
 
-

{solax_py_library-1.0.0.7 → solax_py_library-1.0.0.9}/README.md

@@ -22,7 +22,7 @@ This package provide some general modules to help us can focus on the real proje
 - upload: The module define the upload tool.It support the way by Ftp.
 
 
-#### quick start 
+#### quick start
 
 ```python
 await upload(
@@ -47,4 +47,3 @@ await upload(
     ),
 )
 ```
-

{solax_py_library-1.0.0.7 → solax_py_library-1.0.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solax-py-library"
-version = "1.0.0.7"
+version = "1.0.0.9"
 description = "some common tool"
 authors = ["shenlvyu <13296718439@163.com>"]
 readme = "README.md"

{solax_py_library-1.0.0.7 → solax_py_library-1.0.0.9}/solax_py_library/upload/core/upload_service/ftp.py

@@ -18,7 +18,7 @@ from solax_py_library.upload.errors.upload_error import (
 
 
 class FTPUploadService(BaseUploadService):
-    upload_type = UploadType.FTP.value
+    upload_type = UploadType.FTP
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -55,7 +55,7 @@ class FTPUploadService(BaseUploadService):
             print("Connection closed.")
 
     def _parse(self, upload_data: FTPData) -> FTPParsedData:
-        if upload_data.file_type == FTPFileType.CSV.value:
+        if upload_data.file_type == FTPFileType.CSV:
             parsed_data = CSVDataAdapter.parse_data(upload_data.data)
         else:
             raise NotImplementedError

solax_py_library-1.0.0.9/solax_py_library/upload/test/test_ftp.py

@@ -0,0 +1,39 @@
+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
+            "user": "solax",
+            "password": "sly402",
+            "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-1.0.0.7 → solax_py_library-1.0.0.9}/solax_py_library/upload/types/client.py

@@ -15,5 +15,5 @@ class UploadData(BaseModel):
 
     def build_data(self):
         dict_obj_data = self.data if isinstance(self.data, dict) else self.data.dict()
-        if self.upload_type == UploadType.FTP.value:
+        if self.upload_type == UploadType.FTP:
             return FTPData(**dict_obj_data)

{solax_py_library-1.0.0.7 → solax_py_library-1.0.0.9}/solax_py_library/upload/types/ftp.py

@@ -11,7 +11,7 @@ class FTPFileType(IntEnum):
     @classmethod
     def get_file_suffix(cls, value):
         return {
-            FTPFileType.CSV.value: ".csv",
+            FTPFileType.CSV: ".csv",
         }.get(value)
 
 

solax_py_library-1.0.0.7/solax_py_library/upload/test/test_ftp.py

@@ -1,37 +0,0 @@
-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
-            "user": "solax",
-            "password": "sly402",
-            "remote_path": "/xixi",
-        }
-        asyncio.run(upload(
-            upload_type=UploadType.FTP.value,
-            configuration=ftp_config,
-            upload_data=UploadData(
-                upload_type=UploadType.FTP.value,
-                data=dict(
-                    file_type=FTPFileType.CSV.value,
-                    file_name="new_file",
-                    data=[
-                        {
-                            "EMS1000序列号": "XMG11A011L",
-                            "EMS1000本地时间": "2025-02-11 15:39:10",
-                            "EMS1000版本号": "V007.11.1",
-                            "电站所在国家和地区": None,
-                            "电站所在当前时区": None,
-                            "电站系统类型": None,
-                        }
-                    ],
-                ),
-            ),
-        ))