Merge branch 'abtest-update-20221102' into test

config.py

@@ -199,37 +199,37 @@ class BaseConfig(object):
                       'view_type': 'preview'},
             'rule4': {'cal_score_func': 2, 'return_count': 100, 'platform_return_rate': 0.001,
                       'view_type': 'preview', 'merge_func': 2},
-            # 无回流人群
-            'rule5': {'return_count': 100, 'platform_return_rate': 0.001,
-                      'view_type': 'preview', 'click_score_rate': 0.7},
-            'rule7': {'return_count': 100, 'platform_return_rate': 0.001,
-                      'view_type': 'preview', 'click_score_rate': 0.8},
-            # 有回流人群
-            'rule6': {'return_count': 100, 'platform_return_rate': 0.001,
-                      'view_type': 'preview', 'back_score_rate': 0.7},
-            'rule8': {'return_count': 100, 'platform_return_rate': 0.001,
-                      'view_type': 'preview', 'back_score_rate': 0.8},
+            # # 无回流人群
+            # 'rule5': {'return_count': 100, 'platform_return_rate': 0.001,
+            #           'view_type': 'preview', 'click_score_rate': 0.7},
+            # 'rule7': {'return_count': 100, 'platform_return_rate': 0.001,
+            #           'view_type': 'preview', 'click_score_rate': 0.8},
+            # # 有回流人群
+            # 'rule6': {'return_count': 100, 'platform_return_rate': 0.001,
+            #           'view_type': 'preview', 'back_score_rate': 0.7},
+            # 'rule8': {'return_count': 100, 'platform_return_rate': 0.001,
+            #           'view_type': 'preview', 'back_score_rate': 0.8},
         },
         'data_params': DATA_PARAMS,
         'params_list': [
             {'data': 'data1', 'rule': 'rule3', 'notify_backend': True},
             # {'data': 'data2', 'rule': 'rule3'},
             {'data': 'data2', 'rule': 'rule4'},
-            {'data': 'data3', 'rule': 'rule4'},
-            {'data': 'data4', 'rule': 'rule4'},
-            {'data': 'data6', 'rule': 'rule4'},
-            {'data': 'data7', 'rule': 'rule4'},
-            {'data': 'data1', 'rule': 'rule5'},
-            {'data': 'data1', 'rule': 'rule6'},
-            {'data': 'data8', 'rule': 'rule4'},
-            {'data': 'data9', 'rule': 'rule4'},
+            # {'data': 'data3', 'rule': 'rule4'},
+            # {'data': 'data4', 'rule': 'rule4'},
+            # {'data': 'data6', 'rule': 'rule4'},
+            # {'data': 'data7', 'rule': 'rule4'},
+            # {'data': 'data1', 'rule': 'rule5'},
+            # {'data': 'data1', 'rule': 'rule6'},
+            # {'data': 'data8', 'rule': 'rule4'},
+            # {'data': 'data9', 'rule': 'rule4'},
             {'data': 'data10', 'rule': 'rule4'},
-            {'data': 'data11', 'rule': 'rule4'},
-            {'data': 'data12', 'rule': 'rule4'},
-            {'data': 'data13', 'rule': 'rule4'},
-            # {'data': 'data14', 'rule': 'rule4'},
-            {'data': 'data1', 'rule': 'rule7'},
-            {'data': 'data1', 'rule': 'rule8'},
+            # {'data': 'data11', 'rule': 'rule4'},
+            # {'data': 'data12', 'rule': 'rule4'},
+            # {'data': 'data13', 'rule': 'rule4'},
+            # # {'data': 'data14', 'rule': 'rule4'},
+            # {'data': 'data1', 'rule': 'rule7'},
+            # {'data': 'data1', 'rule': 'rule8'},
         ]
     }
 
@@ -242,43 +242,43 @@ class BaseConfig(object):
         'rule_params': {
             'rule2': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
                       'platform_return_rate': 0.001},
-            'rule3': {'view_type': 'preview', 'return_count': 21, 'score_rule': 0,
-                      'platform_return_rate': 0.001},
+            # 'rule3': {'view_type': 'preview', 'return_count': 21, 'score_rule': 0,
+            #           'platform_return_rate': 0.001},
             'rule4': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
                       'platform_return_rate': 0.001, 'merge_func': 2},
