smartpush 1.1.6__py3-none-any.whl → 1.1.7__py3-none-any.whl

smartpush/export/basic/ExcelExportChecker.py

@@ -104,19 +104,22 @@ def check_excel_content_form_list(actual, expected):
     return check_excel_content(actual=actual, expected=expected)
 
 
-def check_excel_all(actual_oss, expected_oss):
+def check_excel_all(actual_oss, expected_oss,**kwargs):
     """
     校验所有内容
     """
-    file_type = check_and_get_file_suffix_name(expected_oss, actual_oss)
+    file_type = check_and_get_file_suffix_name(actual_oss, expected_oss)
     actual, expected = read_excel_from_oss(actual_oss), read_excel_from_oss(expected_oss)
     actual_data_copy = copy.deepcopy(actual)
     expected_data_copy = copy.deepcopy(expected)
-    flag1, content_result = check_excel_content_form_dict(actual, expected, type=file_type)
-    flag2, name_result = check_excel_name(actual_oss, expected_oss)
+
+    flag1, name_result = check_excel_name(actual_oss, expected_oss)
+    flag2, content_result = check_excel_content_form_dict(actual, expected, type=file_type, **kwargs)
     flag3, header_result = check_excel_header(actual_data_copy,expected_data_copy, type=file_type)
-    return all([flag1, flag2]), json.dumps({f"文件名称-{flag1}": name_result, f"导出内容-{flag2}": content_result,f"表头校验-{flag3}": header_result},
-                                           ensure_ascii=False)
+    print(json.dumps(
+        {f"文件名称-{flag1}": name_result, f"导出内容-{flag2}": content_result, f"表头校验-{flag3}": header_result},
+        ensure_ascii=False))
+    return all([flag1, flag2, flag3])
 
 
 def check_and_get_file_suffix_name(actual_oss, expected_oss) -> str:
@@ -225,32 +228,62 @@ def del_temp_file(file_name=""):
         print(f"删除文件 {file_path} 时出错：{e}")
 
 
-def compare_dicts(dict1, dict2):
+def compare_dicts(actual_dict, expected_dict):
     diff = {}
     # 找出只在 dict1 中存在的键
-    only_in_dict1 = set(dict1.keys()) - set(dict2.keys())
+    only_in_dict1 = set(actual_dict.keys()) - set(expected_dict.keys())
     if only_in_dict1:
-        diff['only_in_dict1'] = {key: dict1[key] for key in only_in_dict1}
+        diff['only_in_dict1'] = {key: actual_dict[key] for key in only_in_dict1}
     # 找出只在 dict2 中存在的键
-    only_in_dict2 = set(dict2.keys()) - set(dict1.keys())
+    only_in_dict2 = set(expected_dict.keys()) - set(actual_dict.keys())
     if only_in_dict2:
-        diff['only_in_dict2'] = {key: dict2[key] for key in only_in_dict2}
+        diff['only_in_dict2'] = {key: expected_dict[key] for key in only_in_dict2}
     # 处理两个字典都有的键
-    common_keys = set(dict1.keys()) & set(dict2.keys())
+    common_keys = set(actual_dict.keys()) & set(expected_dict.keys())
     for key in common_keys:
-        value1 = dict1[key]
-        value2 = dict2[key]
+        value1 = actual_dict[key]
+        value2 = expected_dict[key]
         if isinstance(value1, dict) and isinstance(value2, dict):
             # 如果值是字典，递归比较
             sub_diff = compare_dicts(value1, value2)
             if sub_diff:
-                diff[f'different_sub_dicts_at_{key}'] = sub_diff
+                diff[f'不同的字典_at_{key}'] = sub_diff
         elif isinstance(value1, list) and isinstance(value2, list):
-            # 如果值是列表，比较列表元素
-            if value1 != value2:
-                diff[f'different_lists_at_{key}'] = (value1, value2)
+            # 如果值是列表，递归比较列表元素
+            list_diff = compare_lists(value1, value2)
+            if list_diff:
+                diff[f'sheet【{key}】中存在差异'] = list_diff
         else:
             # 其他情况，直接比较值
             if value1 != value2:
