update update

config.py

@@ -144,8 +144,8 @@ class BaseConfig(object):
             'abtest_229': 60045,
             'abtest_262': 60046,
             'abtest_316': 60047,
-            'abtest_317': 60048,
-            'abtest_318': 60049
+            'abtest_319': 60048,
+            'abtest_320': 60049
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {

recommend.py

@@ -423,7 +423,6 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     recall_dict = {}
     fast_flow_set = set('')
     flow_flow_set = set('')
-    #all_flow_set = set('')
     region_h_recall = []
     region_day_recall = []
     select_day_recall = []
@@ -469,16 +468,8 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     filter_ = FilterVideos(request_id=request_id,
                            app_type=app_type, mid=mid, uid=uid, video_ids=list(recall_dict.keys()))
     #a).expose filter
-    expose_filterd_videos = filter_.new_filter_video()
-    print("------------------expose_filterd_videos------------------------------")
-    print("expose_filterd_videos:",expose_filterd_videos)
-    if expose_filterd_videos is None:
-        return result
-    #b). sep_filter
-    normal_video_list, flow_video_list = filter_.new_flow_video(expose_filterd_videos, flowFlag_dict.keys(), region_code, shield_config)
-    print("normal_video_list:", normal_video_list, "flow_video_list:", flow_video_list)
-    if len(normal_video_list)==0 and len(flow_video_list)==0:
-        return result
+    all_recall_list = filter_.filter_videos_new(pool_type='rov', region_code=region_code, shield_config=shield_config)
+
     #4. sort: old sort: flow 按概率出
     start_rank = time.time()
     #quick_flow_pool_P get from redis
@@ -489,8 +480,6 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     if quick_flow_pool_P:
         flow_pool_P = quick_flow_pool_P
 
-    all_recall_list = normal_video_list+flow_video_list
-
     rank_result= []
     if ab_code==60048 or ab_code==60049:
         rank_ids, add_flow_set = video_new_rank(videoIds=all_recall_list,fast_flow_set=fast_flow_set, flow_set=flow_flow_set,size=size, top_K=top_K, flow_pool_P=float(flow_pool_P))

video_rank.py

@@ -207,7 +207,7 @@ def video_new_rank(videoIds, fast_flow_set, flow_set, size, top_K, flow_pool_P):
 
     for rank_item in rank_result:
         rank_set.add(rank_item[0])
-    print("rank_result:", rank_result)
+    #print("rank_result:", rank_result)
     # 按概率 p 及score排序获取 size - k 个视频， 第4个位置按概率取流量池
     i = 0
     left_quato = size - top_K