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

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

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

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

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

{solax_py_library-1.0.0.6 → solax_py_library-1.0.0.7}/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
+    upload_type = UploadType.FTP.value
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -55,13 +55,13 @@ class FTPUploadService(BaseUploadService):
             print("Connection closed.")
 
     def _parse(self, upload_data: FTPData) -> FTPParsedData:
-        if upload_data.file_type == FTPFileType.CSV:
+        if upload_data.file_type == FTPFileType.CSV.value:
             parsed_data = CSVDataAdapter.parse_data(upload_data.data)
         else:
             raise NotImplementedError
         return FTPParsedData(
             file_name=upload_data.build_full_path(self.remote_path)
-            + upload_data.file_type.get_file_suffix(),
+            + FTPFileType.get_file_suffix(upload_data.file_type),
             file_path=parsed_data,
         )
 

{solax_py_library-1.0.0.6 → solax_py_library-1.0.0.7}/solax_py_library/upload/test/test_ftp.py

@@ -15,13 +15,13 @@ class FTPTest(unittest.TestCase):
             "remote_path": "/xixi",
         }
         asyncio.run(upload(
-            upload_type=UploadType.FTP,
+            upload_type=UploadType.FTP.value,
             configuration=ftp_config,
             upload_data=UploadData(
-                upload_type=UploadType.FTP,
+                upload_type=UploadType.FTP.value,
                 data=dict(
-                    file_type=FTPFileType.CSV,
-                    file_name="new_file.csv",
+                    file_type=FTPFileType.CSV.value,
+                    file_name="new_file",
                     data=[
                         {
                             "EMS1000序列号": "XMG11A011L",

{solax_py_library-1.0.0.6 → solax_py_library-1.0.0.7}/solax_py_library/upload/types/client.py

@@ -1,19 +1,19 @@
-from enum import Enum
+from enum import IntEnum
 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 UploadType(IntEnum):
+    FTP = 1
 
 
 class UploadData(BaseModel):
     data: Optional[Union[dict, FTPData]]
-    upload_type: Optional[UploadType]
+    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:
+        if self.upload_type == UploadType.FTP.value:
             return FTPData(**dict_obj_data)

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

@@ -1,17 +1,18 @@
 import os
-from enum import Enum
+from enum import IntEnum
 from typing import Any, Optional
 
 from pydantic import BaseModel
 
 
-class FTPFileType(str, Enum):
-    CSV = "CSV"
+class FTPFileType(IntEnum):
+    CSV = 1
 
-    def get_file_suffix(self):
+    @classmethod
+    def get_file_suffix(cls, value):
         return {
-            FTPFileType.CSV: ".csv",
-        }.get(self)
+            FTPFileType.CSV.value: ".csv",
+        }.get(value)
 
 
 class FTPData(BaseModel):