Merge branch 'region-h-ab' into pre-master

config.py

@@ -46,7 +46,7 @@ class BaseConfig(object):
         # 'top_video_relevant_appType_19': '058',
         # '24h_rule_rank2': '059',
         # 'whole_movies': '063',
-        # 'region_rule_rank4_appType_5_data1': '068',
+        'region_rule_rank4_appType_5_data1': '068',
         'region_rule_rank4_appType_19': '069',
         'region_rule_rank4_appType_4': '072',
         'region_rule_rank4_appType_6': '073',
@@ -59,6 +59,11 @@ class BaseConfig(object):
         'region_rule_rank4_appType_19_data2': '089',
         'region_rule_rank4_appType_19_data3': '090',
         'region_rule_rank5_appType_0_data1': '095',
+        'region_rule_rank4_appType_4_data2': '096',
+        'region_rule_rank4_appType_4_data3': '097',
+        'region_rule_rank4_appType_6_data2': '098',
+        'region_rule_rank4_appType_6_data3': '099',
+        'region_rule_rank4_appType_18_data2': '100',
     }
 
     # abTest
@@ -105,7 +110,12 @@ class BaseConfig(object):
             'region_rule_rank4_appType_0_data2': 60007,
             'region_rule_rank4_appType_19_data2': 60008,
             'region_rule_rank4_appType_19_data3': 60009,
-            'region_rule_rank5_appType_0_data1': 60010
+            'region_rule_rank5_appType_0_data1': 60010,
+            'region_rule_rank4_appType_4_data2': 60011,
+            'region_rule_rank4_appType_4_data3': 60012,
+            'region_rule_rank4_appType_6_data2': 60013,
+            'region_rule_rank4_appType_6_data3': 60014,
+            'region_rule_rank4_appType_18_data2': 60015,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -143,6 +153,11 @@ class BaseConfig(object):
         'region_rule_rank4_appType_19_data2': {'rule_key': 'rule3', 'data_key': 'data2'},
         'region_rule_rank4_appType_19_data3': {'rule_key': 'rule3', 'data_key': 'data3'},
         'region_rule_rank5_appType_0_data1': {'rule_key': 'rule4', 'data_key': 'data1'},
+        'region_rule_rank4_appType_4_data2': {'rule_key': 'rule3', 'data_key': 'data2'},
+        'region_rule_rank4_appType_4_data3': {'rule_key': 'rule3', 'data_key': 'data3'},
+        'region_rule_rank4_appType_6_data2': {'rule_key': 'rule3', 'data_key': 'data2'},
+        'region_rule_rank4_appType_6_data3': {'rule_key': 'rule3', 'data_key': 'data3'},
+        'region_rule_rank4_appType_18_data2': {'rule_key': 'rule3', 'data_key': 'data2'},
     }
 
     # 小程序地域分组小时级列表key不同实验标识
@@ -422,6 +437,11 @@ class BaseConfig(object):
         "089": {"app_type": 19, "data_key": "data2", "rule_key": "rule3"},
         "090": {"app_type": 19, "data_key": "data3", "rule_key": "rule3"},
         "095": {"app_type": 0, "data_key": "data1", "rule_key": "rule4"},
+        "096": {"app_type": 4, "data_key": "data2", "rule_key": "rule3"},
+        "097": {"app_type": 4, "data_key": "data3", "rule_key": "rule3"},
+        "098": {"app_type": 6, "data_key": "data2", "rule_key": "rule3"},
+        "099": {"app_type": 6, "data_key": "data3", "rule_key": "rule3"},
+        "100": {"app_type": 18, "data_key": "data2", "rule_key": "rule3"},
     }
     REGION_CODE = {
         '北京': '110000', '天津': '120000', '河北省': '130000', '山西省': '140000', '内蒙古': '150000',

recommend.py

@@ -199,16 +199,16 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
                  gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
                  gevent.spawn(pool_recall.flow_pool_recall, size)]
     # 最惊奇相关推荐实验