-                diff[f'different_values_at_{key}'] = (value1, value2)
+                diff[f'不同的值_at_{key}'] = (value1, value2)
+    return diff
+
+
+def compare_lists(actual_dict_list, expected_dict_list):
+    diff = []
+    max_len = max(len(actual_dict_list), len(expected_dict_list))
+    for i in range(max_len):
+        if i >= len(actual_dict_list):
+            # list2 更长
+            diff.append(('只存在expected_dict_list的中', expected_dict_list[i]))
+        elif i >= len(expected_dict_list):
+            # list1 更长
+            diff.append(('只存在actual_dict_list中', actual_dict_list[i]))
+        else:
+            item1 = actual_dict_list[i]
+            item2 = expected_dict_list[i]
+            if isinstance(item1, dict) and isinstance(item2, dict):
+                # 如果元素是字典，递归比较
+                sub_diff = compare_dicts(item1, item2)
+                if sub_diff:
+                    diff.append(('列表索引中存在不同的字典', i, sub_diff))
+            elif isinstance(item1, list) and isinstance(item2, list):
+                # 如果元素是列表，递归比较
+                sub_list_diff = compare_lists(item1, item2)
+                if sub_list_diff:
+                    diff.append(('列表索引的存在不同的子列表', i, sub_list_diff))
+            else:
+                if item1 != item2:
+                    diff.append(('列表索引的不同值', i, (item1, item2)))
     return diff

smartpush/export/basic/GetOssUrl.py

@@ -26,7 +26,7 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kw
     :param requestHeader:
     :return: 带有重试配置的获取 OSS 地址的
     """
-    tries = kwargs.get('tries', 10)  # 重试次数
+    tries = kwargs.get('tries', 20)  # 重试次数
     delay = kwargs.get('delay', 2)
 
 
@@ -77,21 +77,3 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kw
         if isinstance(e, RetryError):
             cancel_export_file(target_id)
         return None
-
-
-if __name__ == '__main__':
-    url = "https://test.smartpushedm.com/api-em-ec2"
-    requestHeader = {
-        "cookie": "osudb_appid=SMARTPUSH;osudb_oar=#01#SID0000122BBLon+0gwvStide+qtdJAK57ZSK1ty+iW8b7tv/Uwl6Zo4gDfUg6B83n+jgqTVjoZ5qRGyRsuLaXc9woDN2WRh3mu1yn7anglBmaFoemhCy/ttS8nqv/y0kj8khbu6mtBmQrseNfnO/Mir8PQP+S;osudb_subappid=1;osudb_uid=4213785247;ecom_http_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDI1Mjk2NTQsImp0aSI6ImM2MTA4MGJkLTU4MGUtNDJiNi05NzU5LTU0ZTNmZDExZDA4OSIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjQ3IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmVhcHAuY29tIiwidXNlclJvbGUiOiJvd25lciIsInBsYXRmb3JtVHlwZSI6Nywic3ViUGxhdGZvcm0iOjEsInBob25lIjoiIiwibGFuZ3VhZ2UiOiJ6aC1oYW5zLWNuIiwiYXV0aFR5cGUiOiIiLCJhdHRyaWJ1dGVzIjp7ImNvdW50cnlDb2RlIjoiQ04iLCJjdXJyZW5jeSI6IkpQWSIsImN1cnJlbmN5U3ltYm9sIjoiSlDCpSIsImRvbWFpbiI6InNtYXJ0cHVzaDQubXlzaG9wbGluZXN0Zy5jb20iLCJsYW5ndWFnZSI6ImVuIiwibWVyY2hhbnRFbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmUuY29tIiwibWVyY2hhbnROYW1lIjoiU21hcnRQdXNoNF9lYzJf6Ieq5Yqo5YyW5bqX6ZO6IiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL01hY2FvIn0sInN0b3JlSWQiOiIxNjQ0Mzk1OTIwNDQ0IiwiaGFuZGxlIjoic21hcnRwdXNoNCIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTczOTkzNzY1NDc2Mywic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIl0sImNsaWVudF9pZCI6ImVtYWlsLW1hcmtldCJ9.X2Birt-jiWILAvEjjwknUchil2ys8Y11omeRYgZ3K0I;",
-        "Content-Type": "application/json"
-    }
-    requestParam = {
-        "page": 1,
-        "pageSize": 20,
-        "type": "EXPORT",
-        "status": None,
-        "startTime": 1740033265288,
-        "endTime": 1740044065288
-    }
-    id = "2334659"
-    get_oss_address_with_retry(2334659, url, requestHeader, requestParam)

smartpush/export/basic/ReadExcel.py

@@ -2,6 +2,7 @@ import io
 import os
 import re
 import warnings
+import zipfile
 from io import BytesIO
 import pandas as pd
 from requests import request
@@ -27,9 +28,9 @@ def read_excel_header(excel_data, **kwargs) -> list:
     1、读出excel的头列 list
     """
     try:
