add clicked topic tag recall

linucb/views/collect_data.py

@@ -50,7 +50,7 @@ class CollectData(object):
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return dict()
 
-    def update_recommend_tag_list(self, device_id,user_feature=None,user_id=None):
+    def update_recommend_tag_list(self, device_id,user_feature=None,user_id=None,click_topic_tag_list=None):
         try:
             recommend_tag_set = set()
             recommend_tag_list = list()
@@ -74,8 +74,17 @@ class CollectData(object):
                 have_read_topic_id_list = Tools.get_have_read_topic_id_list(device_id,-1,TopicPageType.HOME_RECOMMEND)
 
                 recommend_topic_id_list = list()
+                if click_topic_tag_list:
+                    recommend_topic_id_list_click = ESPerform.get_tag_topic_list(click_topic_tag_list,
+                                                                                 have_read_topic_id_list)
+                if len(recommend_topic_id_list) > 0:
+                    num = min(len(recommend_topic_id_list), 2)
+                    recommend_topic_id_list.extend(recommend_topic_id_list_click[0:num])
+
                 tag_id_list = recommend_tag_list[0:100]
                 tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id_list,have_read_topic_id_list)
+                recommend_topic_id_list.extend(tag_topic_id_list)
+
                 # for index in range(0,100):
                 #     recommend_topic_id_list_es = list()
                     # for tag_id in recommend_tag_list[0:100]:
@@ -104,7 +113,7 @@ class CollectData(object):
                     # recommend_topic_id_list.extend(recommend_topic_id_list_es)
                 topic_recommend_redis_key = self.linucb_recommend_topic_id_prefix + str(device_id)
                 redis_data_dict = {
-                    "data": json.dumps(tag_topic_id_list),
+                    "data": json.dumps(recommend_topic_id_list),
                     "cursor":0
                 }
                 redis_client.hmset(topic_recommend_redis_key,redis_data_dict)
@@ -145,13 +154,17 @@ class CollectData(object):
                                 logging.info("consume topic_id:%s,device_id:%s" % (str(topic_id), str(device_id)))
 
                                 tag_list = list()
+                                click_topic_tag_list = list()
+
                                 click_sql_query_results = TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id=topic_id).values_list("tag_id","is_online")
                                 for tag_id,is_online in click_sql_query_results:
                                     if is_online:
-                                      # tag_sql_query_results = Tag.objects.using(settings.SLAVE_DB_NAME).filter(id=tag_id).values_list("id","collection","is_ai")
-                                      # for id,collection,is_ai in tag_sql_query_results:
-                                      #    if collection == 1 or is_ai == 1:
-                                            tag_list.append(tag_id)
+                                        tag_list.append(tag_id)
+                                        tag_sql_query_results = Tag.objects.using(settings.SLAVE_DB_NAME).filter(
+                                            id=tag_id).values_list("id", "collection", "is_ai")
+                                        for id, collection, is_ai in tag_sql_query_results:
+                                            if collection == 1 or is_ai == 1:
+                                                click_topic_tag_list.append(id)
 
                                 is_click = 1
                                 is_vote = 0
@@ -164,7 +177,7 @@ class CollectData(object):
                                     self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature)
 
                                 # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
-                                self.update_recommend_tag_list(device_id, user_feature, user_id)
+                                self.update_recommend_tag_list(device_id, user_feature, user_id,click_topic_tag_list=click_topic_tag_list)
                             elif "type" in raw_val_dict and "page_precise_exposure" == raw_val_dict["type"]:
                                 if isinstance(raw_val_dict["params"]["exposure_cards"],str):
                                     exposure_cards_list = json.loads(raw_val_dict["params"]["exposure_cards"])