Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical

linucb/views/collect_data.py

@@ -52,7 +52,7 @@ class CollectData(object):
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return dict()
 
-    def update_recommend_tag_list(self, device_id,user_feature=None,user_id=None,click_topic_tag_list=None):
+    def update_recommend_tag_list(self, device_id,user_feature=None,user_id=None,click_topic_tag_list=None,new_user_click_tag_list = []):
         try:
             redis_linucb_tag_data_dict = self._get_user_linucb_info(device_id)
             if len(redis_linucb_tag_data_dict) == 0:
@@ -105,7 +105,7 @@ class CollectData(object):
                     have_read_topic_id_list.extend(redis_topic_list[:2])
                 tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id_list,have_read_topic_id_list)
 
-                if len(recommend_topic_id_list)>0:
+                if len(recommend_topic_id_list)>0 or len(new_user_click_tag_list) > 0:
                     tag_topic_id_list = recommend_topic_id_list + tag_topic_id_list
                     redis_data_dict = {
                         "data": json.dumps(tag_topic_id_list),
@@ -236,6 +236,30 @@ class CollectData(object):
 
                                 # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
                                 self.update_recommend_tag_list(device_id, user_feature, user_id)
+                            elif "type" in raw_val_dict and "interest_choice_click_next" == raw_val_dict["type"]:
+                                if isinstance(raw_val_dict["params"]["tagid_list"],str):
+                                    tagid_list = json.loads(raw_val_dict["params"]["tagid_list"])
+                                elif isinstance(raw_val_dict["params"]["tagid_list"],list):
+                                    tagid_list = raw_val_dict["params"]["tagid_list"]
+                                else:
+                                    tagid_list = list()
+                                logging.info(
+                                    "consume topic_id:%s,device_id:%s" % (
+                                    str(tagid_list), str(device_id)))
+                                device_id = raw_val_dict["device"]["device_id"]
+                                user_id = raw_val_dict["user_id"] if "user_id" in raw_val_dict else None
+
+                                # if len(exposure_sql_query_results)>0:
+                                if len(tagid_list) > 0:
+                                   is_click = 1
+                                   is_vote = 0
+
+                                   reward = 1 if is_click or is_vote else 0
+                                   for tag_id in tagid_list:
+                                      self.update_user_linucb_tag_info(reward, device_id, tag_id, user_feature)
+
+                                # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
+                                   self.update_recommend_tag_list(device_id, user_feature, user_id,new_user_click_tag_list=tagid_list)
                             else:
                                 logging.warning("unknown type msg:%s" % raw_val_dict.get("type", "missing type"))
                         except: