update video

config.py

@@ -153,6 +153,7 @@ class BaseConfig(object):
             'abtest_328': 60054,
             'abtest_332': 60055,
             'abtest_333': 60056,
+            'abtest_334': 60057,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -364,6 +365,10 @@ class BaseConfig(object):
         '333': {
             'data_key': 'data10', 'rule_key': 'rule7',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_333')
+        },
+        '334': {
+            'data_key': 'data10', 'rule_key': 'rule7',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_334')
         }
     }
 

recommend.py

@@ -377,7 +377,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         elif ab_code == 60055:
             t.append(gevent.spawn(pool_recall.get_3days_hot_item_reall))
         elif ab_code == 60056:
-            t.append(gevent.spawn(pool_recall.get_7days_hot_item_reall))
+            t.append(gevent.spawn(pool_recall.get_hot_item_reall))
     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),
@@ -390,7 +390,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         elif ab_code == 60055:
             t.append(gevent.spawn(pool_recall.get_3days_hot_item_reall))
         elif ab_code == 60056:
-            t.append(gevent.spawn(pool_recall.get_7days_hot_item_reall))
+            t.append(gevent.spawn(pool_recall.get_hot_item_reall))
 
     gevent.joinall(t)
     recall_result_list = [i.get() for i in t]
@@ -455,7 +455,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
                         now_video_ids.add(video_id)
             if len(rov_pool_recall)>0:
                 recall_result_list[0] = rov_pool_recall
-    # merge hot 7day recall
+    # merge old day recall
     if ab_code == 60056:
         rov_pool_recall = []
         if len(recall_result_list)>=2:
@@ -1529,6 +1529,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     # 简单召回 - 排序 - 兜底
     get_result_st = time.time()
     #print("ab_code:", ab_code)
+    #new pipeline
     if ab_code == 60047 or ab_code == 60048 or ab_code == 60049:
         result = new_video_recommend(request_id=request_id,
                              mid=mid, uid=uid, app_type=app_type,
@@ -1538,6 +1539,7 @@ 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)
+    # old base (test4, test5)
     elif ab_code == 60050 or ab_code == 60051:
         result = video_recommend(request_id=request_id,
                                  mid=mid, uid=uid, app_type=app_type,
@@ -1547,7 +1549,12 @@ 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 or ab_code == 60055 or ab_code == 60056:
+    # 60052,60053,60057(test7, test8, test6)
+    # simrecal: 60054
+    # 3 days , 7days recall: 60005, test1
+    # old video: 60056, test2
+    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054 or ab_code == 60055 or ab_code == 60056 \
+            or ab_code==60057:
         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,

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_p2:"
-    if ab_code == 60053 or ab_code == 60052 :
+    if ab_code == 60052 or ab_code == 60053  or ab_code==60057:
         pre_str = "k_p2:"
     elif ab_code == 60054:
         pre_str = "k_p3:"

video_recall.py

@@ -2405,10 +2405,10 @@ class PoolRecall(object):
         #print("recall_dict:", recall_dict)
         return recall_result
 
-    def get_7days_hot_item_reall(self):
+    def get_hot_item_reall(self):
         if self.video_id is None:
             return  []
-        recall_key = "hot_7day:"
+        recall_key = "hot_video:"
         #print("recall_key:", recall_key)
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
 
@@ -2424,7 +2424,7 @@ class PoolRecall(object):
                     vid = int(per_item[0])
                     video_ids.append(vid)
                     recall_dict[vid] = {'videoId': vid, 'flowPool': '',
-                         'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['hot_7_day_recall'],
+                         'rovScore': per_item[1], 'pushFrom': config_.PUSH_FROM['hot_recall'],
                          'abCode': self.ab_code}
                 except Exception as e:
                     continue