Merge branch 'recall-update-h' into test

config.py

@@ -42,7 +42,7 @@ class BaseConfig(object):
         # 'rule_rank6': '040',
         # '24h_rule_rank1': '052',
         # 'region_rule_rank2': '054',
-        'region_rule_rank3': '055',
+        # 'region_rule_rank3': '055',
         # 'top_video_relevant_appType_19': '058',
         # '24h_rule_rank2': '059',
         # 'whole_movies': '063',
@@ -122,19 +122,18 @@ class BaseConfig(object):
         'rule_rank6': 'rule6',
     }
 
-
     # 小程序地域分组小时级列表key不同实验标识
     RULE_KEY_REGION = {
         'initial': {'rule_key': '', 'data_key': ''},
         # 'region_rule_rank1': 'rule1',
         # 'region_rule_rank2': 'rule1',
-        'region_rule_rank3': {'rule_key': 'rule2', 'data_key': 'data1'},
+        # 'region_rule_rank3': {'rule_key': 'rule2', 'data_key': 'data1'},
         'region_rule_rank4': {'rule_key': 'rule3', 'data_key': 'data1'},
-        'region_rule_rank3_appType_5_data1': {'rule_key': 'rule2', 'data_key': 'data1'},
-        'region_rule_rank3_appType_5_data2': {'rule_key': 'rule2', 'data_key': 'data2'},
-        'region_rule_rank3_appType_5_data3': {'rule_key': 'rule2', 'data_key': 'data3'},
-        'region_rule_rank3_appType_5_data4': {'rule_key': 'rule2', 'data_key': 'data4'},
-        'region_rule_rank3_appType_0_data2': {'rule_key': 'rule2', 'data_key': 'data2'},
+        'region_rule_rank3_appType_5_data1': {'rule_key': 'rule3', 'data_key': 'data1'},
+        'region_rule_rank3_appType_5_data2': {'rule_key': 'rule3', 'data_key': 'data2'},
+        'region_rule_rank3_appType_5_data3': {'rule_key': 'rule3', 'data_key': 'data3'},
+        'region_rule_rank3_appType_5_data4': {'rule_key': 'rule3', 'data_key': 'data4'},
+        'region_rule_rank3_appType_0_data2': {'rule_key': 'rule3', 'data_key': 'data2'},
     }
 
     # 小程序地域分组小时级列表key不同实验标识
@@ -389,17 +388,17 @@ class BaseConfig(object):
         4: {"dataListDesc": "大列表", "dataListCode": 4, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP_REGION_H},
     }
     VIDEO_DATA_LIST_AB_EXP_CODE_MAPPING = {
-        "055": {"app_type": 0, "data_key": "data1", "rule_key": "rule2"},
-        "068": {"app_type": 5, "data_key": "data1", "rule_key": "rule2"},
-        "069": {"app_type": 19, "data_key": "data1", "rule_key": "rule2"},
-        "072": {"app_type": 4, "data_key": "data1", "rule_key": "rule2"},
-        "073": {"app_type": 6, "data_key": "data1", "rule_key": "rule2"},
-        "074": {"app_type": 18, "data_key": "data1", "rule_key": "rule2"},
+        # "055": {"app_type": 0, "data_key": "data1", "rule_key": "rule2"},
+        "068": {"app_type": 5, "data_key": "data1", "rule_key": "rule3"},
+        "069": {"app_type": 19, "data_key": "data1", "rule_key": "rule3"},
+        "072": {"app_type": 4, "data_key": "data1", "rule_key": "rule3"},
+        "073": {"app_type": 6, "data_key": "data1", "rule_key": "rule3"},
+        "074": {"app_type": 18, "data_key": "data1", "rule_key": "rule3"},
         "079": {"app_type": 0, "data_key": "data1", "rule_key": "rule3"},
-        "081": {"app_type": 5, "data_key": "data2", "rule_key": "rule2"},
-        "082": {"app_type": 5, "data_key": "data3", "rule_key": "rule2"},
-        "083": {"app_type": 5, "data_key": "data4", "rule_key": "rule2"},
-        "084": {"app_type": 0, "data_key": "data2", "rule_key": "rule2"},
+        "081": {"app_type": 5, "data_key": "data2", "rule_key": "rule3"},
+        "082": {"app_type": 5, "data_key": "data3", "rule_key": "rule3"},
+        "083": {"app_type": 5, "data_key": "data4", "rule_key": "rule3"},
+        "084": {"app_type": 0, "data_key": "data2", "rule_key": "rule3"},
     }
     REGION_CODE = {
         '河北省': '130000', '山西省': '140000', '辽宁省': '210000', '吉林省': '220000', '黑龙江省': '230000', '江苏省': '320000',

recommend.py

@@ -567,18 +567,22 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, page_type=0)
         #     rule_key = config_.RULE_KEY_REGION['region_rule_rank2']
         #     no_op_flag = True
 
-        if config_.AB_EXP_CODE['region_rule_rank3'] in ab_exp_code_list or\
+        # if config_.AB_EXP_CODE['region_rule_rank3'] in ab_exp_code_list or\
+        #         config_.AB_EXP_CODE['region_rule_rank3_appType_19'] in ab_exp_code_list or\
+        #         config_.AB_EXP_CODE['region_rule_rank3_appType_4'] in ab_exp_code_list or\
+        #         config_.AB_EXP_CODE['region_rule_rank3_appType_6'] in ab_exp_code_list or\
+        #         config_.AB_EXP_CODE['region_rule_rank3_appType_18'] in ab_exp_code_list:
+        #     ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank3')
+        #     expire_time = 3600
+        #     rule_key = config_.RULE_KEY_REGION['region_rule_rank3'].get('rule_key')
+        #     data_key = config_.RULE_KEY_REGION['region_rule_rank3'].get('data_key')
+        #     no_op_flag = True
+
+        if config_.AB_EXP_CODE['region_rule_rank4'] in ab_exp_code_list or\
                 config_.AB_EXP_CODE['region_rule_rank3_appType_19'] in ab_exp_code_list or\
                 config_.AB_EXP_CODE['region_rule_rank3_appType_4'] in ab_exp_code_list or\
                 config_.AB_EXP_CODE['region_rule_rank3_appType_6'] in ab_exp_code_list or\
                 config_.AB_EXP_CODE['region_rule_rank3_appType_18'] in ab_exp_code_list:
-            ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank3')
-            expire_time = 3600
-            rule_key = config_.RULE_KEY_REGION['region_rule_rank3'].get('rule_key')
-            data_key = config_.RULE_KEY_REGION['region_rule_rank3'].get('data_key')
-            no_op_flag = True
-
-        elif config_.AB_EXP_CODE['region_rule_rank4'] in ab_exp_code_list:
             ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank4')
             expire_time = 3600
             rule_key = config_.RULE_KEY_REGION['region_rule_rank4'].get('rule_key')