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

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

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

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

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

{solax_py_library-0.1.0.6 → solax_py_library-0.1.0.7}/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:
@@ -46,7 +55,7 @@ class FTPUploadService(BaseUploadService):
             print("Connection closed.")
 
     def _parse(self, upload_data: UploadData) -> FTPParsedData:
-        data: FTPData = upload_data.ftp_data
+        data: FTPData = upload_data.data
         if data.file_type == FTPFileType.CSV:
             parsed_data = CSVDataAdapter.parse_data(data.data)
         else:

{solax_py_library-0.1.0.6 → solax_py_library-0.1.0.7}/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