Merge branch 'feature_2023112111_liqian_add_abtest' into pre-master

config.py

@@ -187,6 +187,8 @@ class BaseConfig(object):
             'abtest_501': 60088,
             'abtest_502': 60089,
             'abtest_503': 60090,
+            'abtest_505': 60091,
+            'abtest_506': 60092,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -534,7 +536,15 @@ class BaseConfig(object):
         '503': {
             'data_key': 'data10', 'rule_key': 'rule28',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_503')
-        },  # simrecall+融合+backrate指数加权_0.8
+        },  # simrecall+融合+backrate指数加权_2&其他降权_0.5
+        '505': {
+            'data_key': 'data10', 'rule_key': 'rule7', 'rank_key_prefix': 'rank:score8:',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_505')
+        },  # simrecall + 融合 + rank_score8
+        '506': {
+            'data_key': 'data10', 'rule_key': 'rule28', 'rank_key_prefix': 'rank:score8:',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_506')
+        },  # simrecall+融合+backrate指数加权_2&其他降权_0.5 + rank_score8
 
     }
 

recommend.py

@@ -524,7 +524,8 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
                           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 == 60087 or ab_code == 60088 or ab_code == 60089 or ab_code == 60090:
+            or ab_code == 60087 or ab_code == 60088 or ab_code == 60089 or ab_code == 60090 \
+            or ab_code == 60091 or ab_code == 60092:
         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))
@@ -548,7 +549,8 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     #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 == 60087 or ab_code == 60088 or ab_code == 60089 or ab_code == 60090:
+            or ab_code == 60087 or ab_code == 60088 or ab_code == 60089 or ab_code == 60090 \
+            or ab_code == 60091 or ab_code == 60092:
         rov_pool_recall = []
         if len(recall_result_list) >= 2:
             region_recall = recall_result_list[0]
@@ -1994,7 +1996,8 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
             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 == 60087 or ab_code == 60088 or ab_code == 60089 or ab_code == 60090:
+            or ab_code == 60087 or ab_code == 60088 or ab_code == 60089 or ab_code == 60090 \
+            or ab_code == 60091 or ab_code == 60092:
         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,
@@ -2118,7 +2121,8 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
             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 == 60087 or ab_code == 60088 or ab_code == 60089 or ab_code == 60090:
+            or ab_code == 60087 or ab_code == 60088 or ab_code == 60089 or ab_code == 60090 \
+            or ab_code == 60091 or ab_code == 60092:
         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,