-        dfs = read_excel_csv_data(excel_data,**kwargs)
+        dfs = read_excel_csv_data(excel_data, **kwargs)
         result = []
-        if kwargs['type'] in excel_extensions:
+        if kwargs.get('type', None) in excel_extensions:
             for sheet_name, df in dfs.items():
                 result.append(df.keys().values.tolist())
         else:
@@ -43,9 +44,11 @@ def read_excel_header(excel_data, **kwargs) -> list:
 def read_excel_csv_data(excel_data, **kwargs):
     with warnings.catch_warnings():
         warnings.filterwarnings("ignore", category=UserWarning, module=re.escape('openpyxl.styles.stylesheet'))
-        if kwargs['type'] in excel_extensions:
-            dfs = pd.read_excel(excel_data, sheet_name=None, na_filter=False, engine="openpyxl") if isinstance(excel_data,
-                                                                                                      io.BytesIO) \
+        if kwargs.get('type', None) in excel_extensions:
+            dfs = pd.read_excel(excel_data, sheet_name=None, na_filter=False, engine='openpyxl',
+                                skiprows=kwargs.get('skiprows', None), header=kwargs.get('header', None)) if isinstance(
+                excel_data,
+                io.BytesIO) \
                 else excel_data
         else:
             dfs = pd.read_csv(excel_data, na_filter=False)
