Merge branch 'feature/zhangbo_flow_recall' of algorithm/rov-server into master

config.py

@@ -193,6 +193,8 @@ class BaseConfig(object):
             'abtest_510': 60094,
             'abtest_514': 60095,
             'abtest_518': 60096,
+            # 流量池召回子策略，ab实验号523，推荐服务内实验号60097
+            'abtest_523': 60097,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -566,6 +568,10 @@ class BaseConfig(object):
             'h_data_key': 'data10', 'h_rule_key': 'rule1',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_518'),
         },  # simrecall+融合+不区分地域小时级列表作为单路召回(不做离线去重)
+        '523': {
+            'data_key': 'data66', 'rule_key': 'rule66',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_523'),
+        },  #
 
     }
 

recommend.py

@@ -536,7 +536,8 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         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 == 60085 or ab_code == 60086 \
-            or ab_code == 60092 or ab_code == 60093 or ab_code == 60094 or ab_code == 60095 or ab_code == 60096:
+            or ab_code == 60092 or ab_code == 60093 or ab_code == 60094 or ab_code == 60095 or ab_code == 60096\
+            or ab_code == 60097:
         t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
         t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
 
@@ -622,7 +623,8 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     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 == 60085 or ab_code == 60086 \
-            or ab_code == 60092 or ab_code == 60093 or ab_code == 60094 or ab_code == 60095 or ab_code == 60096:
+            or ab_code == 60092 or ab_code == 60093 or ab_code == 60094 or ab_code == 60095 or ab_code == 60096\
+            or ab_code == 60097:
         rov_pool_recall = []
         if len(recall_result_list)>=2:
             region_recall = recall_result_list[0]
@@ -2022,7 +2024,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
             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 == 60091 or ab_code == 60092 or ab_code == 60093 or ab_code == 60094 or ab_code == 60095 \
-            or ab_code == 60096:
+            or ab_code == 60096 or ab_code == 60097:
         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,
@@ -2150,7 +2152,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
             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 == 60091 or ab_code == 60092 or ab_code == 60093 or ab_code == 60094 or ab_code == 60095 \
-            or ab_code == 60096:
+            or ab_code == 60096 or ab_code == 60097:
         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,