smartpush 1.2.7__py3-none-any.whl → 1.2.8__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 smartpush.utils import DataTypeUtils
 
 """
 用于excel校验
@@ -326,3 +327,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)
+    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

@@ -3,23 +3,23 @@
 # @Author :luzebin
 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 import ExcelExportChecker
 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-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.xlsx"
-    oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/a5e18e3b3a83432daca871953cb8471b/【自动化导出】营销活动URL点击与热图.xlsx"
+    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"
     # # 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"
+    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"
     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,7 +27,10 @@ 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=True))
     # 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"))
+    # print(check_excel_all(actual_oss=oss1, expected_oss=oss2, ignore_sort=True))
     # 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)

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.8.dist-info}/METADATA

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

smartpush-1.2.8.dist-info/RECORD

@@ -0,0 +1,15 @@
+smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
+smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
+smartpush/test.py,sha256=JpjJe4F7MEmmbjgPI2xCW4HkE9MZRd44xYVKoLSxxRA,3315
+smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
+smartpush/export/basic/ExcelExportChecker.py,sha256=igJH-RQZWUU5wGVPzoklWxSYpjQRoUFChq1-A-De0nQ,16386
+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.7.dist-info → smartpush-1.2.8.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.2.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=ByqTF3rwjS5fHFhT_o5PGo-5WIzytxfIhIA7Cpih-eU,3052
-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=SkEw4773f8pAFH6K4kM120NJI2dFTZRDYuA_EY-Pan4,7170
-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.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,,