Merge branch 'feature_2023091215_liqian_add_abtest' into pre-master

config.py

@@ -170,6 +170,7 @@ class BaseConfig(object):
             'abtest_409': 60071,
             'abtest_420': 60072,
             'abtest_421': 60073,
+            'abtest_430': 60074,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -450,6 +451,10 @@ class BaseConfig(object):
             'data_key': 'data2', 'rule_key': 'rule7-1',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_421')
         },  # simrecall+融合+地域召回使用vlog数据&内容精选数据 data-[vlog: 0.5, 内容精选: 0.5]
+        '430': {
+            'data_key': 'videos5', 'rule_key': 'rule7-1',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_430')
+        },  # simrecall+融合+地域召回使用内容精选数据 data-[内容精选: 1]
     }
 
     # APP ab实验配置

recommend.py

@@ -460,7 +460,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
              gevent.spawn(pool_recall.flow_pool_recall_new, size, config_.QUICK_FLOW_POOL_ID),
              gevent.spawn(pool_recall.flow_pool_recall_new, size)]
-    if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073:
+    if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073 or ab_code == 60074:
         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))
@@ -481,7 +481,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         result['rankResult'] = []
         return result
     #1. merge simrecall or  deepfm
-    if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073:
+    if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073 or ab_code == 60074:
         rov_pool_recall = []
         if len(recall_result_list) >= 2:
             region_recall = recall_result_list[0]
@@ -1755,7 +1755,8 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     # return video, return video2
     # old video: 60056, test2
     if ab_code == 60054 or ab_code == 60056 or ab_code == 60067 or ab_code == 60068 or ab_code == 60066 \
-            or ab_code == 60069 or ab_code == 60070 or ab_code == 60071 or ab_code == 60072 or ab_code == 60073:
+            or ab_code == 60069 or ab_code == 60070 or ab_code == 60071 or ab_code == 60072 or ab_code == 60073 \
+            or ab_code == 60074:
         result, fea_info = 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,
@@ -1874,7 +1875,8 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
     #                              old_video_index=old_video_index, video_id=video_id,
     #                              params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
     if ab_code == 60054 or ab_code == 60056 or ab_code == 60067 or ab_code == 60068 or ab_code == 60066 \
-            or ab_code == 60069 or ab_code == 60070 or ab_code == 60071 or ab_code == 60072 or ab_code == 60073:
+            or ab_code == 60069 or ab_code == 60070 or ab_code == 60071 or ab_code == 60072 or ab_code == 60073 \
+            or ab_code == 60074:
         result, fea_info = 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,