-            'rule5': {'view_type': 'preview', 'return_count': 21, 'score_rule': 0,
-                      'platform_return_rate': 0.001, 'merge_func': 2},
-            # 无回流人群
-            'rule6': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
-                      'platform_return_rate': 0.001, 'click_score_rate': 0.7},
-            'rule8': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
-                      'platform_return_rate': 0.001, 'click_score_rate': 0.8},
-            # 有回流人群
-            'rule7': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
-                      'platform_return_rate': 0.001, 'back_score_rate': 0.7},
-            'rule9': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
-                      'platform_return_rate': 0.001, 'back_score_rate': 0.8},
+            # 'rule5': {'view_type': 'preview', 'return_count': 21, 'score_rule': 0,
+            #           'platform_return_rate': 0.001, 'merge_func': 2},
+            # # 无回流人群
+            # 'rule6': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
+            #           'platform_return_rate': 0.001, 'click_score_rate': 0.7},
+            # 'rule8': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
+            #           'platform_return_rate': 0.001, 'click_score_rate': 0.8},
+            # # 有回流人群
+            # 'rule7': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
+            #           'platform_return_rate': 0.001, 'back_score_rate': 0.7},
+            # 'rule9': {'view_type': 'video-show', 'return_count': 21, 'score_rule': 0,
+            #           'platform_return_rate': 0.001, 'back_score_rate': 0.8},
         },
         'data_params': DATA_PARAMS,
         'params_list': [
             {'data': 'data1', 'rule': 'rule2'},
             # {'data': 'data2', 'rule': 'rule2'},
             {'data': 'data2', 'rule': 'rule4'},
-            {'data': 'data3', 'rule': 'rule4'},
-            {'data': 'data4', 'rule': 'rule4'},
-            {'data': 'data6', 'rule': 'rule4'},
-            {'data': 'data7', 'rule': 'rule5'},
-            {'data': 'data1', 'rule': 'rule6'},
-            {'data': 'data1', 'rule': 'rule7'},
-            {'data': 'data8', 'rule': 'rule4'},
-            {'data': 'data9', 'rule': 'rule4'},
+            # {'data': 'data3', 'rule': 'rule4'},
+            # {'data': 'data4', 'rule': 'rule4'},
+            # {'data': 'data6', 'rule': 'rule4'},
+            # {'data': 'data7', 'rule': 'rule5'},
+            # {'data': 'data1', 'rule': 'rule6'},
+            # {'data': 'data1', 'rule': 'rule7'},
+            # {'data': 'data8', 'rule': 'rule4'},
+            # {'data': 'data9', 'rule': 'rule4'},
             {'data': 'data10', 'rule': 'rule4'},
-            {'data': 'data11', 'rule': 'rule4'},
-            {'data': 'data12', 'rule': 'rule4'},
-            {'data': 'data13', 'rule': 'rule4'},
+            # {'data': 'data11', 'rule': 'rule4'},
+            # {'data': 'data12', 'rule': 'rule4'},
+            # {'data': 'data13', 'rule': 'rule4'},
             # {'data': 'data14', 'rule': 'rule4'},
-            {'data': 'data1', 'rule': 'rule8'},
-            {'data': 'data1', 'rule': 'rule9'},
+            # {'data': 'data1', 'rule': 'rule8'},
+            # {'data': 'data1', 'rule': 'rule9'},
         ]
     }
 
@@ -298,46 +298,46 @@ class BaseConfig(object):
             #           'region_24h_rule_key': 'rule3', '24h_rule_key': 'rule2'},
             'rule7': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
                       'region_24h_rule_key': 'rule4', '24h_rule_key': 'rule4', 'merge_func': 2},
