linucb编辑标签同义词加权

linucb/views/collect_data.py

@@ -17,6 +17,8 @@ import libs.tools as Tools
 from trans2es.models.pictorial import CommunityPictorialHomeFeed
 from libs.error import logging_exception
 import os
+from search.views.tag import get_same_tagset_ids
+
 
 class KafkaManager(object):
     consumser_obj = None
@@ -91,7 +93,8 @@ class CollectData(object):
                 recommend_lin_pictorial_id_list = list()
 
                 if click_topic_tag_list and len(click_topic_tag_list)>0:
-                    recommend_topic_id_list_click,recommend_topic_id_list_click_dict = ESPerform.get_tag_topic_list_dict(click_topic_tag_list,
+                    click_topic_tag_list_same_tagset_ids = get_same_tagset_ids(click_topic_tag_list)
+                    recommend_topic_id_list_click,recommend_topic_id_list_click_dict = ESPerform.get_tag_topic_list_dict(click_topic_tag_list_same_tagset_ids,
                                                                                  have_read_topic_id_list,size=2)
                     if len(recommend_topic_id_list_click) > 0:
                         recommend_topic_id_list.extend(recommend_topic_id_list_click)
@@ -120,12 +123,14 @@ class CollectData(object):
                 # if len(recommend_topic_id_list)==0 and cursor==0 and len(redis_topic_list)>0:
                 #     have_read_topic_id_list.extend(redis_topic_list[:2])
                 if len(new_user_click_tag_list)>0:
-                     tag_topic_id_list,tag_topic_dict = ESPerform.get_tag_topic_list_dict(new_user_click_tag_list, have_read_topic_id_list)
-                     recommend_lin_pictorial_id_list = ESPerform.get_tag_pictorial_id_list(new_user_click_tag_list,
+                     new_user_click_tag_list_same_tagset_ids = get_same_tagset_ids(new_user_click_tag_list)
+                     tag_topic_id_list,tag_topic_dict = ESPerform.get_tag_topic_list_dict(new_user_click_tag_list_same_tagset_ids, have_read_topic_id_list)
+                     recommend_lin_pictorial_id_list = ESPerform.get_tag_pictorial_id_list(new_user_click_tag_list_same_tagset_ids,
                                                                                       have_read_lin_pictorial_id_list)
                 else:
-                     tag_topic_id_list,tag_topic_dict = ESPerform.get_tag_topic_list_dict(tag_id_list,have_read_topic_id_list)
-                     recommend_lin_pictorial_id_list = ESPerform.get_tag_pictorial_id_list(tag_id_list,
+                     tag_id_list_same_tagset_ids = get_same_tagset_ids(tag_id_list)
+                     tag_topic_id_list,tag_topic_dict = ESPerform.get_tag_topic_list_dict(tag_id_list_same_tagset_ids,have_read_topic_id_list)
+                     recommend_lin_pictorial_id_list = ESPerform.get_tag_pictorial_id_list(tag_id_list_same_tagset_ids,
                                                                                       have_read_lin_pictorial_id_list)
 
                 if len(recommend_topic_id_list)>0 or len(tag_topic_id_list)>0 or len(new_user_click_tag_list) > 0: