Merge branch 'hk' into 'master'

linucb collection tag

See merge request alpha/physical!281

linucb/views/collect_data.py

@@ -188,8 +188,8 @@ class CollectData(object):
                                 reward = 1 if is_click or is_vote else 0
 
                                 logging.info("positive tag_list,device_id:%s,topic_id:%s,tag_list:%s" % (
-                                str(device_id), str(topic_id), str(tag_list)))
-                                for tag_id in tag_list:
+                                str(device_id), str(topic_id), str(click_topic_tag_list)))
+                                for tag_id in click_topic_tag_list:
                                     self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature)
 
                                 # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
@@ -216,14 +216,17 @@ class CollectData(object):
 
                                 topic_tag_id_dict = dict()
                                 tag_list = list()
-                                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:
+                                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","is_collection")
+                                if len(exposure_sql_query_results)>0:
+                                 for topic_id,tag_id,is_online,is_collection in exposure_sql_query_results:
+                                    if is_online and is_collection == 1:
+                                        tag_list.append(tag_id)
                                     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_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 (is_ai == 1) and id not in tag_list:
+                                                tag_list.append(id)
 
                                     if topic_id not in topic_tag_id_dict:
                                         topic_tag_id_dict[topic_id] = list()