update video info

config.py

@@ -151,6 +151,8 @@ class BaseConfig(object):
             'abtest_326': 60052,
             'abtest_327': 60053,
             'abtest_328': 60054,
+            'abtest_332': 60055,
+            'abtest_333': 60056,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -354,6 +356,14 @@ class BaseConfig(object):
         '328': {
             'data_key': 'data10', 'rule_key': 'rule7',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_328')
+        },
+        '332': {
+            'data_key': 'data10', 'rule_key': 'rule7',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_332')
+        },
+        '333': {
+            'data_key': 'data10', 'rule_key': 'rule7',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_333')
         }
     }
 

recommend.py

@@ -371,15 +371,21 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
                              params=params, rule_key_30day=rule_key_30day, shield_config=shield_config, video_id= video_id)
 
     if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
-        t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time)]
-        if ab_code == 60054:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
+        t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
+             pool_recall.get_sim_hot_item_reall_filter]
+        if ab_code == 60055:
+            t.append(gevent.spawn(pool_recall.get_3days_hot_item_reall))
+        if ab_code == 60056:
+            t.append(gevent.spawn(pool_recall.get_7days_hot_item_reall))
     else:
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
              gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
-             gevent.spawn(pool_recall.flow_pool_recall, size)]
-        if ab_code == 60054:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
+             gevent.spawn(pool_recall.flow_pool_recall, size),
+             gevent.spawn(pool_recall.get_sim_hot_item_reall_filter)]
+        if ab_code == 60055:
+            t.append(gevent.spawn(pool_recall.get_3days_hot_item_reall))
+        if ab_code == 60056:
+            t.append(gevent.spawn(pool_recall.get_7days_hot_item_reall))
 
     gevent.joinall(t)
     recall_result_list = [i.get() for i in t]
@@ -389,11 +395,43 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         result['recallResult']= []
         result['rankResult'] = []
         return result
-    if ab_code == 60054:
+    #merge simrecall
+    rov_pool_recall = []
+    if len(recall_result_list) >= 2:
+        region_recall = recall_result_list[0]
+        sim_recall = []
+        if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
+            sim_recall = recall_result_list[1]
+        else:
+            if len(recall_result_list)>=4:
+                sim_recall = recall_result_list[3]
+        now_video_ids = set('')
+        if len(region_recall) > 0:
+            for video in region_recall:
+                video_id = video.get('videoId')
+                if video_id not in now_video_ids:
+                    rov_pool_recall.append(video)
+                    now_video_ids.add(video_id)
+        if len(sim_recall) > 0:
+            for video in sim_recall:
+                video_id = video.get('videoId')
+                # print("sim video_id:", video_id)
+                if video_id not in now_video_ids:
+                    rov_pool_recall.append(video)
+                    now_video_ids.add(video_id)
+        if len(rov_pool_recall) > 0:
+            recall_result_list[0] = rov_pool_recall
+    # merge hot 3day recall
+    if ab_code == 60055:
         rov_pool_recall = []
-        if len(recall_result_list)>=4:
+        if len(recall_result_list)>=3:
             region_recall = recall_result_list[0]
-            sim_recall = recall_result_list[3]
+            hot_3_day_recall = []
+            if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
+                hot_3_day_recall = recall_result_list[1]
+            else:
+                if len(recall_result_list)>=5:
+                    hot_3_day_recall = recall_result_list[4]
             #print("sim:",sim_recall)
             now_video_ids = set('')
             if len(region_recall)>0:
@@ -402,8 +440,35 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
                     if video_id not in now_video_ids:
                         rov_pool_recall.append(video)
                         now_video_ids.add(video_id)
-            if len(sim_recall)>0:
-                for video in sim_recall:
+            if len(hot_3_day_recall)>0:
+                for video in hot_3_day_recall:
+                    video_id = video.get('videoId')
+                    #print("sim video_id:", video_id)
+                    if video_id not in now_video_ids:
+                        rov_pool_recall.append(video)
+                        now_video_ids.add(video_id)
+            if len(rov_pool_recall)>0:
+                recall_result_list[0] = rov_pool_recall
+    # merge hot 7day recall
+    if ab_code == 60056:
+        rov_pool_recall = []
+        if len(recall_result_list)>=4:
+            region_recall = recall_result_list[0]
+            hot_7_day_recall = []
+            if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
+                hot_7_day_recall = recall_result_list[1]
+            else:
+                if len(recall_result_list) >= 5:
+                    hot_7_day_recall = recall_result_list[4]
+            now_video_ids = set('')
+            if len(region_recall)>0:
+                for video in region_recall:
+                    video_id = video.get('videoId')
+                    if video_id not in now_video_ids:
+                        rov_pool_recall.append(video)
+                        now_video_ids.add(video_id)
+            if len(hot_7_day_recall)>0:
+                for video in hot_7_day_recall:
                     video_id = video.get('videoId')
                     #print("sim video_id:", video_id)
                     if video_id not in now_video_ids:
@@ -1476,7 +1541,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
                                  rule_key=rule_key, data_key=data_key,
                                  no_op_flag=no_op_flag, old_video_index=old_video_index,
                                  params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
