smartpush 1.1.8__py3-none-any.whl → 1.2.0__py3-none-any.whl

smartpush/export/basic/ReadExcel.py

@@ -23,19 +23,22 @@ def read_excel_from_oss(url="", method="get"):
         print(f"读取oss报错 {url} 时出错：{e}")
 
 
-def read_excel_header(excel_data, return_type='list', **kwargs) -> list | dict:
+def read_excel_header(excel_data, return_type='list', **kwargs):
     """
     1、读出excel的头列 list
     """
     try:
         result = []
         result_dict = {}
-        skip_rows = kwargs.pop('skiprows', 0) - 1 if 'skiprows' in kwargs else 0
+        skip_rows, skip_flags = (kwargs.pop('skiprows'), True) if 'skiprows' in kwargs else (0, False)
         dfs = read_excel_csv_data(excel_data, **kwargs)
         if kwargs.get('type', None) in excel_extensions:
             for sheet_name, df in dfs.items():
-                # result.append(df.keys().values.tolist())
-                headers = df.iloc[skip_rows].tolist()
+                if skip_flags:
+                    # 因为单元格合并并且跳过存在动态参数，所以这里简单粗暴set去重
+                    headers = list(set(df.iloc[skip_rows - 1].tolist()))
+                else:
+                    headers = df.iloc[skip_rows].tolist()
                 result.append(headers)
                 result_dict[sheet_name] = headers
             if return_type == 'list':
@@ -84,12 +87,14 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
             for sheet_name, row in dfs.items():
                 row = row.to_dict(orient='records')
                 if kwargs.get("ignore_sort", False):
-                    sorted_data_asc = sorted(row[0:], key=lambda x: x[0], reverse=True)  # 内部排序
+                    sorted_data_asc = sorted(row[1:], key=lambda x: x[1], reverse=True)  # 内部排序
+                    sorted_data_asc = [row[0]]+sorted_data_asc
                     row_dict[sheet_name] = sorted_data_asc
                 else:
                     row_dict[sheet_name] = row
         else:
             row_dict = dfs.to_dict()
+        print(row_dict)
         return row_dict
     except zipfile.BadZipFile:
         print(f"文件读取错误，请检查文件是否为无效文件：{dfs}")

smartpush/test.py

@@ -13,15 +13,16 @@ if __name__ == '__main__':
     oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-20/ad9e1534b8134dd098e96813f17d4b4d/%E6%B5%8B%E8%AF%95flow%E6%95%B0%E6%8D%AE%E6%8A%A5%E5%91%8A%E5%AF%BC%E5%87%BA%E5%8B%BF%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
     oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-21/bbe660950493411d88b4a75ed0893ec8/%E6%B5%8B%E8%AF%95flow%E6%95%B0%E6%8D%AE%E6%8A%A5%E5%91%8A%E5%AF%BC%E5%87%BA%E5%8B%BF%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.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"
+    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"
     # # #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))
     # # print(res)
     # # 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(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=oss3, expected_oss=oss4,ignore_sort =True))
     # read_excel_csv_data(type=)
+

{smartpush-1.1.8.dist-info → smartpush-1.2.0.dist-info}/METADATA

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

{smartpush-1.1.8.dist-info → smartpush-1.2.0.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=34f8LgTj6bGO6LFukTo5yeiGq65sXReXGG7a9hgbACc,2668
+smartpush/test.py,sha256=3yHz44AZaalSQtxgsRlIDK5qFla8JiPp8sBgMfkVNJQ,2666
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=Ku-UoBKqTE7VwAWA644DNGUmXmXnnjmY6ifLV4rznUI,13593
 smartpush/export/basic/GetOssUrl.py,sha256=oCbPRGa5SqdPWzzeQ8sG10uZJByhrLAzUtwZi_IZgrg,3062
-smartpush/export/basic/ReadExcel.py,sha256=4UbM0MB--fQmjlBSTAALBlip0aFEyieo6zUlMqxUrcs,6334
+smartpush/export/basic/ReadExcel.py,sha256=MqhfJuqjz8PQYJgV4v26LtO1_5moFLn4dHeqfKXifjg,6609
 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.1.8.dist-info/METADATA,sha256=fm6qLk2nBEPnLwnqLkuy1ahF5WphfsYs2EQb48-9n5U,145
-smartpush-1.1.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.1.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.1.8.dist-info/RECORD,,
+smartpush-1.2.0.dist-info/METADATA,sha256=g00rcKwBscfVLpZkhczQ5WZVPCtsKqgGod4DLonOB3o,145
+smartpush-1.2.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.2.0.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.2.0.dist-info/RECORD,,