solax-py-library 0.1.0.10__tar.gz → 0.1.0.12__tar.gz

{solax_py_library-0.1.0.10 → solax_py_library-0.1.0.12}/PKG-INFO

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

{solax_py_library-0.1.0.10 → solax_py_library-0.1.0.12}/pyproject.toml

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

{solax_py_library-0.1.0.10 → solax_py_library-0.1.0.12}/solax_py_library/upload/core/data_adapter/csv.py

@@ -11,13 +11,13 @@ class CSVDataAdapter(BaseDataAdapter):
         with tempfile.NamedTemporaryFile(
             delete=False, mode="w", newline="", encoding="utf8"
         ) as temp_file:
-
             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

{solax_py_library-0.1.0.10 → solax_py_library-0.1.0.12}/solax_py_library/upload/core/upload_service/ftp.py

@@ -60,7 +60,8 @@ class FTPUploadService(BaseUploadService):
         else:
             raise NotImplementedError
         return FTPParsedData(
-            file_name=upload_data.build_full_path(self.remote_path), data=parsed_data
+            file_name=upload_data.build_full_path(self.remote_path) + upload_data.file_type.get_file_suffix(),
+            data=parsed_data
         )
 
     def _upload(self, data: FTPParsedData):

{solax_py_library-0.1.0.10 → solax_py_library-0.1.0.12}/solax_py_library/upload/test/test_ftp.py

@@ -21,7 +21,7 @@ class FTPTest(unittest.TestCase):
                 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-0.1.0.10 → solax_py_library-0.1.0.12}/solax_py_library/upload/types/ftp.py

@@ -6,7 +6,12 @@ from pydantic import BaseModel
 
 
 class FTPFileType(str, Enum):
-    CSV = "csv"
+    CSV = "CSV"
+
+    def get_file_suffix(self):
+        return {
+            FTPFileType.CSV: ".csv",
+        }.get(self)
 
 
 class FTPData(BaseModel):