solax-py-library 1.0.0.21__tar.gz → 1.0.0.23__tar.gz

{solax_py_library-1.0.0.21 → solax_py_library-1.0.0.23}/PKG-INFO

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

{solax_py_library-1.0.0.21 → solax_py_library-1.0.0.23}/pyproject.toml

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

{solax_py_library-1.0.0.21 → solax_py_library-1.0.0.23}/solax_py_library/snap_shot/core/__init__.py

@@ -1,7 +1,9 @@
+from .base_modbus import ModbusClientBase
 from .snap_shot import SnapshotCore
 from .parser import Parser
 
 __all__ = [
+    "ModbusClientBase",
     "SnapshotCore",
     "Parser",
 ]

{solax_py_library-1.0.0.21 → solax_py_library-1.0.0.23}/solax_py_library/upload/core/upload_service/ftp.py

@@ -34,8 +34,7 @@ class FTPUploadService(BaseUploadService):
         try:
             return FTPServiceConfig(**kwargs)
         except Exception as e:
-            print(e)
-            raise ConfigurationError
+            raise ConfigurationError(message=str(e))
 
     def connect(self):
         if self._client is not None:
@@ -47,17 +46,16 @@ class FTPUploadService(BaseUploadService):
     def _connect(self):
         try:
             self._client = ftplib.FTP()
+            self._client.encoding = "utf8"  # 默认需要配置为utf8
             self._client.connect(self.host, self.port, timeout=self.timeout)
         except Exception as e:
-            print(e)
-            raise ConnectError
+            raise ConnectError(message=str(e))
 
     def _login(self):
         try:
             self._client.login(self.user, self.password)
         except Exception as e:
-            print(e)
-            raise LoginError
+            raise LoginError(message=str(e))
 
     def close(self):
         if self._client:
@@ -81,17 +79,24 @@ class FTPUploadService(BaseUploadService):
         try:
             if not self._is_connect:
                 raise ConnectError(message="not connect yet")
+            self._cwd_folder()
             with open(data.file_path, "rb") as f:
-                self._client.storbinary(
-                    f"STOR {self._build_remote_file(data.file_name)}", f
-                )
+                self._client.storbinary(f"STOR {data.file_name}", f)
             print(f"Successfully uploaded to {data.file_name}")
         except Exception as e:
-            print(e)
-            raise SendDataError
+            raise SendDataError(message=str(e))
         finally:
             if os.path.exists(data.file_path):
                 os.remove(data.file_path)
 
+    def _cwd_folder(self):
+        try:
+            self._client.cwd(self.remote_path)
+        except Exception as e:
+            print(f"CWD error: {e}")
+            self._client.mkd(self.remote_path)
+            self._client.cwd(self.remote_path)
+            print(f"mkdir {self.remote_path}, remove successfully")
+
     def _build_remote_file(self, file_name):
         return os.path.join(self.remote_path, file_name)

{solax_py_library-1.0.0.21 → solax_py_library-1.0.0.23}/solax_py_library/upload/test/test_ftp.py

@@ -48,13 +48,45 @@ class FTPTest(unittest.TestCase):
         except LoginError:
             ...
 
-    def test_ftp_upload(self):
+    def test_ftp_upload_to_windows(self):
         ftp_config = {
             "host": "10.1.31.181",  # 测试host
             "port": 21,
             "user": "solax",
             "password": "123456",
-            "remote_path": "/xixi",
+            "remote_path": "嘻嘻",
+        }
+        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="中文",
+                        data=[
+                            {
+                                "EMS1000序列号": "XMG11A011L",
+                                "EMS1000本地时间": "2025-02-11 15:39:10",
+                                "EMS1000版本号": "V007.11.1",
+                                "电站所在国家和地区": None,
+                                "电站所在当前时区": None,
+                                "电站系统类型": None,
+                            }
+                        ],
+                    ),
+                ),
+            )
+        )
+
+    def test_ftp_upload_to_linux(self):
+        ftp_config = {
+            "host": "920729yofx76.vicp.fun",  # 测试host
+            "port": 59477,
+            "user": "test",
+            "password": "test123456",
+            "remote_path": "test",
         }
         asyncio.run(
             upload(
@@ -64,7 +96,7 @@ class FTPTest(unittest.TestCase):
                     upload_type=UploadType.FTP,
                     data=dict(
                         file_type=FTPFileType.CSV,
-                        file_name="new_file",
+                        file_name="中文",
                         data=[
                             {
                                 "EMS1000序列号": "XMG11A011L",