update video

recommend.py

@@ -371,20 +371,26 @@ 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),
-             pool_recall.get_sim_hot_item_reall_filter]
-        if ab_code == 60055:
+        t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time)]
+        if ab_code == 60052:
+            t.append(pool_recall.get_title_recall)
+        elif ab_code ==60053:
+            t.append(pool_recall.get_sim_hot_item_reall_filter)
+        elif ab_code == 60055:
             t.append(gevent.spawn(pool_recall.get_3days_hot_item_reall))
-        if ab_code == 60056:
+        elif 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),
-             gevent.spawn(pool_recall.get_sim_hot_item_reall_filter)]
-        if ab_code == 60055:
+             gevent.spawn(pool_recall.flow_pool_recall, size)]
+        if ab_code == 60052:
+            t.append(pool_recall.get_title_recall)
+        elif  ab_code == 60053:
+            t.append(pool_recall.get_sim_hot_item_reall_filter)
+        elif ab_code == 60055:
             t.append(gevent.spawn(pool_recall.get_3days_hot_item_reall))
-        if ab_code == 60056:
+        elif ab_code == 60056:
             t.append(gevent.spawn(pool_recall.get_7days_hot_item_reall))
 
     gevent.joinall(t)
@@ -395,43 +401,44 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         result['recallResult']= []
         result['rankResult'] = []
         return result
-    #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
+    #1. merge simrecall
+    if ab_code == 60053:
+        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)>=3:
+        if len(recall_result_list)>=2:
             region_recall = recall_result_list[0]
             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]
+                if len(recall_result_list)>=4:
+                    hot_3_day_recall = recall_result_list[3]
             #print("sim:",sim_recall)
             now_video_ids = set('')
             if len(region_recall)>0:
@@ -452,13 +459,13 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     # merge hot 7day recall
     if ab_code == 60056:
         rov_pool_recall = []
-        if len(recall_result_list)>=4:
+        if len(recall_result_list)>=2:
             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:
+                if len(recall_result_list) >= 3:
                     hot_7_day_recall = recall_result_list[4]
             now_video_ids = set('')
             if len(region_recall)>0:

video_rank.py

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

video_recall.py

@@ -2442,4 +2442,42 @@ class PoolRecall(object):
             if vid in recall_dict:
                 recall_result.append(recall_dict[vid])
         #print("hot recall_result:", recall_result)
+        return recall_result
+
+    def get_title_recall(self):
+        if self.video_id is None:
+            return []
+        recall_key = "title_I2I:" + 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': vid, 'flowPool': '',
+                                        'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['title_i2i_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