-            'rule8': {'view_type': 'preview', 'platform_return_rate': 0.001,
-                      'region_24h_rule_key': 'rule5', '24h_rule_key': 'rule4', 'merge_func': 2},
-            'rule9': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
-                      'region_24h_rule_key': 'rule2', '24h_rule_key': 'rule3', '30day_rule_key': 'rule1'},
-            # 无回流人群
-            'rule10': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
-                       'region_24h_rule_key': 'rule6', '24h_rule_key': 'rule5', 'click_score_rate': 0.7},
-            'rule13': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
-                       'region_24h_rule_key': 'rule8', '24h_rule_key': 'rule7', 'click_score_rate': 0.8},
-            # 有回流人群
-            'rule11': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
-                       'region_24h_rule_key': 'rule7', '24h_rule_key': 'rule6', 'back_score_rate': 0.7},
-            'rule14': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
-                       'region_24h_rule_key': 'rule9', '24h_rule_key': 'rule8', 'back_score_rate': 0.8},
-            # 20点地域小时级列表中增加7点-19点地域小时级的优质视频
-            'rule12': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
-                       'region_24h_rule_key': 'rule2', '24h_rule_key': 'rule3', 'add_videos_in_20h': True},
+            # 'rule8': {'view_type': 'preview', 'platform_return_rate': 0.001,
+            #           'region_24h_rule_key': 'rule5', '24h_rule_key': 'rule4', 'merge_func': 2},
+            # 'rule9': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
+            #           'region_24h_rule_key': 'rule2', '24h_rule_key': 'rule3', '30day_rule_key': 'rule1'},
+            # # 无回流人群
+            # 'rule10': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
+            #            'region_24h_rule_key': 'rule6', '24h_rule_key': 'rule5', 'click_score_rate': 0.7},
+            # 'rule13': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
+            #            'region_24h_rule_key': 'rule8', '24h_rule_key': 'rule7', 'click_score_rate': 0.8},
+            # # 有回流人群
+            # 'rule11': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
+            #            'region_24h_rule_key': 'rule7', '24h_rule_key': 'rule6', 'back_score_rate': 0.7},
+            # 'rule14': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
+            #            'region_24h_rule_key': 'rule9', '24h_rule_key': 'rule8', 'back_score_rate': 0.8},
+            # # 20点地域小时级列表中增加7点-19点地域小时级的优质视频
+            # 'rule12': {'view_type': 'video-show-region', 'platform_return_rate': 0.001,
+            #            'region_24h_rule_key': 'rule2', '24h_rule_key': 'rule3', 'add_videos_in_20h': True},
         },
         'data_params': DATA_PARAMS,
         'params_list': [
             {'data': 'data1', 'rule': 'rule4'},
             # {'data': 'data2', 'rule': 'rule4'},
             {'data': 'data2', 'rule': 'rule7'},
-            {'data': 'data3', 'rule': 'rule7'},
-            {'data': 'data4', 'rule': 'rule7'},
-            {'data': 'data6', 'rule': 'rule7'},
-            {'data': 'data7', 'rule': 'rule8'},
-            {'data': 'data1', 'rule': 'rule9'},
-            {'data': 'data1', 'rule': 'rule10'},
-            {'data': 'data1', 'rule': 'rule11'},
-            {'data': 'data8', 'rule': 'rule7'},
-            {'data': 'data9', 'rule': 'rule7'},
+            # {'data': 'data3', 'rule': 'rule7'},
+            # {'data': 'data4', 'rule': 'rule7'},
+            # {'data': 'data6', 'rule': 'rule7'},
+            # {'data': 'data7', 'rule': 'rule8'},
+            # {'data': 'data1', 'rule': 'rule9'},
+            # {'data': 'data1', 'rule': 'rule10'},
+            # {'data': 'data1', 'rule': 'rule11'},
+            # {'data': 'data8', 'rule': 'rule7'},
+            # {'data': 'data9', 'rule': 'rule7'},
             {'data': 'data10', 'rule': 'rule7'},
-            {'data': 'data11', 'rule': 'rule7'},
-            {'data': 'data12', 'rule': 'rule7'},
-            {'data': 'data13', 'rule': 'rule7'},
-            {'data': 'data1', 'rule': 'rule12'},
+            # {'data': 'data11', 'rule': 'rule7'},
+            # {'data': 'data12', 'rule': 'rule7'},
+            # {'data': 'data13', 'rule': 'rule7'},
+            # {'data': 'data1', 'rule': 'rule12'},
             # {'data': 'data14', 'rule': 'rule7'},  # 159
-            {'data': 'data1', 'rule': 'rule13'},  # 161
-            {'data': 'data1', 'rule': 'rule14'},  # 162
+            # {'data': 'data1', 'rule': 'rule13'},  # 161
+            # {'data': 'data1', 'rule': 'rule14'},  # 162
         ],
     }
 

region_rule_rank_h_task.sh

@@ -3,11 +3,11 @@ echo $ROV_OFFLINE_ENV
 if [[ $ROV_OFFLINE_ENV == 'test' ]]; then
     cd /data2/rov-offline && /root/anaconda3/bin/python /data2/rov-offline/rule_rank_h_by_24h.py &&
      /root/anaconda3/bin/python /data2/rov-offline/region_rule_rank_h_by24h.py &&
-      /root/anaconda3/bin/python /data2/rov-offline/region_rule_rank_h.py '24h' &&
-      /root/anaconda3/bin/python /data2/rov-offline/laohaokan_recommend_update.py
+      /root/anaconda3/bin/python /data2/rov-offline/region_rule_rank_h.py '24h'
+#      /root/anaconda3/bin/python /data2/rov-offline/laohaokan_recommend_update.py
 elif [[ $ROV_OFFLINE_ENV == 'pro' ]]; then
     cd /data/rov-offline && /root/anaconda3/bin/python /data/rov-offline/rule_rank_h_by_24h.py &&
      /root/anaconda3/bin/python /data/rov-offline/region_rule_rank_h_by24h.py &&
-      /root/anaconda3/bin/python /data/rov-offline/region_rule_rank_h.py '24h' &&
-      /root/anaconda3/bin/python /data/rov-offline/laohaokan_recommend_update.py
+      /root/anaconda3/bin/python /data/rov-offline/region_rule_rank_h.py '24h'
+#      /root/anaconda3/bin/python /data/rov-offline/laohaokan_recommend_update.py
 fi