smartpush 1.5.7__py3-none-any.whl → 1.5.8__py3-none-any.whl

smartpush/base/request_base.py

@@ -38,21 +38,33 @@ class RequestBase:
             "timeout": 30,
             "headers": self.headers
         }
+        response_json = None
         default_kwargs.update(kwargs)
-        if default_kwargs.get('data'): # 如果data有值json序列化
+        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()
+            response_json = response.json()
+            print("响应内容为：\n", json.dumps(response_json))
+            assert response_json['code'] == 1
+            return response_json
         except requests.exceptions.RequestException as e:
             print(f"请求失败: {e}")
             return None
+        except Exception as e:
+            print("响应内容为：\n", json.dumps(response_json))
+            raise e
 
 
 class FormRequestBase(RequestBase):
-    def __init__(self, form_id, host, headers):
-        super().__init__(host, headers)
+    def __init__(self, form_id, host, headers, **kwargs):
+        super().__init__(host, headers, **kwargs)
         self.form_id = form_id
+
+
+class CrowdRequestBase(RequestBase):
+    def __init__(self, crowd_id, host, headers, **kwargs):
+        super().__init__(host, headers, **kwargs)
+        self.crowd_id = crowd_id

smartpush/base/url_enum.py

@@ -15,6 +15,7 @@ class URL(Enum):
     """
     editCrowdPackage = '/crowdPackage/editCrowdPackage', 'POST'
     crowdPersonList = '/crowdPackage/crowdPersonList', 'POST'
+    crowdPackageDetail = '/crowdPackage/detail', 'GET'
 
     """
     :type 表单操作

smartpush/crowd/crowd.py

@@ -0,0 +1,52 @@
+from smartpush.base.request_base import CrowdRequestBase
+from smartpush.base.url_enum import URL
+
+
+class Crowd(CrowdRequestBase):
+
+    def callEditCrowdPackage(self, crowdName="", groupRules=None, groupRelation="$AND",
+                             triggerStock=False):
+        """
+        更新群组条件id
+        :param triggerStock:
+        :param crowdName:
+        :param groupRules:
+        :param groupRelation:
+        :return:
+        """
+        requestParam = {"id": self.crowd_id, "crowdName": crowdName, "groupRelation": groupRelation,
+                        "groupRules": groupRules, "triggerStock": triggerStock}
+        result = self.request(method=URL.editCrowdPackage.method, path=URL.editCrowdPackage.url, data=requestParam)
+        return result['resultData']
+
+    def callCrowdPersonList(self, page=1, pageSize=20, filter_type=None, filter_value=None):
+        """
+        获取群组联系人列表
+        :param page:
+        :param pageSize:
+        :param filter_type:
+        :param filter_value:
+        :return:
+        """
+        requestParam = {"id": self.crowd_id, "page": page, "pageSize": pageSize}
+        if filter_value is not None:
+            requestParam["filter"] = {filter_type: {"in": filter_value}}
+        result = self.request(method=URL.crowdPersonList.method, path=URL.crowdPersonList.url, data=requestParam)
+        resultData = result['resultData']
+        return resultData
+
+    def callCrowdPackageDetail(self, page=1, pageSize=20, filter_type=None, filter_value=None):
+        """
+        获取群组详情
+        :param page:
+        :param pageSize:
+        :param filter_type:
+        :param filter_value:
+        :return:
+        """
+        requestParam = {"id": self.crowd_id, "page": page, "pageSize": pageSize, "filter": {}}
+        if filter_value is not None:
+            requestParam["filter"] = {filter_type: {"in": filter_value}}
+        result = self.request(method=URL.crowdPersonList.method, path=URL.crowdPackageDetail.url, data=requestParam)
+        resultData = result['resultData']
+        return resultData

smartpush/form/form_after.py

@@ -2,6 +2,7 @@ import json
 from tenacity import retry, stop_after_attempt, wait_fixed
 from smartpush.base.request_base import FormRequestBase
 from smartpush.base.url_enum import URL
+from smartpush.crowd import crowd
 from smartpush.export.basic.GetOssUrl import log_attempt
 
 
