update

recommend.py

@@ -62,13 +62,16 @@ def relevant_video_top_recommend(app_type, mid, uid, head_vid, videos, size):
 
     # 与现有排序结果 进行合并重排
     # 获取现有排序结果中流量池视频 及其位置
+    relevant_ids = [item['videoId'] for item in relevant_videos_in_effect]
     flow_pool_videos = []
     other_videos = []
     for i, item in enumerate(videos):
-        if item.get('pushFrom', None) == config_.PUSH_FROM['flow_recall']:
+        if item.get('pushFrom', None) == config_.PUSH_FROM['flow_recall'] and item.get('videoId') not in relevant_ids:
             flow_pool_videos.append((i, item))
-        else:
+        elif item.get('videoId') not in relevant_ids:
             other_videos.append(item)
+        else:
+            continue
     # 重排，保持流量池视频位置不变
     rank_result = relevant_videos_in_effect + other_videos
     for i, item in flow_pool_videos: