Merge branch 'change_type' into 'master'

get_highlight_v2

See merge request !60

data_sync/answer/transfer.py

@@ -205,9 +205,9 @@ def get_answers(pks):
                 all_tags = []
                 for tag in tags_info:
                     all_tags.append(tag.get("id", None))
-                    if tag.get("tag_type", 0) == TAG_TYPE.STAR:
+                    if tag.get("id", 0) in (15928, 10682):
                         item['selected_stars'].append(tag.get("name", None))
-                    elif tag.get("tag_type", 0) == TAG_TYPE.INFLUENCER:
+                    elif tag.get("id", 0) in (15930, 10683):
                         item['selected_internet_celebrity'].append(tag.get("name", None))
                     else:
                         pass
@@ -223,7 +223,7 @@ def get_answers(pks):
                 elif 10683 in all_tags:
                     item['selected_content_type'] = SELECTED_CONTENT_TYPE.CELEBRITY_GOSSIP
                 else:
-                    item['selected_content_type'] =SELECTED_CONTENT_TYPE.BEAUTY_PROJECT
+                    item['selected_content_type'] = SELECTED_CONTENT_TYPE.BEAUTY_PROJECT
             else:
                 try:
                     result_data = alo_model.run(answer.content)
@@ -247,7 +247,17 @@ def get_answers(pks):
                                  "胸部修复", "胸部手术", "胸部提升", "生胸毛", "美胸", "胸毛", "胸部", "胸形", "胸部假体", "胸部kyc", "自体脂肪丰胸",
                                  "泰国隆胸", "泰国假体隆胸", "脂肪丰胸", "复合式隆胸", "隆胸假体", "丰胸（隆胸）", "美胸养成", "在线面诊 美胸名医", "为男友隆胸",
                                  "手术隆胸", "美胸创造营", "隆胸手术", "隆胸丰胸", "胸部下垂", '手术隆胸', "隆胸丰胸", "假体隆胸 成都罗通贵", "丰胸隆胸", "美胸套餐",
-                                 "美胸护理", "自体脂肪填充胸部", "自体隆胸","处女膜修复","手术祛副乳","吸脂祛副乳","阴茎延长","包皮手术","阴茎增大","阴道成形","自体脂肪填充阴唇","女性私密检查","阴唇漂红","G点注射","激光脱私处毛发","乳头缩小","手术紧缩阴道","激光紧缩阴道","私密整形","私密脱毛","私密清洁","阴唇美化","阴道美化","阴蒂美化","处女膜修复","处女膜","女性高潮","阴茎美化","女性私密","私密护理","自体脂肪私密紧致","盆底修复","植私密毛发","阴道紧缩","私密清洁","阴道修复","阴唇整形","阴蒂整形","私密紧致","私密修复","玻尿酸丰阴唇","胶原蛋白丰阴唇","私密kyc","阴道松弛","阴蒂","阴道","处女膜","私密美化","阴蒂美化","阴茎美化","阴道成形","私密紧致","漂红","私密手术","男性私密","女性私密","脱私密毛发","缩阴道激光","生私密毛发","私密健康","阴道修复","生殖系统","女性私处","男性私处","阴茎","阴唇","处女膜","私密部位","胸形","乳晕","乳头","乳腺","副乳","私密护理","悦升私密紧收线","私密整形","私密其他","处女膜修复","阴道紧缩","阴道成形","包皮手术","填充阴唇","阴蒂肥大整形","阴唇整形","私密其他项目","阴蒂提升","小阴唇整形","阴茎延长","阴茎增粗","女性私密","男性私密","切开缝合法缩紧阴道","激光紧缩阴道","女性私密保养品","女性私密处保养","D女郎缩阴产品","私密整形1","私处整形","激光脱比基尼部位","私密回春术","缩阴术","激光脱比基尼","缩阴","私处护理","私处紧致","私密超声提升.","阴蒂整形","激光阴道紧缩术"]
+                                 "美胸护理", "自体脂肪填充胸部", "自体隆胸", "处女膜修复", "手术祛副乳", "吸脂祛副乳", "阴茎延长", "包皮手术", "阴茎增大", "阴道成形",
+                                 "自体脂肪填充阴唇", "女性私密检查", "阴唇漂红", "G点注射", "激光脱私处毛发", "乳头缩小", "手术紧缩阴道", "激光紧缩阴道", "私密整形",
+                                 "私密脱毛", "私密清洁", "阴唇美化", "阴道美化", "阴蒂美化", "处女膜修复", "处女膜", "女性高潮", "阴茎美化", "女性私密", "私密护理",
+                                 "自体脂肪私密紧致", "盆底修复", "植私密毛发", "阴道紧缩", "私密清洁", "阴道修复", "阴唇整形", "阴蒂整形", "私密紧致", "私密修复",
+                                 "玻尿酸丰阴唇", "胶原蛋白丰阴唇", "私密kyc", "阴道松弛", "阴蒂", "阴道", "处女膜", "私密美化", "阴蒂美化", "阴茎美化",
+                                 "阴道成形", "私密紧致", "漂红", "私密手术", "男性私密", "女性私密", "脱私密毛发", "缩阴道激光", "生私密毛发", "私密健康",
+                                 "阴道修复", "生殖系统", "女性私处", "男性私处", "阴茎", "阴唇", "处女膜", "私密部位", "胸形", "乳晕", "乳头", "乳腺",
+                                 "副乳", "私密护理", "悦升私密紧收线", "私密整形", "私密其他", "处女膜修复", "阴道紧缩", "阴道成形", "包皮手术", "填充阴唇",
+                                 "阴蒂肥大整形", "阴唇整形", "私密其他项目", "阴蒂提升", "小阴唇整形", "阴茎延长", "阴茎增粗", "女性私密", "男性私密",
+                                 "切开缝合法缩紧阴道", "激光紧缩阴道", "女性私密保养品", "女性私密处保养", "D女郎缩阴产品", "私密整形1", "私处整形", "激光脱比基尼部位",
+                                 "私密回春术", "缩阴术", "激光脱比基尼", "缩阴", "私处护理", "私处紧致", "私密超声提升.", "阴蒂整形", "激光阴道紧缩术"]
             operators_add_tags_names = list()
             operators_add_tags_names = get_tag_v3_names_by_tag_v3_ids(item['operators_add_tags'])
             answer_all_tag_names.extend(item["tags_v3"] + item["first_demands"] + item["second_demands"] + item[

data_sync/tractate/transfer.py

@@ -260,13 +260,12 @@ def get_tractate(pks):
                 all_tags = []
                 for tag in tags_info:
                     all_tags.append(tag.get("id", None))
-                    if tag.get("tag_type", 0) == TAG_TYPE.STAR:
+                    if tag.get("id", 0) in (15928, 10682):
                         item['selected_stars'].append(tag.get("name", None))
-                    elif tag.get("tag_type", 0) == TAG_TYPE.INFLUENCER:
+                    elif tag.get("id", 0) in (15930, 10683):
                         item['selected_internet_celebrity'].append(tag.get("name", None))
                     else:
                         pass
-
                     if tag.get("id") == 14288:
                         item['operators_add_tags'].append(14288)
                 if 15928 in all_tags: