Merge branch 'feature_2023101713_liqian_add_rank_abtest' into pre-master

config.py

@@ -486,15 +486,15 @@ class BaseConfig(object):
         '469': {
             'data_key': 'data10', 'rule_key': 'rule7', 'rank_key_prefix': 'rank:score2:',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_469')
-        },  # simrecall + 融合 + rank_score2
+        },  # simrecall + return_video2 + 融合 + rank_score2
         '470': {
             'data_key': 'data10', 'rule_key': 'rule7', 'rank_key_prefix': 'rank:score4:',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_470')
-        },  # simrecall + 融合 + rank_score4
+        },  # simrecall + return_video2 + 融合 + rank_score4
         '471': {
             'data_key': 'data10', 'rule_key': 'rule7', 'rank_key_prefix': 'rank:score5:',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_471')
-        },  # simrecall + 融合 + rank_score5
+        },  # simrecall + return_video2 + 融合 + rank_score5
 
     }
 

recommend.py

@@ -482,8 +482,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
              gevent.spawn(pool_recall.flow_pool_recall,
                           size, flow_pool_abtest_group=flow_pool_abtest_group)]
     if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073 or ab_code == 60074 \
-            or ab_code == 60075 or ab_code == 60076 or ab_code == 60077 or ab_code == 60078 or ab_code == 60079 \
-            or ab_code == 60080 or ab_code == 60081 or ab_code == 60082:
+            or ab_code == 60075 or ab_code == 60076 or ab_code == 60077 or ab_code == 60078 or ab_code == 60079:
         t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
     elif ab_code == 60056 or ab_code == 60071:
         t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
@@ -491,7 +490,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     elif ab_code == 60067 or ab_code == 60069:
         t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
         t.append(gevent.spawn(pool_recall.get_return_video_reall))
-    elif ab_code == 60068 or ab_code == 60070:
+    elif ab_code == 60068 or ab_code == 60070 or ab_code == 60080 or ab_code == 60081 or ab_code == 60082:
         t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
         t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
 
@@ -505,8 +504,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         return result
     #1. merge simrecall or  deepfm
     if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073 or ab_code == 60074 \
-            or ab_code == 60075 or ab_code == 60076 or ab_code == 60077 or ab_code == 60078 or ab_code == 60079 \
-            or ab_code == 60080 or ab_code == 60081 or ab_code == 60082:
+            or ab_code == 60075 or ab_code == 60076 or ab_code == 60077 or ab_code == 60078 or ab_code == 60079:
         rov_pool_recall = []
         if len(recall_result_list) >= 2:
             region_recall = recall_result_list[0]
@@ -573,7 +571,8 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
                 recall_result_list[0] = rov_pool_recall
 
     #2. merge simrecall, return video
-    if ab_code == 60067 or ab_code==60068 or ab_code==60069 or ab_code==60070:
+    if ab_code == 60067 or ab_code == 60068 or ab_code == 60069 or ab_code == 60070  \
+            or ab_code == 60080 or ab_code == 60081 or ab_code == 60082:
         rov_pool_recall = []
         if len(recall_result_list)>=2:
             region_recall = recall_result_list[0]