smartpush 1.9.7__py3-none-any.whl → 1.9.9__py3-none-any.whl

smartpush/base/request_base.py

@@ -69,3 +69,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)

smartpush/crowd/crowd.py

@@ -1,6 +1,6 @@
 import json
 import time
-
+from smartpush.utils import ListDictUtils
 from smartpush.base.request_base import CrowdRequestBase, RequestBase
 from smartpush.base.url_enum import URL
 from smartpush.export.basic.ExcelExportChecker import compare_lists, compare_dicts
@@ -21,7 +21,7 @@ class Crowd(CrowdRequestBase):
         """
         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)
+        result = self.request(method=URL.Crowd.editCrowdPackage.method, path=URL.Crowd.editCrowdPackage.url, data=requestParam)
         return result['resultData']
 
     def callCrowdPersonListInPackage(self, page=1, pageSize=20, filter_type=None, operator='eq', filter_value=None):
@@ -37,7 +37,7 @@ class Crowd(CrowdRequestBase):
         requestParam = {"id": self.crowd_id, "page": page, "pageSize": pageSize}
         if filter_value is not None:
             requestParam["filter"] = {filter_type: {operator: filter_value}}
-        result = self.request(method=URL.crowdPersonListInPackage.method, path=URL.crowdPersonListInPackage.url,
+        result = self.request(method=URL.Crowd.crowdPersonListInPackage.method, path=URL.Crowd.crowdPersonListInPackage.url,
                               data=requestParam)
         resultData = result['resultData']
         return resultData
@@ -52,7 +52,7 @@ class Crowd(CrowdRequestBase):
         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.crowdPackageDetail.method, path=URL.crowdPackageDetail.url, data=requestParam)
+        result = self.request(method=URL.Crowd.crowdPackageDetail.method, path=URL.Crowd.crowdPackageDetail.url, data=requestParam)
         resultData = result['resultData']
         return resultData
 
@@ -61,24 +61,20 @@ class Crowd(CrowdRequestBase):
         result = {}
         # 校验群组详情条件
         crowd_detail = self.callCrowdPackageDetail()
-        if crowd_detail["resultData"]["groupRules"] == expected_rule:
+        if crowd_detail["groupRules"] == expected_rule:
             result["rule"] = True
         else:
-            result["rule"] = {"条件断言": False, "实际条件": crowd_detail["resultData"]["groupRules"]}
+            result["rule"] = {"条件断言": False, "实际条件": crowd_detail["groupRules"]}
         # 校验群组筛选人群
         time.sleep(sleep)
         crowd_persons = self.callCrowdPersonListInPackage()
-        crowd_person_uids = [person["uid"] for person in crowd_persons]
-        not_in_uid = expected_ids - crowd_person_uids
-        if not_in_uid:
-            result["uid"] = {"人群断言": False, "未匹配到的uid": not_in_uid}
-        else:
-            result["uid"] = True
-
+        crowd_person_uids = [person["uid"] for person in crowd_persons["responseResult"]]
+        print("expected_ids", expected_ids, type(expected_ids))
+        print("crowd_person_uids", crowd_person_uids, type(crowd_person_uids))
+        result["联系人断言"] = ListDictUtils.check_values_in_list_set(a=expected_ids, b=crowd_person_uids)
         return result
 
 
-
 class CrowdList(RequestBase):
     def callCrowdPackageList(self, page=1, pageSize=20):
         """
