solax-py-library 0.1.0.10__py3-none-any.whl → 0.1.0.12__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. solax_py_library/upload/core/data_adapter/csv.py +1 -1
  2. solax_py_library/upload/core/upload_service/ftp.py +2 -1
  3. solax_py_library/upload/test/test_ftp.py +1 -1
  4. solax_py_library/upload/types/ftp.py +6 -1
  5. {solax_py_library-0.1.0.10.dist-info → solax_py_library-0.1.0.12.dist-info}/METADATA +1 -1
  6. {solax_py_library-0.1.0.10.dist-info → solax_py_library-0.1.0.12.dist-info}/RECORD +7 -7
  7. {solax_py_library-0.1.0.10.dist-info → solax_py_library-0.1.0.12.dist-info}/WHEEL +0 -0
solax_py_library/upload/core/data_adapter/csv.py CHANGED
@@ -11,13 +11,13 @@ class CSVDataAdapter(BaseDataAdapter):
11
11
  with tempfile.NamedTemporaryFile(
12
12
  delete=False, mode="w", newline="", encoding="utf8"
13
13
  ) as temp_file:
14
-
15
14
  if isinstance(data[0], list):
16
15
  writer = csv.writer(temp_file)
17
16
  writer.writerows(data)
18
17
  else:
19
18
  headers = list(data[0].keys())
20
19
  writer = csv.DictWriter(temp_file, fieldnames=headers)
20
+ writer.writeheader()
21
21
  writer.writerows(data)
22
22
 
23
23
  temp_file_path = temp_file.name
solax_py_library/upload/core/upload_service/ftp.py CHANGED
@@ -60,7 +60,8 @@ class FTPUploadService(BaseUploadService):
60
60
  else:
61
61
  raise NotImplementedError
62
62
  return FTPParsedData(
63
- file_name=upload_data.build_full_path(self.remote_path), data=parsed_data
63
+ file_name=upload_data.build_full_path(self.remote_path) + upload_data.file_type.get_file_suffix(),
64
+ data=parsed_data
64
65
  )
65
66
 
66
67
  def _upload(self, data: FTPParsedData):
solax_py_library/upload/test/test_ftp.py CHANGED
@@ -21,7 +21,7 @@ class FTPTest(unittest.TestCase):
21
21
  data=dict(
22
22
  file_type=FTPFileType.CSV,
23
23
  file_name="new_file.csv",
24
- data=[["curry", 37, "男"], ["james", 40, "男"], ["lily", 16, "女"]],
24
+ data=[{'EMS1000序列号': 'XMG11A011L', 'EMS1000本地时间': '2025-02-11 15:39:10', 'EMS1000版本号': 'V007.11.1', '电站所在国家和地区': None, '电站所在当前时区': None, '电站系统类型': None}],
25
25
  ),
26
26
  ),
27
27
  )
solax_py_library/upload/types/ftp.py CHANGED
@@ -6,7 +6,12 @@ from pydantic import BaseModel
6
6
 
7
7
 
8
8
  class FTPFileType(str, Enum):
9
- CSV = "csv"
9
+ CSV = "CSV"
10
+
11
+ def get_file_suffix(self):
12
+ return {
13
+ FTPFileType.CSV: ".csv",
14
+ }.get(self)
10
15
 
11
16
 
