smartpush 1.2.8__py3-none-any.whl → 1.2.9__py3-none-any.whl

smartpush/export/basic/ExcelExportChecker.py

@@ -2,6 +2,7 @@ import copy
 import json
 from urllib.parse import unquote
 from smartpush.export.basic.ReadExcel import *
+from datetime import datetime
 from smartpush.utils import DataTypeUtils
 
 """
@@ -96,14 +97,17 @@ def check_excel_content_form_dict(actual, expected, **kwargs):
     return check_excel_content(actual, expected)
 
 
-def check_excel_content_including_expected(actual, expected, **kwargs):
+def check_excel_content_including_expected(actual, expected, expected_oss, **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())
+    if kwargs.get("export_type") == "flow":
+        missing_items = assert_flow(expected, actual, expected_oss)
+    else:
+        missing_items = find_missing_elements(expected.values(), actual.values())
     return (False, {"与期望结果存在差异": missing_items}) if missing_items else (True, "校验期望结果包含校验通过")
 
 
@@ -115,6 +119,33 @@ def find_missing_elements(list1, list2):
     return missing
 
 
+def assert_flow(expected, actual, expected_oss):
+    # 判断预期数据in实际导出的数据
+    ex_sheet0 = expected.get("sheet0", [])
+    ac_sheet0 = actual.get("sheet0", [])
+    ex_sheet1 = expected.get("Flow node data by sending time", [])
+    ac_sheet1 = actual.get("Flow node data by sending time", [])
+    differences = []
+    res=[]
+    ex_sheet1.append(ex_sheet0)
+    ac_sheet1.append(ac_sheet0)
+    for i in ac_sheet1:
+        if i not in ex_sheet1:
+            differences.append(i)
+            # 判断对应的列数据
+            for diff in differences:
+                if len(diff) != 24:
+                    res.append("列预期不正确")
+    # 判断多出的行，获取今天的日期,与预期日期对比
+    ex_data = expected_oss.split("/")[4].split("-")
+    today = datetime.today()
+    target_date = datetime(int(ex_data[0]), int(ex_data[1]), int(ex_data[2]))
+    diff_days = (today - target_date).days
+    if len(differences) != diff_days:
+        res.append("日期预期不正确")
+    return res
+
+
 def check_excel_content_form_list(actual, expected):
     """
     通过 内容 比较 Excel 内容,不包含表头
@@ -135,7 +166,8 @@ def check_excel_all(actual_oss, expected_oss, check_type=None, **kwargs):
     flag1, name_result = check_excel_name(actual_oss, expected_oss)
     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)
+        flag2, content_result = check_excel_content_including_expected(actual, expected, expected_oss, type=file_type,
+                                                                       **kwargs)
     else:
         flag2, content_result = check_excel_content_form_dict(actual, expected, type=file_type, **kwargs)
     print(json.dumps(
@@ -357,5 +389,5 @@ def check_field_format(actual_oss, **kwargs):
                             errors.append(
                                 f"{actual_dict_key[key]} 表, 第{num}行{filed_key}列{kwargs['fileds'][key][filed_key]}格式不符合规范, 值为:{row[filed_key]}")
                     num += 1
-    print(errors)
+    print(errors if len(errors) > 0 else "都校验成功")
     return False if len(errors) > 0 else True

smartpush/test.py

@@ -3,23 +3,23 @@
 # @Author :luzebin
 import pandas as pd
 
-from smartpush.export.basic import ExcelExportChecker
+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.utils.DataTypeUtils import DataTypeUtils
 
 if __name__ == '__main__':
-    oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/31c1a577af244c65ab9f9a984c64f3d9/ab%E5%BC%B9%E7%AA%97%E6%B5%8B%E8%AF%952.10%E5%88%9B%E5%BB%BA-%E6%9C%89%E5%85%A8%E9%83%A8%E6%95%B0%E6%8D%AE%E9%94%80%E5%94%AE%E9%A2%9D%E6%98%8E%E7%BB%86%E6%95%B0%E6%8D%AE.xlsx"
-    oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/31c1a577af244c65ab9f9a984c64f3d9/ab%E5%BC%B9%E7%AA%97%E6%B5%8B%E8%AF%952.10%E5%88%9B%E5%BB%BA-%E6%9C%89%E5%85%A8%E9%83%A8%E6%95%B0%E6%8D%AE%E9%94%80%E5%94%AE%E9%A2%9D%E6%98%8E%E7%BB%86%E6%95%B0%E6%8D%AE.xlsx"
+    oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.xlsx"
+    oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/a5e18e3b3a83432daca871953cb8471b/【自动化导出】营销活动URL点击与热图.xlsx"
     # # print(check_excel_all(oss1, oss1))
-    oss3 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/a5e18e3b3a83432daca871953cb8471b/【自动化导出】营销活动URL点击与热图.xlsx"
-    oss4 = "https://cdn.smartpushedm.com/material_ec2/2025-02-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.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 = "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"
+    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))
@@ -27,10 +27,11 @@ if __name__ == '__main__':
     # # 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_all(actual_oss=oss1, expected_oss=oss2, ignore_sort=0))
     # 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))