@@ -40,30 +41,6 @@ class FormAfter(FormRequestBase):
         resultData = result["resultData"]
         return resultData
 
-    def callEditCrowdPackage(self, _id=None, groupRules=None, groupRelation="$AND"):
-        """
-        更新群组条件id
-        :param _id:
-        :param groupRules:
-        :param groupRelation:
-        :return:
-        """
-        requestParam = {"id": _id, "crowdName": "表单查询群组-自动化", "groupRelation": groupRelation,
-                        "groupRules": groupRules, "triggerStock": False}
-        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
-        return resultData["id"]
-
-    def callCrowdPersonList(self, _id, page, pageSize, filter_type, filter_value):
-        requestParam = {"id": _id, "page": page, "pageSize": pageSize}
-        if filter_value is not None:
-            requestParam["filter"] = {filter_type: {"in": filter_value}}
-        result = self.request(method=URL.crowdPersonList.method, path=URL.crowdPersonList.url, data=requestParam)
-        result.raise_for_status()
-        return result['resultData']
-
     def callGetFormList(self, formName):
         requestParam = {'page': 1, 'pageSize': 10, 'name': formName}
         result = self.request(method=URL.getFormList.method, path=URL.getFormList.url, data=requestParam)

{smartpush-1.5.7.dist-info → smartpush-1.5.8.dist-info}/METADATA

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

{smartpush-1.5.7.dist-info → smartpush-1.5.8.dist-info}/RECORD

@@ -4,8 +4,10 @@ smartpush/account/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 smartpush/account/operate_account.py,sha256=nzJLLAEwNElavZeWVqnA_MSGTBzQrSrknmezYBwtvWs,1525
 smartpush/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/base/faker_data.py,sha256=TOd5EKVImxZpsKEW_dtKa2iqiUGqU7OBkOM8pvqKVUc,24643
-smartpush/base/request_base.py,sha256=JCkISn2mp_Aaugv_ZaNtFQrVaHtjQPxGgko6kCXOdlk,1848
-smartpush/base/url_enum.py,sha256=_RcBMjDMWS_KOAK9T0HKG9msOWZLJGiKYKC4W5lOKjU,965
+smartpush/base/request_base.py,sha256=PpWVYQEBQN6FZtXJNDGx29qPsRKN7o_299HfK_Vr1jE,2297
+smartpush/base/url_enum.py,sha256=PmU44Qj3yvHZPYovx5F8DQ7FQRMjq9Tw0JHV7kHpXM0,1020
+smartpush/crowd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+smartpush/crowd/crowd.py,sha256=x1a-2LSbKx8GZhmJ8hkY9csMa9W6khOr40dflSvEJYU,2088
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=3IAeu1kjFS4MpDxjVB1htAcRA1BtfpH3xEkZyP4htAA,19963
 smartpush/export/basic/GetOssUrl.py,sha256=LeF1y1_uJaYXth1KvO6mEDS29ezb9tliBv5SrbqYkXc,6136
@@ -14,7 +16,7 @@ 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=sRvdYguJ-oJOQ3gOyfubh1xiZOq40O5E35rluOmsykc,9441
+smartpush/form/form_after.py,sha256=VzBRDCzUmrgdSQu_Mr2ccbqkQvVCr71vei2utmvPbwI,8334
 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
@@ -24,7 +26,7 @@ smartpush/utils/ListDictUtils.py,sha256=Fm5_d7UyY6xB8gySMPdl5jIFSRhXZcYXdYW-_L1a
 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.7.dist-info/METADATA,sha256=FL6Z9J-yTkIiTCPhEQEma2LEyVolTLnJxoOq93bAlC4,131
-smartpush-1.5.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.5.7.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.5.7.dist-info/RECORD,,
+smartpush-1.5.8.dist-info/METADATA,sha256=ka9ntRxvwReN7Fgq1j69QX8_An4XFlw2Pon8G6RQYFg,131
+smartpush-1.5.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.5.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.5.8.dist-info/RECORD,,