|
@@ -455,9 +455,9 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
|
if ab_code ==60054 :
|
|
|
t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter, exp_config))
|
|
|
if ab_code == 60055:
|
|
|
- t.append(gevent.spawn(pool_recall.get_3days_hot_item_reall, exp_config))
|
|
|
+ t.append(gevent.spawn(pool_recall.get_return_video_reall, exp_config))
|
|
|
if ab_code == 60056:
|
|
|
- t.append(gevent.spawn(pool_recall.get_hot_item_reall, exp_config))
|
|
|
+ t.append(gevent.spawn(pool_recall.get_U2I_reall, mid , exp_config))
|
|
|
else:
|
|
|
t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time, ab_code, exp_config),
|
|
|
gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
|
|
@@ -465,9 +465,9 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
|
if ab_code == 60054:
|
|
|
t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
|
|
|
if ab_code == 60055:
|
|
|
- t.append(gevent.spawn(pool_recall.get_3days_hot_item_reall))
|
|
|
+ t.append(gevent.spawn(pool_recall.get_return_video_reall, exp_config))
|
|
|
if ab_code == 60056:
|
|
|
- t.append(gevent.spawn(pool_recall.get_hot_item_reall))
|
|
|
+ t.append(gevent.spawn(pool_recall.get_U2I_reall, mid , exp_config))
|
|
|
|
|
|
gevent.joinall(t)
|
|
|
recall_result_list = [i.get() for i in t]
|
|
@@ -504,17 +504,17 @@ 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 hot 3day recall
|
|
|
+ # merge return video
|
|
|
if ab_code == 60055:
|
|
|
rov_pool_recall = []
|
|
|
if len(recall_result_list)>=2:
|
|
|
region_recall = recall_result_list[0]
|
|
|
- hot_3_day_recall = []
|
|
|
+ return_video_reall = []
|
|
|
if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
|
|
|
- hot_3_day_recall = recall_result_list[1]
|
|
|
+ return_video_reall, = recall_result_list[1]
|
|
|
else:
|
|
|
if len(recall_result_list)>=4:
|
|
|
- hot_3_day_recall = recall_result_list[3]
|
|
|
+ return_video_reall = recall_result_list[3]
|
|
|
#print("sim:",sim_recall)
|
|
|
now_video_ids = set('')
|
|
|
if len(region_recall)>0:
|
|
@@ -523,26 +523,25 @@ 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(hot_3_day_recall)>0:
|
|
|
- for video in hot_3_day_recall:
|
|
|
+ if len(return_video_reall)>0:
|
|
|
+ for video in return_video_reall:
|
|
|
video_id = video.get('videoId')
|
|
|
- #print("sim video_id:", video_id)
|
|
|
if video_id not in now_video_ids:
|
|
|
rov_pool_recall.append(video)
|
|
|
now_video_ids.add(video_id)
|
|
|
if len(rov_pool_recall)>0:
|
|
|
recall_result_list[0] = rov_pool_recall
|
|
|
- # merge old day recall
|
|
|
+ # merge u2i title recall
|
|
|
if ab_code == 60056:
|
|
|
rov_pool_recall = []
|
|
|
if len(recall_result_list)>=2:
|
|
|
region_recall = recall_result_list[0]
|
|
|
- hot_7_day_recall = []
|
|
|
+ u2i_title_recall = []
|
|
|
if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
|
|
|
- hot_7_day_recall = recall_result_list[1]
|
|
|
+ u2i_title_recall = recall_result_list[1]
|
|
|
else:
|
|
|
if len(recall_result_list) >= 3:
|
|
|
- hot_7_day_recall = recall_result_list[3]
|
|
|
+ u2i_title_recall = recall_result_list[3]
|
|
|
now_video_ids = set('')
|
|
|
if len(region_recall)>0:
|
|
|
for video in region_recall:
|
|
@@ -550,8 +549,8 @@ 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(hot_7_day_recall)>0:
|
|
|
- for video in hot_7_day_recall:
|
|
|
+ if len(u2i_title_recall)>0:
|
|
|
+ for video in u2i_title_recall:
|
|
|
video_id = video.get('videoId')
|
|
|
#print("sim video_id:", video_id)
|
|
|
if video_id not in now_video_ids:
|