|
@@ -665,6 +665,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
|
'flow_pool_recall': recall_result_list[2]
|
|
|
}
|
|
|
# 3. 特征回流
|
|
|
+ print(env_dict)
|
|
|
if env_dict:
|
|
|
province_code = client_info.get('provinceCode', '-1')
|
|
|
city_code = client_info.get('cityCode', '-1')
|
|
@@ -696,7 +697,6 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
|
env_dict['vid_day_fea_list'] = vid_day_fea_list
|
|
|
env_dict['vid_hour_fea_list'] = vid_hour_fea_list
|
|
|
env_json = json.dumps(env_dict)
|
|
|
- log_.info(env_json)
|
|
|
#4.
|
|
|
rank_result, flow_num = video_new_rank2(data=data, size=size, top_K=top_K, flow_pool_P=float(flow_pool_P), ab_code=ab_code, mid=mid, exp_config=exp_config, env_dict=env_dict)
|
|
|
#print(rank_result)
|
|
@@ -707,7 +707,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
|
|
|
result['rankTime'] = (time.time() - start_rank) * 1000
|
|
|
|
|
|
|
|
|
- return result
|
|
|
+ return result, env_json
|
|
|
# return rank_result, last_rov_recall_key
|
|
|
|
|
|
def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, algo_type, client_info,
|
|
@@ -1709,6 +1709,8 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
|
|
|
get_result_st = time.time()
|
|
|
#print("ab_code:", ab_code)
|
|
|
#new pipeline
|
|
|
+
|
|
|
+ fea_info = json.dumps(env_dict)
|
|
|
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,
|
|
@@ -1726,7 +1728,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
|
|
|
or ab_code == 60055 or ab_code == 60056 or ab_code==60057 \
|
|
|
or ab_code==60065 or ab_code == 60067 or ab_code==60068 \
|
|
|
or ab_code==60066:
|
|
|
- result = 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,
|
|
|
size=size, top_K=top_K, flow_pool_P=flow_pool_P,
|
|
|
algo_type='', client_info=client_info,
|
|
@@ -1783,7 +1785,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
|
|
|
# })
|
|
|
recommend_result['updateRedisDataTime'] = (time.time() - update_redis_st) * 1000
|
|
|
|
|
|
- return recommend_result
|
|
|
+ return recommend_result, fea_info
|
|
|
# return rank_result
|
|
|
|
|
|
|
|
@@ -1829,7 +1831,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
|
|
|
# 'executeTime': (time.time() - param_st) * 1000
|
|
|
# })
|
|
|
recommend_result['getRecommendParamsTime'] = (time.time() - param_st) * 1000
|
|
|
-
|
|
|
+ fea_info = json.dumps(env_dict)
|
|
|
# 简单召回 - 排序 - 兜底
|
|
|
get_result_st = time.time()
|
|
|
#print("ab_code:", ab_code)
|
|
@@ -1845,7 +1847,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
|
|
|
elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054 or ab_code == 60055 or \
|
|
|
ab_code == 60056 or ab_code==60057 or ab_code ==60065 or ab_code ==60067 \
|
|
|
or ab_code ==60068 or ab_code==60066:
|
|
|
- result = 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,
|
|
|
size=size, top_K=top_K, flow_pool_P=flow_pool_P,
|
|
|
algo_type='', client_info=client_info,
|
|
@@ -1905,7 +1907,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
|
|
|
# })
|
|
|
recommend_result['updateRedisDataTime'] = (time.time() - update_redis_st) * 1000
|
|
|
|
|
|
- return recommend_result
|
|
|
+ return recommend_result, fea_info
|
|
|
# return rank_result
|
|
|
|
|
|
|