-    elif ab_code == config_.AB_CODE['top_video_relevant_appType_19']:
-        t = [gevent.spawn(pool_recall.relevant_recall_19, video_id, size, expire_time),
-             gevent.spawn(pool_recall.flow_pool_recall_18_19, size)]
+    # elif ab_code == config_.AB_CODE['top_video_relevant_appType_19']:
+    #     t = [gevent.spawn(pool_recall.relevant_recall_19, video_id, size, expire_time),
+    #          gevent.spawn(pool_recall.flow_pool_recall_18_19, size)]
     # 最惊奇完整影视实验
-    elif ab_code == config_.AB_CODE['whole_movies']:
-        t = [gevent.spawn(pool_recall.rov_pool_recall_19, size, expire_time)]
+    # elif ab_code == config_.AB_CODE['whole_movies']:
+    #     t = [gevent.spawn(pool_recall.rov_pool_recall_19, size, expire_time)]
     # 最惊奇/老好看实验
-    elif app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
-        t = [gevent.spawn(pool_recall.rov_pool_recall, size, expire_time),
-             gevent.spawn(pool_recall.flow_pool_recall_18_19, size)]
+    # elif app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
+    #     t = [gevent.spawn(pool_recall.rov_pool_recall, size, expire_time),
+    #          gevent.spawn(pool_recall.flow_pool_recall_18_19, size)]
     # # 天级实验
     # elif ab_code in [code for _, code in config_.AB_CODE['rank_by_day'].items()]:
     #     t = [gevent.spawn(pool_recall.rov_pool_recall_by_day, size, expire_time),
@@ -597,12 +597,12 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, page_type=0)
             data_key = config_.RULE_KEY_REGION['region_rule_rank4'].get('data_key')
             no_op_flag = True
 
-        # elif config_.AB_EXP_CODE['region_rule_rank4_appType_5_data1'] 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_appType_5_data1'].get('rule_key')
-        #     data_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_5_data1'].get('data_key')
-        #     no_op_flag = True
+        elif config_.AB_EXP_CODE['region_rule_rank4_appType_5_data1'] 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_appType_5_data1'].get('rule_key')
+            data_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_5_data1'].get('data_key')
+            no_op_flag = True
 
         # elif config_.AB_EXP_CODE['region_rule_rank3_appType_5_data2'] in ab_exp_code_list:
         #     ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank3_appType_5_data2')
@@ -653,6 +653,41 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, page_type=0)
             data_key = config_.RULE_KEY_REGION['region_rule_rank5_appType_0_data1'].get('data_key')
             no_op_flag = True
 
+        elif config_.AB_EXP_CODE['region_rule_rank4_appType_4_data2'] in ab_exp_code_list:
+            ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_4_data2')
+            expire_time = 3600
+            rule_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_4_data2'].get('rule_key')
+            data_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_4_data2'].get('data_key')
+            no_op_flag = True
+
+        elif config_.AB_EXP_CODE['region_rule_rank4_appType_4_data3'] in ab_exp_code_list:
+            ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_4_data3')
+            expire_time = 3600
+            rule_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_4_data3'].get('rule_key')
+            data_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_4_data3'].get('data_key')
+            no_op_flag = True
+
+        elif config_.AB_EXP_CODE['region_rule_rank4_appType_6_data2'] in ab_exp_code_list:
+            ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_6_data2')
+            expire_time = 3600
+            rule_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_6_data2'].get('rule_key')
+            data_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_6_data2'].get('data_key')
+            no_op_flag = True
+
+        elif config_.AB_EXP_CODE['region_rule_rank4_appType_6_data3'] in ab_exp_code_list:
+            ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_6_data3')
+            expire_time = 3600
+            rule_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_6_data3'].get('rule_key')
+            data_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_6_data3'].get('data_key')
+            no_op_flag = True
+
+        elif config_.AB_EXP_CODE['region_rule_rank4_appType_18_data2'] in ab_exp_code_list:
+            ab_code = config_.AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_18_data2')
+            expire_time = 3600
+            rule_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_18_data2'].get('rule_key')
+            data_key = config_.RULE_KEY_REGION['region_rule_rank4_appType_18_data2'].get('data_key')
+            no_op_flag = True
+
         else:
             ab_code = config_.AB_CODE['initial']
             expire_time = 24 * 3600