smartpush 1.5.3__py3-none-any.whl → 1.5.4__py3-none-any.whl

smartpush/base/request_base.py

@@ -1,8 +1,16 @@
+import json
+
 import requests
+from requests import session
+from requests.adapters import HTTPAdapter
+from tenacity import stop_after_attempt, wait_fixed, retry
+from urllib3 import Retry
+
+from smartpush.export.basic.GetOssUrl import log_attempt
 
 
 class RequestBase:
-    def __init__(self, host, headers):
+    def __init__(self, host, headers, retries=3, **kwargs):
         """
 
         :param headers: 头，cookie
@@ -10,13 +18,42 @@ class RequestBase:
         """
         self.host = host
         self.headers = headers
-        self.request = requests.Request(headers=self.headers)
-        self.post = requests.Request("POST", headers=self.headers)
-        self.get = requests.Request("GET", headers=self.headers)
+
+        # 配置重试策略
+        retry_strategy = Retry(
+            total=retries,
+            status_forcelist=[429, 500, 502, 503, 504],
+            backoff_factor=1
+        )
+
+        # 创建 Session 并配置适配器
+        self.session = requests.Session()
+        self.session.mount("https://", HTTPAdapter(max_retries=retry_strategy))
+
+    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
+    def request(self, method, path, **kwargs):
+        url = f"{self.host}{path}"
+        print(f"{method} 请求：", url)
+        # 统一处理请求参数
+        default_kwargs = {
+            "timeout": 30,
+            "headers": self.headers
+        }
+        default_kwargs.update(kwargs)
+        if default_kwargs.get('data'): # 如果data有值json序列化
+            data = json.dumps(default_kwargs.get('data'))
+            default_kwargs.update({'data': data})
+        try:
+            response = self.session.request(method, url, **default_kwargs)
+            response.raise_for_status()
+            print("响应内容为：\n", response.json())
+            return response.json()
+        except requests.exceptions.RequestException as e:
+            print(f"请求失败: {e}")
+            return None
 
 
 class FormRequestBase(RequestBase):
     def __init__(self, form_id, host, headers):
         super().__init__(host, headers)
         self.form_id = form_id
-

smartpush/base/url_enum.py

@@ -21,7 +21,7 @@ class URL(Enum):
     """
     deleteForm = '/form/deleteFormInfo', 'GET'
     getFormList = '/form/getFormList', 'POST'
-    getFormInfo = 'form/getFormInfo','GET'
+    getFormInfo = '/form/getFormInfo', 'GET'
 
     @property
     def method(self):

smartpush/form/form_after.py

@@ -6,10 +6,9 @@ from smartpush.export.basic.GetOssUrl import log_attempt
 
 
 class FormAfter(FormRequestBase):
-    def __init__(self, form_id, headers, host):
-        super().__init__(form_id, headers, host)
+    def __init__(self, form_id, host, headers):
+        super().__init__(form_id, host, headers)
 
-    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
     def callPageFormReportDetail(self, reportDetailType, start_time=None, end_time=None):
         """
         获取PageFormReportDetail数据
@@ -22,28 +21,26 @@ class FormAfter(FormRequestBase):
         if start_time is not None and end_time is not None:
             requestParam["startTime"] = start_time
             requestParam["endTime"] = end_time
-        result = self.post(url=self.host + URL.pageFormReportDetail.url, data=json.dumps(requestParam)).json()
-        result.raise_for_status()
+        result = self.request(method=URL.pageFormReportDetail.method, path=URL.pageFormReportDetail.url,
+                              data=requestParam)
         persons_list = result["resultData"]["reportDetailData"]["datas"]
         return persons_list
 
-    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
+
     def callGetFormReportDetail(self):
         requestParam = {"formId": self.form_id}
-        result = self.post(url=self.host + URL.getFormReportDetail.url, data=json.dumps(requestParam)).json()
-        result.raise_for_status()
+        result = self.request(method=URL.getFormReportDetail.method, path=URL.getFormReportDetail.url,
+                              data=requestParam)
         resultData = result["resultData"]
         return resultData
 
-    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
     def callGetFormPerformanceTrend(self):
         requestParam = {"formId": self.form_id}
-        result = self.post(url=self.host + URL.getFormPerformanceTrend.url, data=json.dumps(requestParam)).json()
-        result.raise_for_status()
+        result = self.request(method=URL.getFormPerformanceTrend.method, path=URL.getFormPerformanceTrend.url,
+                              data=requestParam)
         resultData = result["resultData"]
         return resultData
 
-    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
     def callEditCrowdPackage(self, _id=None, groupRules=None, groupRelation="$AND"):
         """
         更新群组条件id
@@ -54,8 +51,7 @@ class FormAfter(FormRequestBase):
         """
         requestParam = {"id": _id, "crowdName": "表单查询群组-自动化", "groupRelation": groupRelation,
                         "groupRules": groupRules, "triggerStock": False}
-        result = self.post(url=self.host + URL.editCrowdPackage.url, data=json.dumps(requestParam)).json()
-        result.raise_for_status()
+        result = self.request(method=URL.editCrowdPackage.method, path=URL.editCrowdPackage.url, data=requestParam)
         assert result.get("code") == 1
         resultData = result["resultData"]
         assert resultData.get("status") == 2
@@ -65,30 +61,25 @@ class FormAfter(FormRequestBase):
         requestParam = {"id": _id, "page": page, "pageSize": pageSize}
         if filter_value is not None:
             requestParam["filter"] = {filter_type: {"in": filter_value}}