@@ -57,13 +60,14 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
     :param excel_data：excel的io对象, 参数和file_name互斥
     :file_name: excel文件名称，目前读取check_file目录下文件，参数和excel_data互斥
     """
+    dfs = None
     try:
         if excel_data is not None and file_name is not None:
             pass
         elif file_name is not None:
             excel_data = os.path.join(os.path.dirname(os.getcwd()) + "/check_file/" + file_name)
         dfs = read_excel_csv_data(excel_data, **kwargs)
-        if kwargs['type'] in excel_extensions:
+        if kwargs.get('type', None) in excel_extensions:
             # 将DataFrame转换为字典，以行为单位存储数据
             row_dict = {}  # 创建一个空字典来存储按行转换的数据
             for sheet_name, row in dfs.items():
@@ -71,6 +75,9 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
         else:
             row_dict = dfs.to_dict()
         return row_dict
+    except zipfile.BadZipFile:
+        print(f"文件读取错误，请检查文件是否为无效文件：{dfs}")
+        raise
     except Exception as e:
         print(f"excel写入dict时出错：{e}")
 

smartpush/test.py

@@ -1,22 +1,21 @@
 # -*- codeing = utf-8 -*-
 # @Time :2025/2/20 00:27
 # @Author :luzebin
-from smartpush.export.basic.ExcelExportChecker import check_excel_all,read_excel_and_write_to_list,read_excel_from_oss,read_excel_csv_data,check_excel
-from smartpush.export.basic.ReadExcel import read_excel_from_oss
-from smartpush.export.basic.ReadExcel import read_excel_and_write_to_dict
-from smartpush.export.basic.GetOssUrl import get_oss_address_with_retry
+from smartpush.export.basic.ExcelExportChecker import *
+from smartpush.export.basic.ReadExcel import *
 
 if __name__ == '__main__':
-    oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-19/4d98418295524ab1b52340c2ed2afa4a/AutoTest-%E5%9B%BA%E5%AE%9AB-2025-02-14%20%E5%88%9B%E5%BB%BA%E7%9A%84Email33%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
-    oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-19/ddbe9965d83840199e678a66dc414518/%E8%90%A5%E9%94%80%E4%BB%BB%E5%8A%A1%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
-    oss3 = "https://cdn.smartpushedm.com/material_ec2/2025-02-19/4d98418295524ab1b52340c2ed2afa4a/AutoTest-%E5%9B%BA%E5%AE%9AB-2025-02-14%20%E5%88%9B%E5%BB%BA%E7%9A%84Email33%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
-    # print(check_excel_all(oss1, oss1))
+    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(json.dumps(read_excel_and_write_to_dict(read_excel_csv_data(read_excel_from_oss(oss1))),ensure_ascii=False))
+
+    # print((oss1, oss1))
 
     # expected_oss ="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"
     # actual_oss = "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"
     # #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=oss1, expected_oss=oss3))
-    # read_excel_csv_data(type=)
+    # print(check_excel_all(actual_oss,expected_oss))
+    print(check_excel("all", actual_oss=oss1, expected_oss=oss2, skiprows=1))
+    print(check_excel_all(oss2, oss1, skiprows=1))

{smartpush-1.1.6.dist-info → smartpush-1.1.7.dist-info}/METADATA

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

smartpush-1.1.7.dist-info/RECORD

@@ -0,0 +1,14 @@
+smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
+smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
+smartpush/test.py,sha256=epaCOwDSLN1Z4tsGTGyo5SOUAdTzaaHfdxnDskXPZS0,1733
+smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
+smartpush/export/basic/ExcelExportChecker.py,sha256=YOHMbWGg0OcnpwX-cenkERxyQtEU_BG_MlfXV-yFSKA,12304
+smartpush/export/basic/GetOssUrl.py,sha256=UfY4q1m_aRfQLKN8vsA3mgY7khDi2xOomE5UvzipAAs,3008
+smartpush/export/basic/ReadExcel.py,sha256=55LUWiq1mk135uBKt_iBmrAEG01DTVEH4zMu_bfgE7M,5595
+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.7.dist-info/METADATA,sha256=bBANzyGNE_7isatlIgW8oI6zYw4_R0lMGiS7yFHBUqQ,145
+smartpush-1.1.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.1.7.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.1.7.dist-info/RECORD,,

{smartpush-1.1.6.dist-info → smartpush-1.1.7.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
 

smartpush-1.1.6.dist-info/RECORD

@@ -1,14 +0,0 @@
-smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
-smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
-smartpush/test.py,sha256=Pkk6y3snpYnJBT-O51LVujutuT2RSm-nGu-rtB1H-f4,2035
-smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=pG6yccw44AIynCOkh_Sv0svLwUMzInMwD-C01qfAtxs,10840
-smartpush/export/basic/GetOssUrl.py,sha256=IYt-C-SBY4WU_y8dm9aH3uKj1d7M7sSNtitDrz4EfHU,4932
-smartpush/export/basic/ReadExcel.py,sha256=rL1D29VIHhp2-CN79ROsbEdnnGWAjKNOe6SbPlO_5hA,5368
-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.6.dist-info/METADATA,sha256=6zoN_MFGdEjUOJFeG3644DSlCHgqO67QaKJN41rVBsc,145
-smartpush-1.1.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-smartpush-1.1.6.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.1.6.dist-info/RECORD,,