Browse Source

update drop info

linfan 1 year ago
parent
commit
0b58251a90
2 changed files with 14 additions and 14 deletions
  1. 8 8
      recommend.py
  2. 6 6
      utils.py

+ 8 - 8
recommend.py

@@ -396,10 +396,10 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
              ]
     else:
         t = [
-             #gevent.spawn(pool_recall.get_region_hour_recall, size, region_code),
-             #gevent.spawn(pool_recall.get_region_day_recall, size, region_code),
-             #gevent.spawn(pool_recall.get_selected_recall, size, region_code),
-             #gevent.spawn(pool_recall.get_no_selected_recall, size, region_code),
+             gevent.spawn(pool_recall.get_region_hour_recall, size, region_code),
+             gevent.spawn(pool_recall.get_region_day_recall, size, region_code),
+             gevent.spawn(pool_recall.get_selected_recall, size, region_code),
+             gevent.spawn(pool_recall.get_no_selected_recall, size, region_code),
              gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
              gevent.spawn(pool_recall.flow_pool_recall, size)]
 
@@ -409,7 +409,7 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     # all recall_result
     all_recall_result_list = [i.get() for i in t]
     all_recall_result = []
-    print(all_recall_result_list)
+    #print(all_recall_result_list)
     result['recallTime'] = (time.time() - start_recall) * 1000
 
     if not all_recall_result_list or len(all_recall_result_list)==0:
@@ -466,7 +466,7 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         else:
             recall_name = recall_dict[vId] + "," + recall_name
             recall_dict[vId] = recall_name
-    print("recall_dict:", recall_dict)
+    #print("recall_dict:", recall_dict)
     #3. filter video, 先过预曝光
     filter_ = FilterVideos(request_id=request_id,
                            app_type=app_type, mid=mid, uid=uid, video_ids=list(recall_dict.keys()))
@@ -489,12 +489,12 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     rank_result= []
     if ab_code==60048 or ab_code==60049:
         rank_ids, add_flow_set = video_new_rank(videoIds=all_recall_list,fast_flow_set=fast_flow_set, flow_set=flow_flow_set,size=size, top_K=top_K, flow_pool_P=float(flow_pool_P))
-        print("rank_ids:", rank_ids)
+        #print("rank_ids:", rank_ids)
         for rank_item in rank_ids:
             rank_id = rank_item[0]
             rank_score = rank_item[1]
             pushFrom = recall_dict.get(rank_id, '')
-            print(pushFrom, rank_id)
+            #print(pushFrom, rank_id)
             flowPoolFlag = ''
             if rank_id in add_flow_set:
                 flowPoolFlag = flowFlag_dict.get(rank_id,'') 

+ 6 - 6
utils.py

@@ -610,12 +610,12 @@ class FilterVideos(object):
         """视频过滤"""
         # 预曝光过滤
         st_pre = time.time()
-        print("self.video_ids:", len(self.video_ids))
+        #print("self.video_ids:", len(self.video_ids))
         filtered_pre_result = self.filter_video_previewed(self.video_ids)
         if not filtered_pre_result:
             return None
-        print("filtered_pre_result:", len(filtered_pre_result))
-        print(filtered_pre_result)
+        #print("filtered_pre_result:", len(filtered_pre_result))
+        #print(filtered_pre_result)
         # 视频已曝光过滤/白名单过滤
         st_viewed = time.time()
         t = [
@@ -623,8 +623,8 @@ class FilterVideos(object):
             gevent.spawn(self.filter_movie_religion_video, filtered_pre_result)]
         gevent.joinall(t)
         filtered_result_list = [i.get() for i in t]
-        print("filtered_result_list1:",filtered_result_list[0])
-        print("filtered_result_list2:",filtered_result_list[1])
+        #print("filtered_result_list1:",filtered_result_list[0])
+        #print("filtered_result_list2:",filtered_result_list[1])
         filtered_viewed_set = set('')
         for i in filtered_result_list[0]:
             filtered_viewed_set.add(int(i))
@@ -637,7 +637,7 @@ class FilterVideos(object):
         if not filtered_viewed_result:
             return None
         filtered_viewed_videos = [int(video_id) for video_id in filtered_viewed_result]
-        print("result:", filtered_viewed_videos)
+        #print("result:", filtered_viewed_videos)
         if pool_type != 'flow':
             return  filtered_viewed_videos
         else: