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

smartpush/base/request_base.py

@@ -41,7 +41,7 @@ class RequestBase:
         }
         response_json = None
         default_kwargs.update(kwargs)
-        if default_kwargs.get('data'):  # 如果data有值json序列化
+        if default_kwargs.get('data') and isinstance(default_kwargs.get('data'), dict):  # 如果data有值json序列化
             data = json.dumps(default_kwargs.get('data'))
             default_kwargs.update({'data': data})
         try:

smartpush/email/universal_content.py

@@ -15,7 +15,7 @@ def gen_universal_request_param(universalId, schema, **kwargs):
     universalName/subUniversal_id/type/flowModal
     """
     universalName = kwargs.get('universalName', gen_universal_name(schema))
-    result_schema = get_universal_schema(schema=schema, _id=generate_UUID(8), universalId=universalId,
+    result_schema = get_universal_schema(schema=schema, _id=generate_UUID(9), universalId=universalId,
                                          universalName=universalName)
     requestParam = {
         "universalId": universalId,
@@ -23,7 +23,7 @@ def gen_universal_request_param(universalId, schema, **kwargs):
         "schema": json.dumps(result_schema),
         "subUniversalId": kwargs.get('subUniversal_id', universalId),
         "type": kwargs.get('type', 0),
-        "blockType": schema.name,
+        "blockType": result_schema.get('type'),
         "flowModal": kwargs.get('flowModal', '')
     }
     return json.dumps(requestParam)
@@ -102,8 +102,7 @@ class UniversalContent(RequestBase):
                               data=requestParam)
         return result
 
-    def assert_block_in_the_section(self, section_universa_name, block_universa_id=None, block_universa_name=None,
-                                    _id=None, ):
+    def assert_block_in_the_section(self, section_universa_name, block_universa=None):
         """
         判断收藏的block是否在该section中
         :param section_universa_name:
@@ -113,53 +112,73 @@ class UniversalContent(RequestBase):
         :return:
         """
         result = self.query_universal(universa_name=section_universa_name)
-        schema = {}
-        section = None
         if result:
             section = result['resultData']['datas'][0]
             schema = json.loads(section['schema'])
         if section['blockType'] == 'Section':
             try:
-                if block_universa_id:
-                    assert ListDictUtils.all_in_list(block_universa_id, [ss['universalId'] for ss in schema['children'][0]['children']])
-                elif block_universa_name:
-                    assert ListDictUtils.all_in_list(block_universa_name, [ss['universalName'] for ss in schema['children'][0]['children']])
-                elif _id:
-                    assert ListDictUtils.all_in_list(_id, [ss['id'] for ss in schema['children'][0]['children']])
-                print("------收藏的block在该section中,断言成功------")
+                assert block_universa == schema['children'][0]['children']
+                # if block_universa_id: # assert ListDictUtils.all_in_list(block_universa_id, #
+                # [blockUniversalId:ss['universalId'] ) elif block_universa_name: assert ListDictUtils.all_in_list(
+                # block_universa_name, [ss['universalName'] for ss in schema['children'][0]['children']]) elif _id:
+                # assert ListDictUtils.all_in_list(_id, [ss['id'] for ss in schema['children'][0]['children']])
+                print(f"------收藏的block在该section({section_universa_name})中,断言成功------")
             except:
                 raise
 
 
-
-
-
-
 def get_time():
     return str(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime()))
 
 
 def gen_universal_name(schema):
-    if schema.value['type']:
-        return 'Auto-' + schema.value['type'] + '-' + get_time()
+    schema = schema if isinstance(schema, dict) else schema.value
+    if schema['type']:
+        return 'Auto-' + schema['type'] + '-' + get_time()
     else:
         return 'Auto-' + generate_UUID(5) + '-' + get_time()
 
 
 def get_universal_schema(schema, _id, universalId, universalName):
-    schema.value.update(id=_id, universalId=universalId, universalName=universalName)
-    return schema.value
+    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(get_universal_schema(genSection(_list), _id=generate_UUID(9), universalId=generate_UUID(),
-    #                                       universalName=gen_universal_name(BlockSchema.Section))))
-
+    # 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 = {}
+    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)
+    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)
+    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"}
-
-    UniversalContent(headers=head, host='https://test.smartpushedm.com/bff/api-sp-market-ec2') \
-        .assert_block_in_the_section('Section23452345234', block_universa_name=['5555345243'])
+    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)
+    except:
+        raise
+    finally:
+        universal.delete_universal(sectionUniversalId)

smartpush/utils/ListDictUtils.py

@@ -55,8 +55,8 @@ def json_to_dict(json_data=None):
             json_result = json.load(file)
     return json_result
 
-def all_in_list(list_a, list_b):
 
+def all_in_list(list_a, list_b):
     """
     判断元素是否都在list_b中
     :param list_a:
@@ -64,9 +64,9 @@ def all_in_list(list_a, list_b):
     :return:
     """
     if isinstance(list_a, str):
-        print(f"字符串【{list_a}】在 {list_b}")
+        print(f"判断字符串【{list_a}】在 {list_b}")
         return list_a in list_b
     else:
         # 支持列表、元组、集合等可迭代类型
-        print(f"对象【{list_a}】在 {list_b}")
+        print(f"判断对象【{list_a}】在 {list_b}")
         return set(list_a).issubset(set(list_b))

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

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

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

@@ -4,13 +4,13 @@ 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=7R-aJyMKJ7d50bbyi-2tCUuqR9JfHsZIU-jGhbSVaSU,2406
+smartpush/base/request_base.py,sha256=mg0dSm6ucPdwqSUn_tQzynYWYKf0_vX7kcGJWSsX3e0,2455
 smartpush/base/url_enum.py,sha256=GC8lXuXflKFl3xbeOIzS3vgE7BF2Zo5H9pn6okgHPyQ,1627
 smartpush/crowd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/crowd/crowd.py,sha256=8z5FIWCiTeSUQJGWbLLjS_2AsPbVOsW0GrSZKnYtgng,20985
 smartpush/email/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/email/schema.py,sha256=Gf9tYNP9UjkbXpPbh_uAcAx7QZ5RNs-E7GPVp1BU9d8,23478
-smartpush/email/universal_content.py,sha256=MPGrquHFpxFaX6g8LNfwNxaQvJkvhsbzPU20IJfHRB0,7676
+smartpush/email/universal_content.py,sha256=By8ZzhPEvTYuktPfh_wRwRSYnntwoV5qJd3mXzkrSg4,9063
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=YqWmDGSFadQdK2vNJ070Qvad9ZtqEwiQyPkOemlACfs,21508
 smartpush/export/basic/GetOssUrl.py,sha256=zxNZj6x7Ph9N3P5k82pLpBFjZxKrDfbgqS2fTYyhvso,8467
@@ -27,11 +27,11 @@ 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=LEQG9J9q7st5GHbM8rpDz5mlPbSWU8fOQMPcIKEAmXg,2812
+smartpush/utils/ListDictUtils.py,sha256=HFjBTtSgMv5lxV53qyRGNVkjLmx454_SDIBrSh2RrZk,2824
 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.5.dist-info/METADATA,sha256=xJ4SYQzXuTsLr1FXC8NS-A_FgsER1PRafbxdz5tUU5I,131
-smartpush-1.9.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.9.5.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.9.5.dist-info/RECORD,,
+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,,