|  | @@ -23,19 +23,19 @@ def cal_compose_score(score_hour_path, score_24h_path, merge_score_path):
 | 
											
												
													
														|  |      score_merge_df = pd.merge(score_hour_df, score_24h_df, on='videoid', how='outer')
 |  |      score_merge_df = pd.merge(score_hour_df, score_24h_df, on='videoid', how='outer')
 | 
											
												
													
														|  |      score_merge_df.fillna(0, inplace=True)
 |  |      score_merge_df.fillna(0, inplace=True)
 | 
											
												
													
														|  |      # print(score_merge_df)
 |  |      # print(score_merge_df)
 | 
											
												
													
														|  | -    print(f"score_hour_df shape: {score_hour_df.shape}")
 |  | 
 | 
											
												
													
														|  | -    print(f"score_24h_df shape: {score_24h_df.shape}")
 |  | 
 | 
											
												
													
														|  | -    print(f"score_merge_df shape: {score_merge_df.shape}")
 |  | 
 | 
											
												
													
														|  | 
 |  | +    log_.info(f"score_hour_df shape: {score_hour_df.shape}")
 | 
											
												
													
														|  | 
 |  | +    log_.info(f"score_24h_df shape: {score_24h_df.shape}")
 | 
											
												
													
														|  | 
 |  | +    log_.info(f"score_merge_df shape: {score_merge_df.shape}")
 | 
											
												
													
														|  |      score_merge_df['score1'] = score_merge_df['24h_score1'] + score_merge_df['hour_score1']
 |  |      score_merge_df['score1'] = score_merge_df['24h_score1'] + score_merge_df['hour_score1']
 | 
											
												
													
														|  |      score_merge_df['score2'] = score_merge_df['24h_score1'] + score_merge_df['hour_score2']
 |  |      score_merge_df['score2'] = score_merge_df['24h_score1'] + score_merge_df['hour_score2']
 | 
											
												
													
														|  |      # score_merge_df['score3'] = score_merge_df['24h_score1'] + score_merge_df['hour_score3']
 |  |      # score_merge_df['score3'] = score_merge_df['24h_score1'] + score_merge_df['hour_score3']
 | 
											
												
													
														|  |      score_merge_df['score4'] = score_merge_df['24h_score1'] + score_merge_df['hour_score4']
 |  |      score_merge_df['score4'] = score_merge_df['24h_score1'] + score_merge_df['hour_score4']
 | 
											
												
													
														|  |      score_merge_df['score5'] = score_merge_df['24h_score1'] + score_merge_df['hour_score5']
 |  |      score_merge_df['score5'] = score_merge_df['24h_score1'] + score_merge_df['hour_score5']
 | 
											
												
													
														|  |      # print(score_merge_df)
 |  |      # print(score_merge_df)
 | 
											
												
													
														|  | -    print(f"score_merge_df shape: {score_merge_df.shape}")
 |  | 
 | 
											
												
													
														|  | 
 |  | +    log_.info(f"score_merge_df shape: {score_merge_df.shape}")
 | 
											
												
													
														|  |      score_merge_df.to_csv(merge_score_path, index=False)
 |  |      score_merge_df.to_csv(merge_score_path, index=False)
 | 
											
												
													
														|  |      score_df = score_merge_df[['videoid', 'score1', 'score2', 'score4', 'score5']]
 |  |      score_df = score_merge_df[['videoid', 'score1', 'score2', 'score4', 'score5']]
 | 
											
												
													
														|  | -    print(f"score_df shape: {score_merge_df.shape}")
 |  | 
 | 
											
												
													
														|  | 
 |  | +    log_.info(f"score_df shape: {score_merge_df.shape}")
 | 
											
												
													
														|  |      return score_df
 |  |      return score_df
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -64,7 +64,7 @@ def score_to_redis(score_df):
 | 
											
												
													
														|  |  if __name__ == '__main__':
 |  |  if __name__ == '__main__':
 | 
											
												
													
														|  |      try:
 |  |      try:
 | 
											
												
													
														|  |          now_date = sys.argv[1]
 |  |          now_date = sys.argv[1]
 | 
											
												
													
														|  | -        print("now date:", now_date)
 |  | 
 | 
											
												
													
														|  | 
 |  | +        log_.info(f"now date: {now_date}")
 | 
											
												
													
														|  |          score_hour_path = f"./data/hour_score_{now_date}.csv"
 |  |          score_hour_path = f"./data/hour_score_{now_date}.csv"
 | 
											
												
													
														|  |          score_24h_path = f"./data/24h_score_{now_date}.csv"
 |  |          score_24h_path = f"./data/24h_score_{now_date}.csv"
 | 
											
												
													
														|  |          merge_score_path = f"./data/merge_score_{now_date}.csv"
 |  |          merge_score_path = f"./data/merge_score_{now_date}.csv"
 | 
											
										
											
												
													
														|  | @@ -72,7 +72,7 @@ if __name__ == '__main__':
 | 
											
												
													
														|  |              score_hour_path=score_hour_path, score_24h_path=score_24h_path, merge_score_path=merge_score_path
 |  |              score_hour_path=score_hour_path, score_24h_path=score_24h_path, merge_score_path=merge_score_path
 | 
											
												
													
														|  |          )
 |  |          )
 | 
											
												
													
														|  |          score_to_redis(score_df=score_df)
 |  |          score_to_redis(score_df=score_df)
 | 
											
												
													
														|  | -        print("rank score update finished!")
 |  | 
 | 
											
												
													
														|  | 
 |  | +        log_.info("rank score update finished!")
 | 
											
												
													
														|  |      except Exception as e:
 |  |      except Exception as e:
 | 
											
												
													
														|  |          log_.error(f"rank 分值合并更新失败, exception: {e}, traceback: {traceback.format_exc()}")
 |  |          log_.error(f"rank 分值合并更新失败, exception: {e}, traceback: {traceback.format_exc()}")
 | 
											
												
													
														|  |          send_msg_to_feishu(
 |  |          send_msg_to_feishu(
 |