|
|
@@ -199,7 +199,7 @@ def add_videos(initial_df, now_date, rule_key, region, data_key):
|
|
|
return df
|
|
|
|
|
|
|
|
|
-def video_rank(df, now_date, now_h, rule_key, param, region, data_key, rule_rank_h_flag, add_videos_in_19h):
|
|
|
+def video_rank(df, now_date, now_h, rule_key, param, region, data_key, rule_rank_h_flag, add_videos_in_19h=False):
|
|
|
"""
|
|
|
获取符合进入召回源条件的视频，与每日更新的rov模型结果视频列表进行合并
|
|
|
:param df:
|
|
|
@@ -416,12 +416,14 @@ def process_with_region(region, df_merged, data_key, rule_key, rule_param, now_d
|
|
|
log_.info(f"region = {region} end!")
|
|
|
|
|
|
|
|
|
-def process_with_region2(region, df_merged, data_key, rule_key, rule_param, now_date, now_h, rule_rank_h_flag):
|
|
|
+def process_with_region2(region, df_merged, data_key, rule_key, rule_param, now_date, now_h,
|
|
|
+ rule_rank_h_flag, add_videos_in_19h):
|
|
|
log_.info(f"region = {region} start...")
|
|
|
region_score_df = df_merged[df_merged['code'] == region]
|
|
|
log_.info(f'region = {region}, region_score_df count = {len(region_score_df)}')
|
|
|
video_rank(df=region_score_df, now_date=now_date, now_h=now_h, region=region,
|
|
|
- rule_key=rule_key, param=rule_param, data_key=data_key, rule_rank_h_flag=rule_rank_h_flag)
|
|
|
+ rule_key=rule_key, param=rule_param, data_key=data_key, rule_rank_h_flag=rule_rank_h_flag,
|
|
|
+ add_videos_in_19h=add_videos_in_19h)
|
|
|
log_.info(f"region = {region} end!")
|
|
|
|
|
|
|
|
|
@@ -534,7 +536,8 @@ def process_with_param(param, data_params_item, rule_params_item, region_code_li
|
|
|
df_merged['platform_return_rate'] = df_merged['platform_return'] / df_merged['lastonehour_return']
|
|
|
task_list = [
|
|
|
gevent.spawn(process_with_region2,
|
|
|
- region, df_merged, data_key, rule_key, rule_param, now_date, now_h, rule_rank_h_flag)
|
|
|
+ region, df_merged, data_key, rule_key, rule_param, now_date, now_h, rule_rank_h_flag,
|
|
|
+ add_videos_in_19h)
|
|
|
for region in region_code_list
|
|
|
]
|
|
|
else:
|
