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

smartpush/export/basic/ExcelExportChecker.py

@@ -113,6 +113,10 @@ def check_excel_content_including_expected(actual, expected, expected_oss, **kwa
 
 def find_missing_elements(list1, list2):
     missing = []
+    sorted_list1 = sorted(list1)
+    sorted_list2 = sorted(list2)
+    if sorted_list1 == sorted_list2:
+        return missing
     for element in list1:
         if element not in list2:
             missing.append(element)
@@ -126,7 +130,7 @@ def assert_flow(expected, actual, expected_oss):
     ex_sheet1 = expected.get("Flow node data by sending time", [])
     ac_sheet1 = actual.get("Flow node data by sending time", [])
     differences = []
-    res=[]
+    res = []
     ex_sheet1.append(ex_sheet0)
     ac_sheet1.append(ac_sheet0)
     for i in ac_sheet1:
@@ -176,7 +180,7 @@ def check_excel_all(actual_oss, expected_oss, check_type=None, **kwargs):
     return all([flag1, flag2, flag3])
 
 
-def check_and_get_file_suffix_name(actual_oss, expected_oss) -> str:
+def check_and_get_file_suffix_name(actual_oss, expected_oss, **kwargs) -> str:
     """
     校验并获取oss的后缀类型
     @param actual_oss:
@@ -185,6 +189,8 @@ def check_and_get_file_suffix_name(actual_oss, expected_oss) -> str:
     """
     actual_file_suffix_name = get_file_suffix_name(actual_oss)
     expected_file_suffix_name = get_file_suffix_name(expected_oss)
+    if actual_oss == expected_oss and kwargs.get("test", False):
+        raise Exception("oss链接不允许相同，请检查oss链接是否为相同链接,调试需要请传参数test=True")
     try:
         assert actual_file_suffix_name == expected_file_suffix_name
         return actual_file_suffix_name
@@ -270,11 +276,6 @@ 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, return_type='dict', **kwargs), read_excel_header(expected,
                                                                                                         return_type='dict',
                                                                                                         **kwargs)
@@ -364,12 +365,11 @@ def compare_lists(actual_dict_list, expected_dict_list):
 def check_field_format(actual_oss, **kwargs):
     """
         逐个校验字段类型
-        **kwargs: fileds为需检查字段，结构为dict，如{"0": {"1": "email", "2": "time"}},
+        **kwargs: fileds为需检查字段，结构为dict，如{0: {0: "email", 1: "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 = []

smartpush/export/basic/GetOssUrl.py

@@ -2,10 +2,11 @@ import json
 import urllib
 
 import requests
-from tenacity import retry, stop_after_attempt, wait_fixed, RetryError
+from requests import HTTPError
+from tenacity import retry, stop_after_attempt, wait_fixed, RetryError, stop_any
 from smartpush.utils.StringUtils import StringUtils
 
-_requestParam = {
+export_requestParam = {
     "page": 1,
     "pageSize": 20,
     "type": "EXPORT",
@@ -14,6 +15,17 @@ _requestParam = {
     "endTime": None
 }
 
+import_requestParam = {
+    "page": 1,
+    "pageSize": 20,
+    "type": "IMPORT",
+    "status": None,
+    "startTime": None,
+    "endTime": None
+}
+
+manually_stop = False  # 手动停止表示
+
 
 # 用于技术第几次重试，无需修改
 def log_attempt(retry_state):
@@ -24,10 +36,18 @@ def log_attempt(retry_state):
     print(f"当前重试次数: {attempt_number}")
 
 
-def get_oss_address_with_retry(target_id, url, requestHeader, requestParam=None, **kwargs) -> str:
+# 自定义停止条件函数
+def should_stop(retry_state):
+    if manually_stop:
+        print("数据导入/导出状态是失败，立即停止重试")
+    return manually_stop
+
+
+def get_oss_address_with_retry(target_id, url, requestHeader, requestParam=None, is_import=False, **kwargs) -> str:
     """
     创建带有动态重试配置的获取 OSS 地址
     **kwargs 可传参：tries=10, delay=2, backoff=1
+    :param is_import: 如果是导入的则传True
     :param requestParam:
     :param url:
     :param target_id:
