多样性需求

recommend.py

@@ -537,10 +537,10 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     elif ab_code == 60068 or ab_code == 60070 or ab_code == 60080 or ab_code == 60081 or ab_code == 60082 \
             or ab_code == 60083 or ab_code == 60084 or ab_code == 60085 or ab_code == 60086 \
             or ab_code == 60092 or ab_code == 60093 or ab_code == 60094 or ab_code == 60095 or ab_code == 60096\
-            or ab_code == 60097:
+            or ab_code == 60097 or ab_code == 60098:
         t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
         t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
-    elif ab_code == 60098:
+    elif ab_code == 60099:
         t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
         t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
         # todo:zhangbo
@@ -629,7 +629,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
             or ab_code == 60080 or ab_code == 60081 or ab_code == 60082 or ab_code == 60083 or ab_code == 60084\
             or ab_code == 60085 or ab_code == 60086 \
             or ab_code == 60092 or ab_code == 60093 or ab_code == 60094 or ab_code == 60095 or ab_code == 60096\
-            or ab_code == 60097:
+            or ab_code == 60097 or ab_code == 60098:
         rov_pool_recall = []
         if len(recall_result_list)>=2:
             region_recall = recall_result_list[0]
@@ -667,7 +667,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
             if len(rov_pool_recall)>0:
                 recall_result_list[0] = rov_pool_recall
     # merge新增的recall_strategy_trend_v1 60098
-    if ab_code == 60098:
+    if ab_code == 60099:
         rov_pool_recall = []
         if len(recall_result_list) >= 2:
             region_recall = recall_result_list[0]

video_rank.py

@@ -949,9 +949,9 @@ def video_new_rank3_4density(data, size, top_K, flow_pool_P, rank_key_prefix='ra
     video_ids = list(set(video_ids))
     video_tag_dict = get_video_tags(redis_helper, video_ids)
     for v in rov_recall_rank:
-        v["tags"] = video_tag_dict.get(v, [])
+        v["tags"] = video_tag_dict.get(v["videoId"], [])
     for v in flow_recall_rank:
-        v["tags"] = video_tag_dict.get(v, [])
+        v["tags"] = video_tag_dict.get(v["videoId"], [])
 
     rank_result = []
     flow_pool_recall_process['recall_duplicate_res'] = {'rov_recall_rank': rov_recall_rank,
@@ -966,6 +966,7 @@ def video_new_rank3_4density(data, size, top_K, flow_pool_P, rank_key_prefix='ra
         # 按概率 p 及score排序获取 size - k 个视频
     flow_num = 0
     i = 0
+    # print("zb-flow_pool_recall_process:" + str(flow_pool_recall_process))
     # print("zb-density_rules:" + str(density_rules))
     # print("zb-2:" + str([i for i in rov_recall_rank if i["videoId"] not in [j["videoId"] for j in rank_result[:size]]]))
     # print("zb-3:" + str([i for i in flow_recall_rank if i["videoId"] not in [j["videoId"] for j in rank_result[:size]]]))