update abtest: 069/072/073/074/082 config & update recall

config.py

@@ -121,6 +121,7 @@ class BaseConfig(object):
             'region_rule_rank6_appType_0_data1': 60016,
             'region_rule_rank6_appType_13_data2': 60017,
             'abtest_112': 60018,
+            'abtest_082': 60019,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -135,45 +136,49 @@ class BaseConfig(object):
     # AB实验配置
     AB_EXP_CODE = {
         '069': {
-            'data_key': 'data1', 'rule_key': 'rule3', 'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4')
-        },  # 最惊奇：data-vlog, rule-rule3
+            'data_key': 'data1', 'rule_key': 'rule4',
+            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1')
+        },  # 最惊奇：data-vlog, rule-rule4
         '072': {
-            'data_key': 'data1', 'rule_key': 'rule3', 'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4')
-        },  # 票圈视频：data-vlog, rule-rule3
+            'data_key': 'data1', 'rule_key': 'rule4',
+            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1')
+        },  # 票圈视频：data-vlog, rule-rule4
         '073': {
-            'data_key': 'data1', 'rule_key': 'rule3', 'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4')
-        },  # 票圈短视频：data-vlog, rule-rule3
+            'data_key': 'data1', 'rule_key': 'rule4',
+            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1')
+        },  # 票圈短视频：data-vlog, rule-rule4
         '074': {
-            'data_key': 'data1', 'rule_key': 'rule3', 'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4')
-        },  # 老好看视频：data-vlog, rule-rule3
+            'data_key': 'data1', 'rule_key': 'rule4',
+            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1')
+        },  # 老好看视频：data-vlog, rule-rule4
         '082': {
-            'data_key': 'data2', 'rule_key': 'rule3',
-            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_5_data3')
-        },  # 票圈内容精选：data-[内容精选,vlog], rule-rule3
-        '083': {
-            'data_key': 'data6', 'rule_key': 'rule3',
-            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_5_data4')
-        },  # 票圈内容精选：data-[内容精选,vlog, 票圈视频,票圈短视频], rule-rule3
+            'data_key': 'data2', 'rule_key': 'rule4',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_082')
+        },  # 票圈内容精选：data-[内容精选,vlog], rule-rule4
+        # '083': {
+        #     'data_key': 'data6', 'rule_key': 'rule3',
+        #     'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_5_data4')
+        # },  # 票圈内容精选：data-[内容精选,vlog, 票圈视频,票圈短视频], rule-rule3
         '095': {
             'data_key': 'data1', 'rule_key': 'rule4',
             'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1')
         },  # vlog：data-vlog, rule-rule4
-        '096': {
-            'data_key': 'data3', 'rule_key': 'rule3',
-            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_4_data2')
-        },  # 票圈视频：data-[票圈视频,vlog], rule-rule3
-        '097': {
-            'data_key': 'data6', 'rule_key': 'rule3',
-            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_4_data3')
-        },  # 票圈视频：data-[内容精选,vlog, 票圈视频,票圈短视频], rule-rule3
-        '098': {
-            'data_key': 'data4', 'rule_key': 'rule3',
-            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_6_data2')
-        },  # 票圈短视频：data-[票圈短视频,vlog], rule-rule3
-        '099': {
-            'data_key': 'data6', 'rule_key': 'rule3',
-            'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_6_data3')
-        },  # 票圈短视频：data-[内容精选,vlog, 票圈视频,票圈短视频], rule-rule3
+        # '096': {
+        #     'data_key': 'data3', 'rule_key': 'rule3',
+        #     'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_4_data2')
+        # },  # 票圈视频：data-[票圈视频,vlog], rule-rule3
+        # '097': {
+        #     'data_key': 'data6', 'rule_key': 'rule3',
+        #     'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_4_data3')
+        # },  # 票圈视频：data-[内容精选,vlog, 票圈视频,票圈短视频], rule-rule3
+        # '098': {
+        #     'data_key': 'data4', 'rule_key': 'rule3',
+        #     'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_6_data2')
+        # },  # 票圈短视频：data-[票圈短视频,vlog], rule-rule3
+        # '099': {
+        #     'data_key': 'data6', 'rule_key': 'rule3',
+        #     'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_6_data3')
+        # },  # 票圈短视频：data-[内容精选,vlog, 票圈视频,票圈短视频], rule-rule3
         '112': {
             'data_key': 'data1', 'rule_key': 'rule4',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_112')
@@ -508,8 +513,8 @@ class BaseConfig(object):
                 {"dataListCode": 2, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP1_REGION_24H_H},
                 {"dataListCode": 3, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP2_REGION_24H_H},
                 {"dataListCode": 4, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP3_REGION_24H_H},
-                {"dataListCode": 5, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP2_REGION_48H_H},
-                {"dataListCode": 6, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP3_REGION_48H_H},
+                # {"dataListCode": 5, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP2_REGION_48H_H},
+                # {"dataListCode": 6, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP3_REGION_48H_H},
                 {"dataListCode": 7, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP_REGION_H},
             ]
         },
@@ -517,8 +522,8 @@ class BaseConfig(object):
         2: {"dataListDesc": "地域相对24小时级", "dataListCode": 2, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP1_REGION_24H_H},
         3: {"dataListDesc": "非地域相对24小时级", "dataListCode": 3, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP2_REGION_24H_H},
         4: {"dataListDesc": "非地域相对24小时级列表2", "dataListCode": 4, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP3_REGION_24H_H},
-        5: {"dataListDesc": "非地域相对48小时级", "dataListCode": 5, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP2_REGION_48H_H},
-        6: {"dataListDesc": "非地域相对48小时级列表2", "dataListCode": 6, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP3_REGION_48H_H},
+        # 5: {"dataListDesc": "非地域相对48小时级", "dataListCode": 5, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP2_REGION_48H_H},
+        # 6: {"dataListDesc": "非地域相对48小时级列表2", "dataListCode": 6, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP3_REGION_48H_H},
         7: {"dataListDesc": "大列表", "dataListCode": 7, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP_REGION_H},
     }
 

video_recall.py

@@ -1199,6 +1199,7 @@ class PoolRecall(object):
 
         # if self.ab_code == config_.AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1'):
         if self.ab_code in [config_.AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1'),
+                            config_.AB_CODE['region_rank_by_h'].get('abtest_082'),
                             config_.AB_CODE['region_rank_by_h'].get('abtest_112')]:
 
             if province_code == '-1':
@@ -1215,17 +1216,17 @@ class PoolRecall(object):
                      gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_24h', expire_time),
                      gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup2', expire_time),
                      gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup3', expire_time)]
-        elif self.ab_code == config_.AB_CODE['region_rank_by_h'].get('region_rule_rank6_appType_0_data1'):
-            if province_code == '-1':
-                t = [
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup2', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup3', expire_time)]
-            else:
-                t = [
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_h', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_24h', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup2', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup3', expire_time)]
+        # elif self.ab_code == config_.AB_CODE['region_rank_by_h'].get('region_rule_rank6_appType_0_data1'):
+        #     if province_code == '-1':
+        #         t = [
+        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup2', expire_time),
+        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup3', expire_time)]
+        #     else:
+        #         t = [
+        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_h', expire_time),
+        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_24h', expire_time),
+        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup2', expire_time),
+        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup3', expire_time)]
         else:
             if province_code == '-1':
                 # t = [gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'day_24h')]