Merge branch 'feature_2023101214_liqian_add_abtest' into pre-master

config.py

@@ -171,6 +171,9 @@ class BaseConfig(object):
             'abtest_420': 60072,
             'abtest_421': 60073,
             'abtest_430': 60074,
+            'abtest_461': 60075,
+            'abtest_462': 60076,
+            'abtest_463': 60077,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -455,6 +458,18 @@ class BaseConfig(object):
             'data_key': 'videos5', 'rule_key': 'rule7-1',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_430')
         },  # simrecall+融合+地域召回使用内容精选数据 data-[内容精选: 1]
+        '461': {
+            'data_key': 'data1', 'rule_key': 'rule20',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_461')
+        },  # simrecall+融合+地域召回使用vlog数据+地域小时级召回score1（加权前两小时回流表现数据）
+        '462': {
+            'data_key': 'data1', 'rule_key': 'rule21',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_462')
+        },  # simrecall+融合+地域召回使用vlog数据+地域小时级召回score2（增加前两小时回流留存特征）
+        '463': {
+            'data_key': 'data1', 'rule_key': 'rule22',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_463')
+        },  # simrecall+融合+地域召回使用vlog数据+地域小时级召回score3（增加前两小时回流率特征）
     }
 
     # APP ab实验配置

recommend.py

@@ -479,7 +479,8 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
                           size, flow_pool_id=config_.QUICK_FLOW_POOL_ID, flow_pool_abtest_group=flow_pool_abtest_group),
              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:
+    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:
         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))
@@ -500,7 +501,8 @@ 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 or ab_code == 60074:
+    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:
         rov_pool_recall = []
         if len(recall_result_list) >= 2:
             region_recall = recall_result_list[0]
@@ -1848,7 +1850,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     # 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 == 60074:
+            or ab_code == 60074 or ab_code == 60075 or ab_code == 60076 or ab_code == 60077:
         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, algo_type='',
                                                client_info=client_info, ab_code=ab_code, expire_time=expire_time,
@@ -1968,7 +1970,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
     #                              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 == 60074:
+            or ab_code == 60074 or ab_code == 60075 or ab_code == 60076 or ab_code == 60077:
         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, algo_type='',
                                                client_info=client_info, ab_code=ab_code, expire_time=expire_time,