@@ -90,7 +86,7 @@ class CrowdList(RequestBase):
         :return:
         """
         requestParam = {"page": page, "pageSize": pageSize}
-        result = self.request(method=URL.crowdPackageList.method, path=URL.crowdPackageList.url,
+        result = self.request(method=URL.Crowd.crowdPackageList.method, path=URL.Crowd.crowdPackageList.url,
                               data=requestParam)
         resultData = result['resultData']
         return resultData

smartpush/email/activity.py

@@ -0,0 +1,66 @@
+import json
+
+from smartpush.base.request_base import ActivityTemplateRequestBase, RequestBase
+from smartpush.base.url_enum import URL
+from smartpush.utils.date_utils import *
+from smartpush.email.schema import *
+
+"""
+创建活动草稿
+"""
+
+"""
+更新活动草稿内容
+"""
+
+
+class ActivityTemplate(ActivityTemplateRequestBase, RequestBase):
+
+    def create_activity_template(self):
+        requestParam = {"activityName": "自动化创建草稿活动-" + DateUtils.get_current_datetime_to_str(),
+                        "pickContactPacks": [],
+                        "smartSending": False, "subjectId": [], "emailName": "测试", "subtitle": "",
+                        "sender": "SmartPush_AutoTest_ec2自动化店铺 AutoTestName", "senderDomain": "DEFAULT_DOMAIN",
+                        "receiveAddress": "autotest-smartpushauto@smartpush.com", "utmConfigEnable": False,
+                        "language": "en", "sendType": "EMAIL", "type": "MKT", "id": None, "domainType": 3,
+                        "activityTemplateId": None, "activityId": None, "timezone": None, "timezoneGmt": None,
+                        "originTemplate": 6, "createSource": 0, "sendStrategy": "DELAY", "booster": None,
+                        "customerGroupIds": [], "excludeContactPacks": [], "excludeCustomerGroupIds": [],
+                        "warmupPack": 0}
+        result = self.request(path=URL.Activity.step1.url, method=URL.Activity.step1.method, data=requestParam)
+        return json.dumps(result)
+
+    def update_activity_template_schema(self, currentJsonSchema, schema):
+        currentJsonSchema = self.add_element_to_section_column_children(currentJsonSchema, schema)
+        final_currentJsonSchema = json.dumps(isinstance) if isinstance(currentJsonSchema, dict) else currentJsonSchema
+        requestParam = {"id": self.activityTemplateId,
+                        "activityImage": DateUtils.get_current_timestamp(),
+                        "blocks": None,
+                        "currentHtml": "",
+                        "currentJsonSchema": final_currentJsonSchema,
+                        "previewJsonSchema": final_currentJsonSchema,
+                        "schemaAnalysis": genSchemaAnalysis(json.loads(final_currentJsonSchema))}
+
+        result = self.request(path=URL.Activity.step2.url, method=URL.Activity.step2.method,
+                              data=requestParam)
+        return json.dumps(result)
+
+    @staticmethod
+    def add_element_to_section_column_children(currentJsonSchema, new_schema):
+        """
+        在Section下的Column节点的children中添加元素，并返回原JSON（已修改）
+        :param new_schema: 原始JSON字典
+        :param currentJsonSchema:  要添加的元素（字典）
+        :return: 修改后的原始JSON字典
+        """
+        # 1. 遍历找到type为Section的节点
+        for child in currentJsonSchema.get("children", []):
+            if child.get("type") == "Section":
+                # 2. 在Section的children中找到Column节点
+                for column in child.get("children", []):
+                    if column.get("type") == "Column":
+                        # 3. 向Column的children添加元素
+                        column["children"].append(new_schema)
+                        break  # 若有多个Column可根据需求调整，这里匹配第一个Column
+                break  # 若有多个Section可根据需求调整，这里匹配第一个Section
+        return currentJsonSchema

smartpush/email/schema.py

@@ -162,7 +162,7 @@ class BlockSchema(Enum):
                                 "src": "https://client-test.smartpushedm.com/sp-media-support/gif/0894dd7053af4b189f665dd2ddb54606.gif?v=1762701524060",
                                 "imgRatio": 0.26, "timerType": 1, "endTime": "1762874323452",
                                 "timerZone": "America/New_York", "expire": False,
-                                "expireText": "The current activity has expired", "duration": "", "layout": 1,
+                                "expireText": "The current activity.py has expired", "duration": "", "layout": 1,
                                 "numberFontFamily": "Arial Bold", "numberSize": "40px", "numberColor": "#FFFFFF",
                                 "timeUnitFontFamily": "Arial Bold", "timeUnitSize": "16px", "timeUnitColor": "#FFFFFF",
                                 "align": "center", "paddingLeft": "10px", "paddingRight": "10px", "paddingTop": "10px",
@@ -397,6 +397,116 @@ class BlockSchema(Enum):
             }
         ]
     }
+    Subscribe = {
+        "id": generate_UUID(9),
+        "type": "Subscribe",
+        "props": {
+            "content": "<div  class='sp-font-12'><p style=\"text-align: center; \" data-mce-style=\"text-align: "
+                       "center; \"><em><span class='sp-font-12' style=\"font-size: 12px; color: rgb(122, 132, "
+                       "153);\" data-mce-style=\"font-size: 12px; color: #7a8499;\">Please add us to your email "
+                       "contacts list to receive exclusive recommendations!</span></em></p><p style=\"text-align: "
+                       "center; \" data-mce-style=\"text-align: center; \"><em><span class='sp-font-12' "
+                       "style=\"font-size: 12px; color: rgb(122, 132, 153);\" data-mce-style=\"font-size: 12px; "
+                       "color: #7a8499;\">You are receiving this message from [[shopName]] because you have signed up "
+                       "for subscriptions to receive information about products, services, "
+                       "and campaigns.</span></em></p></div><div class=\"sp-font-12\" style=\"color: rgb(122, 132, "
+                       "153); font-family: arial, helvetica, sans-serif, Arial, Helvetica, sans-serif;  font-size: "
+                       "12px; text-align: center; margin-top: 12px;padding-left: 10px; padding-right: 10px; "
+                       "padding-bottom: 20px;\"><div>Questions? Please <span "
+                       "style=color:#479EEF;text-decoration:underline>contact us</span>, we are glad to "
+                       "help.</div><div>If you don't want to receive our message, just <span "
+                       "style=color:#479EEF;text-decoration:underline>click here</span> to cancel the "
+                       "subscription.</div></div><div class=\"sp-font-12\" style=\"color: rgb(122, 132, "
+                       "153); font-size: 12px; text-align: center; font-style: oblique;\">Questions? Please <a href=["
+                       "[customerEmail]]  style=\"color:#479EEF;text-decoration:underline\" "
+                       "rel=\"noreferrer\">contact us</a>, we are glad to help.</div><div class=\"sp-font-12\" "
+                       "style=\"color: rgb(122, 132, 153); font-size: 12px; text-align: center; font-style: "
+                       "oblique;\">If you don't want to receive our message, just <a href=[[unsubscribe.url]] "
+                       "target=\"_blank\" style=\"color:#479EEF;text-decoration:underline\" rel=\"noreferrer\">click "
+                       "here</a> to cancel the subscription.</div>",
+            "containerBackgroundColor": "transparent"
+        },
+        "children": []
+    }
+    Header = {
+        "id": generate_UUID(9),
+        "type": "Header",
+        "props": {
+            "backgroundColor": "#ffffff",
+            "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": "98d909a48",
+                "type": "Column",
+                "props": {},
+                "children": [
+                    {
+                        "id": "8298cb99a",
+                        "type": "TextSet",
+                        "props": {
+                            "list": [
+                                {
+                                    "borderWidth": "1px",
+                                    "borderStyle": "none",
+                                    "content": "<p style=\"line-height: 3; text-align: right;\"><span style=\"color: #000000; font-size: 12px; font-family: arial, sans-serif;\"><a style=\"color: #000000;\" href=\"${viewInWebApiUrl}\">Can't see the email? Please <span style=\"color: #3598db;\">click here</span></a></span></p>",
+                                    "paddingLeft": "10px",
+                                    "paddingRight": "10px",
+                                    "paddingTop": "0px",
+                                    "paddingBottom": "0px",
+                                    "borderColor": "#ffffff"
+                                }
+                            ],
+                            "containerBackgroundColor": "transparent",
+                            "paddingLeft": "10px",
+                            "paddingRight": "10px",
+                            "paddingTop": "10px",
+                            "paddingBottom": "10px"
+                        },
+                        "children": []
+                    }
+                ]
+            }
+        ]
+    }
+    Footer = {
+        "id": generate_UUID(9),
+        "type": "Footer",
+        "props": {
+            "backgroundColor": "#ffffff",
+            "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": "b3bcabad7",
+                "type": "Column",
+                "props": {},
+                "children": [
+                    Subscribe
+                ]
+            }
+        ]
+    }
 
 
 def genSection(block_list: list):
@@ -411,14 +521,64 @@ def genSection(block_list: list):
     return section
 
 
+def genSchemaAnalysis(schema):
+    """
+        递归遍历嵌套字典结构，提取所有层级的type和对应的id
+        相同type的id将以列表形式汇总（按遍历顺序追加）
+
+        Args:
+            data: 嵌套字典/列表结构（支持单节点字典或children列表）
+
+        Returns:
+            dict: key为type值，value为id列表（即使只有一个id也保持列表格式）
+            :param schema:
+        """
+    result = {}
+
+    def recursive_parse(node):
+        if isinstance(node, dict):
+            if 'type' in node and 'id' in node:
+                type_val = node['type']
+                id_val = node['id']
+                result.setdefault(type_val, []).append(id_val)
+
+            if 'children' in node and isinstance(node['children'], list):
+                for child in node['children']:
+                    recursive_parse(child)
+        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, indent=4, ensure_ascii=False)
+
+
 def genAllBlockSchema():
     """
     获取所有的BlockSchema
     :return:
     """
-    temp_list = [i.value for i in BlockSchema if i != BlockSchema.Section]
+    temp_list = [i.value for i in BlockSchema if i not in (BlockSchema.Section, BlockSchema.Footer, BlockSchema.Header)]
+    return temp_list
+
+
+def genAllBlockSchemaList():
+    """
+    获取所有的BlockSchema
+    :return:
+    """
+    temp_list = [i.name for i in BlockSchema if i not in (BlockSchema.Section, BlockSchema.Footer, BlockSchema.Header)]
     return temp_list
 
 
 if __name__ == '__main__':
-    print(json.dumps(genAllBlockSchema()))
+    # print(BlockSchema.Footer.value)
+    # print(genAllBlockSchemaList())
+    # [BlockSchema.Logo, BlockSchema.Social]
+    # [BlockSchema.Logo, BlockSchema.Link, BlockSchema.Image, BlockSchema.ImageSet, BlockSchema.Video,
+    #  BlockSchema.TimerCountdown, BlockSchema.Commodity, BlockSchema.Discount, BlockSchema.TextSet,
+    #  BlockSchema.ImageText,
+    #  BlockSchema.Button, BlockSchema.Divider, BlockSchema.Social, BlockSchema.HTMLCode]
+
+    print(genSchemaAnalysis(BlockSchema.Section))

smartpush/email/universal_content.py

@@ -3,7 +3,6 @@ import time
 from smartpush.base.request_base import RequestBase
 from smartpush.base.url_enum import *
 from smartpush.email.schema import *
-from smartpush.utils import ListDictUtils
 
 
 def gen_universal_request_param(universalId, schema, **kwargs):
@@ -34,7 +33,7 @@ class UniversalContent(RequestBase):
 
     # 创建universal
     def create_universal(self, requestParam):
-        result = self.request(method=URL.saveUniversalContent.method, path=URL.saveUniversalContent.url,
+        result = self.request(method=URL.UniversalContent.saveUniversalContent.method, path=URL.UniversalContent.saveUniversalContent.url,
                               data=requestParam)
         return result
 
@@ -49,7 +48,7 @@ class UniversalContent(RequestBase):
         requestParam = {'universalName': universa_name}
         if blockType_list and type(blockType_list) == list:
             requestParam.update(blockType=blockType_list)
-        result = self.request(method=URL.queryUniversalContent.method, path=URL.queryUniversalContent.url,
+        result = self.request(method=URL.UniversalContent.queryUniversalContent.method, path=URL.UniversalContent.queryUniversalContent.url,
                               data=requestParam)
         return result
 
@@ -73,7 +72,7 @@ class UniversalContent(RequestBase):
             "data": universal_list,
             "type": _type
         }
-        result = self.request(method=URL.updateUniversalContent.method, path=URL.updateUniversalContent.url,
+        result = self.request(method=URL.UniversalContent.updateUniversalContent.method, path=URL.UniversalContent.updateUniversalContent.url,
                               data=requestParam)
         return result
 
@@ -85,7 +84,7 @@ class UniversalContent(RequestBase):
         :return:
         """
         requestParam = {'universalId': universalId}
