Merge branch 'hot_fix' into 'master'

hot fix

See merge request !506

search/views/topic.py

@@ -53,7 +53,7 @@ def get_discover_page_topic_ids(user_id, device_id, size, query_type=TopicPageTy
         return []
 
 
-def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, underexposure_lin_topic_count, size, query=None,
+def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, underexposure_lin_topic_count=0, size=0, query=None,
                                  query_type=TopicPageType.HOME_RECOMMEND, promote_topic_list=[], disable_collpase=False,
                                  usefulrecall=-1, useful_tag_list=[], has_score=False, gray_list=[]):
     try:
@@ -141,10 +141,11 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, underexposu
                 # linucb 推荐新帖子
                 if linucb_recommend_tags:
                     linucb_recommend_tags_set_tags = get_same_tagset_ids(linucb_recommend_tags)
-                    underexposure_lin_topic_ids = ESPerform.get_tag_new_topic_list(linucb_recommend_tags_set_tags, have_read_topic_id_list, underexposure_lin_topic_count)
-                    size = size - len(underexposure_lin_topic_ids)
-                    have_read_topic_id_list.extend(underexposure_lin_topic_ids)
-                    redis_client.publish("new_topic_impression", json.dumps(underexposure_lin_topic_ids))
+                    if underexposure_lin_topic_count:
+                        underexposure_lin_topic_ids = ESPerform.get_tag_new_topic_list(linucb_recommend_tags_set_tags, have_read_topic_id_list, underexposure_lin_topic_count)
+                        size = size - len(underexposure_lin_topic_ids)
+                        have_read_topic_id_list.extend(underexposure_lin_topic_ids)
+                        redis_client.publish("new_topic_impression", json.dumps(underexposure_lin_topic_ids))
 
                 # linucb 推荐老帖子
                 recommend_topic_dict = redis_client.hgetall(topic_recommend_redis_key)
@@ -570,10 +571,10 @@ def home_query(device_id="", tag_id=-1, user_id=-1, query="", offset=0, size=10,
         if not isinstance(device_id, str):
             device_id = ""
 
-        recommend_topic_list, rank_topic_id_list = get_home_recommend_topic_ids(user_id, device_id, tag_id,
+        unexposure_lin_topic, recommend_topic_list, rank_topic_id_list = get_home_recommend_topic_ids(user_id, device_id, tag_id,
                                                                                 offset=offset, size=size, query=query)
         if len(rank_topic_id_list) > 0 and len(rank_topic_id_list) < size:
-            recommend_topic_list, rank_topic_id_list = get_home_recommend_topic_ids(user_id, device_id, tag_id,
+            unexposure_lin_topic, recommend_topic_list, rank_topic_id_list = get_home_recommend_topic_ids(user_id, device_id, tag_id,
                                                                                     offset=offset, size=size,
                                                                                     query=query, disable_collpase=True)