+    # print(check_excel_all(actual_oss=e_person_oss1, expected_oss=a_person_oss2, check_type="person"))
     # read_excel_csv_data(type=)
-    # print(DataTypeUtils().check_email_format())
-    errors = ExcelExportChecker.check_field_format(actual_oss=oss1, fileds={0: {2: "email", 5: "time"}}, skiprows=2)
-    print(errors)
+
+    flow_ex="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"
+    flow_ac="https://cdn.smartpushedm.com/material_ec2/2025-03-04/0c8f919f28d4455f9908f905aada7efb/测试flow数据报告导出勿动数据概览.xlsx"
+    print(check_excel_all(actual_oss=flow_ac, expected_oss=flow_ex, check_type="including",export_type="flow",skiprows=1))

{smartpush-1.2.8.dist-info → smartpush-1.2.9.dist-info}/METADATA

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

{smartpush-1.2.8.dist-info → smartpush-1.2.9.dist-info}/RECORD

@@ -1,15 +1,15 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
-smartpush/test.py,sha256=JpjJe4F7MEmmbjgPI2xCW4HkE9MZRd44xYVKoLSxxRA,3315
+smartpush/test.py,sha256=pMXVJzsiQc7INFYmH_ZUPkHBbjl0xmFD8-9yKL8Wn1o,3564
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=igJH-RQZWUU5wGVPzoklWxSYpjQRoUFChq1-A-De0nQ,16386
+smartpush/export/basic/ExcelExportChecker.py,sha256=BOcIEqYrZD9yhMSvHrqPFDOUj_5zKhm2_OyQSN7KOds,17718
 smartpush/export/basic/GetOssUrl.py,sha256=zlExF_jy_TRV5lp0fws8Wed5MF_byp7JAEmvARVqlIg,3263
 smartpush/export/basic/ReadExcel.py,sha256=ZnG2mtYqLY-xuYx9SyulbdYUP_0E5jIeKDewfakAsTw,7342
 smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
 smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
 smartpush/utils/StringUtils.py,sha256=NXomJ4qmyBRAFnGj5hrFRWwQnRQMTcPzy20fk1dunSw,3980
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush-1.2.8.dist-info/METADATA,sha256=SyedtaWkHLFDo9aoke_TJUG4lESSzjq0YzZoeNlryGY,145
-smartpush-1.2.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-smartpush-1.2.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.2.8.dist-info/RECORD,,
+smartpush-1.2.9.dist-info/METADATA,sha256=NLRbHHvxDiBoF4HDuR8tV_7F61tySFBVumFx0Jcebew,145
+smartpush-1.2.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.2.9.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.2.9.dist-info/RECORD,,

{smartpush-1.2.8.dist-info → smartpush-1.2.9.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