add abtest: 480, 481

config.py

@@ -181,6 +181,8 @@ class BaseConfig(object):
             'abtest_471': 60082,
             'abtest_475': 60083,
             'abtest_476': 60084,
+            'abtest_480': 60085,
+            'abtest_481': 60086,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -500,11 +502,19 @@ class BaseConfig(object):
         '475': {
             'data_key': 'data10', 'rule_key': 'rule7', 'rank_key_prefix': 'rank:score6:',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_475')
-        },  # simrecall + return_video2 + 融合 + rank_score5
+        },  # simrecall + return_video2 + 融合 + rank_score6
         '476': {
             'data_key': 'data10', 'rule_key': 'rule7', 'rank_key_prefix': 'rank:score7:',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_476')
-        },  # simrecall + return_video2 + 融合 + rank_score5
+        },  # simrecall + return_video2 + 融合 + rank_score7
+        '480': {
+            'data_key': 'data1', 'rule_key': 'rule22', 'rank_key_prefix': 'rank:score4:',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_480')
+        },  # simrecall+融合+地域召回使用vlog数据+地域小时级召回score3（增加前两小时回流率特征） + 融合 + rank_score4
+        '481': {
+            '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
 
     }
 

recommend.py

@@ -503,7 +503,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         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 or ab_code == 60080 or ab_code == 60081 or ab_code == 60082 \
-            or ab_code == 60083 or ab_code == 60084:
+            or ab_code == 60083 or ab_code == 60084 or ab_code == 60085 or ab_code == 60086:
         t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
         t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
 
@@ -585,7 +585,8 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
 
     #2. merge simrecall, return video
     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 or ab_code == 60083 or ab_code == 60084:
+            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:
         rov_pool_recall = []
         if len(recall_result_list)>=2:
             region_recall = recall_result_list[0]
@@ -1930,7 +1931,7 @@ 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 == 60083 or ab_code == 60084 or ab_code == 60085 or ab_code == 60086:
         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,
@@ -2053,7 +2054,7 @@ 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 == 60083 or ab_code == 60084 or ab_code == 60085 or ab_code == 60086:
         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,