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

smartpush/export/basic/ExcelExportChecker.py

@@ -2,6 +2,8 @@ import copy
 import json
 from urllib.parse import unquote
 from smartpush.export.basic.ReadExcel import *
+from datetime import datetime
+from smartpush.utils import DataTypeUtils
 
 """
 用于excel校验
@@ -95,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, "校验期望结果包含校验通过")
 
 
@@ -114,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 内容,不包含表头
@@ -134,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(
@@ -326,3 +359,35 @@ def compare_lists(actual_dict_list, expected_dict_list):
                 if item1 != item2:
                     diff.append(('列表索引的不同值', i, (item1, item2)))
     return diff
+
+
+def check_field_format(actual_oss, **kwargs):
+    """
+        逐个校验字段类型
+        **kwargs: fileds为需检查字段，结构为dict，如{"0": {"1": "email", "2": "time"}},
+        即校验第一个sheet第二个字段需符合email格式，第二个字段需符合time格式
+        """
+    # 获取oss内容并存入dict
+    actual = read_excel_from_oss(actual_oss)
+    actual_data_copy = copy.deepcopy(actual)
+    actual_dict = read_excel_and_write_to_dict(actual, **kwargs)
+    # 解析参数并校验字段类型
+    errors = []
+    actual_dict_key = list(actual_dict.keys())
+    for key in kwargs["fileds"].keys():
+        if isinstance(key, int) and 0 <= key < len(actual_dict):
+            for filed_key in kwargs["fileds"][key].keys():
+                num = 1
+                for row in actual_dict[actual_dict_key[key]]:
+                    if kwargs["fileds"][key][filed_key] == "email":
+                        fool = DataTypeUtils.DataTypeUtils().check_email_format(email=row[filed_key])
+                        if not fool:
+                            errors.append(f"{actual_dict_key[key]} 表, 第{num}行{filed_key}列{kwargs['fileds'][key][filed_key]}格式不符合规范, 值为:{row[filed_key]}")
+                    elif kwargs["fileds"][key][filed_key] == "time":
+                        fool = DataTypeUtils.DataTypeUtils().check_time_format(time_str=row[filed_key], precision=kwargs.get('precision', 's'))
+                        if not fool:
+                            errors.append(
+                                f"{actual_dict_key[key]} 表, 第{num}行{filed_key}列{kwargs['fileds'][key][filed_key]}格式不符合规范, 值为:{row[filed_key]}")
+                    num += 1
+    print(errors if len(errors) > 0 else "都校验成功")
+    return False if len(errors) > 0 else True

smartpush/export/basic/ReadExcel.py

@@ -95,7 +95,8 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
             row_dict = {}  # 创建一个空字典来存储按行转换的数据
             for sheet_name, row in dfs.items():
                 row = row.to_dict(orient='records')
-                if kwargs.get("ignore_sort") is not None:
+                if kwargs.get("ignore_sort") is not None and StringUtils.to_lower(sheet_name) == \
+                        StringUtils.to_lower(kwargs.get("ignore_sort_sheet_name", sheet_name)):  # 可传参指定那个sheet_name
                     sorted_data_asc = sorted(row[1:], key=lambda x: x.get(kwargs.get("ignore_sort"), 0),
                                              reverse=True)  # 内部排序
                     sorted_data_asc = [row[0]] + sorted_data_asc

smartpush/test.py

@@ -27,7 +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=0))
+    #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=e_person_oss1, expected_oss=a_person_oss2, check_type="person"))
     # read_excel_csv_data(type=)
+
+    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/utils/DataTypeUtils.py

@@ -0,0 +1,30 @@
+import re
+from datetime import datetime
+
+
+class DataTypeUtils:
+
+    def check_email_format(self, email):
+        # 检查邮箱是否符合格式
+        if email != "" or email is not None:
+            pattern = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
+            return bool(re.match(pattern, email))
+
+    def check_time_format(self, time_str, precision="s"):
+        # 检查时间是否符合格式，并校验是精确到秒还是分
+        if precision == 's':
+            try:
+                # 尝试按照精确到秒的格式解析
+                datetime.strptime(time_str, '%Y-%m-%d %H:%M:%S')
+                return True
+            except ValueError:
+                return False
+        elif precision == 'm':
+            try:
+                # 尝试按照精确到分钟的格式解析
+                datetime.strptime(time_str, '%Y-%m-%d %H:%M')
+                return True
+            except ValueError:
+                return False
+        else:
+            raise ValueError("Invalid precision parameter. Use 's' for seconds or 'm' for minutes.")

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

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

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

@@ -1,14 +1,15 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
-smartpush/test.py,sha256=ByqTF3rwjS5fHFhT_o5PGo-5WIzytxfIhIA7Cpih-eU,3052
+smartpush/test.py,sha256=pMXVJzsiQc7INFYmH_ZUPkHBbjl0xmFD8-9yKL8Wn1o,3564
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=BsThRl0rGlGxNQZP8rzgqCwlkdFu7JM5lMy7ypE-kFs,14553
+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=SkEw4773f8pAFH6K4kM120NJI2dFTZRDYuA_EY-Pan4,7170
+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.7.dist-info/METADATA,sha256=N9_NqcRES80PuyMHicleAkszj6xkvxBxuGWHDgd5BqE,145
-smartpush-1.2.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.2.7.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.2.7.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,,