@@ -35,23 +55,34 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam=None,
     :return: 带有重试配置的获取 OSS 地址的
     """
     if requestParam is None:
-        requestParam = _requestParam
+        requestParam = import_requestParam if is_import else export_requestParam
     tries = kwargs.get('tries', 30)  # 重试次数
     delay = kwargs.get('delay', 2)
+    _url = url + '/bulkOps/query'
+    if StringUtils.is_empty(target_id):
+        raise ValueError("缺少target_id参数")
 
-    @retry(stop=stop_after_attempt(tries), wait=wait_fixed(delay), after=log_attempt)
+    def bulkOps_query(_url, _requestHeader, _requestParam):
+        response = requests.request(url=_url, headers=_requestHeader, data=json.dumps(_requestParam),
+                                    method="post")
+        response.raise_for_status()
+        result = response.json()
+        if result['code'] != 1:
+            raise HTTPError(f"{result}")
+        return result
+
+    @retry(stop=stop_after_attempt(tries) | stop_any(should_stop), wait=wait_fixed(delay), after=log_attempt)
     def get_oss_address():
-        _url = url + '/bulkOps/query'
-        result = None
-        if StringUtils.is_empty(target_id):
-            raise ValueError("缺少target_id参数")
         try:
-            response = requests.request(url=_url, headers=requestHeader, data=json.dumps(requestParam),
-                                        method="post")
-            response.raise_for_status()
-            result = response.json()
+            result = bulkOps_query(_url, requestHeader, requestParam)
             id_url_dict = {item["id"]: item["url"] for item in result["resultData"]["datas"]}
+            id_status_dict = {item["id"]: [item["status"], item["reason"]] for item in result["resultData"]["datas"]}
             if target_id in id_url_dict:
+                if id_status_dict[target_id][0] == "FAIL":
+                    reason = id_status_dict[target_id][1]
+                    print(f"导出id {target_id}失败，原因是 [{reason}]")
+                    global manually_stop
+                    manually_stop = True
                 if len(id_url_dict[target_id]) == 1:
                     target_url = urllib.parse.unquote(id_url_dict[target_id][0])
                     print(f"target_id [{target_id}] 的oss链接为： {target_url}")
@@ -59,16 +90,45 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam=None,
                 else:
                     raise ValueError(f"存在多条 id 为 {target_id} 的记录，记录为：{id_url_dict[target_id]}")
             else:
-                raise ValueError(f"未找到 id 为 {target_id} 的记录，未包含有效的 OSS 地址,")
+                raise ValueError(f"未找到 导出id 为 {target_id} 的记录，未包含有效的 OSS 地址")
         except (KeyError, json.JSONDecodeError) as e:
             raise ValueError(f"响应数据格式错误,响应结果: {result},异常: {e}")
         except requests.RequestException as e:
             print(f"请求发生异常: {e}，正在重试...")
             raise
 
+    @retry(stop=stop_after_attempt(tries) | stop_any(should_stop), wait=wait_fixed(delay), after=log_attempt)
+    def get_import_success():
+        target_id_list = []
+        try:
+            result = bulkOps_query(_url, requestHeader, requestParam)
+            for item in result["resultData"]["datas"]:
+                if item.get("id") == int(target_id):
+                    status = item.get("status")
+                    reason = item.get("reason")
+                    if status == "FAIL":
+                        print(f"导入id {target_id}失败，原因是 [{reason}]")
+                        global manually_stop
+                        manually_stop = True
+                    assert status == "SUCCESS"
+                    return f"导入id {target_id} 导入成功"
+                else:
+                    target_id_list.append(item.get("id"))
+            if target_id not in target_id_list:
+                raise ValueError(f"未找到 导入id 为 {target_id} 的记录，请检查是否发起导入")
+        except AssertionError:
+            raise AssertionError(f"导入id 为 {target_id} 的记录非SUCCESS，状态为：{status}")
+        except (KeyError, json.JSONDecodeError) as e:
+            raise ValueError(f"响应数据格式错误,响应结果: {result},异常: {e}")
+        except requests.RequestException as e:
+            print(f"请求发生异常: {e}，正在重试...")
+            raise
+        except Exception:
+            raise
+
     def cancel_export_file(_target_id):
         """
