Merge branch 'hk_now' into 'test'

fix bug

See merge request alpha/physical!340

search/views/topic.py

@@ -157,11 +157,16 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         redis_client.hmset(redis_key, redis_dict)
         # 每个session key保存60天
         redis_client.expire(redis_key, 60 * 60 * 24 * 60)
-
-        return recommend_topic_list,rank_topic_id_list,useful_topic_id_list
+        if usefulrecall != -1:
+            return recommend_topic_list,rank_topic_id_list,useful_topic_id_list
+        else:
+            return recommend_topic_list, rank_topic_id_list
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
-        return [],[]
+        if usefulrecall != -1:
+            return [],[],[]
+        else:
+            return [], []
 
 
 @bind("physical/search/query_tag_id_by_topic")
@@ -212,11 +217,14 @@ def home_recommend(device_id="", user_id=-1, offset=0, size=10, query_type=Topic
                     recommend_topic_ids = have_read_topic_id_list[0:size]
 
         else:
+          if usefulrecall != -1:
             recommend_topic_ids,rank_topic_ids,useful_topic_ids = get_home_recommend_topic_ids(user_id, device_id, tag_id=0, offset=0, size=size,
                                                            query_type=query_type,promote_topic_list=promote_topic_list,usefulrecall=usefulrecall)
-        if usefulrecall != -1:
             return {"linucb_topic_ids": recommend_topic_ids,"rank_topic_ids":rank_topic_ids,"useful_topic_ids":useful_topic_ids}
-        else:
+          else:
+            recommend_topic_ids,rank_topic_ids = get_home_recommend_topic_ids(user_id, device_id, tag_id=0, offset=0, size=size,
+                                                           query_type=query_type,promote_topic_list=promote_topic_list)
+
             return {"linucb_topic_ids": recommend_topic_ids,"rank_topic_ids":rank_topic_ids}
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())