smartpush 1.2.5__py3-none-any.whl → 1.2.6__py3-none-any.whl

smartpush/export/basic/ReadExcel.py

@@ -1,5 +1,6 @@
 import csv
 import io
+import json
 import os
 import re
 import warnings
@@ -94,8 +95,9 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
             row_dict = {}  # 创建一个空字典来存储按行转换的数据
             for sheet_name, row in dfs.items():
                 row = row.to_dict(orient='records')
-                if kwargs.get("ignore_sort", False):
-                    sorted_data_asc = sorted(row[1:], key=lambda x: x[1], reverse=True)  # 内部排序
+                if kwargs.get("ignore_sort") is not None:
+                    sorted_data_asc = sorted(row[1:], key=lambda x: x.get(kwargs.get("ignore_sort"), 0),
+                                             reverse=True)  # 内部排序
                     sorted_data_asc = [row[0]] + sorted_data_asc
                     row_dict[sheet_name] = sorted_data_asc
                 else:

smartpush/test.py

@@ -10,16 +10,16 @@ from smartpush.export.basic.ReadExcel import read_excel_and_write_to_dict
 from smartpush.export.basic.GetOssUrl import get_oss_address_with_retry
 
 if __name__ == '__main__':
-    oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-03-03/3a4003ba99ca44d2941da5856943af4b/%E8%A1%A8%E5%8D%95%E4%BB%BB%E5%8A%A1%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
-    oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-10/f58e33a896d141d9bcd52d6836f398b9/%E8%A1%A8%E5%8D%95%E4%BB%BB%E5%8A%A1%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
+    oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.xlsx"
+    oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/a5e18e3b3a83432daca871953cb8471b/【自动化导出】营销活动URL点击与热图.xlsx"
     # # print(check_excel_all(oss1, oss1))
-    # oss3 = "https://cdn.smartpushedm.com/material_ec2/2025-02-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.xlsx"
-    # oss4 = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/58cee630b4c84eec9572b867af4ce692/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8URL%E7%82%B9%E5%87%BB%E4%B8%8E%E7%83%AD%E5%9B%BE.xlsx"
-    # expected_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
-    # actual_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
+    oss3 = "https://cdn.smartpushedm.com/material_ec2/2025-02-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.xlsx"
+    oss4 = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/58cee630b4c84eec9572b867af4ce692/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8URL%E7%82%B9%E5%87%BB%E4%B8%8E%E7%83%AD%E5%9B%BE.xlsx"
+    expected_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
+    actual_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
 
-    # e_person_oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/b48f34b3e88045d189631ec1f0f23d51/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
-    # a_person_oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/c50519d803c04e3b9b52d9f625fed413/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
+    e_person_oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/b48f34b3e88045d189631ec1f0f23d51/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
+    a_person_oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/c50519d803c04e3b9b52d9f625fed413/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
 
     # # #actual_oss= get_oss_address_with_retry("23161","https://cdn.smartpushedm.com/material_ec2_prod/2025-02-20/dae941ec20964ca5b106407858676f89/%E7%BE%A4%E7%BB%84%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx","",'{"page":1,"pageSize":10,"type":null,"status":null,"startTime":null,"endTime":null}')
     # # res=read_excel_and_write_to_dict(read_excel_from_oss(actual_oss))
@@ -27,7 +27,7 @@ if __name__ == '__main__':
     # # print(read_excel_and_write_to_dict(read_excel_from_oss(oss1), type=".xlsx"))
     # print(check_excel(check_type="all", actual_oss=actual_oss, expected_oss=expected_oss))
     # print(check_excel_all(actual_oss=oss1, expected_oss=oss2,skiprows =1))
-    # print(check_excel_all(actual_oss=oss1, expected_oss=oss2,ignore_sort=True))
+    print(check_excel_all(actual_oss=oss1, expected_oss=oss2, ignore_sort=0))
     # print(check_excel_all(actual_oss=a_person_oss2, expected_oss=e_person_oss1, check_type="including"))
-    print(check_excel_all(actual_oss=oss1, expected_oss=oss2, ignore_sort=True))
+    # print(check_excel_all(actual_oss=e_person_oss1, expected_oss=a_person_oss2, check_type="person"))
     # read_excel_csv_data(type=)

{smartpush-1.2.5.dist-info → smartpush-1.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.2.5
+Version: 1.2.6
 Summary: 用于smartpush自动化测试工具包
 Author: 卢泽彬、邵宇飞、周彦龙
 

{smartpush-1.2.5.dist-info → smartpush-1.2.6.dist-info}/RECORD

@@ -1,14 +1,14 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
-smartpush/test.py,sha256=4xDDCmCUsLQd30TG9Qxo9pb7TmYzX2VoZ0M7P9wxkvc,3087
+smartpush/test.py,sha256=ByqTF3rwjS5fHFhT_o5PGo-5WIzytxfIhIA7Cpih-eU,3052
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=BsThRl0rGlGxNQZP8rzgqCwlkdFu7JM5lMy7ypE-kFs,14553
 smartpush/export/basic/GetOssUrl.py,sha256=zlExF_jy_TRV5lp0fws8Wed5MF_byp7JAEmvARVqlIg,3263
-smartpush/export/basic/ReadExcel.py,sha256=HI6w1O7dgQRdtybGmIyG8rodNqI64kFJOOv73VrrCrg,7077
+smartpush/export/basic/ReadExcel.py,sha256=f5u8YXwXQ6W1Up3AIzSLwrv6yJE7HaWa6BaqGWcSC_I,7170
 smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
 smartpush/utils/StringUtils.py,sha256=NXomJ4qmyBRAFnGj5hrFRWwQnRQMTcPzy20fk1dunSw,3980
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush-1.2.5.dist-info/METADATA,sha256=IMBUqz5rtAufUD9JY1j1gqFtgpULoX80jsQGmbIBfBs,145
-smartpush-1.2.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-smartpush-1.2.5.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.2.5.dist-info/RECORD,,
+smartpush-1.2.6.dist-info/METADATA,sha256=P1YSwgGV5QA6lXMH_AXexoEaMFbmsmUtGCGR9-cWwPQ,145
+smartpush-1.2.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.2.6.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.2.6.dist-info/RECORD,,

{smartpush-1.2.5.dist-info → smartpush-1.2.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any