-        用于失败后取消导出
+        用于失败后取消导出/导入
         :param _target_id:
         :return:
         """
@@ -76,13 +136,19 @@ def get_oss_address_with_retry(target_id, url, requestHeader, requestParam=None,
         response = requests.request(url=cancel_url, headers=requestHeader, params={'id': _target_id}, method="get")
         response.raise_for_status()
         result = response.json()
-        print(f"获取Oss Url失败，取消 {_target_id} 的导出记录，响应：{result}")
+        if is_import:
+            print(f"导入文件失败，取消 {_target_id} 的导入记录，响应：{result}")
+        else:
+            print(f"获取Oss Url失败，取消 {_target_id} 的导出记录，响应：{result}")
         return result
 
     try:
-        return get_oss_address()
+        if is_import:
+            return get_import_success()
+        else:
+            return get_oss_address()
     except Exception as e:
         # print(f"最终失败，错误信息: {e}")
         if isinstance(e, RetryError):
             cancel_export_file(target_id)
-        return None
+        return f"执行失败，错误信息: {e}"

smartpush/test.py

@@ -7,7 +7,7 @@ from smartpush.export.basic.ExcelExportChecker import check_excel_all, read_exce
     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.export.basic.GetOssUrl import get_oss_address_with_retry, export_requestParam, import_requestParam
 
 if __name__ == '__main__':
     oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.xlsx"
@@ -20,18 +20,22 @@ if __name__ == '__main__':
 
     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}')
+    host = "https://test.smartpushedm.com/api-em-ec2"
+    reqHeaders = {
+        'cookie': 'osudb_appid=SMARTPUSH;osudb_oar=#01#SID0000123BL6ciRHRKpvOm/vWT9OS9brpfhSErcOdgeXJc0RJFopg83z0N3RzDE4w2DE5cQj6ALkLP8vG6Rhs0sR7NfToZvCLWXdQtYk6DJoKe4tqdo4kNcIc9F5obzLuyRmwGy9CZKcg/bMlmNyDZwBI1SIO;osudb_subappid=1;osudb_uid=4213785247;ecom_http_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDM4NDI1NTIsImp0aSI6IjEwNGQwOTVjLTA3MDItNDI5MC1iZjQzLWQ4YTVhNjdmNDM2NSIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjQ3IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmVhcHAuY29tIiwidXNlclJvbGUiOiJvd25lciIsInBsYXRmb3JtVHlwZSI6Nywic3ViUGxhdGZvcm0iOjEsInBob25lIjoiIiwibGFuZ3VhZ2UiOiJ6aC1oYW5zLWNuIiwiYXV0aFR5cGUiOiIiLCJhdHRyaWJ1dGVzIjp7ImNvdW50cnlDb2RlIjoiQ04iLCJjdXJyZW5jeSI6IkpQWSIsImN1cnJlbmN5U3ltYm9sIjoiSlDCpSIsImRvbWFpbiI6InNtYXJ0cHVzaDQubXlzaG9wbGluZXN0Zy5jb20iLCJsYW5ndWFnZSI6ImVuIiwibWVyY2hhbnRFbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmUuY29tIiwibWVyY2hhbnROYW1lIjoiU21hcnRQdXNoNF9lYzJf6Ieq5Yqo5YyW5bqX6ZO6IiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL01hY2FvIn0sInN0b3JlSWQiOiIxNjQ0Mzk1OTIwNDQ0IiwiaGFuZGxlIjoic21hcnRwdXNoNCIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTc0MTI1MDU1MjI4Miwic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIl0sImNsaWVudF9pZCI6ImVtYWlsLW1hcmtldCJ9.SjeTCLaZqbEFEFNeKe_EjrwmR0LdEYO9697ymVNzf5Q;',
+        'Content-Type': 'application/json'}
+    actual_oss = get_oss_address_with_retry(11911, host, reqHeaders, import_requestParam, is_import=True)
+    actual_oss = get_oss_address_with_retry(11896, host, reqHeaders, export_requestParam)
     # # 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=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))
+    # 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.9.dist-info → smartpush-1.3.0.dist-info}/METADATA

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

{smartpush-1.2.9.dist-info → smartpush-1.3.0.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=pMXVJzsiQc7INFYmH_ZUPkHBbjl0xmFD8-9yKL8Wn1o,3564
+smartpush/test.py,sha256=lbPkb0Pk0r4C0u_dD3Qov59MUOhjXomIbb0Ktw3rnV4,5117
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=BOcIEqYrZD9yhMSvHrqPFDOUj_5zKhm2_OyQSN7KOds,17718
-smartpush/export/basic/GetOssUrl.py,sha256=zlExF_jy_TRV5lp0fws8Wed5MF_byp7JAEmvARVqlIg,3263
+smartpush/export/basic/ExcelExportChecker.py,sha256=iZe-cb9YAIdLhbJb32xh6WUDgzIFyUx9XIAlpciGiNc,17716
+smartpush/export/basic/GetOssUrl.py,sha256=LeF1y1_uJaYXth1KvO6mEDS29ezb9tliBv5SrbqYkXc,6136
 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.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.3.0.dist-info/METADATA,sha256=mtKumAl9qgD0gtQNvF0y65zblr6KXMRuX48Ym31Eqcc,145
+smartpush-1.3.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.3.0.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.3.0.dist-info/RECORD,,