update ab_test code

config.py

@@ -137,6 +137,8 @@ class BaseConfig(object):
             'abtest_229': 60045,
             'abtest_262': 60046,
             'abtest_316': 60047,
+            'abtest_317': 60048,
+            'abtest_318': 60049
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -316,6 +318,14 @@ class BaseConfig(object):
         '316': {
             'data_key': 'data10', 'rule_key': 'rule19',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_316')
+        },
+        '317': {
+            'data_key': 'data10', 'rule_key': 'rule19',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_317')
+        },
+        '318': {
+            'data_key': 'data10', 'rule_key': 'rule19',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_318')
         }
     }
 

recommend.py

@@ -401,8 +401,10 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
              gevent.spawn(pool_recall.get_selected_recall, size, region_code),
              gevent.spawn(pool_recall.get_no_selected_recall, size, region_code),
              gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
-             gevent.spawn(pool_recall.flow_pool_recall, size),
-             gevent.spawn(pool_recall.get_sim_hot_item_reall)]
+             gevent.spawn(pool_recall.flow_pool_recall, size)]
+
+        if ab_code ==60049:
+            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall))
     gevent.joinall(t)
     # all recall_result
     all_recall_result_list = [i.get() for i in t]
@@ -482,7 +484,7 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     all_recall_list = normal_video_list+flow_video_list
 
     rank_result= []
-    if ab_code=="ab_new_test":
+    if ab_code==60048 or ab_code==60049:
         rank_ids = video_new_rank(videoIds=all_recall_list,fast_flow_set=fast_flow_set, flow_set=flow_flow_set,size=size, top_K=top_K, flow_pool_P=float(flow_pool_P))
         for rank_id in rank_ids:
             if rank_id in recall_dict:
@@ -1309,8 +1311,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     # 简单召回 - 排序 - 兜底
     get_result_st = time.time()
     print("ab_code:", ab_code)
-    if ab_code == "60047":
-        print("ab_code:", ab_code)
+    if ab_code == 60047 or ab_code == 60048 or ab_code == 60049:
         result = new_video_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,
@@ -1348,7 +1349,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     #                     app_type=app_type, mid=mid, uid=uid)
     # redis数据刷新
     update_redis_st = time.time()
-    if ab_code == "60047":
+    if ab_code == 60047 or  ab_code == 60048 or  ab_code == 60049:
         update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     else:
         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
@@ -1413,8 +1414,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
     # 简单召回 - 排序 - 兜底
     get_result_st = time.time()
     print("ab_code:", ab_code)
-    if ab_code == 60047:
-        #print("new_video_recommend:", new_video_recommend)
+    if ab_code == 60047 or ab_code == 60048 or ab_code == 60049:
         result = new_video_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,
@@ -1454,7 +1454,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
 
     # redis数据刷新
     update_redis_st = time.time()
-    if ab_code == "60047":
+    if ab_code == 60047 or ab_code == 60048 or  ab_code == 60049:
         update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     else:
         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)