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

smartpush/export/basic/ExcelExportChecker.py

@@ -1,7 +1,6 @@
 import copy
 import json
 from urllib.parse import unquote
-
 from smartpush.export.basic.ReadExcel import *
 
 """
@@ -104,9 +103,10 @@ def check_excel_content_form_list(actual, expected):
     return check_excel_content(actual=actual, expected=expected)
 
 
-def check_excel_all(actual_oss, expected_oss,**kwargs):
+def check_excel_all(actual_oss, expected_oss, **kwargs):
     """
     校验所有内容
+    **kwargs: skiprows->int 用于跳过读取行数，如果第一行是动态变化的，建议单独过滤,第一行传1
     """
     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)
@@ -115,7 +115,7 @@ def check_excel_all(actual_oss, expected_oss,**kwargs):
 
     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)
+    flag3, header_result = check_excel_header(actual_data_copy, expected_data_copy, type=file_type, **kwargs)
     print(json.dumps(
         {f"文件名称-{flag1}": name_result, f"导出内容-{flag2}": content_result, f"表头校验-{flag3}": header_result},
         ensure_ascii=False))
@@ -173,17 +173,31 @@ def check_excel_content(actual, expected):
             # 断言2：对比具体行
             if isinstance(actual, list) and isinstance(expected, list):
                 # 第一层提取sheet
-                for i in range(min(len(expected), len(actual))):
-                    if actual[i] == expected[i]:
+                for i in range(max(len(expected), len(actual))):
+                    if len(expected) <= i:
+                        errors.append(f"预期结果不存在第{i + 1}个sheet")
+                        continue
+                    elif len(actual) <= i:
+                        errors.append(f"预期结果不存在第{i + 1}个sheet")
                         continue
                     else:
-                        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]))
+                        if actual[i] == expected[i]:
+                            continue
+                        else:
+                            for row in range(max(len(expected[i]), len(actual[i]))):
+                                if len(expected[i]) <= row:
+                                    errors.append(f"预期结果不存在第{row + 1}个行")
+                                    continue
+                                elif len(actual[i]) <= row:
+                                    errors.append(f"实际内容不存在第{row + 1}个行")
+                                    continue
+                                else:
+                                    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)
@@ -201,17 +215,20 @@ def check_excel_header(actual, expected, **kwargs):
     @return:
     """
     try:
-        if all([isinstance(actual, str), isinstance(expected, str)]):
-            actual1, expected1 = read_excel_header(read_excel_from_oss(actual), **kwargs), read_excel_header(
-                read_excel_from_oss(
-                    expected), **kwargs)
-        else:
-            actual1, expected1 = read_excel_header(actual, **kwargs), read_excel_header(expected, **kwargs)
+        # if all([isinstance(actual, str), isinstance(expected, str)]):
+        #     actual1, expected1 = read_excel_header(read_excel_from_oss(actual), **kwargs), read_excel_header(
+        #         read_excel_from_oss(
+        #             expected), **kwargs)
+        # else:
+        actual1, expected1 = read_excel_header(actual, return_type='dict', **kwargs), read_excel_header(expected,
+                                                                                                        return_type='dict',
+                                                                                                        **kwargs)
         try:
-            assert actual1 == expected1
+            result = check_excel_content(actual1, expected1)
+            assert result[0]
             return True, "表头校验值与顺序一致"
         except Exception as e:
-            return False, f"表头校验值与顺序失败 {e}"
+            return False, f"表头校验值与顺序失败 {result[1]}"
     except Exception as e:
         return False, f"表头校验异常 {e}"
 

smartpush/export/basic/GetOssUrl.py

@@ -1,9 +1,8 @@
-# from retry import retry
 import json
+import urllib
 
 import requests
-from tenacity import retry, stop_after_attempt, wait_fixed,RetryError
-
+from tenacity import retry, stop_after_attempt, wait_fixed, RetryError
 from smartpush.utils.StringUtils import StringUtils
 
 
@@ -29,7 +28,6 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kw
     tries = kwargs.get('tries', 20)  # 重试次数
     delay = kwargs.get('delay', 2)
 
-
     @retry(stop=stop_after_attempt(tries), wait=wait_fixed(delay), after=log_attempt)
     def get_oss_address():
         _url = url + '/bulkOps/query'
@@ -45,8 +43,9 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kw
             id_url_dict = {item["id"]: item["url"] for item in result["resultData"]["datas"]}
             if target_id in id_url_dict:
                 if len(id_url_dict[target_id]) == 1:
-                    print(f"{target_id} oss链接为：{id_url_dict[target_id][0]}")
-                    return id_url_dict[target_id][0]
+                    target_url = urllib.parse.unquote(id_url_dict[target_id][0])
+                    print(f"target_id [{target_id}] 的oss链接为： {target_url}")
+                    return target_url
                 else:
                     raise ValueError(f"存在多条 id 为 {target_id} 的记录，记录为：{id_url_dict[target_id]}")
             else:

smartpush/export/basic/ReadExcel.py

@@ -23,19 +23,30 @@ def read_excel_from_oss(url="", method="get"):
         print(f"读取oss报错 {url} 时出错：{e}")
 
 
-def read_excel_header(excel_data, **kwargs) -> list:
+def read_excel_header(excel_data, return_type='list', **kwargs):
     """
     1、读出excel的头列 list
     """
     try:
-        dfs = read_excel_csv_data(excel_data, **kwargs)
         result = []
+        result_dict = {}
+        skip_rows = kwargs.pop('skiprows', 0) - 1 if 'skiprows' in kwargs else 0
+        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())
+                # result.append(df.keys().values.tolist())
+                headers = df.iloc[skip_rows].tolist()
+                result.append(headers)
+                result_dict[sheet_name] = headers
+            if return_type == 'list':
+                return result
+            else:
+                return result_dict
         else:
-            result = dfs.keys().values.tolist()
-        return result
+            # csv的头
+            # result = dfs.keys().values.tolist()
+            result = dfs.columns.tolist()
+            return result
     except Exception as e:
         print(f"excel生成header-list出错：{e}")
         raise
@@ -71,7 +82,12 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
             # 将DataFrame转换为字典，以行为单位存储数据
             row_dict = {}  # 创建一个空字典来存储按行转换的数据
             for sheet_name, row in dfs.items():
-                row_dict[sheet_name] = row.to_dict(orient='records')
+                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)  # 内部排序
+                    row_dict[sheet_name] = sorted_data_asc
+                else:
+                    row_dict[sheet_name] = row
         else:
             row_dict = dfs.to_dict()
         return row_dict

smartpush/test.py

@@ -1,21 +1,28 @@
 # -*- codeing = utf-8 -*-
 # @Time :2025/2/20 00:27
 # @Author :luzebin
-from smartpush.export.basic.ExcelExportChecker import *
-from smartpush.export.basic.ReadExcel import *
+import pandas as pd
+
+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-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))
+    # # 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"
+    # # #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))
+    # read_excel_csv_data(type=)
 
-    # 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(check_excel("all", actual_oss=oss1, expected_oss=oss2, skiprows=1))
-    print(check_excel_all(oss2, oss1, skiprows=1))

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

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

smartpush-1.1.9.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=MBz_SJ0cqQiGLJhBMKkyZbXBqp3QQ0KcHMhyThB2Sy0,2669
+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=uE6_Y7i1lzizatt1k8XbgJBVO7Bz1OucaymYfu6pQ6s,6319
+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.9.dist-info/METADATA,sha256=xfanHJ-TadMM-ClWyRgjcf2YX28oX4-vXDywuCWKvD4,145
+smartpush-1.1.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.1.9.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.1.9.dist-info/RECORD,,

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