添加搜索条件

search/views/topic.py

@@ -15,7 +15,6 @@ from libs.es import ESPerform
 from django.conf import settings
 
 
-
 def get_discover_page_topic_ids(user_id, device_id, size, query_type=TopicPageType.FIND_PAGE):
     try:
         if user_id == -1:
@@ -28,10 +27,11 @@ def get_discover_page_topic_ids(user_id, device_id, size, query_type=TopicPageTy
 
         have_read_topic_id_list = json.loads(redis_field_val_list[0]) if redis_field_val_list[0] else []
 
-        recommend_topic_ids = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=0, offset=0, size=size,single_size=size,
+        recommend_topic_ids = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=0, offset=0, size=size,
+                                                                 single_size=size,
                                                                  query_type=query_type,
-                                                           filter_topic_id_list=have_read_topic_id_list,index_type="topic",routing="4,5,6")
-
+                                                                 filter_topic_id_list=have_read_topic_id_list,
+                                                                 index_type="topic", routing="4,5,6")
 
         have_read_topic_id_list.extend(recommend_topic_ids)
         redis_dict = {
@@ -46,19 +46,21 @@ def get_discover_page_topic_ids(user_id, device_id, size, query_type=TopicPageTy
 
 
 def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query=None,
-                                 query_type=TopicPageType.HOME_RECOMMEND,promote_topic_list = [],disable_collpase=False):
+                                 query_type=TopicPageType.HOME_RECOMMEND, promote_topic_list=[],
+                                 disable_collpase=False):
     try:
         if query is None:
-            if user_id>0:
+            if user_id > 0:
                 redis_key = "physical:home_recommend" + ":user_id:" + str(user_id) + ":query_type:" + str(query_type)
             else:
                 redis_key = "physical:home_recommend" + ":device_id:" + device_id + ":query_type:" + str(query_type)
         else:
-            if user_id>0:
-                redis_key = "physical:home_query" + ":user_id:" + str(user_id) + ":query:" + str(query) + ":query_type:" + str(query_type)
+            if user_id > 0:
+                redis_key = "physical:home_query" + ":user_id:" + str(user_id) + ":query:" + str(
+                    query) + ":query_type:" + str(query_type)
             else:
-                redis_key = "physical:home_query" + ":device_id:" + device_id + ":query:" + str(query) + ":query_type:" + str(query_type)
-
+                redis_key = "physical:home_query" + ":device_id:" + device_id + ":query:" + str(
+                    query) + ":query_type:" + str(query_type)
 
         redis_field_list = [b'have_read_topic_list']
         redis_field_val_list = redis_client.hmget(redis_key, redis_field_list)
@@ -70,7 +72,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             if query is None:
                 have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
             else:
-                if offset>0: # 首次搜索时不需要过滤已读
+                if offset > 0:  # 首次搜索时不需要过滤已读
                     have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
 
         # user_similar_score_redis_key = "physical:user_similar_score:user_id:" + str(user_id)
@@ -89,7 +91,6 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             if b"data" in recommend_topic_dict:
                 recommend_topic_id_list = json.loads(recommend_topic_dict[b"data"])
 
-
                 # 推荐帖子是强插的，要保证推荐帖子不在已读里
                 # recommend_topic_id_list = list(set(recommend_topic_id_list) - set(have_read_topic_id_list))
                 cursor = int(str(recommend_topic_dict[b"cursor"], encoding="utf-8"))
@@ -106,8 +107,8 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             # 用户关注标签
             redis_tag_data = redis_client.hget("physical:linucb:register_user_tag_info", user_id)
             attention_tag_list = json.loads(redis_tag_data) if redis_tag_data else []
-            if len(recommend_topic_list)>0:
-                size = size-len(recommend_topic_list)
+            if len(recommend_topic_list) > 0:
+                size = size - len(recommend_topic_list)
                 have_read_topic_id_list.extend(recommend_topic_list)
 
             # have_read_topic_id_list_add_promote = list()
@@ -120,9 +121,12 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         have_read_topic_id_list.extend(promote_topic_list)
         topic_id_list = list()
         rank_topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=0, size=size,
-                                                           single_size=size,query=query, query_type=query_type,
+                                                                single_size=size, query=query, query_type=query_type,
                                                                 filter_topic_id_list=have_read_topic_id_list,
-                                                           index_type="topic-high-star",routing="4,5,6",attention_tag_list=attention_tag_list,linucb_user_id_list=recommend_topic_user_list,disable_collpase=disable_collpase)
+                                                                index_type="topic-high-star", routing="4,5,6",
+                                                                attention_tag_list=attention_tag_list,
+                                                                linucb_user_id_list=recommend_topic_user_list,
+                                                                disable_collpase=disable_collpase)
 
         # if len(recommend_topic_list) == 6 and query is None:
         #     if (size < 11):
@@ -140,7 +144,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
 
         have_read_topic_id_list.extend(rank_topic_id_list)
         if len(have_read_topic_id_list) > 30000:
-            cut_len = len(have_read_topic_id_list)-30000
+            cut_len = len(have_read_topic_id_list) - 30000
             have_read_topic_id_list = have_read_topic_id_list[cut_len:]
         redis_dict = {
             "have_read_topic_list": json.dumps(have_read_topic_id_list),
@@ -149,10 +153,10 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         # 每个session key保存60天
         redis_client.expire(redis_key, 60 * 60 * 24 * 60)
 
-        return recommend_topic_list,rank_topic_id_list
+        return recommend_topic_list, rank_topic_id_list
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
-        return [],[]
+        return [], []
 
 
 @bind("physical/search/query_tag_id_by_topic")
@@ -165,7 +169,8 @@ def query_tag_id_by_topic(offset=0, size=10, topic_id_list=[], user_id=-1):
 
 
 @bind("physical/search/home_recommend")
-def home_recommend(device_id="", user_id=-1, offset=0, size=10, query_type=TopicPageType.HOME_RECOMMEND,promote_topic_list=[]):
+def home_recommend(device_id="", user_id=-1, offset=0, size=10, query_type=TopicPageType.HOME_RECOMMEND,
+                   promote_topic_list=[]):
     """
     :remark:首页推荐，目前只推荐日记
     :param session_id:
@@ -197,18 +202,20 @@ def home_recommend(device_id="", user_id=-1, offset=0, size=10, query_type=Topic
                 have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
 
                 if len(have_read_topic_id_list) > offset:
-                    recommend_topic_ids = have_read_topic_id_list[offset:offset+size]
+                    recommend_topic_ids = have_read_topic_id_list[offset:offset + size]
                 else:
                     recommend_topic_ids = have_read_topic_id_list[0:size]
 
         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)
+            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}
+        return {"linucb_topic_ids": recommend_topic_ids, "rank_topic_ids": rank_topic_ids}
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
-        return {"linucb_topic_ids": [],"rank_topic_ids":[]}
+        return {"linucb_topic_ids": [], "rank_topic_ids": []}
 
 
 @bind("physical/search/discover_page")
@@ -252,11 +259,12 @@ 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, 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,
+                                                                                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,
                                                                                     offset=offset, size=size,
-                                                                                    query=query,disable_collpase=True)
+                                                                                    query=query, disable_collpase=True)
         return {"recommend_topic_ids": rank_topic_id_list}
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
@@ -278,9 +286,9 @@ def topic_detail_page_recommend(device_id="", user_id=-1, topic_id=-1, topic_pic
         if not isinstance(user_id, int):
             user_id = -1
         if user_id > 0:
-                redis_key = "physical:topic_detail_recommend" + ":user_id:" + str(user_id) + "topic_id:"+str(topic_id)
+            redis_key = "physical:topic_detail_recommend" + ":user_id:" + str(user_id) + "topic_id:" + str(topic_id)
         else:
-                redis_key = "physical:topic_detail_recommend" + ":device_id:" + device_id + "topic_id:"+str(topic_id)
+            redis_key = "physical:topic_detail_recommend" + ":device_id:" + device_id + "topic_id:" + str(topic_id)
         if int(offset) == 0:
             have_read_topic_list = list()
             # redis_dict = {
@@ -293,7 +301,7 @@ def topic_detail_page_recommend(device_id="", user_id=-1, topic_id=-1, topic_pic
             have_read_topic_list = list()
             redis_field_list = [b'have_read_topic_list']
 
-            have_read_topic_redis_data = redis_client.hmget(redis_key,redis_field_list)
+            have_read_topic_redis_data = redis_client.hmget(redis_key, redis_field_list)
             have_read_topic_list = json.loads(have_read_topic_redis_data[0]) if have_read_topic_redis_data[0] else []
         es_cli_obj = ESPerform.get_cli()
         have_read_topic_list.append(topic_id)
@@ -301,18 +309,23 @@ def topic_detail_page_recommend(device_id="", user_id=-1, topic_id=-1, topic_pic
         topic_tag_result = list()
         result = list()
         if len(topic_tag_list) != 0:
-             topic_tag_result = TopicUtils.top_get_topic_detail_recommend_list(user_id,topic_id,have_read_topic_list,size,es_cli_obj,
-                                                                               index_type="topic",routing="3,4,5,6",topic_tag_list = topic_tag_list)
+            topic_tag_result = TopicUtils.top_get_topic_detail_recommend_list(user_id, topic_id, have_read_topic_list,
+                                                                              size, es_cli_obj,
+                                                                              index_type="topic", routing="3,4,5,6",
+                                                                              topic_tag_list=topic_tag_list)
             topic_tag_size = len(topic_tag_result)
             have_read_topic_list.extend(topic_tag_result)
         else:
             topic_tag_size = 0
-        if topic_tag_size <size:
+        if topic_tag_size < size:
             size = size - topic_tag_size
             if topic_user_id != -1:
-              topic_user_result = TopicUtils.top_get_topic_detail_recommend_list(user_id, topic_id, have_read_topic_list,
+                topic_user_result = TopicUtils.top_get_topic_detail_recommend_list(user_id, topic_id,
+                                                                                   have_read_topic_list,
                                                                                    size, es_cli_obj,
-                                                                              index_type="topic", routing="3,4,5,6",topic_user_id = topic_user_id
+                                                                                   index_type="topic",
+                                                                                   routing="3,4,5,6",
+                                                                                   topic_user_id=topic_user_id
                                                                                    )
                 topic_user_size = len(topic_user_result)
                 have_read_topic_list.extend(topic_user_result)
@@ -398,7 +411,7 @@ def topic_search(filters, nfilters=None, sorts_by=None, offset=0, size=10):
     """帖子搜索。"""
 
     try:
-        (topic_id_list,total_count) = TopicUtils.list_topic_ids(filters=filters, nfilters=nfilters,
+        (topic_id_list, total_count) = TopicUtils.list_topic_ids(filters=filters, nfilters=nfilters,
                                                                  sorts_by=sorts_by, offset=offset, size=size)
 
         return {
@@ -422,8 +435,10 @@ def query_topic_by_user_similarity(topic_similarity_score_dict, offset=0, size=1
     try:
 
         must_topic_id_list = list(topic_similarity_score_dict.keys())
-        topic_id_list = TopicUtils.get_recommend_topic_ids(tag_id=0, user_id=-1, offset=offset, size=size,single_size=size,
-                                                           must_topic_id_list=must_topic_id_list,index_type="topic",routing="4,5,6")
+        topic_id_list = TopicUtils.get_recommend_topic_ids(tag_id=0, user_id=-1, offset=offset, size=size,
+                                                           single_size=size,
+                                                           must_topic_id_list=must_topic_id_list, index_type="topic",
+                                                           routing="4,5,6")
 
         return {"recommend_topic_ids": topic_id_list}
     except: