solax-py-library 1.0.0.2__tar.gz → 1.0.0.3__tar.gz

{solax_py_library-1.0.0.2 → solax_py_library-1.0.0.3}/PKG-INFO

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

{solax_py_library-1.0.0.2 → solax_py_library-1.0.0.3}/pyproject.toml

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

{solax_py_library-1.0.0.2 → solax_py_library-1.0.0.3}/solax_py_library/upload/core/data_adapter/csv.py

@@ -23,4 +23,4 @@ class CSVDataAdapter(BaseDataAdapter):
             temp_file_path = temp_file.name
             temp_file.seek(0)
 
-        return open(temp_file_path, "rb")
+        return temp_file_path

{solax_py_library-1.0.0.2 → solax_py_library-1.0.0.3}/solax_py_library/upload/core/upload_service/ftp.py

@@ -61,20 +61,24 @@ class FTPUploadService(BaseUploadService):
             raise NotImplementedError
         return FTPParsedData(
             file_name=upload_data.build_full_path(self.remote_path) + upload_data.file_type.get_file_suffix(),
-            data=parsed_data
+            file_path=parsed_data
         )
 
     def _upload(self, data: FTPParsedData):
         try:
             if not self._is_connect:
                 raise ConnectError(message="not connect yet")
-            self._client.storbinary(
-                f"STOR {self._build_remote_file(data.file_name)}", data.data
-            )
+            with open(data.file_path, "rb") as f:
+                self._client.storbinary(
+                    f"STOR {self._build_remote_file(data.file_name)}", f
+                )
             print(f"Successfully uploaded to {data.file_name}")
         except Exception as e:
             print(e)
             raise SendDataError
+        finally:
+            if os.path.exists(data.file_path):
+                os.remove(data.file_path)
 
     def _build_remote_file(self, file_name):
         return os.path.join(self.remote_path, file_name)

{solax_py_library-1.0.0.2 → solax_py_library-1.0.0.3}/solax_py_library/upload/types/ftp.py

@@ -32,4 +32,4 @@ class FTPServiceConfig(BaseModel):
 
 class FTPParsedData(BaseModel):
     file_name: str
-    data: Any
+    file_path: str