Merge branch 'feature_2023111711_liqian_add_abtest' into pre-master

config.py

@@ -183,6 +183,8 @@ class BaseConfig(object):
             'abtest_476': 60084,
             'abtest_480': 60085,
             'abtest_481': 60086,
+            'abtest_500': 60087,
+            'abtest_501': 60088,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -515,6 +517,14 @@ class BaseConfig(object):
             'data_key': 'data1', 'rule_key': 'rule22', 'rank_key_prefix': 'rank:score6:',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_481')
         },  # simrecall+融合+地域召回使用vlog数据+地域小时级召回score3（增加前两小时回流率特征） + 融合 + rank_score6
+        '500': {
+            'data_key': 'data10', 'rule_key': 'rule25',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_500')
+        },  # simrecall+融合 + back_view0
+        '501': {
+            'data_key': 'data10', 'rule_key': 'rule26',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_501')
+        },  # simrecall+融合 + back_view1
 
     }
 

recommend.py

@@ -523,7 +523,8 @@ 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 == 60075 or ab_code == 60076 or ab_code == 60077 or ab_code == 60078 or ab_code == 60079 \
+            or ab_code == 60087 or ab_code == 60088:
         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))
@@ -546,7 +547,8 @@ 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 == 60075 or ab_code == 60076 or ab_code == 60077 or ab_code == 60078 or ab_code == 60079 \
+            or ab_code == 60087 or ab_code == 60088:
         rov_pool_recall = []
         if len(recall_result_list) >= 2:
             region_recall = recall_result_list[0]
@@ -1991,7 +1993,8 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
             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 == 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 == 60083 or ab_code == 60084 or ab_code == 60085 or ab_code == 60086:
+            or ab_code == 60083 or ab_code == 60084 or ab_code == 60085 or ab_code == 60086 \
+            or ab_code == 60087 or ab_code == 60088:
         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,
@@ -2114,7 +2117,8 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
             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 == 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 == 60083 or ab_code == 60084 or ab_code == 60085 or ab_code == 60086:
+            or ab_code == 60083 or ab_code == 60084 or ab_code == 60085 or ab_code == 60086 \
+            or ab_code == 60087 or ab_code == 60088:
         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,