solax-py-library 1.0.0.8__tar.gz → 1.0.0.10__tar.gz

{solax_py_library-1.0.0.8 → solax_py_library-1.0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.8
+Version: 1.0.0.10
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com
@@ -40,7 +40,7 @@ This package provide some general modules to help us can focus on the real proje
 - upload: The module define the upload tool.It support the way by Ftp.
 
 
-#### quick start 
+#### quick start
 
 ```python
 await upload(
@@ -66,4 +66,3 @@ await upload(
 )
 ```
 
-

{solax_py_library-1.0.0.8 → solax_py_library-1.0.0.10}/README.md

@@ -22,7 +22,7 @@ This package provide some general modules to help us can focus on the real proje
 - upload: The module define the upload tool.It support the way by Ftp.
 
 
-#### quick start 
+#### quick start
 
 ```python
 await upload(
@@ -47,4 +47,3 @@ await upload(
     ),
 )
 ```
-

{solax_py_library-1.0.0.8 → solax_py_library-1.0.0.10}/pyproject.toml

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

{solax_py_library-1.0.0.8 → solax_py_library-1.0.0.10}/solax_py_library/upload/core/upload_service/ftp.py

@@ -24,6 +24,7 @@ class FTPUploadService(BaseUploadService):
         super().__init__(**kwargs)
         config = self._init_config(**kwargs)
         self.host = config.host
+        self.port = config.port
         self.user = config.user
         self.password = config.password
         self.remote_path = config.remote_path
@@ -40,6 +41,7 @@ class FTPUploadService(BaseUploadService):
             self.close()
         try:
             self._client = ftplib.FTP(self.host, timeout=self.timeout)
+            self._client.connect(self.host, self.port, timeout=self.timeout)
             self._client.login(self.user, self.password)
             print(f"Connected to {self.host}")
             self._is_connect = True
@@ -55,7 +57,7 @@ class FTPUploadService(BaseUploadService):
             print("Connection closed.")
 
     def _parse(self, upload_data: FTPData) -> FTPParsedData:
-        if upload_data.file_type == FTPFileType.CSV.value:
+        if upload_data.file_type == FTPFileType.CSV:
             parsed_data = CSVDataAdapter.parse_data(upload_data.data)
         else:
             raise NotImplementedError

solax_py_library-1.0.0.10/solax_py_library/upload/test/test_ftp.py

@@ -0,0 +1,40 @@
+import asyncio
+import unittest
+
+from solax_py_library.upload.api.service import upload
+from solax_py_library.upload.types.client import UploadType, UploadData
+from solax_py_library.upload.types.ftp import FTPFileType
+
+
+class FTPTest(unittest.TestCase):
+    def test_ftp_upload(self):
+        ftp_config = {
+            "host": "10.1.31.181",  # 测试host
+            "port": 21,
+            "user": "solax",
+            "password": "123456",
+            "remote_path": "/xixi",
+        }
+        asyncio.run(
+            upload(
+                upload_type=UploadType.FTP,
+                configuration=ftp_config,
+                upload_data=UploadData(
+                    upload_type=UploadType.FTP,
+                    data=dict(
+                        file_type=FTPFileType.CSV,
+                        file_name="new_file",
+                        data=[
+                            {
+                                "EMS1000序列号": "XMG11A011L",
+                                "EMS1000本地时间": "2025-02-11 15:39:10",
+                                "EMS1000版本号": "V007.11.1",
+                                "电站所在国家和地区": None,
+                                "电站所在当前时区": None,
+                                "电站系统类型": None,
+                            }
+                        ],
+                    ),
+                ),
+            )
+        )

{solax_py_library-1.0.0.8 → solax_py_library-1.0.0.10}/solax_py_library/upload/types/ftp.py

@@ -11,7 +11,7 @@ class FTPFileType(IntEnum):
     @classmethod
     def get_file_suffix(cls, value):
         return {
-            FTPFileType.CSV.value: ".csv",
+            FTPFileType.CSV: ".csv",
         }.get(value)
 
 
@@ -26,6 +26,7 @@ class FTPData(BaseModel):
 
 class FTPServiceConfig(BaseModel):
     host: str
+    port: int
     user: Optional[str]
     password: Optional[str]
     remote_path: str

solax_py_library-1.0.0.8/solax_py_library/upload/test/test_ftp.py

@@ -1,37 +0,0 @@
-import asyncio
-import unittest
-
-from solax_py_library.upload.api.service import upload
-from solax_py_library.upload.types.client import UploadType, UploadData
-from solax_py_library.upload.types.ftp import FTPFileType
-
-
-class FTPTest(unittest.TestCase):
-    def test_ftp_upload(self):
-        ftp_config = {
-            "host": "10.1.31.181",  # 测试host
-            "user": "solax",
-            "password": "sly402",
-            "remote_path": "/xixi",
-        }
-        asyncio.run(upload(
-            upload_type=UploadType.FTP,
-            configuration=ftp_config,
-            upload_data=UploadData(
-                upload_type=UploadType.FTP,
-                data=dict(
-                    file_type=FTPFileType.CSV,
-                    file_name="new_file",
-                    data=[
-                        {
-                            "EMS1000序列号": "XMG11A011L",
-                            "EMS1000本地时间": "2025-02-11 15:39:10",
-                            "EMS1000版本号": "V007.11.1",
-                            "电站所在国家和地区": None,
-                            "电站所在当前时区": None,
-                            "电站系统类型": None,
-                        }
-                    ],
-                ),
-            ),
-        ))