12
17
  class FTPData(BaseModel):
{solax_py_library-0.1.0.10.dist-info → solax_py_library-0.1.0.12.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: solax-py-library
3
- Version: 0.1.0.10
3
+ Version: 0.1.0.12
4
4
  Summary: some common tool
5
5
  Author: shenlvyu
6
6
  Author-email: 13296718439@163.com
{solax_py_library-0.1.0.10.dist-info → solax_py_library-0.1.0.12.dist-info}/RECORD RENAMED
@@ -5,18 +5,18 @@ solax_py_library/upload/api/service.py,sha256=RJ8oqIqsVA8d978UDGgNfxYTDJ44nWIfQB
5
5
  solax_py_library/upload/core/__init__.py,sha256=XMcnyDzCfsLwWaTAZt9-an7TuwYFqVNSt9W1_QRUrwA,89
6
6
  solax_py_library/upload/core/data_adapter/__init__.py,sha256=9CXepLZSOjZMfNjyYKAWQCWZt353kTL_0tFBlIeUIOo,116
7
7
  solax_py_library/upload/core/data_adapter/base.py,sha256=Va-SEe0eL3gobhNOnzHGkYBLIwf5RVawQdYRHHXg9g0,170
8
- solax_py_library/upload/core/data_adapter/csv.py,sha256=G6RFXTzJX42mwZ86RpCp_PWmJRfnmNE7ulId0eIAq1s,832
8
+ solax_py_library/upload/core/data_adapter/csv.py,sha256=2hAtDdU2ibzg6hRcZgZiRVI9JAOEhzGzXlDcWmDYvqI,868
9
9
  solax_py_library/upload/core/upload_service/__init__.py,sha256=uA-UeH31rDNxByeZwvPhNFHPV_-J8JyCev8geuc---k,269
10
10
  solax_py_library/upload/core/upload_service/base.py,sha256=vl6QTxcx-QVFv0J1VN7HSgh4opouKfTpmJDkwQYzLVU,881
11
- solax_py_library/upload/core/upload_service/ftp.py,sha256=EyqaCn6b24rOKDbf-DqZQirq5JuDaVuApsb48RADsfk,2432
11
+ solax_py_library/upload/core/upload_service/ftp.py,sha256=O566dyVKTLrXVJq6KLXAnxn2Tk3YB6IxLqzm3nV45QU,2486
12
12
  solax_py_library/upload/errors/__init__.py,sha256=pVAcSOXvlsPJW3PjHLBOdbl7KvntiYmz7TP0XuRwZ_A,243
13
13
  solax_py_library/upload/errors/base.py,sha256=T01ZrZHF25PWgCrOv76Vhg26hds3I1Yy8Kl2LZRKOxo,258
14
14
  solax_py_library/upload/errors/upload_error.py,sha256=9pCZzR_y3-VkBWSs5w7mMHYFRJjzVosIcxi-5SO8N1U,409
15
15
  solax_py_library/upload/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
16
- solax_py_library/upload/test/test_ftp.py,sha256=a3-jNQVjkoo_gh45yvnicGitIeJX6pco5MiEsDQqr-Q,889
16
+ solax_py_library/upload/test/test_ftp.py,sha256=geXAU1LM4IIkQHEJ5w2yBVNOo5YN-h6dipIWgv5ukdE,1038
17
17
  solax_py_library/upload/types/__init__.py,sha256=og9KBpYbcs36_S1izURj3vyHeuNOLJQrD9GpxK_JJaw,244
18
18
  solax_py_library/upload/types/client.py,sha256=IE4tw2KFRmZABptmujB7SXG2-61cW7X7qN9b2IrBF3Y,505
19
- solax_py_library/upload/types/ftp.py,sha256=RTREbHwvGz6hrz_VUaw8Rx5utB4LQisytcsI2jGT6zc,533
20
- solax_py_library-0.1.0.10.dist-info/METADATA,sha256=aj92DxpdIPJ_J7ijc3VE5IzsKtIZjha1Bmh_Ia7thp8,671
21
- solax_py_library-0.1.0.10.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
22
- solax_py_library-0.1.0.10.dist-info/RECORD,,
19
+ solax_py_library/upload/types/ftp.py,sha256=vHStILTntRAKrpRofnuEaNIvoDcmWnObU-5PSJaZQ58,639
20
+ solax_py_library-0.1.0.12.dist-info/METADATA,sha256=mGD6Hco4KelZXJsN5Fu2G9_goAtAiBhpxXAvfmy7bY4,671
21
+ solax_py_library-0.1.0.12.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
22
+ solax_py_library-0.1.0.12.dist-info/RECORD,,