smartpush 2.0.5__py3-none-any.whl → 2.0.7__py3-none-any.whl

smartpush/base/request_base.py

@@ -77,3 +77,10 @@ class ActivityTemplateRequestBase(RequestBase):
     def __init__(self, activityTemplateId, host, headers, **kwargs):
         super().__init__(host, headers, **kwargs)
         self.activityTemplateId = activityTemplateId
+
+
+class OpenApiRequestBase(RequestBase):
+    def __init__(self, event_id, host, headers, **kwargs):
+        super().__init__(host, headers, **kwargs)
+        self.event_id = event_id
+

smartpush/base/url_enum.py

@@ -64,8 +64,20 @@ class URL:
         step1 = "/marketing/insertOrUpdateActivity/step1", POST
         step2 = "/marketing/insertOrUpdateActivity/step2", POST
         step2_get = "/marketing/activityDetail/step2", GET
-        delete = "/marketing/deleteActivity",GET
-        copy = '/marketing/copyActivity',GET
+        delete = "/marketing/deleteActivity", GET
+        copy = '/marketing/copyActivity', GET
+
+    class OpenApi(BaseEnum):
+        """
+        :type OpenApi
+        """
+        getEventMetaList = '/metrics/getEventMetaList', POST
+        getEventMetaById = '/metrics/getEventMetaById', POST
+        delEventMetaById = '/metrics/delEventMetaById', POST
+        editEventMeta = '/metrics/editEventMeta', POST
+        getEventChannel = '/metrics/getEventChannel', GET
+        getEventAttr = '/metrics/getEventAttr', POST
+
 
 
 if __name__ == '__main__':

smartpush/email/activity.py

@@ -1,17 +1,7 @@
-import json
-
-from smartpush.base.request_base import ActivityTemplateRequestBase, RequestBase
+from smartpush.base.request_base import ActivityTemplateRequestBase
 from smartpush.base.url_enum import URL
-from smartpush.utils.date_utils import *
 from smartpush.email.schema import *
-
-"""
-创建活动草稿
-"""
-
-"""
-更新活动草稿内容
-"""
+from smartpush.utils.date_utils import *
 
 
 class ActivityTemplate(ActivityTemplateRequestBase):

smartpush/email/schema.py

@@ -11,6 +11,18 @@ def generate_UUID(length=None):
         return _uuid
 
 
