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

smartpush/base/faker_data.py

@@ -561,13 +561,33 @@ class FakeDataGenerator:
     def fake_height(self):
         return random.randint(600, 2500)
 
+    @property
+    def generate_color_name(self) -> str:
+            """生成随机颜色名称（如 "red", "blue"）"""
+            return fake.color_name()
+
+    @property
+    def generate_hex_color(self) -> str:
+            """生成随机十六进制颜色（如 "#ff0000"）"""
+            return fake.hex_color()
+
+    @property
+    def generate_rgb_color(self) -> tuple[int, ...]:
+            """生成随机RGB颜色元组（如 (255, 0, 0)）"""
+            rgb_str = fake.rgb_color()  # 返回字符串 "255,0,0"
+            return tuple(map(int, rgb_str.split(",")))
+
+    @property
+    def generate_rgba_color(self) -> str:
+            """生成随机RGBA颜色（如 "rgba(255,0,0,0.5)"）"""
+            return fake.rgba_color()
+
     def generate_user_data(self):
         """
         生成完整的用户测试数据
         """
         user_agent = self.fake.user_agent()
         parsed_ua = parse(user_agent)
-
         return {
             'user_agent': user_agent,
             'fake_currency': self.fake.currency()[0],
@@ -675,5 +695,6 @@ class FakeDataGenerator:
             'fake_unix_time': self.fake.unix_time(),
             'fake_year': self.fake.year(),
             'fake_width': random.randint(800, 4000),
-            'fake_height': random.randint(600, 2500)
+            'fake_height': random.randint(600, 2500),
+            'fake_hex_color': self.fake.hex_color()
         }

smartpush/email/activity.py

@@ -13,8 +13,7 @@ from smartpush.email.schema import *
 更新活动草稿内容
 """
 
-
-class ActivityTemplate(ActivityTemplateRequestBase, RequestBase):
+class ActivityTemplate(ActivityTemplateRequestBase):
 
     def create_activity_template(self):
         requestParam = {"activityName": "自动化创建草稿活动-" + DateUtils.get_current_datetime_to_str(),
@@ -28,7 +27,7 @@ class ActivityTemplate(ActivityTemplateRequestBase, RequestBase):
                         "customerGroupIds": [], "excludeContactPacks": [], "excludeCustomerGroupIds": [],
                         "warmupPack": 0}
         result = self.request(path=URL.Activity.step1.url, method=URL.Activity.step1.method, data=requestParam)
-        return json.dumps(result)
+        return result
 
     def update_activity_template_schema(self, currentJsonSchema, schema):
         currentJsonSchema = self.add_element_to_section_column_children(currentJsonSchema, schema)
@@ -43,7 +42,13 @@ class ActivityTemplate(ActivityTemplateRequestBase, RequestBase):
 
         result = self.request(path=URL.Activity.step2.url, method=URL.Activity.step2.method,
                               data=requestParam)
-        return json.dumps(result)
+        return result
+
+    def getActivityTemplateStep2(self):
+        requestParam = {"id": self.activityTemplateId}
+        result = self.request(path=URL.Activity.step2_get.url, method=URL.Activity.step2_get.method,params = requestParam)
+        return result
+
 
     @staticmethod
     def add_element_to_section_column_children(currentJsonSchema, new_schema):
@@ -64,3 +69,26 @@ class ActivityTemplate(ActivityTemplateRequestBase, RequestBase):
                         break  # 若有多个Column可根据需求调整，这里匹配第一个Column
                 break  # 若有多个Section可根据需求调整，这里匹配第一个Section
         return currentJsonSchema
+    @staticmethod
+    def get_column_children_universal_property(currentJsonSchema,universalId,property):
+        _currentJsonSchema = json.loads(currentJsonSchema)
+        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":
+                       for block in column.get("children", []):
+                           if block.get("universalId") == universalId:
+                                result = block.get('props').get(property)
+                                return result
+        return None
+
+    def assert_activity_template_schema_is_update(self,universalId,property='containerBackgroundColor',value = '#123456'):
+        step2_result = self.getActivityTemplateStep2()
+        currentJsonSchema = json.loads(step2_result['resultData']['currentJsonSchema'])
+        assert self.get_column_children_universal_property(currentJsonSchema,universalId,property) == value
+
+
+if __name__ == '__main__':
+    currentJsonSchema = "{\"id\":\"a4a9fba2a\",\"type\":\"Stage\",\"props\":{\"backgroundColor\":\"#EAEDF1\",\"width\":\"600px\",\"fullWidth\":\"normal-width\"},\"children\":[{\"id\":\"84ba788da\",\"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\":\"adbbaaaea\",\"universalId\":\"4c8a94eb-fb4f-4cba-934c-8bbcf4f02f63\",\"universalName\":\"Auto-Logo-2025-11-26 15:11:22\",\"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\":\"#123456\",\"paddingLeft\":\"20px\",\"paddingRight\":\"20px\",\"paddingTop\":\"20px\",\"paddingBottom\":\"20px\",\"paddingCondition\":true,\"segmentTypeConfig\":1},\"children\":[]}]}]},{\"id\":\"84ba7bbda\",\"type\":\"Section\",\"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\":\"8cab9aa48\",\"type\":\"Column\",\"props\":{},\"children\":[{\"id\":\"f946192ef\",\"universalId\":\"4c8a94eb-fb4f-4cba-934c-8bbcf4f02f63\",\"universalName\":\"Auto-Logo-2025-11-26 15:11:22\",\"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\":[]}]}]},{\"id\":\"b8bbabad9\",\"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\":[{\"id\":\"b39b6a94a\",\"type\":\"Subscribe\",\"props\":{\"content\":\"<p style=\\\\\\\"text-align:center;\\\\\\\"><span style=\\\\\\\"font-size:12px\\\\\\\"><span style=\\\\\\\"font-family:Arial, Helvetica, sans-serif\\\\\\\">在此處輸入聯繫地址，可以讓你的顧客更加信任這封郵件</span></span></p><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>\"},\"children\":[]}]}]}],\"extend\":{\"version\":\"1.0.0\",\"updateTime\":\"2025-11-26T07:25:17.609Z\"}}"
+    print(ActivityTemplate.get_column_children_universal_property(currentJsonSchema,'4c8a94eb-fb4f-4cba-934c-8bbcf4f02f63','containerBackgroundColor'))

smartpush/email/schema.py

@@ -582,4 +582,4 @@ if __name__ == '__main__':
     #  BlockSchema.ImageText,
     #  BlockSchema.Button, BlockSchema.Divider, BlockSchema.Social, BlockSchema.HTMLCode]
 
-    print(genSchemaAnalysis(BlockSchema.Section))
+    print(BlockSchema.genSchemaAnalysis(BlockSchema.Section))

smartpush/email/universal_content.py

@@ -4,6 +4,7 @@ import time
 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):
@@ -130,6 +131,16 @@ class UniversalContent(RequestBase):
                 print(f"------收藏的block在该section({section_universa_name})中,断言成功------")
             except:
                 raise
+    @staticmethod
+    def assert_universal_schema_is_update(schema, property='containerBackgroundColor', value ='#123456'):
+        """
+        用于查找素材schema的属性是否更新成功
+        :param property:
+        :param value:
+        :return:
+        """
+        _schema =schema if isinstance(schema,dict) else json.loads(schema)
+        assert _schema['props'][property] == value
 
 
 def get_time():

{smartpush-2.0.0.dist-info → smartpush-2.0.1.dist-info}/METADATA

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

{smartpush-2.0.0.dist-info → smartpush-2.0.1.dist-info}/RECORD

@@ -4,15 +4,15 @@ 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
-smartpush/base/faker_data.py,sha256=TOd5EKVImxZpsKEW_dtKa2iqiUGqU7OBkOM8pvqKVUc,24643
+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=vVg4Y1w8ayT_jD3DDzQCEzD6cWpnRr-7MxPeEqU5OTU,2226
 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=bFiuxp8wb5qxQP0hg2BSqztqnLy7jxuaUONpqF9dl0M,3493
-smartpush/email/schema.py,sha256=790z_2aym1L4yd3igslgMmugvDOJ_XXwzMFrgfUsqg0,31208
-smartpush/email/universal_content.py,sha256=_SHnp1QeZK076U0MEWIFsSSgzEWt2W1R2oMEMbMOa08,11502
+smartpush/email/activity.py,sha256=XME4UpOcP3oKBk4LJTkDvR7b6E7RgvPXpRC3tTMAVf0,8821
+smartpush/email/schema.py,sha256=Uef41D0Z_xw07khOyLiJhjfZ9GVE0urN0tG8orQjIfY,31220
+smartpush/email/universal_content.py,sha256=0VaY_-2--AofdJBuRrOClDXZqn-tCU_FOxSPY-GIRIk,11954
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=YqWmDGSFadQdK2vNJ070Qvad9ZtqEwiQyPkOemlACfs,21508
 smartpush/export/basic/GetOssUrl.py,sha256=zxNZj6x7Ph9N3P5k82pLpBFjZxKrDfbgqS2fTYyhvso,8467
@@ -34,7 +34,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.0.dist-info/METADATA,sha256=v4plV_C6P-VNEfK4waKSnHj2DvCLvAl_6ASXVz1RZ5Y,131
-smartpush-2.0.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-2.0.0.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-2.0.0.dist-info/RECORD,,
+smartpush-2.0.1.dist-info/METADATA,sha256=vvby9hLqP-pNQo9MTusB1EULNABvvi3BLYFXhnB2G2c,131
+smartpush-2.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-2.0.1.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-2.0.1.dist-info/RECORD,,