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

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

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

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

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

{solax_py_library-1.0.0.3 → solax_py_library-1.0.0.5}/solax_py_library/upload/api/service.py

@@ -16,9 +16,9 @@ def upload_service(upload_type: UploadType, configuration: Dict[str, Any]):
     return upload_class(**configuration)
 
 
-def upload(
+async def upload(
     upload_type: UploadType, configuration: Dict[str, Any], upload_data: UploadData
 ):
     service = upload_service(upload_type, configuration)
     with service as s:
-        s.upload(upload_data)
+        await s.upload(upload_data)

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

@@ -9,7 +9,7 @@ class CSVDataAdapter(BaseDataAdapter):
     @classmethod
     def parse_data(cls, data: Union[List[List[Any]], List[Dict[str, Any]]]):
         with tempfile.NamedTemporaryFile(
-            delete=False, mode="w", newline="", encoding="utf8"
+            delete=False, mode="w", newline="", encoding="utf-8-sig"
         ) as temp_file:
             if isinstance(data[0], list):
                 writer = csv.writer(temp_file)

{solax_py_library-1.0.0.3 → solax_py_library-1.0.0.5}/solax_py_library/upload/core/upload_service/base.py

@@ -14,7 +14,7 @@ class BaseUploadService(metaclass=ABCMeta):
     def connect(self):
         ...
 
-    def upload(self, data: UploadData):
+    async def upload(self, data: UploadData):
         upload_data = self._parse(data.build_data())
         return self._upload(upload_data)
 

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

@@ -2,7 +2,7 @@ import ftplib
 import os
 
 from .base import BaseUploadService
-from solax_py_library.upload.types.client import UploadType, UploadData
+from solax_py_library.upload.types.client import UploadType
 from solax_py_library.upload.core.data_adapter import CSVDataAdapter
 from solax_py_library.upload.types.ftp import (
     FTPServiceConfig,
@@ -60,8 +60,9 @@ class FTPUploadService(BaseUploadService):
         else:
             raise NotImplementedError
         return FTPParsedData(
-            file_name=upload_data.build_full_path(self.remote_path) + upload_data.file_type.get_file_suffix(),
-            file_path=parsed_data
+            file_name=upload_data.build_full_path(self.remote_path)
+            + upload_data.file_type.get_file_suffix(),
+            file_path=parsed_data,
         )
 
     def _upload(self, data: FTPParsedData):

{solax_py_library-1.0.0.3 → solax_py_library-1.0.0.5}/solax_py_library/upload/test/test_ftp.py

@@ -1,8 +1,9 @@
+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 FTPData, FTPFileType
+from solax_py_library.upload.types.ftp import FTPFileType
 
 
 class FTPTest(unittest.TestCase):
@@ -13,7 +14,7 @@ class FTPTest(unittest.TestCase):
             "password": "sly402",
             "remote_path": "/xixi",
         }
-        upload(
+        asyncio.run(upload(
             upload_type=UploadType.FTP,
             configuration=ftp_config,
             upload_data=UploadData(
@@ -21,7 +22,16 @@ class FTPTest(unittest.TestCase):
                 data=dict(
                     file_type=FTPFileType.CSV,
                     file_name="new_file.csv",
-                    data=[{'EMS1000序列号': 'XMG11A011L', 'EMS1000本地时间': '2025-02-11 15:39:10', 'EMS1000版本号': 'V007.11.1', '电站所在国家和地区': None, '电站所在当前时区': None, '电站系统类型': None}],
+                    data=[
+                        {
+                            "EMS1000序列号": "XMG11A011L",
+                            "EMS1000本地时间": "2025-02-11 15:39:10",
+                            "EMS1000版本号": "V007.11.1",
+                            "电站所在国家和地区": None,
+                            "电站所在当前时区": None,
+                            "电站系统类型": None,
+                        }
+                    ],
                 ),
             ),
-        )
+        ))

solax_py_library-1.0.0.3/solax_py_library/main.py

@@ -1,7 +0,0 @@
-import os.path
-import sys
-
-current_directory = os.path.dirname(os.path.abspath(__file__))
-parent_directory = os.path.abspath(os.path.join(current_directory, '..'))
-target_file_path = os.path.join(parent_directory, "dependency")
-sys.path.append(target_file_path)