|
@@ -122,9 +122,10 @@ def video_rank(df, now_date, now_h, return_count):
|
|
|
h_video_ids.append(int(video_id))
|
|
|
h_recall_key_name = \
|
|
|
f"{config_.RECALL_KEY_NAME_PREFIX_BY_H}{return_count}.{datetime.datetime.strftime(now_date, '%Y%m%d')}.{now_h}"
|
|
|
- redis_helper.add_data_with_zset(key_name=h_recall_key_name, data=h_recall_result, expire_time=24 * 3600)
|
|
|
- # 清空线上过滤应用列表
|
|
|
- redis_helper.del_keys(key_name=f"{config_.H_VIDEO_FILER}{return_count}")
|
|
|
+ if len(h_recall_result) > 0:
|
|
|
+ redis_helper.add_data_with_zset(key_name=h_recall_key_name, data=h_recall_result, expire_time=23 * 3600)
|
|
|
+ # 清空线上过滤应用列表
|
|
|
+ redis_helper.del_keys(key_name=f"{config_.H_VIDEO_FILER}{return_count}")
|
|
|
|
|
|
# 去重更新rov模型结果,并另存为redis中
|
|
|
initial_data_dup = {}
|
|
@@ -133,7 +134,7 @@ def video_rank(df, now_date, now_h, return_count):
|
|
|
initial_data_dup[int(video_id)] = score
|
|
|
log_.info(f"initial data dup count = {len(initial_data_dup)}")
|
|
|
initial_key_name = f"{config_.RECALL_KEY_NAME_PREFIX_DUP_H}{return_count}.{datetime.datetime.strftime(now_date, '%Y%m%d')}.{now_h}"
|
|
|
- redis_helper.add_data_with_zset(key_name=initial_key_name, data=initial_data_dup, expire_time=24 * 3600)
|
|
|
+ redis_helper.add_data_with_zset(key_name=initial_key_name, data=initial_data_dup, expire_time=23 * 3600)
|
|
|
|
|
|
|
|
|
# # 去重合并
|
|
@@ -179,7 +180,7 @@ def h_rank_bottom(now_date, now_h, return_count):
|
|
|
redis_dt = datetime.datetime.strftime(now_date, '%Y%m%d')
|
|
|
redis_h = now_h - 1
|
|
|
key_prefix_list = [config_.RECALL_KEY_NAME_PREFIX_BY_H, config_.RECALL_KEY_NAME_PREFIX_DUP_H]
|
|
|
- for i, key_prefix in enumerate(key_prefix_list):
|
|
|
+ for key_prefix in key_prefix_list:
|
|
|
key_name = f"{key_prefix}{return_count}.{redis_dt}.{redis_h}"
|
|
|
initial_data = redis_helper.get_data_zset_with_index(key_name=key_name, start=0, end=-1, with_scores=True)
|
|
|
final_data = dict()
|
|
@@ -188,16 +189,17 @@ def h_rank_bottom(now_date, now_h, return_count):
|
|
|
# 存入对应的redis
|
|
|
final_key_name = \
|
|
|
f"{key_prefix}{return_count}.{datetime.datetime.strftime(now_date, '%Y%m%d')}.{now_h}"
|
|
|
- redis_helper.add_data_with_zset(key_name=final_key_name, data=final_data, expire_time=24 * 3600)
|
|
|
+ if len(final_data) > 0:
|
|
|
+ redis_helper.add_data_with_zset(key_name=final_key_name, data=final_data, expire_time=23 * 3600)
|
|
|
# 清空线上过滤应用列表
|
|
|
redis_helper.del_keys(key_name=f"{config_.H_VIDEO_FILER}{return_count}")
|
|
|
|
|
|
|
|
|
def h_timer_check():
|
|
|
return_count_list = [20, 50]
|
|
|
- now_date = datetime.datetime.today()
|
|
|
+ now_date = datetime.datetime.today() - datetime.timedelta(hours=5)
|
|
|
log_.info(f"now_date: {datetime.datetime.strftime(now_date, '%Y%m%d%H')}")
|
|
|
- now_h = datetime.datetime.now().hour
|
|
|
+ now_h = datetime.datetime.now().hour - 5
|
|
|
now_min = datetime.datetime.now().minute
|
|
|
if now_h == 0:
|
|
|
for cnt in return_count_list:
|