-        result = self.post(url=self.host + URL.crowdPersonList.url, data=json.dumps(requestParam)).json()
+        result = self.request(method=URL.crowdPersonList.method, path=URL.crowdPersonList.url, data=requestParam)
         result.raise_for_status()
         return result['resultData']
 
-    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
     def callGetFormList(self, formName):
-        params = {'page': 1, 'pageSize': 10, 'name': formName}
-        result = self.post(url=self.host + URL.getFormList.url, data=params).json()
-        result.raise_for_status()
+        requestParam = {'page': 1, 'pageSize': 10, 'name': formName}
+        result = self.request(method=URL.getFormList.method, path=URL.getFormList.url, data=requestParam)
         return result["resultData"]['datas']
 
-    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
     def callGetFormInfo(self):
-        params = {'formId': self.form_id}
-        result = self.get(url=self.host + URL.getFormInfo.url, params=params).json()
-        result.raise_for_status()
+        requestParam = {'formId': self.form_id}
+        result = self.request(method=URL.getFormInfo.method, path=URL.getFormInfo.url, params=requestParam)
         return result['resultData']
 
-    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
     def callDeleteForm(self, merchant_id):
-        params = {"formId": self.form_id, "merchant_id": merchant_id}
-        result = self.get(url=self.host + URL.deleteForm.url, params=params)
-        result.raise_for_status()
-        print(f"删除id{self.form_id}表单成功")
+        requestParam = {"formId": self.form_id, "merchant_id": merchant_id}
+        result = self.request(url=self.host + URL.deleteForm.url, params=requestParam)
+        assert result['code']
+        print(f"删除id:{self.form_id}表单成功")
 
     # --------        处理数据  --------------
     def collectFormDetails(self, key, start_time=None, end_time=None):

smartpush/form/test_form_after.py

@@ -0,0 +1,2 @@
+def test_call_page_form_report_detail():
+    assert False

{smartpush-1.5.3.dist-info → smartpush-1.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.5.3
+Version: 1.5.4
 Summary: 用于smartpush自动化测试工具包
 Author: lulu、felix、long
 

{smartpush-1.5.3.dist-info → smartpush-1.5.4.dist-info}/RECORD

@@ -2,8 +2,8 @@ smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=OYaDV6VPAmkGKYLlRnsi1ZyKHU8xEiVnjsYrc41ZR0U,17910
 smartpush/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/base/faker_data.py,sha256=TOd5EKVImxZpsKEW_dtKa2iqiUGqU7OBkOM8pvqKVUc,24643
-smartpush/base/request_base.py,sha256=Fn1uPWgaZQZdu8yyi2n13nuiKPVeR95iwx99sG6XGVU,574
-smartpush/base/url_enum.py,sha256=PmMwG10p9OqjCgfVduJTvb88YDoygl6lI1Pt8XkL0VA,963
+smartpush/base/request_base.py,sha256=LQfbECJTIk57iV-JFNjOx_zWbhwCLWAWTOUU1VmwTIw,1877
+smartpush/base/url_enum.py,sha256=_RcBMjDMWS_KOAK9T0HKG9msOWZLJGiKYKC4W5lOKjU,965
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=3IAeu1kjFS4MpDxjVB1htAcRA1BtfpH3xEkZyP4htAA,19963
 smartpush/export/basic/GetOssUrl.py,sha256=LeF1y1_uJaYXth1KvO6mEDS29ezb9tliBv5SrbqYkXc,6136
@@ -12,17 +12,18 @@ smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0F
 smartpush/flow/MockFlow.py,sha256=MI8WIMZyKlxrV5QVs8rXX6iD07Ldl37_L5Yb5FWqHzU,8595
 smartpush/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/form/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/form/form_after.py,sha256=_Sq-QE1_HRUOJFH6_WIbXkqV4Z3fPOcBdsvcAGAiEUc,6866
+smartpush/form/form_after.py,sha256=3z3dO22_ncVsAA1w9zGAcfJZCOELZ2lVBmaV-RfD0Hc,6335
 smartpush/form/form_assert.py,sha256=wPIRfQHhr7lN1fFd-mp0z_qKMtF4jfrNxRWvp2xfqCg,257
 smartpush/form/form_before.py,sha256=CCvAC_2yWPlnQGtjEA8LPLy9853Nq3nNjcL2GewFWIs,175
 smartpush/form/form_client_operation.py,sha256=gg-5uHXCyMa_ypBSYPYFVxXdwZdYBJsNtUCqayknMBw,303
+smartpush/form/test_form_after.py,sha256=aZglf2k2BUqKgL7FDMGX25rQ_ulj5kCd4R70hQzx4zs,58
 smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
 smartpush/utils/EmailUtlis.py,sha256=DAHd73bJ8hiJCLEXtD0xcwxPD7SOPSmBB7Jvlf6gN6s,11201
 smartpush/utils/ListDictUtils.py,sha256=Fm5_d7UyY6xB8gySMPdl5jIFSRhXZcYXdYW-_L1alcE,1640
 smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrAo,4139
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/utils/form_utils.py,sha256=ld-g_Dm_ZlnagQt7imYfUc87bcBRVlTctywuLtzmjXQ,849
-smartpush-1.5.3.dist-info/METADATA,sha256=3G1HMXQMe5tTBYuShoRgtfvmqElJsLD_FfYk4JY2VzU,131
-smartpush-1.5.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.5.3.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.5.3.dist-info/RECORD,,
+smartpush-1.5.4.dist-info/METADATA,sha256=UWktqTBpOYyes2pWSBCBjNF_RsRAvSNqLLgkuDS3cdE,131
+smartpush-1.5.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.5.4.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.5.4.dist-info/RECORD,,