Bladeren bron

523实验 地域1小时 更新公式

zhangbo 1 jaar geleden
bovenliggende
commit
846a476fec
3 gewijzigde bestanden met toevoegingen van 17 en 12 verwijderingen
  1. 9 6
      alg_recsys_recall_1h_region.py
  2. 1 0
      config.py
  3. 7 6
      region_rule_rank_h_v2.py

+ 9 - 6
alg_recsys_recall_1h_region.py

@@ -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():

+ 1 - 0
config.py

@@ -423,6 +423,7 @@ class BaseConfig(object):
                 # 'view_type': 'video-show-region', "return_countv2": 1, 'platform_return_ratev2': 0.001,
                 'view_type': 'video-show-region',
                 'score_func': '20240223',
+                'lastonehour_allreturn': "1",
                 'region_24h_rule_key': 'rule66', '24h_rule_key': 'rule66'
             },
             'rule68': {

+ 7 - 6
region_rule_rank_h_v2.py

@@ -642,14 +642,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():
+        h_recall_df = df[
+            (df['lastonehour_allreturn'] > 0)
+            ]
     # try:
     #     if "return_countv2" in param.keys() and "platform_return_ratev2" in param.keys():
     #         return_countv2 = param["return_countv2"]