-        result = self.request(method=URL.deleteUniversalContent.method, path=URL.deleteUniversalContent.url,
+        result = self.request(method=URL.UniversalContent.deleteUniversalContent.method, path=URL.UniversalContent.deleteUniversalContent.url,
                               params=requestParam)
         return result
 
@@ -98,19 +97,18 @@ class UniversalContent(RequestBase):
         :return:
         """
         requestParam = {"type": _type, "campaignId": campaignId, "universalIds": universalIds}
-        result = self.request(method=URL.updateCampaignUsed.method, path=URL.updateCampaignUsed.url,
+        result = self.request(method=URL.UniversalContent.updateCampaignUsed.method, path=URL.UniversalContent.updateCampaignUsed.url,
                               data=requestParam)
         return result
 
     def assert_block_in_the_section(self, section_universa_name, block_universa=None):
         """
         判断收藏的block是否在该section中
+        :param block_universa:
         :param section_universa_name:
-        :param _id:
-        :param block_universa_id:
-        :param block_universa_name:
         :return:
         """
+        section = {}
         result = self.query_universal(universa_name=section_universa_name)
         if result:
             section = result['resultData']['datas'][0]
@@ -182,3 +180,26 @@ if __name__ == '__main__':
         raise
     finally:
         universal.delete_universal(sectionUniversalId)
+
+
+if __name__ == '__main__':
+    sectionUniversalId = generate_UUID()
+    sectionUniversalName = gen_universal_name(BlockSchema.Section)
+    print(sectionUniversalName)
+    block_list = [BlockSchema.Logo]  # 添加block
+
+    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(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/flow/MockFlow.py

@@ -102,16 +102,13 @@ def check_flow(host_domain, cookies, mock_domain="", **kwargs):
     split_node: list，有拆分节点时需填，结构：如: ["false", "true"]，即走到拆分节点限制不满足分支再走满足分支
     get_email_content: bool，默认false, 提取邮件内容，用于断言邮箱内是否送达
     """
-    # todo: 还差邮件校验部分，后续补充
     is_split_steps = kwargs.get("split_steps", "all")
     # 步骤1 - 所需字段：split_steps、host_domain、cookies、flow_id、pulsar
     if is_split_steps == "one" or is_split_steps == "all":
-        # 触发前提取flow数据，后续做对比
-        old_flow_counts, old_versions, _ = get_current_flow(host_domain=host_domain, cookies=cookies,
-                                                            flow_id=kwargs["flow_id"],
-                                                            splits=kwargs.get("split_node", None))
-        kwargs["old_flow_counts"] = old_flow_counts
-        print(f"触发前节点数据: {old_flow_counts}")
+        # 提取版本号
+        _, old_versions, _ = get_current_flow(host_domain=host_domain, cookies=cookies,
+                                              flow_id=kwargs["flow_id"],
+                                              splits=kwargs.get("split_node", None))
         # 更新flow
         if kwargs.get("update_flow_params", False):
             global_flow.update_flow(host_domain=host_domain, cookies=cookies,
@@ -124,6 +121,14 @@ def check_flow(host_domain, cookies, mock_domain="", **kwargs):
         # 启动flow
         global_flow.start_flow(host_domain=host_domain, cookies=cookies, flow_id=kwargs["flow_id"],
                                version=old_versions, draft_snap_version=draft_snap_version)
+
+        # 触发前提取flow数据，后续做对比
+        old_flow_counts, _, _ = get_current_flow(host_domain=host_domain, cookies=cookies,
+                                                 flow_id=kwargs["flow_id"],
+                                                 splits=kwargs.get("split_node", None))
+        time.sleep(3)
+        kwargs["old_flow_counts"] = old_flow_counts
+        print(f"触发前节点数据: {old_flow_counts}")
         # 触发flow
         mock_pulsar(mock_domain=mock_domain, pulsar=kwargs["pulsar"], limit=kwargs.get("limit", 1))
         if is_split_steps == "one":

smartpush/utils/ListDictUtils.py

@@ -70,3 +70,16 @@ def all_in_list(list_a, list_b):
         # 支持列表、元组、集合等可迭代类型
         print(f"判断对象【{list_a}】在 {list_b}")
         return set(list_a).issubset(set(list_b))
+
+
+def check_values_in_list_set(a, b):
+    """
+    使用集合检查列表a中的所有值是否都在列表b中（效率更高）
+    """
+    set_b = set(b)
+    missing_values = [x for x in a if x not in set_b]
+
+    if not missing_values:
+        return [True, "匹配成功"]
+    else:
+        return [False, "匹配失败，不匹配数据" + str(missing_values)]

smartpush/utils/date_utils.py

@@ -0,0 +1,339 @@
+from datetime import date, datetime, timedelta, timezone
+import calendar
+import random
+from zoneinfo import ZoneInfo
+
+
+class DateUtils:
+    """日期生成与处理工具类"""
+
+    # ==================== 1. 获取当前日期/时间 ====================
+    @staticmethod
+    def get_current_date() -> date:
+        """获取当前日期（date对象，仅年月日）"""
+        return date.today()
+
+    @staticmethod
+    def get_current_datetime(tz: str | None = None) -> datetime:
+        """获取当前datetime对象（可选时区）
+        :param tz: 时区标识（如"Asia/Shanghai"、"America/New_York"）
+        """
+        if tz:
+            return datetime.now(ZoneInfo(tz))
+        return datetime.now()
+
+    @staticmethod
+    def get_current_datetime_to_str() -> str:
+        """获取当前datetime对象（可选时区）
+        """
+        return str(DateUtils.get_current_datetime())
+
+
+    @staticmethod
+    def get_utc_now() -> datetime:
+        """获取UTC标准时间（带时区信息）"""
+        return datetime.utcnow().replace(tzinfo=timezone.utc)
+
+    # ==================== 2. 生成指定日期/时间 ====================
+    @staticmethod
+    def get_specified_date(year: int, month: int, day: int) -> date | None:
+        """生成指定日期（date对象），无效日期返回None"""
+        try:
+            return date(year, month, day)
+        except ValueError as e:
+            print(f"❌ 无效日期：{year}-{month}-{day}，错误：{e}")
+            return None
+
+    @staticmethod
+    def get_specified_datetime(
+        year: int, month: int, day: int,
+        hour: int = 0, minute: int = 0, second: int = 0,
+        tz: str | None = None
+    ) -> datetime | None:
+        """生成指定datetime对象（可选时区），无效参数返回None"""
+        try:
+            dt = datetime(year, month, day, hour, minute, second)
+            if tz:
+                dt = dt.replace(tzinfo=ZoneInfo(tz))
+            return dt
+        except ValueError as e:
+            print(f"❌ 无效日期时间：{year}-{month}-{day} {hour}:{minute}:{second}，错误：{e}")
+            return None
+
+    @staticmethod
+    def str_to_date(date_str: str, format_str: str = "%Y-%m-%d") -> date | None:
+        """字符串转date对象
+        :param date_str: 日期字符串（如"2025-01-01"）
+        :param format_str: 字符串格式（默认"%Y-%m-%d"）
+        """
+        try:
+            return datetime.strptime(date_str, format_str).date()
+        except ValueError as e:
+            print(f"❌ 日期字符串格式错误：{date_str}，预期格式：{format_str}，错误：{e}")
+            return None
+
+    # ==================== 3. 生成日期范围 ====================
+    @staticmethod
+    def get_last_n_days(n: int, include_today: bool = True) -> list[date]:
+        """获取近N天的日期列表
+        :param include_today: 是否包含今天（默认True）
+        """
+        today = date.today()
+        if include_today:
+            return [today - timedelta(days=i) for i in range(n)]
+        return [today - timedelta(days=i+1) for i in range(n)]
+
+    @staticmethod
+    def get_date_range(
+        start_date: date | str,
+        end_date: date | str,
+        format_str: str = "%Y-%m-%d"
+    ) -> list[date]:
+        """获取起止日期之间的所有日期（包含两端）"""
+        # 处理字符串输入
+        if isinstance(start_date, str):
+            start_date = DateUtils.str_to_date(start_date, format_str)
+        if isinstance(end_date, str):
+            end_date = DateUtils.str_to_date(end_date, format_str)
+
+        if not start_date or not end_date or start_date > end_date:
+            print("❌ 起止日期无效或起始日期大于结束日期")
+            return []
+
+        delta = end_date - start_date
+        return [start_date + timedelta(days=i) for i in range(delta.days + 1)]
+
+    @staticmethod
+    def get_days_in_month(year: int, month: int) -> list[date]:
+        """获取指定年月的所有日期"""
+        try:
+            days_count = calendar.monthrange(year, month)[1]  # 获取当月天数
+            return [date(year, month, day) for day in range(1, days_count + 1)]
+        except ValueError as e:
+            print(f"❌ 无效年月：{year}-{month}，错误：{e}")
+            return []
+
+    # ==================== 4. 生成随机日期 ====================
+    @staticmethod
+    def get_random_date(
+        start_date: date | str,
+        end_date: date | str,
+        format_str: str = "%Y-%m-%d"
+    ) -> date | None:
+        """生成指定范围内的随机日期"""
+        date_range = DateUtils.get_date_range(start_date, end_date, format_str)
+        if not date_range:
+            return None
+        return random.choice(date_range)
+
+    @staticmethod
+    def get_random_datetime(
+        start_dt: datetime | str,
+        end_dt: datetime | str,
+        format_str: str = "%Y-%m-%d %H:%M:%S"
+    ) -> datetime | None:
+        """生成指定范围内的随机datetime"""
+        # 处理字符串输入
+        if isinstance(start_dt, str):
+            try:
+                start_dt = datetime.strptime(start_dt, format_str)
+            except ValueError:
+                print(f"❌ 起始时间格式错误：{start_dt}")
+                return None
+        if isinstance(end_dt, str):
+            try:
+                end_dt = datetime.strptime(end_dt, format_str)
+            except ValueError:
+                print(f"❌ 结束时间格式错误：{end_dt}")
+                return None
+
+        if start_dt >= end_dt:
+            print("❌ 起始时间大于等于结束时间")
+            return None
+
+        delta = end_dt - start_dt
+        random_seconds = random.randint(0, int(delta.total_seconds()))
+        return start_dt + timedelta(seconds=random_seconds)
+
+    # ==================== 5. 日期计算 ====================
+    @staticmethod
+    def add_days(base_date: date | datetime, days: int) -> date | datetime:
+        """日期加N天"""
+        return base_date + timedelta(days=days)
+
+    @staticmethod
+    def subtract_days(base_date: date | datetime, days: int) -> date | datetime:
+        """日期减N天"""
+        return base_date - timedelta(days=days)
+
+    @staticmethod
+    def get_month_start(year: int | None = None, month: int | None = None) -> date:
+        """获取指定年月的月初日期（默认当前年月）"""
+        year = year or date.today().year
+        month = month or date.today().month
+        return date(year, month, 1)
+
+    @staticmethod
+    def get_month_end(year: int | None = None, month: int | None = None) -> date:
+        """获取指定年月的月末日期（默认当前年月）"""
+        year = year or date.today().year
+        month = month or date.today().month
+        days_count = calendar.monthrange(year, month)[1]
+        return date(year, month, days_count)
+
+    @staticmethod
+    def get_quarter_start(year: int | None = None, quarter: int | None = None) -> date:
+        """获取指定年季度的起始日期（默认当前年当前季度）
+        :param quarter: 季度（1-4）
+        """
+        year = year or date.today().year
+        quarter = quarter or (date.today().month - 1) // 3 + 1
+        start_month = (quarter - 1) * 3 + 1
+        return date(year, start_month, 1)
+
+    # ==================== 6. 日期格式化 ====================
+    @staticmethod
+    def date_to_str(date_obj: date | datetime, format_str: str = "%Y-%m-%d") -> str:
+        """日期/时间对象转字符串"""
+        return date_obj.strftime(format_str)
+
+    # ==================== 7. 时区转换 ====================
+    @staticmethod
+    def convert_timezone(dt: datetime, from_tz: str, to_tz: str) -> datetime:
+        """转换时区
+        :param dt: 原始时间对象（若无时区信息，需指定from_tz）
+        :param from_tz: 原始时区
+        :param to_tz: 目标时区
+        """
+        if not dt.tzinfo:
+            dt = dt.replace(tzinfo=ZoneInfo(from_tz))
+        return dt.astimezone(ZoneInfo(to_tz))
+
+# ==================== 原有基础功能（省略，保持之前的方法） ====================
+    # （注：若需完整代码，需包含之前的get_current_date、get_specified_date等方法）
+
+    # ==================== 新增：时间戳相关功能 ====================
+    @staticmethod
+    def get_current_timestamp(precision: str = "millisecond") -> int:
+        """获取当前时间戳
+        :param precision: 精度（"second"=秒级，"millisecond"=毫秒级）
+        :return: 时间戳整数
+        """
+        now = datetime.now()
+        if precision == "millisecond":
+            return int(now.timestamp() * 1000)
+        return int(now.timestamp())
+
+    @staticmethod
+    def get_utc_timestamp(precision: str = "second") -> int:
+        """获取当前UTC时间戳
+        :param precision: 精度（"second"=秒级，"millisecond"=毫秒级）
+        :return: UTC时间戳整数
+        """
+        utc_now = datetime.utcnow()
+        if precision == "millisecond":
+            return int(utc_now.timestamp() * 1000)
+        return int(utc_now.timestamp())
+
+    @staticmethod
+    def timestamp_to_datetime(
+        timestamp: int,
+        precision: str = "second",
+        tz: str | None = None
+    ) -> datetime | None:
+        """时间戳转datetime对象（支持时区）
+        :param timestamp: 时间戳（整数）
+        :param precision: 时间戳精度（"second"=秒级，"millisecond"=毫秒级）
+        :param tz: 时区（如"Asia/Shanghai"，None则为本地时区）
+        :return: datetime对象（带时区信息，若指定tz）
+        """
+        try:
+            # 转换毫秒级时间戳为秒级
+            ts = timestamp / 1000 if precision == "millisecond" else timestamp
+            dt = datetime.fromtimestamp(ts)
+            # 设置时区
+            if tz:
+                dt = dt.replace(tzinfo=ZoneInfo(tz))
+            return dt
+        except ValueError as e:
+            print(f"❌ 无效时间戳：{timestamp}，错误：{e}")
+            return None
+
+    @staticmethod
+    def datetime_to_timestamp(
+        dt: datetime,
+        precision: str = "second"
+    ) -> int | None:
+        """datetime对象转时间戳
+        :param dt: datetime对象（若带时区，会自动转换为UTC时间戳）
+        :param precision: 精度（"second"=秒级，"millisecond"=毫秒级）
+        :return: 时间戳整数
+        """
+        try:
+            ts = dt.timestamp()
+            return int(ts * 1000) if precision == "millisecond" else int(ts)
+        except ValueError as e:
+            print(f"❌ 无效datetime对象：{dt}，错误：{e}")
+            return None
+
+    @staticmethod
+    def timestamp_to_str(
+        timestamp: int,
+        format_str: str = "%Y-%m-%d %H:%M:%S",
+        precision: str = "second",
+        tz: str | None = None
+    ) -> str | None:
+        """时间戳转格式化字符串
+        :param timestamp: 时间戳（整数）
+        :param format_str: 输出格式（默认"%Y-%m-%d %H:%M:%S"）
+        :param precision: 时间戳精度（"second"=秒级，"millisecond"=毫秒级）
+        :param tz: 时区（如"Asia/Shanghai"）
+        :return: 格式化日期字符串
+        """
+        dt = DateUtils.timestamp_to_datetime(timestamp, precision, tz)
+        if dt:
+            return dt.strftime(format_str)
+        return None
+
+    @staticmethod
+    def str_to_timestamp(
+        date_str: str,
+        format_str: str = "%Y-%m-%d %H:%M:%S",
+        precision: str = "second",
+        tz: str | None = None
+    ) -> int | None:
+        """格式化字符串转时间戳
+        :param date_str: 日期字符串（如"2025-01-01 12:00:00"）
+        :param format_str: 输入格式（默认"%Y-%m-%d %H:%M:%S"）
+        :param precision: 输出精度（"second"=秒级，"millisecond"=毫秒级）
+        :param tz: 时区（如"Asia/Shanghai"，None则为本地时区）
+        :return: 时间戳整数
+        """
+        try:
+            dt = datetime.strptime(date_str, format_str)
+            if tz:
+                dt = dt.replace(tzinfo=ZoneInfo(tz))
+            return DateUtils.datetime_to_timestamp(dt, precision)
+        except ValueError as e:
+            print(f"❌ 日期字符串格式错误：{date_str}，错误：{e}")
+            return None
+
+    @staticmethod
+    def get_random_timestamp(
+        start_ts: int,
+        end_ts: int,
+        precision: str = "second"
+    ) -> int | None:
+        """生成指定时间戳范围内的随机时间戳
+        :param start_ts: 起始时间戳
+        :param end_ts: 结束时间戳
+        :param precision: 精度（"second"=秒级，"millisecond"=毫秒级）
+        :return: 随机时间戳
+        """
+        if start_ts >= end_ts:
+            print("❌ 起始时间戳大于等于结束时间戳")
+            return None
+        # 毫秒级需处理范围
+        multiplier = 1000 if precision == "millisecond" else 1
+        random_ts = random.randint(start_ts * multiplier, end_ts * multiplier)
+        return random_ts if precision == "millisecond" else random_ts // multiplier

{smartpush-1.9.7.dist-info → smartpush-1.9.9.dist-info}/METADATA

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

{smartpush-1.9.7.dist-info → smartpush-1.9.9.dist-info}/RECORD

@@ -4,19 +4,20 @@ 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=mg0dSm6ucPdwqSUn_tQzynYWYKf0_vX7kcGJWSsX3e0,2455
-smartpush/base/url_enum.py,sha256=GC8lXuXflKFl3xbeOIzS3vgE7BF2Zo5H9pn6okgHPyQ,1627
+smartpush/base/request_base.py,sha256=eMF6zw0QKzIMQhg3LNqutaCNTQJ5lsrHuohkaadOl64,2677
+smartpush/base/url_enum.py,sha256=7JRE61JPvwaGfnbZHhFohhxqS758CSiAPk-wwlLyy78,2232
 smartpush/crowd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/crowd/crowd.py,sha256=8z5FIWCiTeSUQJGWbLLjS_2AsPbVOsW0GrSZKnYtgng,20985
+smartpush/crowd/crowd.py,sha256=7FNtTVfW8Okf-RU1n5O9olFv7aSKxBVHigZ6zi9MFKw,21107
 smartpush/email/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/email/schema.py,sha256=Gf9tYNP9UjkbXpPbh_uAcAx7QZ5RNs-E7GPVp1BU9d8,23478
-smartpush/email/universal_content.py,sha256=By8ZzhPEvTYuktPfh_wRwRSYnntwoV5qJd3mXzkrSg4,9063
+smartpush/email/activity.py,sha256=LXssDWgxnPEcqnmlr7kiSVP4YbNhP4SDJep6Qc49bcM,3481
+smartpush/email/schema.py,sha256=cB9WAjdLbesfnMGnu6gB7JJU0Ja4WJB8-s_jz5DaCYg,30927
+smartpush/email/universal_content.py,sha256=TwbhvtybbegkUzuvh9WE3SOnPs15PQu-mXQUCz2iMuw,10180
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=YqWmDGSFadQdK2vNJ070Qvad9ZtqEwiQyPkOemlACfs,21508
 smartpush/export/basic/GetOssUrl.py,sha256=zxNZj6x7Ph9N3P5k82pLpBFjZxKrDfbgqS2fTYyhvso,8467
 smartpush/export/basic/ReadExcel.py,sha256=SbVRBKd4Y1UPUXXnvyQ3J6WtZLinwTCYpBos1D6_wtU,8921
 smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
-smartpush/flow/MockFlow.py,sha256=QVEONbTOswKMPLvJWaBa6csMcybPldCImQhUFGFUWh8,7733
+smartpush/flow/MockFlow.py,sha256=L-T_x8hieHs1nPDsP2BUSa6q4pVuiURVN2xP9njakzs,7943
 smartpush/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/flow/global_flow.py,sha256=D1hCpO5fsWTEfl4yNpi3O8PFhz_UmKLHSIQhKtypkvU,2817
 smartpush/flow/history_flow.py,sha256=Gds1FI6i9ue-n1WwpNgL2JlQ2PhSR8VK7dvZ9JemZKw,4854
@@ -27,11 +28,12 @@ smartpush/form/form_before.py,sha256=CCvAC_2yWPlnQGtjEA8LPLy9853Nq3nNjcL2GewFWIs
 smartpush/form/form_client_operation.py,sha256=gg-5uHXCyMa_ypBSYPYFVxXdwZdYBJsNtUCqayknMBw,303
 smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
 smartpush/utils/EmailUtlis.py,sha256=DAHd73bJ8hiJCLEXtD0xcwxPD7SOPSmBB7Jvlf6gN6s,11201
-smartpush/utils/ListDictUtils.py,sha256=HFjBTtSgMv5lxV53qyRGNVkjLmx454_SDIBrSh2RrZk,2824
+smartpush/utils/ListDictUtils.py,sha256=6jIngO_4vARkKTKRb9ZW4wR7zPkYbc1wiMLF7ySZQXc,3191
 smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrAo,4139
 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-1.9.7.dist-info/METADATA,sha256=krn6EjNisMYKHIWS3SKMx1aMzbTgVecLBSb6ybNbz3c,131
-smartpush-1.9.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.9.7.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.9.7.dist-info/RECORD,,
+smartpush-1.9.9.dist-info/METADATA,sha256=fy3DQCfKtpyrckWnVSd4mNNjxLnRNjeENPVnQ_xAf4o,131
+smartpush-1.9.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.9.9.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.9.9.dist-info/RECORD,,