smartpush 1.9.8__py3-none-any.whl → 2.0.0__py3-none-any.whl

smartpush/base/request_base.py

@@ -41,21 +41,23 @@ class RequestBase:
         }
         response_json = None
         default_kwargs.update(kwargs)
-        if default_kwargs.get('data') and isinstance(default_kwargs.get('data'), dict):  # 如果data有值json序列化
+        if default_kwargs.get('data') and isinstance(default_kwargs.get('data'), dict):
             data = json.dumps(default_kwargs.get('data'))
             default_kwargs.update({'data': data})
+        response = None
         try:
             print("请求参数为：\n", json.dumps(default_kwargs, ensure_ascii=False))
             response = self.session.request(method, url, **default_kwargs)
             response.raise_for_status()
             response_json = response.json()
             print("响应内容为：\n", json.dumps(response_json, ensure_ascii=False))
-            # 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", response)
+            print("响应内容为：\n", json.dumps(response.json(), ensure_ascii=False))
             raise e
 
 
@@ -69,3 +71,9 @@ class CrowdRequestBase(RequestBase):
     def __init__(self, crowd_id, host, headers, **kwargs):
         super().__init__(host, headers, **kwargs)
         self.crowd_id = crowd_id
+
+
+class ActivityTemplateRequestBase(RequestBase):
+    def __init__(self, activityTemplateId, host, headers, **kwargs):
+        super().__init__(host, headers, **kwargs)
+        self.activityTemplateId = activityTemplateId

smartpush/base/url_enum.py

@@ -1,54 +1,73 @@
 from enum import Enum, unique
 
+POST = 'POST'
+GET = 'GET'
+
 
 @unique
-class URL(Enum):
+class BaseEnum(Enum):
+    @property
+    def method(self):
+        return self.value[1]
+
+    @property
+    def url(self):
+        return self.value[0]
+
+
+class URL:
     """
     GET的参数用params，
     POST参数用data，
     """
 
-    """
-    :type:表单报告
-    """
-    pageFormReportDetail = '/formReport/detail/pageFormReportDetail', 'POST'  # 获取表单收集数据
-    getFormReportDetail = '/formReport/getFormReportDetail', 'POST'  # 获取表单报告数据(曝光/点击)
-    getFormPerformanceTrend = 'formReport/getFormPerformanceTrend', 'POST'
+    class FormReport(BaseEnum):
+        """
+        :type:表单报告
+        """
+        pageFormReportDetail = '/formReport/detail/pageFormReportDetail', POST  # 获取表单收集数据
+        getFormReportDetail = '/formReport/getFormReportDetail', POST  # 获取表单报告数据(曝光/点击)
+        getFormPerformanceTrend = 'formReport/getFormPerformanceTrend', POST
 
-    """
-    :type 群组
-    """
-    editCrowdPackage = '/crowdPackage/editCrowdPackage', 'POST'
-    crowdPersonListInPackage = '/crowdPackage/crowdPersonList', 'POST'
-    crowdPackageDetail = '/crowdPackage/detail', 'POST'
-    crowdPackageList = '/crowdPackage/list', 'POST'
-
-    """
-    :type 表单操作
-    """
-    deleteForm = '/form/deleteFormInfo', 'GET'
-    getFormList = '/form/getFormList', 'POST'
-    getFormInfo = '/form/getFormInfo', 'GET'
+    class Crowd(BaseEnum):
+        """
+        :type 群组
+        """
+        editCrowdPackage = '/crowdPackage/editCrowdPackage', POST
+        crowdPersonListInPackage = '/crowdPackage/crowdPersonList', POST
+        crowdPackageDetail = '/crowdPackage/detail', POST
+        crowdPackageList = '/crowdPackage/list', POST
 
-    """
-    :type 素材收藏
-    """
-    saveUniversalContent = "/universalContent/saveUniversalContent", 'POST'
-    deleteUniversalContent = "/universalContent/deleteUniversalContent", 'GET'
-    updateUniversalContent = "/universalContent/updateUniversalContent", 'POST'
-    queryUniversalContent = "/universalContent/query", 'POST'
-    updateCampaignUsed = "/universalContent/updateCampaignUsed",'POST'
-    queryUsedDetail = "/universalContent/queryUsedDetail", 'POST'
+    class Form(BaseEnum):
+        """
+        :type 表单操作
+        """
+        deleteForm = '/form/deleteFormInfo', GET
+        getFormList = '/form/getFormList', POST
+        getFormInfo = '/form/getFormInfo', GET
 
-    @property
-    def method(self):
-        return self.value[1]
+    class UniversalContent(BaseEnum):
+        """
+        :type 素材收藏
+        """
+        saveUniversalContent = "/universalContent/saveUniversalContent", POST
+        deleteUniversalContent = "/universalContent/deleteUniversalContent", GET
+        updateUniversalContent = "/universalContent/updateUniversalContent", POST
+        queryUniversalContent = "/universalContent/query", POST
+        updateCampaignUsed = "/universalContent/updateCampaignUsed", POST
+        queryUsedDetail = "/universalContent/queryUsedDetail", POST
 
-    @property
-    def url(self):
-        return self.value[0]
+    class Activity(BaseEnum):
+        """
+        :type 活动
+        """
+        step1 = "/marketing/insertOrUpdateActivity/step1", POST
+        step2 = "/marketing/insertOrUpdateActivity/step2", POST
+        step2_get = "/marketing/activityDetail/step2", GET
 
 
 if __name__ == '__main__':
-    print(URL.pageFormReportDetail.method)
-    print(URL.getFormReportDetail.url)
+    print(URL.FormReport.pageFormReportDetail.url)
+    print(URL.FormReport.pageFormReportDetail.method)
+    print(BaseEnum.url)
+    # print(URL.getFormReportDetail.url)