|
@@ -25,6 +25,7 @@ RULE_PARAMS = {
|
|
|
'rule66': {
|
|
|
'view_type': 'video-show-region',
|
|
|
'score_func': '20240223',
|
|
|
+ 'lastonehour_allreturn': "1",
|
|
|
'region_24h_rule_key': 'rule66', '24h_rule_key': 'rule66'
|
|
|
},
|
|
|
'rule67': {
|
|
@@ -660,13 +661,15 @@ def video_rank(df, now_date, now_h, rule_key, param, region, data_key, rule_rank
|
|
|
platform_return_rate = param.get('platform_return_rate', 0)
|
|
|
# h_recall_df = df[(df['lastonehour_return'] >= return_count) & (df['score'] >= score_value)
|
|
|
# & (df['platform_return_rate'] >= platform_return_rate)]
|
|
|
- # h_recall_df = df[
|
|
|
- # (df['lastonehour_return'] >= return_count) &
|
|
|
- # (df['score'] >= score_value) &
|
|
|
- # (df['platform_return_rate'] >= platform_return_rate)
|
|
|
- # ]
|
|
|
h_recall_df = df[
|
|
|
- (df['lastonehour_allreturn'] > 0)
|
|
|
+ (df['lastonehour_return'] >= return_count) &
|
|
|
+ (df['score'] >= score_value) &
|
|
|
+ (df['platform_return_rate'] >= platform_return_rate)
|
|
|
+ ]
|
|
|
+ if "lastonehour_allreturn" in param.keys():
|
|
|
+ log_.info("采用 lastonehour_allreturn 过滤")
|
|
|
+ h_recall_df = df[
|
|
|
+ (df['lastonehour_allreturn'] > 0)
|
|
|
]
|
|
|
# try:
|
|
|
# if "return_countv2" in param.keys() and "platform_return_ratev2" in param.keys():
|