solax-py-library 0.1.0.6__py3-none-any.whl → 0.1.0.8__py3-none-any.whl

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/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,13 @@ 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), data=parsed_data
         )
 
     def _upload(self, data: FTPParsedData):

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/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)

solax_py_library/upload/types/ftp.py

@@ -2,7 +2,7 @@ import os
 from enum import Enum
 from typing import Any, Optional
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 
 
 class FTPFileType(str, Enum):
@@ -20,7 +20,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.0.6.dist-info → solax_py_library-0.1.0.8.dist-info}/METADATA

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

{solax_py_library-0.1.0.6.dist-info → solax_py_library-0.1.0.8.dist-info}/RECORD

@@ -7,16 +7,16 @@ solax_py_library/upload/core/data_adapter/__init__.py,sha256=9CXepLZSOjZMfNjyYKA
 solax_py_library/upload/core/data_adapter/base.py,sha256=Va-SEe0eL3gobhNOnzHGkYBLIwf5RVawQdYRHHXg9g0,170
 solax_py_library/upload/core/data_adapter/csv.py,sha256=LR-45i1Guihrm_eN2Li9kNoutTAsiPeWQNTUz2HJmok,518
 solax_py_library/upload/core/upload_service/__init__.py,sha256=uA-UeH31rDNxByeZwvPhNFHPV_-J8JyCev8geuc---k,269
-solax_py_library/upload/core/upload_service/base.py,sha256=T6h0ws_bCVRL2AeIXmDpbfPWZzJnUGh5gJKTZoF1CSw,856
-solax_py_library/upload/core/upload_service/ftp.py,sha256=Stbqd5SBB0-khAOymTz8w_69IkgGCS4eiowxAfLoaf8,2433
+solax_py_library/upload/core/upload_service/base.py,sha256=vl6QTxcx-QVFv0J1VN7HSgh4opouKfTpmJDkwQYzLVU,881
+solax_py_library/upload/core/upload_service/ftp.py,sha256=EyqaCn6b24rOKDbf-DqZQirq5JuDaVuApsb48RADsfk,2432
 solax_py_library/upload/errors/__init__.py,sha256=pVAcSOXvlsPJW3PjHLBOdbl7KvntiYmz7TP0XuRwZ_A,243
 solax_py_library/upload/errors/base.py,sha256=T01ZrZHF25PWgCrOv76Vhg26hds3I1Yy8Kl2LZRKOxo,258
 solax_py_library/upload/errors/upload_error.py,sha256=9pCZzR_y3-VkBWSs5w7mMHYFRJjzVosIcxi-5SO8N1U,409
 solax_py_library/upload/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solax_py_library/upload/test/test_ftp.py,sha256=mJcYdroFLpI82t2-8IVGXNYGWB9TVJK723uaQFcTFr4,856
+solax_py_library/upload/test/test_ftp.py,sha256=a3-jNQVjkoo_gh45yvnicGitIeJX6pco5MiEsDQqr-Q,889
 solax_py_library/upload/types/__init__.py,sha256=og9KBpYbcs36_S1izURj3vyHeuNOLJQrD9GpxK_JJaw,244
-solax_py_library/upload/types/client.py,sha256=PEUG7pulvwEb6NS6yiu5yYHowNI8UrUDygawfAkPIlo,294
-solax_py_library/upload/types/ftp.py,sha256=JN2KD2WPZGvPXh30p15rLY9AUzeWUXkeSIdb4CesdAw,544
-solax_py_library-0.1.0.6.dist-info/METADATA,sha256=zg5vGI7s2GvmQqJ4BYlfpOE3PoBC0pf5RPyUIzA6bZE,670
-solax_py_library-0.1.0.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-0.1.0.6.dist-info/RECORD,,
+solax_py_library/upload/types/client.py,sha256=IE4tw2KFRmZABptmujB7SXG2-61cW7X7qN9b2IrBF3Y,505
+solax_py_library/upload/types/ftp.py,sha256=RTREbHwvGz6hrz_VUaw8Rx5utB4LQisytcsI2jGT6zc,533
+solax_py_library-0.1.0.8.dist-info/METADATA,sha256=gsU0pqfIGRpQG_33PXXDH-6B3UCKCaydmRL8VX-2bPE,670
+solax_py_library-0.1.0.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-0.1.0.8.dist-info/RECORD,,