linfan 1 年之前
父節點
當前提交
ebb08397e0
共有 3 個文件被更改,包括 38 次插入5 次删除
  1. 15 0
      config.py
  2. 22 4
      recommend.py
  3. 1 1
      video_rank.py

+ 15 - 0
config.py

@@ -148,6 +148,9 @@ class BaseConfig(object):
             'abtest_320': 60049,
             'abtest_322': 60050,
             'abtest_323': 60051,
+            'abtest_326': 60052,
+            'abtest_327': 60053,
+            'abtest_328': 60054,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -339,6 +342,18 @@ class BaseConfig(object):
         '323': {
             'data_key': 'data10', 'rule_key': 'rule7',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_323')
+        },
+        '326': {
+            'data_key': 'data10', 'rule_key': 'rule7',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_326')
+        },
+        '327': {
+            'data_key': 'data10', 'rule_key': 'rule7',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_327')
+        },
+        '328': {
+            'data_key': 'data10', 'rule_key': 'rule7',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_328')
         }
     }
 

+ 22 - 4
recommend.py

@@ -372,13 +372,13 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
 
     if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time)]
-        if ab_code == 60052:
+        if ab_code == 60054:
             t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
     else:
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
              gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
              gevent.spawn(pool_recall.flow_pool_recall, size)]
-        if ab_code == 60052:
+        if ab_code == 60054:
             t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
 
     gevent.joinall(t)
@@ -387,7 +387,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         result['recallResult']= []
         result['rankResult'] = []
         return result
-    if ab_code == 60052:
+    if ab_code == 60054:
         rov_pool_recall = []
         if len(recall_result_list)>=4:
             region_recall = recall_result_list[0]
@@ -1469,6 +1469,15 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
                                  rule_key=rule_key, data_key=data_key,
                                  no_op_flag=no_op_flag, old_video_index=old_video_index,
                                  params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
+    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054:
+        result = video_old_recommend(request_id=request_id,
+                                     mid=mid, uid=uid, app_type=app_type,
+                                     size=size, top_K=top_K, flow_pool_P=flow_pool_P,
+                                     algo_type='', client_info=client_info,
+                                     ab_code=ab_code, expire_time=expire_time,
+                                     rule_key=rule_key, data_key=data_key, no_op_flag=no_op_flag,
+                                     old_video_index=old_video_index, video_id=video_id,
+                                     params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
     else:
         result = video_recommend(request_id=request_id,
                              mid=mid, uid=uid, app_type=app_type,
@@ -1575,7 +1584,16 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
                                  old_video_index=old_video_index, video_id=video_id,
                                  params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
         # log_.info({
-    elif ab_code == 60050 or ab_code == 60051 or ab_code == 60052:
+    elif ab_code == 60050 or ab_code == 60051:
+        result = video_recommend(request_id=request_id,
+                                 mid=mid, uid=uid, app_type=app_type,
+                                 size=size, top_K=top_K, flow_pool_P=flow_pool_P,
+                                 algo_type='', client_info=client_info,
+                                 ab_code=ab_code, expire_time=expire_time,
+                                 rule_key=rule_key, data_key=data_key, no_op_flag=no_op_flag,
+                                 old_video_index=old_video_index, video_id=video_id,
+                                 params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
+    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054:
         result = video_old_recommend(request_id=request_id,
                                  mid=mid, uid=uid, app_type=app_type,
                                  size=size, top_K=top_K, flow_pool_P=flow_pool_P,

+ 1 - 1
video_rank.py

@@ -608,7 +608,7 @@ def video_new_rank2(data, size, top_K, flow_pool_P, ab_code):
     vidKeys = []
     recall_list = []
     pre_str = "k_p:"
-    if ab_code==60051:
+    if ab_code==60053:
         pre_str = "k_p2:"
     for recall_item in data['rov_pool_recall']:
         if len(recall_item)<=0: