update

libs/es.py

@@ -265,6 +265,14 @@ class ESPerform(object):
 
     @classmethod
     def get_tag_topic_list(cls,tag_id):
+        for id in tag_id:
+         functions_list.append(
+                {
+                    "filter": {"term": {"tag_list": id}},
+                    "weight": 1
+                }
+            )
+
         try:
             q = {
                 "query":{
@@ -273,14 +281,17 @@ class ESPerform(object):
                             {"range": {"content_level": {"gte": 4, "lte": 5}}},
                             {"term":{"is_online": True}},
                             {"term":{"is_deleted": False}},
-                            {"term":{"tag_list":tag_id}}
+                            {"terms":{"tag_list":tag_id}}
                         ]
                     }
                 },
+                "score_mode": "sum",
+                "functions": functions_list,
                 "_source":{
                     "include":["id"]
                 },
                 "sort":[
+                    {"_score": {"order": "desc"}},
                     {"create_time_val":{"order":"desc"}},
                     {"language_type":{"order":"asc"}},
                 ]

linucb/views/collect_data.py

@@ -75,23 +75,31 @@ class CollectData(object):
 
                 recommend_topic_id_list = list()
                 for index in range(0,100):
-                    recommend_topic_id_list_random = list()
-                    for tag_id in recommend_tag_list[0:100]:
-                        redis_tag_id_key = self.tag_topic_id_redis_prefix + str(tag_id)
-                        redis_tag_id_data = redis_client.get(redis_tag_id_key)
-                        tag_topic_id_list = json.loads(redis_tag_id_data) if redis_tag_id_data else []
-                        if not redis_tag_id_data:
-                            tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id)
-                            redis_client.set(redis_tag_id_key,json.dumps(tag_topic_id_list))
-                            redis_client.expire(redis_tag_id_key,1*24*60*60)
-
-                        if len(tag_topic_id_list)>index:
-                            for topic_id in tag_topic_id_list[index:]:
-                                if topic_id not in have_read_topic_id_list and topic_id not in recommend_topic_id_list_random and topic_id not in recommend_topic_id_list:
-                                    recommend_topic_id_list_random.append(topic_id)
-                                    break
-                    random.shuffle(recommend_topic_id_list_random)
-                    recommend_topic_id_list.extend(recommend_topic_id_list_random)
+                    recommend_topic_id_list_es = list()
+                    # for tag_id in recommend_tag_list[0:100]:
+                    #     redis_tag_id_key = self.tag_topic_id_redis_prefix + str(tag_id)
+                    #     redis_tag_id_data = redis_client.get(redis_tag_id_key)
+                    #     tag_topic_id_list = json.loads(redis_tag_id_data) if redis_tag_id_data else []
+                    #     if not redis_tag_id_data:
+                    #         tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id)
+                    #         redis_client.set(redis_tag_id_key,json.dumps(tag_topic_id_list))
+                    #         redis_client.expire(redis_tag_id_key,1*24*60*60)
+                    #
+                    #     if len(tag_topic_id_list)>index:
+                    #         for topic_id in tag_topic_id_list[index:]:
+                    #             if topic_id not in have_read_topic_id_list and topic_id not in recommend_topic_id_list_random and topic_id not in recommend_topic_id_list:
+                    #                 recommend_topic_id_list_random.append(topic_id)
+                    #                 break
+                    tag_id = recommend_tag_list[0:100]
+                    tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id)
+                    if len(tag_topic_id_list) > index:
+                      for topic_id in tag_topic_id_list[index:]:
+                                if topic_id not in have_read_topic_id_list and topic_id not in recommend_topic_id_list_es and topic_id not in recommend_topic_id_list:
+                                    recommend_topic_id_list_es.append(topic_id)
+                                    if len(recommend_topic_id_list_es) == 100:
+                                        break
+                    # random.shuffle(recommend_topic_id_list_random)
+                    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 = {
@@ -179,7 +187,11 @@ class CollectData(object):
                                 exposure_sql_query_results = TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id__in=exposure_topic_id_list).values_list("topic_id","tag_id","is_online")
                                 for topic_id,tag_id,is_online in exposure_sql_query_results:
                                     if is_online:
-                                        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:
+                                                tag_list.append(id)
 
                                     if topic_id not in topic_tag_id_dict:
                                         topic_tag_id_dict[topic_id] = list()