-    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054:
+    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054 or ab_code == 60055 or ab_code == 60056:
         result = video_old_recommend(request_id=request_id,
                                      mid=mid, uid=uid, app_type=app_type,
                                      size=size, top_K=top_K, flow_pool_P=flow_pool_P,
@@ -1518,7 +1583,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
         update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     elif ab_code == 60050 or  ab_code == 60051:
         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
-    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054:
+    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054 or ab_code == 60055 or ab_code == 60056:
         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     else:
         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
@@ -1602,7 +1667,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
                                  rule_key=rule_key, data_key=data_key, no_op_flag=no_op_flag,
                                  old_video_index=old_video_index, video_id=video_id,
                                  params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
-    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054:
+    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054 or ab_code == 60055 or ab_code == 60056:
         result = video_old_recommend(request_id=request_id,
                                  mid=mid, uid=uid, app_type=app_type,
                                  size=size, top_K=top_K, flow_pool_P=flow_pool_P,
@@ -1645,7 +1710,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
          update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     elif ab_code == 60050 or ab_code == 60051:
          update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
-    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054:
+    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054 or ab_code == 60055 or ab_code == 60056:
          update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     else:
          update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)

video_rank.py

@@ -607,10 +607,14 @@ def video_new_rank2(data, size, top_K, flow_pool_P, ab_code):
     redisObj = RedisHelper()
     vidKeys = []
     recall_list = []
-    pre_str = "k_p:"
-    if ab_code==60053 or ab_code==60054:
+    pre_str = "k_p2:"
+    if ab_code == 60052 or ab_code == 60055:
+        pre_str = "k_p3:"
+    elif ab_code == 60053 or ab_code == 60056:
+        pre_str = "k_p4:"
+    elif ab_code ==60054:
         pre_str = "k_p2:"
-    #print("pre_str:", pre_str)
+    print("pre_str:", pre_str)
     for recall_item in data['rov_pool_recall']:
         if len(recall_item)<=0:
             continue

video_recall.py

@@ -2362,4 +2362,80 @@ class PoolRecall(object):
         #     'executeTime': (time.time() - start_time) * 1000
         # })
 
-        return flow_pool_recall_result[:size]
+        return flow_pool_recall_result[:size]
+
+    def get_3days_hot_item_reall(self):
+        if self.video_id is None:
+            return  []
+        recall_key = "hot_3day:" + str(self.video_id)
+        # print("recall_key:", recall_key)
+        data = self.redis_helper.get_data_from_redis(key_name=recall_key)
+
+        # print(data)
+        recall_result = []
+        recall_dict  = {}
+        video_ids = []
+        if data is not None:
+            json_result = json.loads(data)
+            # print("json_result:", json_result)
+            for per_item in json_result:
+                try:
+                    vid = int(per_item[0])
+                    video_ids.append(vid)
+                    recall_dict[vid] = {'videoId': per_item[0], 'flowPool': '',
+                         'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['hot_3_day_recall'],
+                         'abCode': self.ab_code}
+                except Exception as e:
+                    continue
+        if len(video_ids)<=0:
+            return  recall_result
+        video_ids = video_ids[:50]
+        #print(video_ids)
+        filter_ = FilterVideos(request_id=self.request_id,
+                               app_type=self.app_type, mid=self.mid, uid=self.uid, video_ids=video_ids)
+        filtered_viewed_videos = filter_.filter_videos(pool_type='rov')
+        if filtered_viewed_videos is None:
+            return recall_result
+        #print("filtered_viewed_videos:", filtered_viewed_videos)
+        for vid in filtered_viewed_videos:
+            if vid in recall_dict:
+                recall_result.append(recall_dict[vid])
+        return recall_result
+
+    def get_7days_hot_item_reall(self):
+        if self.video_id is None:
+            return  []
+        recall_key = "hot_7day:" + str(self.video_id)
+        # print("recall_key:", recall_key)
+        data = self.redis_helper.get_data_from_redis(key_name=recall_key)
+
+        # print(data)
+        recall_result = []
+        recall_dict  = {}
+        video_ids = []
+        if data is not None:
+            json_result = json.loads(data)
+            # print("json_result:", json_result)
+            for per_item in json_result:
+                try:
+                    vid = int(per_item[0])
+                    video_ids.append(vid)
+                    recall_dict[vid] = {'videoId': per_item[0], 'flowPool': '',
+                         'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['hot_7_day_recall'],
+                         'abCode': self.ab_code}
+                except Exception as e:
+                    continue
+        if len(video_ids)<=0:
+            return  recall_result
+        video_ids = video_ids[:50]
+        #print(video_ids)
+        filter_ = FilterVideos(request_id=self.request_id,
+                               app_type=self.app_type, mid=self.mid, uid=self.uid, video_ids=video_ids)
+        filtered_viewed_videos = filter_.filter_videos(pool_type='rov')
+        if filtered_viewed_videos is None:
+            return recall_result
+        #print("filtered_viewed_videos:", filtered_viewed_videos)
+        for vid in filtered_viewed_videos:
+            if vid in recall_dict:
+                recall_result.append(recall_dict[vid])
+        return recall_result