smartpush 1.2.1__py3-none-any.whl → 1.2.4__py3-none-any.whl

smartpush/export/basic/ExcelExportChecker.py

@@ -95,6 +95,25 @@ def check_excel_content_form_dict(actual, expected, **kwargs):
     return check_excel_content(actual, expected)
 
 
+def check_excel_content_including_expected(actual, expected, **kwargs):
+    """
+    通过 OSS URL 比较 Excel 内容,期望是包含的结果,actual传的是生成的oss
+    """
+    actual, expected = read_excel_and_write_to_dict(actual, **kwargs), read_excel_and_write_to_dict(
+        expected, **kwargs)
+    # 判断是否存在差异
+    missing_items = find_missing_elements(expected.values(), actual.values())
+    return (False, {"与期望结果存在差异": missing_items}) if missing_items else (True, "校验期望结果包含校验通过")
+
+
+def find_missing_elements(list1, list2):
+    missing = []
+    for element in list1:
+        if element not in list2:
+            missing.append(element)
+    return missing
+
+
 def check_excel_content_form_list(actual, expected):
     """
     通过 内容 比较 Excel 内容,不包含表头
@@ -103,7 +122,7 @@ 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, check_type=None, **kwargs):
     """
     校验所有内容
     **kwargs: skiprows->int 用于跳过读取行数，如果第一行是动态变化的，建议单独过滤,第一行传1
@@ -112,10 +131,12 @@ def check_excel_all(actual_oss, expected_oss, **kwargs):
     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, 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, **kwargs)
+    if check_type == "including":
+        flag2, content_result = check_excel_content_including_expected(actual, expected, type=file_type, **kwargs)
+    else:
+        flag2, content_result = check_excel_content_form_dict(actual, expected, type=file_type, **kwargs)
     print(json.dumps(
         {f"文件名称-{flag1}": name_result, f"导出内容-{flag2}": content_result, f"表头校验-{flag3}": header_result},
         ensure_ascii=False))
@@ -196,7 +217,8 @@ def check_excel_content(actual, expected):
                                         continue
                                     else:
                                         errors.append(
-                                            f"第{i+1}个sheet的内容-第" + str(i + 1) + "行不匹配，预期为：" + str(expected[i]) + ", 实际为: " + str(
+                                            f"第{i + 1}个sheet的内容-第" + str(i + 1) + "行不匹配，预期为：" + str(
+                                                expected[i]) + ", 实际为: " + str(
                                                 actual[i]))
                 return False, errors
             else:

smartpush/export/basic/GetOssUrl.py

@@ -5,6 +5,15 @@ import requests
 from tenacity import retry, stop_after_attempt, wait_fixed, RetryError
 from smartpush.utils.StringUtils import StringUtils
 
+_requestParam = {
+    "page": 1,
+    "pageSize": 20,
+    "type": "EXPORT",
+    "status": None,
+    "startTime": None,
+    "endTime": None
+}
+
 
 # 用于技术第几次重试，无需修改
 def log_attempt(retry_state):
@@ -15,7 +24,7 @@ def log_attempt(retry_state):
     print(f"当前重试次数: {attempt_number}")
 
 
-def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kwargs) -> str:
+def get_oss_address_with_retry(target_id, url, requestHeader, requestParam=None, **kwargs) -> str:
     """
     创建带有动态重试配置的获取 OSS 地址
     **kwargs 可传参：tries=10, delay=2, backoff=1
@@ -25,7 +34,9 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kw
     :param requestHeader:
     :return: 带有重试配置的获取 OSS 地址的
     """
-    tries = kwargs.get('tries', 20)  # 重试次数
+    if requestParam is None:
+        requestParam = _requestParam
+    tries = kwargs.get('tries', 30)  # 重试次数
     delay = kwargs.get('delay', 2)
 
     @retry(stop=stop_after_attempt(tries), wait=wait_fixed(delay), after=log_attempt)
@@ -33,8 +44,7 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kw
         _url = url + '/bulkOps/query'
         result = None
         if StringUtils.is_empty(target_id):
