smartpush 1.9.2__py3-none-any.whl → 1.9.4__py3-none-any.whl

smartpush/crowd/crowd.py

@@ -1,4 +1,5 @@
 import json
+import time
 
 from smartpush.base.request_base import CrowdRequestBase, RequestBase
 from smartpush.base.url_enum import URL
@@ -55,6 +56,28 @@ class Crowd(CrowdRequestBase):
         resultData = result['resultData']
         return resultData
 
+    def check_crowd(self, expected_rule, expected_ids, sleep=5):
+        """校验群组结果"""
+        result = {}
+        # 校验群组详情条件
+        crowd_detail = self.callCrowdPackageDetail()
+        if crowd_detail["resultData"]["groupRules"] == expected_rule:
+            result["rule"] = True
+        else:
+            result["rule"] = {"条件断言": False, "实际条件": crowd_detail["resultData"]["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
+
+        return result
+
+
 
 class CrowdList(RequestBase):
     def callCrowdPackageList(self, page=1, pageSize=20):

smartpush/email/schema.py

@@ -1,21 +1,28 @@
 import uuid
-import time
 from enum import unique, Enum
 
 
+def generate_UUID(length=None):
+    _uuid = str(uuid.uuid4())
+    if length:
+        return _uuid.replace('-', '')[:length]
+    else:
+        return _uuid
+
+
 @unique
 class BlockSchema(Enum):
     Logo = {
-        "id": "81886ba38",
-        "universalId": "8ff4fe49-c36f-426c-9f8c-d06e1a4877c3",
-        "universalName": "block",
+        "id": generate_UUID(9),
+        "universalId": None,
+        "universalName": None,
         "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://lulu373.myshoplinestg.com",
+            "href": "https://smartpush4.myshoplinestg.com",
             "align": "center",
             "containerBackgroundColor": "transparent",
             "paddingLeft": "20px",
@@ -29,9 +36,9 @@ class BlockSchema(Enum):
         "children": []
     }
     Link = {
-        "id": "b78bcb99a",
-        "universalId": "c3db1401-ddae-4222-8ec3-b5dd9e6b16f3",
-        "universalName": "block",
+        "id": generate_UUID(9),
+        "universalId": None,
+        "universalName": None,
         "type": "Navigation",
         "props": {
             "moduleList": [
@@ -69,9 +76,9 @@ class BlockSchema(Enum):
         "children": []
     }
     Image = {
-        "id": "a499b9a69",
-        "universalId": "a3d8c5f1-3384-492c-8984-81e424892357",
-        "universalName": "img",
+        "id": generate_UUID(9),
+        "universalId": None,
+        "universalName": None,
         "type": "Image",
         "props": {
             "width": "600px",
@@ -89,9 +96,9 @@ class BlockSchema(Enum):
         "children": []
     }
     ImageSet = {
-        "id": "a59b8ba3b",
-        "universalId": "0980b7a8-188e-4afb-b829-e3d93bb78347",
-        "universalName": "block",
+        "id": generate_UUID(9),
+        "universalId": None,
+        "universalName": None,
         "type": "ImageSet",
         "props": {
             "list": [
@@ -134,7 +141,9 @@ class BlockSchema(Enum):
         },
         "children": []
     }
-    Video = {"id": "939b5b82b", "universalId": "11bdb29c-1b68-4346-b8a8-87c3fd806291", "universalName": "block",
+    Video = {"id": generate_UUID(9),
+             "universalId": None,
+             "universalName": None,
              "type": "Video",
              "props": {"iconColor": "#ffffff", "iconStyle": 1, "videoImageType": "auto", "videoHref": "",
                        "width": "600px",
@@ -143,8 +152,9 @@ class BlockSchema(Enum):
                        "containerBackgroundColor": "transparent", "paddingLeft": "10px", "paddingRight": "10px",
                        "paddingTop": "10px", "paddingBottom": "10px", "paddingCondition": True
                        }, "children": []}
-    TimerCountdown = {"id": "92a88aa98", "universalId": "e5ff3684-977b-4934-8c6b-148aa76214fe",
-                      "universalName": "block",
+    TimerCountdown = {"id": generate_UUID(9),
+                      "universalId": None,
+                      "universalName": None,
                       "type": "TimerCountdown",
                       "props": {"gifColor": "#FA7124", "gifLoading": False, "selected": False, "day": 2, "hour": 0,
                                 "minute": 0, "width": "600px", "height": "156px",
@@ -159,7 +169,9 @@ class BlockSchema(Enum):
                           ,
                                 "containerBackgroundColor": "transparent", "gifId": "246f5df56e674676add060956fac7b3f"},
                       "children": []}
-    Commodity = {"id": "8d9a48a69", "universalId": "784daa8e-a474-42d9-a514-ab6509aec569", "universalName": "block",
+    Commodity = {"id": generate_UUID(9),
+                 "universalId": None,
+                 "universalName": None,
                  "type": "Commodity",
                  "props": {"source": None, "limit": 6, "justifyContent": "center", "imgRatio": "3:4",
                            "imgFillType": "cover", "isProductTitle": True
@@ -186,7 +198,9 @@ class BlockSchema(Enum):
                            "currency": 1, "currencyFormat": True
                      , "currencyDecimalPoint": 2,
                            "segmentTypeConfig": 1}, "children": []}
-    Discount = {"id": "979a29818", "universalId": "69130914-e7f9-4b3b-b5de-aef5891cb55d", "universalName": "block",
+    Discount = {"id": generate_UUID(9),
+                "universalId": None,
+                "universalName": None,
                 "type": "Discount",
                 "props": {"discountTermsFontFamily_SHOPIFY": "arial,helvetica,sans-serif,Arial, Helvetica, sans-serif",
                           "discountTermsFontFamily_EC1": "arial,helvetica,sans-serif,Arial, Helvetica, sans-serif",
@@ -269,7 +283,9 @@ class BlockSchema(Enum):
                           "btnText_CUSTOM": "Use discount now", "btnText_EC1": "Use discount now", "btnUrl_EC2": "",
                           "btnUrl_SHOPIFY": "", "btnUrl_CUSTOM": "", "btnUrl_EC1": "", "isShowPreviewForm": False},
                 "children": []}
-    TextSet = {"id": "908928b6b", "universalId": "d857d68f-3565-4d78-8a4b-dd56e133043e", "universalName": "block",
+    TextSet = {"id": generate_UUID(9),
+               "universalId": None,
+               "universalName": None,
                "type": "TextSet", "props": {"list": [{
             "content": "<p style=\"font-family: arial,helvetica,sans-serif,Arial, Helvetica, sans-serif\">在此处输入文本，支持按需调整字体大小、行距、对齐方式等样式</p>",
             "paddingLeft": "10px", "paddingRight": "10px", "paddingTop": "0px",
@@ -279,7 +295,9 @@ class BlockSchema(Enum):
             "paddingRight": "10px", "paddingTop": "10px", "paddingBottom": "10px",
             "paddingCondition": True
         }, "children": []}
-    ImageText = {"id": "a499ea949", "universalId": "41f04a27-8230-42d1-bd05-16c2444e7b37", "universalName": "block",
+    ImageText = {"id": generate_UUID(9),
+                 "universalId": None,
+                 "universalName": None,
                  "type": "ImageText", "props": {"list": [{"src": "", "width": "290", "height": "150", "imgRatio": 0.51,
                                                           "content": "<p style=\"font-family: arial,helvetica,sans-serif,Arial, Helvetica, sans-serif\">在此处输入文本，支持按需调整字体大小、行距、对齐方式等样式</p>",
                                                           "layout": "rightText", "borderWidth": "1px",
@@ -289,7 +307,9 @@ class BlockSchema(Enum):
                                                 "paddingRight": "10px", "paddingTop": "10px", "paddingBottom": "10px",
                                                 "paddingCondition": True
             , "layoutItem": "rightText", "segmentTypeConfig": 1}, "children": []}
-    Button = {"id": "bea9bb83b", "universalId": "cb3a47a7-2db5-46c3-af57-3eb134fabb98", "universalName": "block",
+    Button = {"id": generate_UUID(9),
+              "universalId": None,
+              "universalName": None,
               "type": "Button",
               "props": {"content": "Button", "color": "#ffffff", "fontSize": "18px", "fontWeight": 500,
                         "fontFamily": "arial,helvetica,sans-serif,Arial, Helvetica, sans-serif",
@@ -300,22 +320,91 @@ class BlockSchema(Enum):
                         "paddingRight": "10px", "paddingTop": "10px", "paddingBottom": "10px",
                         "paddingCondition": True
                         }, "children": []}
-    Divider = {"id": "b2897b90a", "universalId": "2ebe35a0-521a-4b8a-aee0-2c035618333f", "universalName": "block",
+    Divider = {"id": generate_UUID(9),
+               "universalId": None,
+               "universalName": None,
                "type": "Divider",
                "props": {"borderColor": "#000000", "borderStyle": "solid", "borderWidth": "1px", "paddingLeft": "20px",
                          "paddingRight": "20px", "paddingTop": "20px", "paddingBottom": "20px", "paddingCondition": True
                          }, "children": []}
-    Social = {"id": "9b8b19879", "universalId": "138ccb97-3c62-4119-9490-1a251808c5c3", "universalName": "block",
+    Social = {"id": generate_UUID(9),
+              "universalId": None,
+              "universalName": None,
               "type": "Social", "props": {
             "list": [{"name": "facebook-noshare", "iconSize": "36px", "src": "", "iconStyle": 1, "href": ""},
                      {"name": "instagram", "iconSize": "36px", "src": "", "iconStyle": 1, "href": ""},
                      {"name": "web", "iconSize": "36px", "src": "", "iconStyle": 1, "href": ""}],
             "containerBackgroundColor": "transparent", "iconStyle": 1}, "children": []}
-    HTMLCode = {"id": "838a79a4a", "universalId": "14baf9dc-764f-43a4-8cba-e72eac5ce5d5", "universalName": "block",
+    HTMLCode = {"id": generate_UUID(9),
+                "universalId": None,
+                "universalName": None,
                 "type": "HTMLCode", "props": {"list": [
             {"content": "使用你自定义的代码段", "paddingLeft": "0px", "paddingRight": "0px", "paddingTop": "0px",
              "paddingBottom": "0px", "borderStyle": "none", "borderColor": "#ffffff", "borderWidth": "1px"}],
             "containerBackgroundColor": "TRANSPARENT", "paddingLeft": "0px",
             "paddingRight": "0px", "paddingTop": "0px", "paddingBottom": "0px",
             "paddingCondition": True
-        }, "children": []}
+        }, "children": []}
+    Section = {
+        "id": generate_UUID(9),
+        "universalId": None,
+        "universalName": None,
+        "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": "a398fa9db",
+                        "universalId": "3a8b79e8-b400-43d4-8d4c-c70969284a24",
+                        "universalName": "Auto-Logo-2025-11-14 00:33:28",
+                        "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": []
+                    }
+                ]
+            }
+        ]
+    }
+
+
+def genSection(block_list: list):
+    """
+        根据Block生成Section结构体
+        :param block_list:
+        :return:
+        """
+    section = BlockSchema.Section
+    if section.value['children'][0]['type'] == 'Column':
+        section.value['children'][0]['children'] = block_list
+    return section

smartpush/email/universal_content.py

@@ -1,5 +1,5 @@
 import json
-
+import time
 from smartpush.base.request_base import RequestBase
 from smartpush.base.url_enum import *
 from smartpush.email.schema import *
@@ -38,14 +38,14 @@ class UniversalContent(RequestBase):
         return result
 
     # 查询universal
-    def query_universal(self, universa_name='', blockType_list=None):
+    def query_universal(self, universa_name='', blockType_list=[]):
         """
         查询素材
         :param blockType_list:
         :param universa_name:
         :return:
         """
-        requestParam = {'universa_name': universa_name}
+        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,
@@ -102,13 +102,6 @@ class UniversalContent(RequestBase):
         return result
 
 
-def generate_UUID(length=None):
-    _uuid = str(uuid.uuid4())
-    if length:
-        return _uuid[:length]
-    else:
-        return _uuid
-
 
 def get_time():
     return str(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime()))
@@ -127,4 +120,7 @@ def get_universal_schema(schema, _id, universalId, universalName):
 
 
 if __name__ == '__main__':
-    print(gen_universal_request_param(generate_UUID(), BlockSchema.Social, ))
+    _list = [get_universal_schema(BlockSchema.Logo, _id=generate_UUID(9), universalId=generate_UUID(),
+                                  universalName=gen_universal_name(BlockSchema.Logo))]
+    print(json.dumps(get_universal_schema(genSection(_list), _id=generate_UUID(9), universalId=generate_UUID(),
+                               universalName=gen_universal_name(BlockSchema.Section))))

{smartpush-1.9.2.dist-info → smartpush-1.9.4.dist-info}/METADATA

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

{smartpush-1.9.2.dist-info → smartpush-1.9.4.dist-info}/RECORD

@@ -1,6 +1,5 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=s3hPwC6KePS5BtqNS9o15eCh7Nx2gn16bn6tfYK0iQI,18112
-smartpush/test.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/account/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/account/operate_account.py,sha256=nzJLLAEwNElavZeWVqnA_MSGTBzQrSrknmezYBwtvWs,1525
 smartpush/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,10 +7,10 @@ smartpush/base/faker_data.py,sha256=TOd5EKVImxZpsKEW_dtKa2iqiUGqU7OBkOM8pvqKVUc,
 smartpush/base/request_base.py,sha256=7R-aJyMKJ7d50bbyi-2tCUuqR9JfHsZIU-jGhbSVaSU,2406
 smartpush/base/url_enum.py,sha256=GC8lXuXflKFl3xbeOIzS3vgE7BF2Zo5H9pn6okgHPyQ,1627
 smartpush/crowd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/crowd/crowd.py,sha256=XAOdvtgUVRMMQOor2bRPdTK2aYqlA_Zo7HapqsBANcE,20110
+smartpush/crowd/crowd.py,sha256=8z5FIWCiTeSUQJGWbLLjS_2AsPbVOsW0GrSZKnYtgng,20985
 smartpush/email/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/email/schema.py,sha256=hWFAuYFM2O55Wfds8xm750cXDr5gr2QnIawma2FIfyE,20925
-smartpush/email/universal_content.py,sha256=GXaCEutCee3GoVCVzLznuGxSXU7-MI1QMj7SRstfXyU,4323
+smartpush/email/schema.py,sha256=SHRETmm2pe79YTo82aFFM9JPbuUEBRSUsCXODikimDg,23211
+smartpush/email/universal_content.py,sha256=XpCMs_frppmog8OAY1rAht0iXzr8ICjQsXV8Lq_kFYM,4505
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=YqWmDGSFadQdK2vNJ070Qvad9ZtqEwiQyPkOemlACfs,21508
 smartpush/export/basic/GetOssUrl.py,sha256=zxNZj6x7Ph9N3P5k82pLpBFjZxKrDfbgqS2fTYyhvso,8467
@@ -32,7 +31,7 @@ smartpush/utils/ListDictUtils.py,sha256=62GDkG5VrWoxahIDTnzAHr6zz8r5ebrRmnjU3YZa
 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.9.2.dist-info/METADATA,sha256=K5olHFNjdGMo1rmeSEhJExgwqXe0pFAfTA9RoQYPEjM,131
-smartpush-1.9.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.9.2.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.9.2.dist-info/RECORD,,
+smartpush-1.9.4.dist-info/METADATA,sha256=g7Cao4EdEdlklwrGuHtV8yExVx5Z3ECa9b4ey_DJ_js,131
+smartpush-1.9.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.9.4.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.9.4.dist-info/RECORD,,