Merge branch 'feature_2023090619_liqian_add_recommend_abtest' into pre-master

config.py

@@ -168,6 +168,8 @@ class BaseConfig(object):
             'abtest_407': 60069,
             'abtest_408': 60070,
             'abtest_409': 60071,
+            'abtest_420': 60072,
+            'abtest_421': 60073,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -440,6 +442,14 @@ class BaseConfig(object):
             'data_key': 'data10', 'rule_key': 'rule7',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_409')
         },
+        '420': {
+            'data_key': 'data1', 'rule_key': 'rule4',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_420')
+        },  # simrecall+融合+地域召回使用vlog数据
+        '421': {
+            '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]
     }
 
     # APP ab实验配置

recommend.py

@@ -445,32 +445,32 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     # 60054 全量： simrecall+融合排序
     if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time)]
-        if ab_code ==60054 or ab_code==60066:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
-        if ab_code == 60056 or ab_code == 60071:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
-            t.append(gevent.spawn(pool_recall.get_U2I_reall, mid))
-        if ab_code ==60067  or ab_code == 60069:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
-            t.append(gevent.spawn(pool_recall.get_return_video_reall))
-        if ab_code == 60068 or ab_code == 60070:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
-            t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
+        # if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073:
+        #     t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
+        # if ab_code == 60056 or ab_code == 60071:
+        #     t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
+        #     t.append(gevent.spawn(pool_recall.get_U2I_reall, mid))
+        # if ab_code ==60067  or ab_code == 60069:
+        #     t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
+        #     t.append(gevent.spawn(pool_recall.get_return_video_reall))
+        # if ab_code == 60068 or ab_code == 60070:
+        #     t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
+        #     t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
     else:
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
              gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
              gevent.spawn(pool_recall.flow_pool_recall, size)]
-        if  ab_code == 60054 or ab_code==60066:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
-        if ab_code == 60056 or ab_code == 60071:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
-            t.append(gevent.spawn(pool_recall.get_U2I_reall, mid))
-        if ab_code == 60067 or ab_code == 60069:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
-            t.append(gevent.spawn(pool_recall.get_return_video_reall))
-        if ab_code == 60068 or ab_code == 60070:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
-            t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
+    if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073:
+        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))
+        t.append(gevent.spawn(pool_recall.get_U2I_reall, mid))
+    elif ab_code == 60067 or ab_code == 60069:
+        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:
+        t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
+        t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
 
     gevent.joinall(t)
     recall_result_list = [i.get() for i in t]
@@ -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:
+    if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073:
         rov_pool_recall = []
         if len(recall_result_list) >= 2:
             region_recall = recall_result_list[0]
@@ -1698,10 +1698,8 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     # simrecal: 60054 +融合, 全量
     # return video, return video2
     # old video: 60056, test2
-    elif  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:
+    elif 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:
         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,
@@ -1816,9 +1814,8 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
                                  rule_key=rule_key, data_key=data_key, no_op_flag=no_op_flag,
                                  old_video_index=old_video_index, video_id=video_id,
                                  params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
-    elif   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:
+    elif 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:
         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,