-            print(f"缺少参数:target_id")
-            return
+            raise ValueError("缺少target_id参数")
         try:
             response = requests.request(url=_url, headers=requestHeader, data=json.dumps(requestParam),
                                         method="post")
@@ -75,4 +85,4 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kw
         # print(f"最终失败，错误信息: {e}")
         if isinstance(e, RetryError):
             cancel_export_file(target_id)
-        return None
+        return None

smartpush/export/basic/ReadExcel.py

@@ -1,3 +1,4 @@
+import csv
 import io
 import os
 import re
@@ -7,6 +8,8 @@ from io import BytesIO
 import pandas as pd
 from requests import request
 
+from smartpush.utils.StringUtils import StringUtils
+
 warnings.simplefilter("ignore")
 excel_extensions = ['.xlsb', '.xlsx', '.xlsm', '.xls', '.xltx', '.xltm', '.xlam', None]
 csv_extensions = ['.csv']
@@ -48,7 +51,7 @@ def read_excel_header(excel_data, return_type='list', **kwargs):
         else:
             # csv的头
             # result = dfs.keys().values.tolist()
-            result = dfs.columns.tolist()
+            result = dfs.index.tolist()  # csv转置后读取头数据
             return result
     except Exception as e:
         print(f"excel生成header-list出错：{e}")
@@ -65,7 +68,12 @@ def read_excel_csv_data(excel_data, **kwargs):
                 io.BytesIO) \
                 else excel_data
         else:
-            dfs = pd.read_csv(excel_data, na_filter=False)
+            dfs = pd.read_csv(excel_data, encoding='utf-8', na_filter=False, dtype={'\ufeff姓名': str})
+            # 这里替换制表符
+            # for col in dfs.columns:
+            #     if dfs[col].dtype == 'object':  # 只处理字符串类型的列
+            #         dfs[col] = dfs[col].str.replace('\t', '')
+            dfs = dfs.transpose()  # 转置
         return dfs
 
 
@@ -88,12 +96,13 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
                 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)  # 内部排序
-                    sorted_data_asc = [row[0]]+sorted_data_asc
+                    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}")
@@ -160,6 +169,8 @@ def read_excel_data_for_oss_write_to_dict(oss, **kwargs) -> dict:
 
 # 从 URL 中提取文件名
 def get_file_suffix_name(url):
+    if StringUtils.is_empty(url):
+        raise ValueError("Oss Url不允许为空")
     last_filename = ""
     filename = url.split("/")[-1]
     # 从文件名中提取文件后缀

smartpush/test.py

@@ -10,19 +10,24 @@ 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"
+    oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-03-03/195a4a0d37724bd6b86f7a8477aa7b94/%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-01-23/adf5404751e44e768e24be61000a42f1/%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"
     # # 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"
+
     # # #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=oss3, expected_oss=oss4,ignore_sort =True))
+    # print(check_excel_all(actual_oss=oss1, expected_oss=oss2,ignore_sort=True))
+    # 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))
     # read_excel_csv_data(type=)
-

{smartpush-1.2.1.dist-info → smartpush-1.2.4.dist-info}/METADATA

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

smartpush-1.2.4.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=g1ZR_S7Mg9pfBJuMoZiRzh4OjA9dWtakJcqt9ggWkGE,3087
+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=pDnw5Ga-q367N_9UzyW82VV8zXwNUnM224v4Fmj2WPc,7101
+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.4.dist-info/METADATA,sha256=P7-P9xlfETWGc8_fFzwxzTMfL4neeW-oaG4udUPuV6M,145
+smartpush-1.2.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+smartpush-1.2.4.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.2.4.dist-info/RECORD,,

{smartpush-1.2.1.dist-info → smartpush-1.2.4.dist-info}/WHEEL

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

smartpush-1.2.1.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=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=xrmXIpA3T3YUNvIaO6qyo8zfX519n0ZDIdk3AbMV3ok,6585
-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.1.dist-info/METADATA,sha256=djV2ptPEu4on3orOKKMF8R9lFiNo7amdNCQ8hiI9_cs,145
-smartpush-1.2.1.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
-smartpush-1.2.1.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.2.1.dist-info/RECORD,,