+class BlockType(Enum):
+    Section = 1
+    Block = 0
+
+    @staticmethod
+    def getType(block_type):
+        if block_type == BlockType.Section.name:
+            return BlockType.Section.value
+        else:
+            return BlockType.Block.value
+
+
 @unique
 class BlockSchema(Enum):
     Logo = {
@@ -548,6 +560,7 @@ class BlockSchema(Enum):
             elif isinstance(node, list):
                 for item in node:
                     recursive_parse(item)
+
         recursive_parse(schema if isinstance(schema, dict) else schema.value)
         schemaAnalysis = {"schema": result}
         return json.dumps(schemaAnalysis)

smartpush/email/universal_content.py

@@ -1,15 +1,14 @@
-import json
 import time
+from typing import Optional, List, Dict, Any
 
 from smartpush.base.request_base import RequestBase
 from smartpush.base.url_enum import *
 from smartpush.email.schema import *
-from smartpush.email.activity import ActivityTemplate
 
 
 def gen_universal_request_param(universalId, schema, **kwargs):
     """
-
+    生成单个universal的请求参数
     :param schema:
     :type universalId:
     kwargs :
@@ -23,15 +22,88 @@ def gen_universal_request_param(universalId, schema, **kwargs):
         "universalName": universalName,
         "schema": json.dumps(result_schema),
         "subUniversalId": kwargs.get('subUniversal_id', universalId),
-        "type": kwargs.get('type', 0),
+        "type": BlockType.getType(result_schema.get('type')),
         "blockType": result_schema.get('type'),
         "flowModal": kwargs.get('flowModal', '')
     }
-    return json.dumps(requestParam)
+    return json.dumps(requestParam) if kwargs.get('jsonDumps') else requestParam
+
+
+def gen_update_universal_param(
+        block_schema_list: Optional[List[Dict[str, Any]]] = None,
+        section_schema: Optional[Dict[str, Any]] = None
+) -> dict[str, list[dict[str, Any]] | int]:
+    """
+    根据Block列表生成更新参数，支持同时更新关联的Section（Section始终放在参数列表首位）
+
+    :param block_schema_list: Block schema列表（每个元素为字典格式的schema）
+    :param section_schema: Section schema字典（可选，传入则同步更新Section）
+    :return: 统一格式的更新请求参数列表（字典类型，未序列化）
+    """
+    # 初始化参数列表和Block收集列表（默认空列表，避免None判断）
+    update_params: List[Dict[str, Any]] = []
+    valid_block_schemas: List[Dict[str, Any]] = []
+    type = 0
+    # 处理Block参数（过滤无效schema，避免异常）
+    block_schema_list = block_schema_list or []
+    for block_schema in block_schema_list:
+        if not isinstance(block_schema, dict):
+            print("不符合格式：",block_schema)
+            continue  # 跳过非字典格式的无效schema
+        # 提取必要字段（无默认值时用空字符串兜底，避免KeyError）
+        universal_id = block_schema.get('universalId', '')
+        universal_name = block_schema.get('universalName', '')
+
+        # 生成Block更新参数（指定jsonDumps=False返回字典，保持格式统一）
+        block_param = gen_universal_request_param(
+            universalId=universal_id,
+            schema=block_schema,
+            jsonDumps=False,
+            universalName=universal_name
+        )
+        update_params.append(block_param)
+
+        # 收集有效Block，用于更新Section的children
+        if section_schema:
+            valid_block_schemas.append(block_schema)
+
+    # 处理Section参数（如需同步更新，插入列表首位）
+    if isinstance(section_schema, dict):
+        # 提取Section必要字段
+        section_id = section_schema.get('universalId', '')
+        section_name = section_schema.get('universalName', '')
+        section_inner_id = section_schema.get('id', '')
+
+        # 若有有效Block，更新Section的children（保持原逻辑）
+        final_section_schema = section_schema
+        if valid_block_schemas:
+            final_section_schema = get_universal_schema(
+                schema=BlockSchema.genSection(valid_block_schemas),
+                _id=section_inner_id,
+                universalId=section_id,
+                universalName=section_name
+            )
+
+        # 生成Section更新参数
+        section_param = gen_universal_request_param(
+            universalId=section_id,
+            schema=final_section_schema,
+            jsonDumps=False,
+            universalName=section_name
+        )
+        type = 1
+        # 插入列表开头（确保Section在首位）
+        update_params.insert(0, section_param)
+    print(f"生成更新请求参数（共{len(update_params)}个）：\n{json.dumps(update_params, indent=2, ensure_ascii=False)}")
+    return {'data':update_params,'type':type}
 
 
 class UniversalContent(RequestBase):
-    # 获取universal创建参数
+    # 写一个init初始化
+    def __init__(self, universal_id=None, *args, **kwargs):
+        """初始化，传入"""
+        super().__init__(*args, **kwargs)  # 调用父类初始化
+        self.universal_id = universal_id  # 初始化event_id属性
 
     # 创建universal
     def create_universal(self, requestParam):
@@ -57,35 +129,53 @@ class UniversalContent(RequestBase):
         return result
 
     # 更新universal
-    def update_universal(self, universal_list, _type=0):
+    def update_universal(self, universal_list):
         """
-        更新素材
-        :param _type:
+        更新素材，需要多个universal参数组合，type参数为section =1 ，block =0，有section和block时取section
         :param universal_list:
-                [{"universalId": _dict.get('universa_id'),
-                "universalName": _dict.get('universa_name'),
-                "schema": json.dumps(result_schema),
-                "subUniversalId": _dict.get('subUniversal_id', _dict.get('universa_id')),
-                "type": _dict.get('type'),
-                "blockType": _dict.get('schema').name,
-                "flowModal": ""
-                }]
+        {
+            "data": [
+                {
+                    "universalId": "9a1d1b16-7b48-4f9e-9dc9-f379efd746a5",
+                    "universalName": "Auto-Section-2025-12-03 14:44:01",
+                    "schema": "{\"id\": \"546bced03\", \"universalId\": \"9a1d1b16-7b48-4f9e-9dc9-f379efd746a5\", \"universalName\": \"Auto-Section-2025-12-03 14:44:01\", \"type\": \"Section\", \"props\": {\"backgroundColor\": \"#f1e6e6\", \"borderLeft\": \"1px none #ffffff\", \"borderRight\": \"1px none #ffffff\", \"borderTop\": \"1px none #ffffff\", \"borderBottom\": \"1px none #ffffff\", \"paddingTop\": \"0px\", \"paddingBottom\": \"0px\", \"paddingLeft\": \"0px\", \"paddingRight\": \"0px\", \"cols\": [12]}, \"children\": [{\"id\": \"8cab9aa48\", \"type\": \"Column\", \"props\": {}, \"children\": [{\"id\": \"f4baab96e\", \"universalId\": \"eed20601-e227-4481-897b-42e4a1a9d37a\", \"universalName\": \"Auto-Logo-2025-12-03 14:44:01\", \"type\": \"Logo\", \"props\": {\"width\": \"120\", \"height\": \"120\", \"imgRatio\": 1, \"src\": \"https://cdn.smartpushedm.com/frontend/smart-push/staging/1741054956275/1758595834300_74d62ae6.png?width=120&height=120\", \"href\": \"https://smartpush4.myshoplinestg.com\", \"align\": \"center\", \"containerBackgroundColor\": \"transparent\", \"paddingLeft\": \"20px\", \"paddingRight\": \"20px\", \"paddingTop\": \"20px\", \"paddingBottom\": \"20px\", \"paddingCondition\": true, \"segmentTypeConfig\": 1}, \"children\": []}]}]}",
+                    "subUniversalId": "9a1d1b16-7b48-4f9e-9dc9-f379efd746a5",
+                    "type": 1,
+                    "blockType": "Section",
+                    "flowModal": ""
+                },
+                {
+                    "universalId": "eed20601-e227-4481-897b-42e4a1a9d37a",
+                    "universalName": "Auto-Logo-2025-12-03 14:44:01",
+                    "schema": "{\"id\": \"f4baab96e\", \"universalId\": \"eed20601-e227-4481-897b-42e4a1a9d37a\", \"universalName\": \"Auto-Logo-2025-12-03 14:44:01\", \"type\": \"Logo\", \"props\": {\"width\": \"120\", \"height\": \"120\", \"imgRatio\": 1, \"src\": \"https://cdn.smartpushedm.com/frontend/smart-push/staging/1741054956275/1758595834300_74d62ae6.png?width=120&height=120\", \"href\": \"https://smartpush4.myshoplinestg.com\", \"align\": \"center\", \"containerBackgroundColor\": \"transparent\", \"paddingLeft\": \"20px\", \"paddingRight\": \"20px\", \"paddingTop\": \"20px\", \"paddingBottom\": \"20px\", \"paddingCondition\": true, \"segmentTypeConfig\": 1}, \"children\": []}",
+                    "subUniversalId": "eed20601-e227-4481-897b-42e4a1a9d37a",
+                    "type": 0,
+                    "blockType": "Logo",
+                    "flowModal": ""
+                }
+            ],
+            "type": 1
+        }
         :return:
         """
-        requestParam = {
-            "data": universal_list,
-            "type": _type
-        }
+        # block_type_list = []
+        # for data in universal_list:
+        #     block_type_list.append(data['type'])
+        # if BlockType.Section.value in set(block_type_list):
+        #     _type = BlockType.Section.value
+        # else:
+        #     _type = BlockType.Block.value
+        requestParam = universal_list
         result = self.request(method=URL.UniversalContent.updateUniversalContent.method,
                               path=URL.UniversalContent.updateUniversalContent.url,
                               data=requestParam)
-        # TODO 未完成
         return result
 
     # 删除universal
     def delete_universal(self, universalId):
         """
         删除素材
+        :param universalId:
         :param universa_id:
         :return:
         """
@@ -131,15 +221,17 @@ class UniversalContent(RequestBase):
                 print(f"------收藏的block在该section({section_universa_name})中,断言成功------")
             except:
                 raise
+
     @staticmethod
-    def assert_universal_schema_is_update(schema, property='containerBackgroundColor', value ='#123456'):
+    def assert_universal_schema_is_update(schema, property='containerBackgroundColor', value='#123456'):
         """
         用于查找素材schema的属性是否更新成功
+        :param schema:
         :param property:
         :param value:
         :return:
         """
-        _schema =schema if isinstance(schema,dict) else json.loads(schema)
+        _schema = schema if isinstance(schema, dict) else json.loads(schema)
         assert _schema['props'][property] == value
 
 
@@ -148,6 +240,11 @@ def get_time():
 
 
 def gen_universal_name(schema):
+    """
+    生成素材名称
+    :param schema:
+    :return:
+    """
     schema = schema if isinstance(schema, dict) else schema.value
     if schema['type']:
         return 'Auto-' + schema['type'] + '-' + get_time()
@@ -156,77 +253,67 @@ def gen_universal_name(schema):
 
 
 def get_universal_schema(schema, _id, universalId, universalName):
+    """
+    获取素材中的schema
+    :param schema:
+    :param _id:
+    :param universalId:
+    :param universalName:
+    :return:
+    """
     schema = schema if isinstance(schema, dict) else schema.value
     schema.update(id=_id, universalId=universalId, universalName=universalName)
     return schema
 
 
 if __name__ == '__main__':
-    # _list = [get_universal_schema(BlockSchema.Logo, _id=generate_UUID(9), universalId=generate_UUID(),
-    #                               universalName=gen_universal_name(BlockSchema.Logo))]
-    # print(json.dumps(_list))
-    # print(gen_universal_request_param(generate_UUID(),
-    #                                              get_universal_schema(genSection(_list), _id=generate_UUID(9),
-    #                                                                   universalId=generate_UUID(),
-    #                                                                   universalName=gen_universal_name(
-    #                                                                       BlockSchema.Section))))
     sectionUniversalId = generate_UUID()
     sectionUniversalName = gen_universal_name(BlockSchema.Section)
-    print(sectionUniversalName)
-    block_list = [BlockSchema.Logo]
-    block_dict = {}
+    # print(sectionUniversalName)
+    block_list = [BlockSchema.Logo,BlockSchema.Discount]
+    # block_dict = {}
     result_list = []
-    blockUniversalNameList = []
+    # update_request_param = []
+    # blockUniversalNameList = []
     for block in block_list:
         name = block.name
-        block_schema = get_universal_schema(block, _id=generate_UUID(9), universalId=generate_UUID(),
+        universal_id = generate_UUID()
+        block_schema = get_universal_schema(block, _id=generate_UUID(9), universalId=universal_id,
                                             universalName=gen_universal_name(block))
+        block_request_param = gen_universal_request_param(universal_id, block_schema, jsonDumps=False)
         result_list.append(block_schema)
-    print(result_list)
+        # update_request_param.append(block_request_param)
     section_schema = get_universal_schema(BlockSchema.genSection(result_list), _id=generate_UUID(9),
                                           universalId=sectionUniversalId,
                                           universalName=sectionUniversalName)
-    universal_request_param = gen_universal_request_param(sectionUniversalId, section_schema)
-    print(universal_request_param)
-    head = {
-        "cookie": "osudb_appid=SMARTPUSH;osudb_oar=#01#SID0000141BOhqtUqYGMjRho2SIPBeE5o1HNWFHo9q+qttt/jMLf+gRshde7x0NZUgAST4PB4CfSuAa450BCuCZf6pwolP1vXs/cF+6e/snBhESLvofXaxDaIFN9swZq4Np2xBc4uw6R4V58uWjrwg+s8XTLVv;osudb_subappid=1;osudb_uid=4213785247;ecom_http_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NjU1OTg0NzQsImp0aSI6ImU0YzAyZjcxLWQ4NDktNDZlYS1iNzNmLTY1YjU0YTc3MTJjZCIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjQ3IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmVhcHAuY29tIiwidXNlclJvbGUiOiJvd25lciIsInBsYXRmb3JtVHlwZSI6Nywic3ViUGxhdGZvcm0iOjEsInBob25lIjoiIiwibGFuZ3VhZ2UiOiJ6aC1oYW5zLWNuIiwiYXV0aFR5cGUiOiIiLCJhdHRyaWJ1dGVzIjp7ImNvdW50cnlDb2RlIjoiQ04iLCJjdXJyZW5jeSI6IkpQWSIsImN1cnJlbmN5U3ltYm9sIjoiSlDCpSIsImRvbWFpbiI6InNtYXJ0cHVzaDQubXlzaG9wbGluZXN0Zy5jb20iLCJsYW5ndWFnZSI6ImVuIiwibWVyY2hhbnRFbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmUuY29tIiwibWVyY2hhbnROYW1lIjoiU21hcnRQdXNoNF9lYzJf6Ieq5Yqo5YyW5bqX6ZO6IiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL01hY2FvIn0sInN0b3JlSWQiOiIxNjQ0Mzk1OTIwNDQ0IiwiaGFuZGxlIjoic21hcnRwdXNoNCIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTc2MzAwNjQ3NDQzNywic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIiwiYXBpLXNwLW1hcmtldC1lYzIiXSwiY2xpZW50X2lkIjoiZW1haWwtbWFya2V0In0.erTiG4r364sutySNgx8X1rmrAjFsyfoe3UIUZ6J9e-o;",
-        "Content-Type": "application/json", "accept-language": "zh-CN"}
-    universal = UniversalContent(headers=head, host='https://test.smartpushedm.com/bff/api-sp-market-ec2')
-    try:
-        # universal.create_universal(requestParam=universal_request_param)
-        # universal.assert_block_in_the_section(sectionUniversalName, result_list)
-        _list =[
-            {"universalId": "ec5d5278-4ed7-4933-8010-2b0c6a776356", "universalName": "Auto-Logo-2025-11-26 00:35:35",
-             "schema": "{\"id\":\"96997bb0a\",\"universalId\":\"ec5d5278-4ed7-4933-8010-2b0c6a776356\",\"universalName\":\"Auto-Logo-2025-11-26 00:35:35\",\"type\":\"Logo\",\"props\":{\"width\":120,\"height\":120,\"imgRatio\":1,\"src\":\"https://cdn.smartpushedm.com/frontend/smart-push/staging/1741054956275/1758595834300_74d62ae6.png?width=120&height=120\",\"href\":\"https://smartpush4.myshoplinestg.com\",\"align\":\"center\",\"containerBackgroundColor\":\"#b46b6b\",\"paddingLeft\":\"20px\",\"paddingRight\":\"20px\",\"paddingTop\":\"20px\",\"paddingBottom\":\"20px\",\"paddingCondition\":\"true\",\"segmentTypeConfig\":1},\"children\":[]}",
-             "subUniversalId": "ec5d5278-4ed7-4933-8010-2b0c6a776356", "type": 0, "blockType": "Logo",
-             "flowModal": ""}]
-        universal.update_universal(_list)
-    except:
-        raise
-    finally:
-        # universal.delete_universal(sectionUniversalId)
-        # pass
-        pass
-#
-# if __name__ == '__main__':
-#     sectionUniversalId = generate_UUID()
-#     sectionUniversalName = gen_universal_name(BlockSchema.Section)
-#     print(sectionUniversalName)
-#     block_list = [BlockSchema.Logo]  # 添加block
+    # section_universal_request_param = gen_universal_request_param(sectionUniversalId, section_schema, jsonDumps=False)
+    #
+    # update_request_param.insert(0, section_universal_request_param)
+    # print("update_request_param:", update_request_param)
+    # print(result_list)
+    # print(section_schema)
+    print(gen_update_universal_param(result_list,section_schema))
+    # print("universal_request_param:", section_universal_request_param)
+    # head = {
+    #     "cookie": "osudb_appid=SMARTPUSH;osudb_oar=#01#SID0000141BOhqtUqYGMjRho2SIPBeE5o1HNWFHo9q+qttt/jMLf+gRshde7x0NZUgAST4PB4CfSuAa450BCuCZf6pwolP1vXs/cF+6e/snBhESLvofXaxDaIFN9swZq4Np2xBc4uw6R4V58uWjrwg+s8XTLVv;osudb_subappid=1;osudb_uid=4213785247;ecom_http_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NjU1OTg0NzQsImp0aSI6ImU0YzAyZjcxLWQ4NDktNDZlYS1iNzNmLTY1YjU0YTc3MTJjZCIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjQ3IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmVhcHAuY29tIiwidXNlclJvbGUiOiJvd25lciIsInBsYXRmb3JtVHlwZSI6Nywic3ViUGxhdGZvcm0iOjEsInBob25lIjoiIiwibGFuZ3VhZ2UiOiJ6aC1oYW5zLWNuIiwiYXV0aFR5cGUiOiIiLCJhdHRyaWJ1dGVzIjp7ImNvdW50cnlDb2RlIjoiQ04iLCJjdXJyZW5jeSI6IkpQWSIsImN1cnJlbmN5U3ltYm9sIjoiSlDCpSIsImRvbWFpbiI6InNtYXJ0cHVzaDQubXlzaG9wbGluZXN0Zy5jb20iLCJsYW5ndWFnZSI6ImVuIiwibWVyY2hhbnRFbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmUuY29tIiwibWVyY2hhbnROYW1lIjoiU21hcnRQdXNoNF9lYzJf6Ieq5Yqo5YyW5bqX6ZO6IiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL01hY2FvIn0sInN0b3JlSWQiOiIxNjQ0Mzk1OTIwNDQ0IiwiaGFuZGxlIjoic21hcnRwdXNoNCIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTc2MzAwNjQ3NDQzNywic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIiwiYXBpLXNwLW1hcmtldC1lYzIiXSwiY2xpZW50X2lkIjoiZW1haWwtbWFya2V0In0.erTiG4r364sutySNgx8X1rmrAjFsyfoe3UIUZ6J9e-o;",
+    #     "Content-Type": "application/json", "accept-language": "zh-CN"}
+    # universal = UniversalContent(headers=head, host='https://test.smartpushedm.com/bff/api-sp-market-ec2')
+    # universal.update_universal(update_request_param)
+    #
+    # universal = UniversalContent(headers=head, host='https://test.smartpushedm.com/bff/api-sp-market-ec2')
+    # try:
+    #     # universal.create_universal(requestParam=universal_request_param)
+    #     # universal.assert_block_in_the_section(sectionUniversalName, result_list)
+    #     _list =[
+    #         {"universalId": "ec5d5278-4ed7-4933-8010-2b0c6a776356", "universalName": "Auto-Logo-2025-11-26 00:35:35",
+    #          "schema": "{\"id\":\"96997bb0a\",\"universalId\":\"ec5d5278-4ed7-4933-8010-2b0c6a776356\",\"universalName\":\"Auto-Logo-2025-11-26 00:35:35\",\"type\":\"Logo\",\"props\":{\"width\":120,\"height\":120,\"imgRatio\":1,\"src\":\"https://cdn.smartpushedm.com/frontend/smart-push/staging/1741054956275/1758595834300_74d62ae6.png?width=120&height=120\",\"href\":\"https://smartpush4.myshoplinestg.com\",\"align\":\"center\",\"containerBackgroundColor\":\"#b46b6b\",\"paddingLeft\":\"20px\",\"paddingRight\":\"20px\",\"paddingTop\":\"20px\",\"paddingBottom\":\"20px\",\"paddingCondition\":\"true\",\"segmentTypeConfig\":1},\"children\":[]}",
+    #          "subUniversalId": "ec5d5278-4ed7-4933-8010-2b0c6a776356", "type": 0, "blockType": "Logo",
+    #          "flowModal": ""}]
+    #     universal.update_universal(_list)
+    # except:
+    #     raise
+    # finally:
+    #     # universal.delete_universal(sectionUniversalId)
+    #     # pass
+    #     pass
 #
-#     block_dict = {}
-#     result_list = []
-#     blockUniversalNameList = []
-#     for block in block_list:
-#         name = block.name
-#         block_schema = get_universal_schema(block, _id=generate_UUID(9), universalId=generate_UUID(),
-#                                             universalName=gen_universal_name(block))
-#         result_list.append(block_schema)
-#     print(result_list)
-#     # vars['result_list'] = result_list
-#     section_schema = get_universal_schema(BlockSchema.genSection(result_list), _id=generate_UUID(9),
-#                                           universalId=sectionUniversalId,
-#                                           universalName=sectionUniversalName)
-#     universal_request_param = gen_universal_request_param(sectionUniversalId, section_schema)
-#     vars['universal_request_param'] = universal_request_param
-#     print(universal_request_param)

smartpush/openapi/openapi.py

@@ -0,0 +1,159 @@
+import random
+
+from smartpush.base.request_base import OpenApiRequestBase
+from smartpush.base.url_enum import URL
+
+
+class OpenApi(OpenApiRequestBase):
+    def __init__(self, event_id=None, *args, **kwargs):
+        """初始化OpenApi，支持传入event_id"""
+        super().__init__(*args, **kwargs)  # 调用父类初始化
+        self.event_id = event_id  # 初始化event_id属性
+        self.attrTypeList = ('STRING', 'BIGINT', 'BOOLEAN', 'DATE', 'DECIMAL')
+
+    def get_attribute_type(self, _type=None):
+        """
+        返回一个数据类型('STRING', 'BIGINT', 'BOOLEAN', 'DATE', 'DECIMAL')
+        :param _type:
+        :return:
+        """
+
+        if _type is not None and _type in self.attrTypeList:
+            return _type
+        else:
+            return random.choice(self.attrTypeList)
+
+    def getEventMetaList(self, code=None, channel=None):
+        """
+        获取EventMeta数据
+        :param code: 事件编码
+        :param channel: 渠道类型
+        :return: 请求结果
+        """
+        requestParam = {"pageModel": {"page": 1, "pageSize": 20}}
+        # 正确的参数更新逻辑：有值才更新
+        if channel:
+            requestParam["channel"] = channel
+        if code:
+            requestParam["code"] = code
+        result = self.request(
+            URL.OpenApi.getEventMetaList.url,
+            URL.OpenApi.getEventMetaList.method,
+            data=requestParam
+        )
+        return result
+
+    def getEventMetaById(self, eventCode):
+        """
+        获取事件详情
+        :param eventCode: 事件编码
+        :return: 请求结果
+        """
+        if not self.event_id:
+            raise ValueError("event_id未初始化，请在实例化时传入")
+        requestParam = {"id": self.event_id, "eventCode": eventCode}
+        result = self.request(
+            URL.OpenApi.getEventMetaById.url,
+            URL.OpenApi.getEventMetaById.method,
+            data=requestParam
+        )
+        return result
+
+    def deleteEventMetaById(self, eventCode):
+        """
+        删除事件（根据ID）
+        :param eventCode: 事件编码
+        :return: 请求结果
+        """
+        if not self.event_id:
+            raise ValueError("event_id未初始化，请在实例化时传入")
+        requestParam = {"id": self.event_id, "eventCode": eventCode}
+        result = self.request(
+            URL.OpenApi.delEventMetaById.url,
+            URL.OpenApi.delEventMetaById.method,
+            data=requestParam
+        )
+        return result
+
+    def editEventMeta(self, eventCode, eventName, eventChannel, channelMetaTabi, eventAttrs: list,
+                      updateEventAttrs: list, deleteEventAttrs: list):
+        if not self.event_id:
+            raise ValueError("event_id未初始化，请在实例化时传入")
+        requestParam = {
+            "eventCode": eventCode,
+            "eventName": eventName,
+            "eventChannel": eventChannel,
+            "eventAttrs": eventAttrs,
+            "id": self.event_id,
+            "channel": {
+                "updateEventChannel": {
+                    "channelMetaTabi": channelMetaTabi,
+                    "channelCode": "eventChannel"
+                }
+            },
+            "attrs": {
+                "updateEventAttrs": updateEventAttrs,
+                "deleteEventAttrs": deleteEventAttrs
+            }
+        }
+        result = self.request(
+            URL.OpenApi.editEventMeta.url,
+            URL.OpenApi.editEventMeta.method,
+            data=requestParam
+        )
+        return result
+
+    def getEventChannel(self):
+        # requestParam = {"id": self.event_id, "eventCode": eventCode}
+        result = self.request(
+            URL.OpenApi.getEventChannel.url,
+            URL.OpenApi.getEventChannel.method,
+        )
+        return result
+
+    def getEventAttr(self):
+        result = self.request(
+            URL.OpenApi.getEventAttr.url,
+            URL.OpenApi.getEventAttr.method,
+        )
+        return result
+
+
+class AssertOpenApi(OpenApi):
+    def assert_event_create_success(self, code, channel, is_delete=True) -> str:
+        """
+        断言事件新增成功，并返回eventId
+        :param code: 事件编码
+        :param channel: 渠道类型
+        :param is_delete: 是否删除事件
+        :return: eventId
+        """
+        event_id = None
+        try:
+            result = self.getEventMetaList(code=code, channel=channel)
+            # 安全获取数据，避免KeyError
+            result_data = result.get("resultData", {})
+            datas = result_data.get("datas", [])
+
+            if not datas:
+                raise AssertionError(f"未找到事件：code={code}, channel={channel}")
+            matched_data = None
+            for data in datas:
+                if data.get("eventCode") == code and data.get("channelType") == channel:
+                    matched_data = data
+                    break
+            if not matched_data:
+                raise AssertionError(f"事件属性不匹配：code={code}, channel={channel}")
+
+            # 断言关键属性
+            assert matched_data.get("isMerchantEvent"), "isMerchantEvent应为True"
+            event_id = matched_data.get("eventId")
+            assert event_id, "eventId不存在"
+            return event_id
+
+        except Exception as e:
+            raise AssertionError(f"事件新增断言失败：{str(e)}") from e
+        finally:
+            if is_delete and event_id:
+                self.event_id = event_id
+                self.deleteEventMetaById(code)

{smartpush-2.0.5.dist-info → smartpush-2.0.7.dist-info}/METADATA

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

{smartpush-2.0.5.dist-info → smartpush-2.0.7.dist-info}/RECORD

@@ -5,14 +5,14 @@ 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=-OcFFQnDGpjZR3guo_tHfxV7zQEHo9ciidWGqKv_jNs,25437
-smartpush/base/request_base.py,sha256=jQRnURl9-BA5BnymjyD5auqFc256CtmepM_woFVkE6g,2754
-smartpush/base/url_enum.py,sha256=TVNCSB23DdervtVpGG0LeVVNkGbZ3Ks6DxEbAqRKfjw,2320
+smartpush/base/request_base.py,sha256=hP5uhCwOMlCgwKjyh1PhJ5fCmWY-8LowZdW97r5cm_0,2938
+smartpush/base/url_enum.py,sha256=OuEd3EqlLvKiYesU2gISPLh9wH2nNYZ-5nzBu_6Zxnw,2748
 smartpush/crowd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/crowd/crowd.py,sha256=KNwvX-BnBnMVVuHM79a-VeBMp_guB-Kqw3tFaAPiAp8,9768
 smartpush/email/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/email/activity.py,sha256=Uogpx0oe0FBw4-SUTc6i1IjOeUql5JcYgDH0Niwz56g,10104
-smartpush/email/schema.py,sha256=Uef41D0Z_xw07khOyLiJhjfZ9GVE0urN0tG8orQjIfY,31220
-smartpush/email/universal_content.py,sha256=0VaY_-2--AofdJBuRrOClDXZqn-tCU_FOxSPY-GIRIk,11954
+smartpush/email/activity.py,sha256=rQ62GIfg0Yh0fFkwiaRIVATBn5vY1wZzbLEJLwHmx1E,10016
+smartpush/email/schema.py,sha256=mysik-N6cry4HuSxzMMhQFsnnu5_UJ_oqVPTGY1RUkQ,31471
+smartpush/email/universal_content.py,sha256=bST0RCVN4YUglrsCv0OsIox7vceEvJRVkqcMaEgj9No,17226
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=YqWmDGSFadQdK2vNJ070Qvad9ZtqEwiQyPkOemlACfs,21508
 smartpush/export/basic/GetOssUrl.py,sha256=zxNZj6x7Ph9N3P5k82pLpBFjZxKrDfbgqS2fTYyhvso,8467
@@ -27,6 +27,8 @@ smartpush/form/form_after.py,sha256=KHatgVQvOiCykbfXm5TD07gvGvMgQYqQIQkcIKkAnQU,
 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/openapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+smartpush/openapi/openapi.py,sha256=SFZ4HHjHgEQ5HVZu6-r_97C_dhRe6M8McrgaqGjEG5g,5558
 smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
 smartpush/utils/EmailUtlis.py,sha256=DAHd73bJ8hiJCLEXtD0xcwxPD7SOPSmBB7Jvlf6gN6s,11201
 smartpush/utils/ListDictUtils.py,sha256=Xc8kfSOZjX_k026Au4cfvtgFh5WoHxw4yRJWASyA_Cc,5041
@@ -34,7 +36,7 @@ smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrA
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/utils/date_utils.py,sha256=Xgx2DbmWYri71xXBiaKYTZDeh2a8MFhYns_xB0U2JOA,13159
 smartpush/utils/form_utils.py,sha256=ld-g_Dm_ZlnagQt7imYfUc87bcBRVlTctywuLtzmjXQ,849
-smartpush-2.0.5.dist-info/METADATA,sha256=Ng2o6uXjxL0bifLufabbjQrrRxYUCZDmr-7qsLcHJ4Q,131
-smartpush-2.0.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-2.0.5.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-2.0.5.dist-info/RECORD,,
+smartpush-2.0.7.dist-info/METADATA,sha256=O5ZwtC49PI2pCh1dafsPRTGR13CSgWKGlJHMnmQdL5Y,131
+smartpush-2.0.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-2.0.7.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-2.0.7.dist-info/RECORD,,