|
@@ -371,11 +371,10 @@ def video_homepage_recommend(mid, uid, size, app_type, algo_type, client_info, a
|
|
|
top_K=top_K, expire_time=12 * 3600)
|
|
|
|
|
|
else:
|
|
|
-
|
|
|
+ # size = size
|
|
|
+ top_K = config_.K
|
|
|
+ flow_pool_P = config_.P
|
|
|
if not ab_exp_info:
|
|
|
- size = size
|
|
|
- top_K = config_.K
|
|
|
- flow_pool_P = config_.P
|
|
|
ab_code = config_.AB_CODE['initial']
|
|
|
expire_time = 24 * 3600
|
|
|
return_count = -1
|
|
@@ -392,20 +391,20 @@ def video_homepage_recommend(mid, uid, size, app_type, algo_type, client_info, a
|
|
|
ab_exp_code_list.append(str(ab_exp_code))
|
|
|
config_value_dict[str(ab_exp_code)] = ab_item.get('configValue', None)
|
|
|
# 推荐条数 10->4 实验
|
|
|
- if config_.AB_EXP_CODE['rec_size_home'] in ab_exp_code_list:
|
|
|
- config_value = config_value_dict.get(config_.AB_EXP_CODE['rec_size_home'], None)
|
|
|
- if config_value:
|
|
|
- config_value = eval(str(config_value))
|
|
|
- else:
|
|
|
- config_value = {}
|
|
|
- log_.info(f'config_value: {config_value}, type: {type(config_value)}')
|
|
|
- size = int(config_value.get('size', 4))
|
|
|
- top_K = int(config_value.get('K', 3))
|
|
|
- flow_pool_P = float(config_value.get('P', 0.3))
|
|
|
- else:
|
|
|
- size = size
|
|
|
- top_K = config_.K
|
|
|
- flow_pool_P = config_.P
|
|
|
+ # if config_.AB_EXP_CODE['rec_size_home'] in ab_exp_code_list:
|
|
|
+ # config_value = config_value_dict.get(config_.AB_EXP_CODE['rec_size_home'], None)
|
|
|
+ # if config_value:
|
|
|
+ # config_value = eval(str(config_value))
|
|
|
+ # else:
|
|
|
+ # config_value = {}
|
|
|
+ # log_.info(f'config_value: {config_value}, type: {type(config_value)}')
|
|
|
+ # size = int(config_value.get('size', 4))
|
|
|
+ # top_K = int(config_value.get('K', 3))
|
|
|
+ # flow_pool_P = float(config_value.get('P', 0.3))
|
|
|
+ # else:
|
|
|
+ # size = size
|
|
|
+ # top_K = config_.K
|
|
|
+ # flow_pool_P = config_.P
|
|
|
|
|
|
# 小时级更新-规则1 实验
|
|
|
if config_.AB_EXP_CODE['rule_rank1_20'] in ab_exp_code_list:
|
|
@@ -449,11 +448,11 @@ def video_relevant_recommend(video_id, mid, uid, size, app_type, ab_exp_info):
|
|
|
:param ab_exp_info: ab实验分组参数 [{"expItemId":1, "configValue":{"size":4, "K":3, ...}}, ...]
|
|
|
:return: videos type-list
|
|
|
"""
|
|
|
+ # size = size
|
|
|
+ top_K = config_.K
|
|
|
+ flow_pool_P = config_.P
|
|
|
# 解析ab实验参数
|
|
|
if not ab_exp_info:
|
|
|
- size = size
|
|
|
- top_K = config_.K
|
|
|
- flow_pool_P = config_.P
|
|
|
ab_code = config_.AB_CODE['initial']
|
|
|
expire_time = 24 * 3600
|
|
|
return_count = -1
|
|
@@ -471,20 +470,20 @@ def video_relevant_recommend(video_id, mid, uid, size, app_type, ab_exp_info):
|
|
|
config_value_dict[str(ab_exp_code)] = ab_item.get('configValue', None)
|
|
|
|
|
|
# 推荐条数 10->4 实验
|
|
|
- if config_.AB_EXP_CODE['rec_size_relevant'] in ab_exp_code_list:
|
|
|
- config_value = config_value_dict.get(config_.AB_EXP_CODE['rec_size_relevant'], None)
|
|
|
- if config_value:
|
|
|
- config_value = eval(str(config_value))
|
|
|
- else:
|
|
|
- config_value = {}
|
|
|
- log_.info(f'config_value: {config_value}, type: {type(config_value)}')
|
|
|
- size = int(config_value.get('size', 4))
|
|
|
- top_K = int(config_value.get('K', 3))
|
|
|
- flow_pool_P = float(config_value.get('P', 0.3))
|
|
|
- else:
|
|
|
- size = size
|
|
|
- top_K = config_.K
|
|
|
- flow_pool_P = config_.P
|
|
|
+ # if config_.AB_EXP_CODE['rec_size_relevant'] in ab_exp_code_list:
|
|
|
+ # config_value = config_value_dict.get(config_.AB_EXP_CODE['rec_size_relevant'], None)
|
|
|
+ # if config_value:
|
|
|
+ # config_value = eval(str(config_value))
|
|
|
+ # else:
|
|
|
+ # config_value = {}
|
|
|
+ # log_.info(f'config_value: {config_value}, type: {type(config_value)}')
|
|
|
+ # size = int(config_value.get('size', 4))
|
|
|
+ # top_K = int(config_value.get('K', 3))
|
|
|
+ # flow_pool_P = float(config_value.get('P', 0.3))
|
|
|
+ # else:
|
|
|
+ # size = size
|
|
|
+ # top_K = config_.K
|
|
|
+ # flow_pool_P = config_.P
|
|
|
|
|
|
# 小时级更新-规则1 实验
|
|
|
if config_.AB_EXP_CODE['rule_rank1_20'] in ab_exp_code_list:
|