|
@@ -460,7 +460,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
|
|
t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
|
|
gevent.spawn(pool_recall.flow_pool_recall_new, size, config_.QUICK_FLOW_POOL_ID),
|
|
gevent.spawn(pool_recall.flow_pool_recall_new, size, config_.QUICK_FLOW_POOL_ID),
|
|
gevent.spawn(pool_recall.flow_pool_recall_new, size)]
|
|
gevent.spawn(pool_recall.flow_pool_recall_new, size)]
|
|
- if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073:
|
|
|
|
|
|
+ if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073 or ab_code == 60074:
|
|
t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
|
|
t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
|
|
elif ab_code == 60056 or ab_code == 60071:
|
|
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_sim_hot_item_reall_filter))
|
|
@@ -481,7 +481,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
result['rankResult'] = []
|
|
result['rankResult'] = []
|
|
return result
|
|
return result
|
|
#1. merge simrecall or deepfm
|
|
#1. merge simrecall or deepfm
|
|
- if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073:
|
|
|
|
|
|
+ if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073 or ab_code == 60074:
|
|
rov_pool_recall = []
|
|
rov_pool_recall = []
|
|
if len(recall_result_list) >= 2:
|
|
if len(recall_result_list) >= 2:
|
|
region_recall = recall_result_list[0]
|
|
region_recall = recall_result_list[0]
|
|
@@ -1755,7 +1755,8 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
|
|
# return video, return video2
|
|
# return video, return video2
|
|
# old video: 60056, test2
|
|
# old video: 60056, test2
|
|
if ab_code == 60054 or ab_code == 60056 or ab_code == 60067 or ab_code == 60068 or ab_code == 60066 \
|
|
if 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:
|
|
|
|
|
|
+ or ab_code == 60069 or ab_code == 60070 or ab_code == 60071 or ab_code == 60072 or ab_code == 60073 \
|
|
|
|
+ or ab_code == 60074:
|
|
result, fea_info = video_old_recommend(request_id=request_id,
|
|
result, fea_info = video_old_recommend(request_id=request_id,
|
|
mid=mid, uid=uid, app_type=app_type,
|
|
mid=mid, uid=uid, app_type=app_type,
|
|
size=size, top_K=top_K, flow_pool_P=flow_pool_P,
|
|
size=size, top_K=top_K, flow_pool_P=flow_pool_P,
|
|
@@ -1874,7 +1875,8 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
|
|
# old_video_index=old_video_index, video_id=video_id,
|
|
# old_video_index=old_video_index, video_id=video_id,
|
|
# params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
|
|
# params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
|
|
if ab_code == 60054 or ab_code == 60056 or ab_code == 60067 or ab_code == 60068 or ab_code == 60066 \
|
|
if 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:
|
|
|
|
|
|
+ or ab_code == 60069 or ab_code == 60070 or ab_code == 60071 or ab_code == 60072 or ab_code == 60073 \
|
|
|
|
+ or ab_code == 60074:
|
|
result, fea_info = video_old_recommend(request_id=request_id,
|
|
result, fea_info = video_old_recommend(request_id=request_id,
|
|
mid=mid, uid=uid, app_type=app_type,
|
|
mid=mid, uid=uid, app_type=app_type,
|
|
size=size, top_K=top_K, flow_pool_P=flow_pool_P,
|
|
size=size, top_K=top_K, flow_pool_P=flow_pool_P,
|