solax-py-library 0.1.0.7__py3-none-any.whl → 0.1.0.9__py3-none-any.whl

solax_py_library/upload/core/data_adapter/csv.py

@@ -1,17 +1,24 @@
 import csv
 import tempfile
+from typing import Any, Union, List, Dict
 
 from solax_py_library.upload.core.data_adapter.base import BaseDataAdapter
 
 
 class CSVDataAdapter(BaseDataAdapter):
     @classmethod
-    def parse_data(cls, data):
+    def parse_data(cls, data: Union[List[List[Any]], List[Dict[str, Any]]]):
         with tempfile.NamedTemporaryFile(
             delete=False, mode="w", newline="", encoding="utf8"
         ) as temp_file:
-            writer = csv.writer(temp_file)
-            writer.writerows(data)
+            if isinstance(data[0], list):
+                writer = csv.writer(temp_file)
+                writer.writerows(data)
+            else:
+                headers = list(data[0].keys())
+                writer = csv.DictWriter(temp_file, fieldnames=headers)
+                writer.writeheader()
+                writer.writerows(data)
 
             temp_file_path = temp_file.name
             temp_file.seek(0)

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

@@ -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/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,10 +17,11 @@ 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, "女"]],
+                    data=[{'EMS1000序列号': 'XMG11A011L', 'EMS1000本地时间': '2025-02-11 15:39:10', 'EMS1000版本号': 'V007.11.1', '电站所在国家和地区': None, '电站所在当前时区': None, '电站系统类型': None}],
                 ),
             ),
         )

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-0.1.0.7.dist-info → solax_py_library-0.1.0.9.dist-info}/METADATA

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

{solax_py_library-0.1.0.7.dist-info → solax_py_library-0.1.0.9.dist-info}/RECORD

@@ -5,18 +5,18 @@ solax_py_library/upload/api/service.py,sha256=RJ8oqIqsVA8d978UDGgNfxYTDJ44nWIfQB
 solax_py_library/upload/core/__init__.py,sha256=XMcnyDzCfsLwWaTAZt9-an7TuwYFqVNSt9W1_QRUrwA,89
 solax_py_library/upload/core/data_adapter/__init__.py,sha256=9CXepLZSOjZMfNjyYKAWQCWZt353kTL_0tFBlIeUIOo,116
 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/data_adapter/csv.py,sha256=2hAtDdU2ibzg6hRcZgZiRVI9JAOEhzGzXlDcWmDYvqI,868
 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=ll7Q-KmWQVFtM9XFyVDNoY32Szx5CvATHe-KKOtDUiw,2455
+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=geXAU1LM4IIkQHEJ5w2yBVNOo5YN-h6dipIWgv5ukdE,1038
 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/client.py,sha256=IE4tw2KFRmZABptmujB7SXG2-61cW7X7qN9b2IrBF3Y,505
 solax_py_library/upload/types/ftp.py,sha256=RTREbHwvGz6hrz_VUaw8Rx5utB4LQisytcsI2jGT6zc,533
-solax_py_library-0.1.0.7.dist-info/METADATA,sha256=hXXqrAI6oTOHqQcvRL1LWhcjKROx4zIbwdWCXdQJNVo,670
-solax_py_library-0.1.0.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-0.1.0.7.dist-info/RECORD,,
+solax_py_library-0.1.0.9.dist-info/METADATA,sha256=DrrCk80KrBA73sxFhZhro1k3X-rUlYFl7kAzeBilBww,670
+solax_py_library-0.1.0.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-0.1.0.9.dist-info/RECORD,,