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

smartpush/export/basic/ExcelExportChecker.py

@@ -20,6 +20,8 @@ def check_excel(check_type="content", **kwargs):
             all: 对比所有内容
     """
     try:
+        if "type" not in kwargs.keys():
+            kwargs["type"] = ".xlsx"
         if check_type == "content":
             if "actual" in kwargs.keys() and "expected" in kwargs.keys():
                 return check_excel_content(actual=kwargs["actual"], expected=kwargs["expected"])
@@ -39,8 +41,7 @@ def check_excel(check_type="content", **kwargs):
                                                             **kwargs)
             flag1, content_result = check_excel_content(actual=actual_content, expected=expected_content)
             flag2, name_result = check_excel_name(actual_oss=kwargs["actual_oss"], expected_oss=kwargs["expected_oss"])
-            flag3, header_result = check_excel_header(actual=actual_content, expected=expected_content, **kwargs)
-            return all([flag1, flag2, flag3]), {"文件名称": name_result, "导出内容": content_result, "表头比较:": header_result}
+            return all([flag1, flag2]), {"文件名称": name_result, "导出内容和表头": content_result}
         else:
             return False, f"不支持此类型: {check_type}"
     except Exception as e:
@@ -157,33 +158,29 @@ def check_excel_content(actual, expected):
      """
     try:
         if actual == expected:
-            return True, ["excel内容-完全匹配"]
+            return True, ["excel内容和表头-完全匹配"]
         else:
             errors = []
-            # 断言1：校验行数
-            actual_num = len(actual)
-            expected_num = len(expected)
-            check_row = actual_num - expected_num
-            if check_row == 0:
-                errors.append("excel内容-预期和实际行数相等，为" + str(actual_num) + "行")
-            else:
-                errors.append(
-                    "excel内容-行数和预期对比差" + check_row.__str__() + "行" + ", 实际:" + str(
-                        actual_num) + "预期: " + str(
-                        expected_num))
-            # 断言不匹配行
-            if check_row >= 0:
-                num = len(expected)
-            else:
-                num = len(actual)
+            # 断言1：对比sheet数
+            errors = []
+            actual_num, expected_num = len(actual), len(expected)
+            errors.append("预期和实际sheet数相等，为" + str(
+                actual_num) + "个" if actual_num - expected_num == 0 else "sheet数和预期对比差" + str(
+                actual_num - expected_num) + "个" + ", 实际:" + str(actual_num) + " 预期: " + str(expected_num))
+            # 断言2：对比具体行
             if isinstance(actual, list) and isinstance(expected, list):
-                for i in range(num):
+                # 第一层提取sheet
+                for i in range(min(len(expected), len(actual))):
                     if actual[i] == expected[i]:
                         continue
                     else:
-                        errors.append(
-                            "excel内容-第" + str(i + 1) + "行不匹配，预期为：" + str(expected[i]) + ", 实际为: " + str(
-                                actual[i]))
+                        for row in range(min(len(expected[i]), len(actual[i]))):
+                            if actual[i][row] == expected[i][row]:
+                                continue
+                            else:
+                                errors.append(
+                                    f"第{i+1}个sheet的内容-第" + str(i + 1) + "行不匹配，预期为：" + str(expected[i]) + ", 实际为: " + str(
+                                        actual[i]))
                 return False, errors
             else:
                 return False, compare_dicts(actual, expected)

smartpush/export/basic/GetOssUrl.py

@@ -2,8 +2,7 @@
 import json
 
 import requests
-import tenacity
-from tenacity import retry, stop_after_attempt, wait_fixed
+from tenacity import retry, stop_after_attempt, wait_fixed,RetryError
 
 from smartpush.utils.StringUtils import StringUtils
 
@@ -75,7 +74,7 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kw
         return get_oss_address()
     except Exception as e:
         # print(f"最终失败，错误信息: {e}")
-        if isinstance(e, tenacity.RetryError):
+        if isinstance(e, RetryError):
             cancel_export_file(target_id)
         return None
 

smartpush/export/basic/ReadExcel.py

@@ -44,7 +44,7 @@ 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) if isinstance(excel_data,
+            dfs = pd.read_excel(excel_data, sheet_name=None, na_filter=False, engine="openpyxl") if isinstance(excel_data,
                                                                                                       io.BytesIO) \
                 else excel_data
         else:
@@ -87,11 +87,17 @@ def read_excel_and_write_to_list(excel_data=None, sheet_name=None, file_name=Non
             excel_data = os.path.join(os.path.dirname(os.getcwd()) + "/check_file/" + file_name)
         dfs = read_excel_csv_data(excel_data, **kwargs)
         rows_list = []
+        excel_header = read_excel_header(dfs, **kwargs)
+        index = 0
         # 多sheet处理
         for name, df in dfs.items():
-            rows_list.append(df.values.tolist())
+            row_list = df.values.tolist()
+            row_list.insert(0, excel_header[index])
+            rows_list.append(row_list)
+            index += 1
         if len(dfs) <= 1:
             rows_list = rows_list[0]
+        # 插入表头
         return rows_list
     except Exception as e:
         print(f"excel写入list时出错：{e}")

smartpush/test.py

@@ -1,19 +1,22 @@
 # -*- codeing = utf-8 -*-
 # @Time :2025/2/20 00:27
 # @Author :luzebin
-from smartpush.export.basic.ExcelExportChecker import check_excel_all
+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
 
 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"
-    print(check_excel_all(oss1, oss1))
+    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))
 
     # 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(check_excel_all(actual_oss,expected_oss))
+    # 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=)

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

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

smartpush-1.1.6.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=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,,

{smartpush-1.1.4.dist-info → smartpush-1.1.6.dist-info}/WHEEL

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

smartpush-1.1.4.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=m_Y67qrUeFphwM5jqBOTqheAufmnnjnBVF71nXRXUxg,1598
-smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=anvovO657rmo2PF8Mbn_BLFlhSOdyCut4yYoLFUK85c,10807
-smartpush/export/basic/GetOssUrl.py,sha256=K64PNHNpshYp0ag37IS-wjViCSKS8G4v8AuafHgM31Y,4946
-smartpush/export/basic/ReadExcel.py,sha256=rGPDq36ujLKA1dlz_33iQQU6I8dhlc5l2ij_JAQX2a0,5145
-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.4.dist-info/METADATA,sha256=pg3q4VEGLs7d_rDvijLlWHcmOFD4WNF-el-qQzknCvE,145
-smartpush-1.1.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.1.4.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.1.4.dist-info/RECORD,,