solax-py-library 1.0.0.5__py3-none-any.whl → 1.0.0.7__py3-none-any.whl

solax_py_library/upload/core/upload_service/base.py

@@ -9,6 +9,7 @@ class BaseUploadService(metaclass=ABCMeta):
     def __init__(self, **kwargs) -> None:
         self._client = None
         self._is_connect = False
+        self.timeout = 5
 
     @abstractmethod
     def connect(self):

solax_py_library/upload/core/upload_service/ftp.py

@@ -18,7 +18,7 @@ from solax_py_library.upload.errors.upload_error import (
 
 
 class FTPUploadService(BaseUploadService):
-    upload_type = UploadType.FTP
+    upload_type = UploadType.FTP.value
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -39,7 +39,7 @@ class FTPUploadService(BaseUploadService):
         if self._client is not None:
             self.close()
         try:
-            self._client = ftplib.FTP(self.host)
+            self._client = ftplib.FTP(self.host, timeout=self.timeout)
             self._client.login(self.user, self.password)
             print(f"Connected to {self.host}")
             self._is_connect = True
@@ -55,13 +55,13 @@ class FTPUploadService(BaseUploadService):
             print("Connection closed.")
 
     def _parse(self, upload_data: FTPData) -> FTPParsedData:
-        if upload_data.file_type == FTPFileType.CSV:
+        if upload_data.file_type == FTPFileType.CSV.value:
             parsed_data = CSVDataAdapter.parse_data(upload_data.data)
         else:
             raise NotImplementedError
         return FTPParsedData(
             file_name=upload_data.build_full_path(self.remote_path)
-            + upload_data.file_type.get_file_suffix(),
+            + FTPFileType.get_file_suffix(upload_data.file_type),
             file_path=parsed_data,
         )
 

solax_py_library/upload/test/test_ftp.py

@@ -15,13 +15,13 @@ class FTPTest(unittest.TestCase):
             "remote_path": "/xixi",
         }
         asyncio.run(upload(
-            upload_type=UploadType.FTP,
+            upload_type=UploadType.FTP.value,
             configuration=ftp_config,
             upload_data=UploadData(
-                upload_type=UploadType.FTP,
+                upload_type=UploadType.FTP.value,
                 data=dict(
-                    file_type=FTPFileType.CSV,
-                    file_name="new_file.csv",
+                    file_type=FTPFileType.CSV.value,
+                    file_name="new_file",
                     data=[
                         {
                             "EMS1000序列号": "XMG11A011L",

solax_py_library/upload/types/client.py

@@ -1,19 +1,19 @@
-from enum import Enum
+from enum import IntEnum
 from pydantic import BaseModel
 from typing import Optional, Union
 
 from solax_py_library.upload.types.ftp import FTPData
 
 
-class UploadType(str, Enum):
-    FTP = "FTP"
+class UploadType(IntEnum):
+    FTP = 1
 
 
 class UploadData(BaseModel):
     data: Optional[Union[dict, FTPData]]
-    upload_type: Optional[UploadType]
+    upload_type: 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:
+        if self.upload_type == UploadType.FTP.value:
             return FTPData(**dict_obj_data)

solax_py_library/upload/types/ftp.py

@@ -1,17 +1,18 @@
 import os
-from enum import Enum
+from enum import IntEnum
 from typing import Any, Optional
 
 from pydantic import BaseModel
 
 
-class FTPFileType(str, Enum):
-    CSV = "CSV"
+class FTPFileType(IntEnum):
+    CSV = 1
 
-    def get_file_suffix(self):
+    @classmethod
+    def get_file_suffix(cls, value):
         return {
-            FTPFileType.CSV: ".csv",
-        }.get(self)
+            FTPFileType.CSV.value: ".csv",
+        }.get(value)
 
 
 class FTPData(BaseModel):

solax_py_library-1.0.0.7.dist-info/METADATA

@@ -0,0 +1,69 @@
+Metadata-Version: 2.1
+Name: solax-py-library
+Version: 1.0.0.7
+Summary: some common tool
+Author: shenlvyu
+Author-email: 13296718439@163.com
+Requires-Python: >=3.8,<4.0
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: pydantic (>=1.10.0,<2.0.0)
+Requires-Dist: typing-extensions (==4.7.1)
+Description-Content-Type: text/markdown
+
+### solax common module
+
+#### install
+
+```shell
+pip install solax_py_library
+```
+
+#### struction
+
+module:
+- api: provide the api
+- core: core code
+- errors: define errors
+- test: unit tests
+- types: modle define
+
+#### module
+
+This package provide some general modules to help us can focus on the real project coding.It`s our own package,we can add more and more general modules.
+
+- upload: The module define the upload tool.It support the way by Ftp.
+
+
+#### quick start 
+
+```python
+await 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.csv",
+            data=[
+                {
+                    "EMS1000序列号": "XMG11A011L",
+                    "EMS1000本地时间": "2025-02-11 15:39:10",
+                    "EMS1000版本号": "V007.11.1",
+                    "电站所在国家和地区": None,
+                    "电站所在当前时区": None,
+                    "电站系统类型": None,
+                }
+            ],
+        ),
+    ),
+)
+```
+
+

{solax_py_library-1.0.0.5.dist-info → solax_py_library-1.0.0.7.dist-info}/RECORD

@@ -7,16 +7,16 @@ solax_py_library/upload/core/data_adapter/__init__.py,sha256=9CXepLZSOjZMfNjyYKA
 solax_py_library/upload/core/data_adapter/base.py,sha256=Va-SEe0eL3gobhNOnzHGkYBLIwf5RVawQdYRHHXg9g0,170
 solax_py_library/upload/core/data_adapter/csv.py,sha256=8nlnV_43mMAR3re50MQJymzT5HYpZOo7eSeMsEfnEVE,861
 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=Mi1KFKy80-ssyJ1x3kgDxOeTpSM26cZI7YSW5UrAzs4,887
-solax_py_library/upload/core/upload_service/ftp.py,sha256=uQda33G-Pyz80qUzCUSYrLSDD1Swod2FxsRM_dbufFE,2652
+solax_py_library/upload/core/upload_service/base.py,sha256=dxCBVtPxDhN7oRTjnwnjtc2XAF4hyIz9HsYCJePlggg,912
+solax_py_library/upload/core/upload_service/ftp.py,sha256=7asBEbe3eckl7kJsq8WvLUiY70SXRTMz9-Mnp9VtJ9Y,2697
 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=lCuPgi1VOW_JTq9m7tlyxhR64x4oE0F1y0Dlv9lmz0I,1298
+solax_py_library/upload/test/test_ftp.py,sha256=axcdPOm3oEDlHOBI1pFWn_Dyh1aWmbhKPlRUaA7d-ew,1312
 solax_py_library/upload/types/__init__.py,sha256=og9KBpYbcs36_S1izURj3vyHeuNOLJQrD9GpxK_JJaw,244
-solax_py_library/upload/types/client.py,sha256=IE4tw2KFRmZABptmujB7SXG2-61cW7X7qN9b2IrBF3Y,505
-solax_py_library/upload/types/ftp.py,sha256=APxneZ9m1OwImr3xZWnNkhxlh5Wy5rNCdegcVuOLyEM,644
-solax_py_library-1.0.0.5.dist-info/METADATA,sha256=W7YlNm0vaLcbnADeW6HGCj82hTCQ4GelDoQNs9tYWgU,670
-solax_py_library-1.0.0.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-solax_py_library-1.0.0.5.dist-info/RECORD,,
+solax_py_library/upload/types/client.py,sha256=3XFsOkglGj9exLkLgav1I8ITt92gzhQMC8oiqXXdwzE,498
+solax_py_library/upload/types/ftp.py,sha256=nOloYA_OHoGma1yg5ENWHzfIWK2hoBEwyoyJ72yRZjY,671
+solax_py_library-1.0.0.7.dist-info/METADATA,sha256=E3tQDChk9sYQ2p3AkXLQsI45MvLIZlqjUMKynB96aVs,1791
+solax_py_library-1.0.0.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+solax_py_library-1.0.0.7.dist-info/RECORD,,

solax_py_library-1.0.0.5.dist-info/METADATA

@@ -1,20 +0,0 @@
-Metadata-Version: 2.1
-Name: solax-py-library
-Version: 1.0.0.5
-Summary: some common tool
-Author: shenlvyu
-Author-email: 13296718439@163.com
-Requires-Python: >=3.8,<4.0
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: pydantic (>=1.10.0,<2.0.0)
-Requires-Dist: typing-extensions (==4.7.1)
-Description-Content-Type: text/markdown
-
-### solax common module
-