Merge branch 'linUCB' into 'master'

modify linucb

See merge request !126

linucb/views/collect_data.py

@@ -84,28 +84,30 @@ class CollectData(object):
                 logging.info(ori_msg)
 
                 value_dict = json.loads(ori_msg.value)
-                if "@raw" in value_dict and "type" in value_dict["@raw"] and "on_click_feed_topic_card"==value_dict["@raw"]["type"]:
-                    topic_id = value_dict["@raw"]["params"]["business_id"]
-                    device_id = value_dict["@raw"]["device"]["device_id"]
+                if "@raw" in value_dict:
+                    raw_val_dict = json.loads(value_dict["@raw"])
+                    if "type" in raw_val_dict and "on_click_feed_topic_card"==raw_val_dict["type"]:
+                        topic_id = raw_val_dict["params"]["business_id"]
+                        device_id = raw_val_dict["device"]["device_id"]
 
-                    logging.info("consume topic_id:%s,device_id:%s" % (str(topic_id),str()))
+                        logging.info("consume topic_id:%s,device_id:%s" % (str(topic_id),str()))
 
-                    tag_list = list()
-                    sql_query_results = TopicTag.objects.filter(is_online=True,topic_id=topic_id)
-                    for sql_item in sql_query_results:
-                        tag_list.append(sql_item.tag_id)
+                        tag_list = list()
+                        sql_query_results = TopicTag.objects.filter(is_online=True,topic_id=topic_id)
+                        for sql_item in sql_query_results:
+                            tag_list.append(sql_item.tag_id)
 
-                    is_click = 1
-                    is_vote = 0
+                        is_click = 1
+                        is_vote = 0
 
-                    user_feature = [is_click, is_vote]
-                    reward = 1 if is_click or is_vote else 0
+                        user_feature = [is_click, is_vote]
+                        reward = 1 if is_click or is_vote else 0
 
-                    for tag_id in tag_list:
-                        self.update_user_linucb_tag_info(reward,device_id,tag_id,user_feature)
+                        for tag_id in tag_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)
+                        # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
+                        self.update_recommend_tag_list(device_id, user_feature)
 
             return True
         except: