solax-py-library 0.1.0.7__tar.gz → 0.1.0.8__tar.gz

{solax_py_library-0.1.0.7 → solax_py_library-0.1.0.8}/PKG-INFO

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

{solax_py_library-0.1.0.7 → solax_py_library-0.1.0.8}/pyproject.toml

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

{solax_py_library-0.1.0.7 → solax_py_library-0.1.0.8}/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.0.7 → solax_py_library-0.1.0.8}/solax_py_library/upload/core/upload_service/ftp.py

@@ -54,14 +54,13 @@ class FTPUploadService(BaseUploadService):
             self._is_connect = False
             print("Connection closed.")
 
-    def _parse(self, upload_data: UploadData) -> FTPParsedData:
-        data: FTPData = upload_data.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), data=parsed_data
         )
 
     def _upload(self, data: FTPParsedData):

{solax_py_library-0.1.0.7 → solax_py_library-0.1.0.8}/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,7 +17,8 @@ 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, "女"]],

{solax_py_library-0.1.0.7 → solax_py_library-0.1.0.8}/solax_py_library/upload/types/client.py

@@ -10,5 +10,10 @@ class UploadType(str, Enum):
 
 
 class UploadData(BaseModel):
-    data: Optional[Union[FTPData]]
+    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)