|
@@ -457,6 +457,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
|
if ab_code == 60055:
|
|
|
t.append(gevent.spawn(pool_recall.get_return_video_reall, exp_config))
|
|
|
if ab_code == 60056:
|
|
|
+ t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter, exp_config))
|
|
|
t.append(gevent.spawn(pool_recall.get_U2I_reall, mid , exp_config))
|
|
|
if ab_code == 60065 :
|
|
|
t.append(gevent.spawn(pool_recall.get_return_video_reall, exp_config, 'rv2:'))
|
|
@@ -475,6 +476,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
|
if ab_code == 60055:
|
|
|
t.append(gevent.spawn(pool_recall.get_return_video_reall, exp_config))
|
|
|
if ab_code == 60056:
|
|
|
+ t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter, exp_config))
|
|
|
t.append(gevent.spawn(pool_recall.get_U2I_reall, mid , exp_config))
|
|
|
if ab_code == 60065:
|
|
|
t.append(gevent.spawn(pool_recall.get_return_video_reall, exp_config, 'rv2:'))
|
|
@@ -547,17 +549,22 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
|
now_video_ids.add(video_id)
|
|
|
if len(rov_pool_recall)>0:
|
|
|
recall_result_list[0] = rov_pool_recall
|
|
|
- # merge u2i title recall
|
|
|
+ # merge simrecall, merge u2i title recall
|
|
|
if ab_code == 60056:
|
|
|
rov_pool_recall = []
|
|
|
if len(recall_result_list)>=2:
|
|
|
region_recall = recall_result_list[0]
|
|
|
+ sim_recall = []
|
|
|
u2i_title_recall = []
|
|
|
if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
|
|
|
- u2i_title_recall = recall_result_list[1]
|
|
|
- else:
|
|
|
+ sim_recall = recall_result_list[1]
|
|
|
if len(recall_result_list) >= 3:
|
|
|
- u2i_title_recall = recall_result_list[3]
|
|
|
+ u2i_title_recall = recall_result_list[2]
|
|
|
+ else:
|
|
|
+ if len(recall_result_list) >= 4:
|
|
|
+ sim_recall = recall_result_list[3]
|
|
|
+ if len(recall_result_list) >= 5:
|
|
|
+ u2i_title_recall = recall_result_list[4]
|
|
|
now_video_ids = set('')
|
|
|
if len(region_recall)>0:
|
|
|
for video in region_recall:
|
|
@@ -565,6 +572,12 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
|
if video_id not in now_video_ids:
|
|
|
rov_pool_recall.append(video)
|
|
|
now_video_ids.add(video_id)
|
|
|
+ if len(sim_recall) > 0:
|
|
|
+ for video in sim_recall:
|
|
|
+ video_id = video.get('videoId')
|
|
|
+ if video_id not in now_video_ids:
|
|
|
+ rov_pool_recall.append(video)
|
|
|
+ now_video_ids.add(video_id)
|
|
|
if len(u2i_title_recall)>0:
|
|
|
for video in u2i_title_recall:
|
|
|
video_id = video.get('videoId')
|