浏览代码

update log

linfan 1 年之前
父节点
当前提交
2e3c3b2704
共有 3 个文件被更改,包括 18 次插入14 次删除
  1. 13 9
      recommend.py
  2. 3 3
      video_rank.py
  3. 2 2
      video_recall.py

+ 13 - 9
recommend.py

@@ -384,7 +384,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     gevent.joinall(t)
     recall_result_list = [i.get() for i in t]
 
-    print(recall_result_list)
+    #print(recall_result_list)
     if len(recall_result_list)<0:
         result['recallResult']= []
         result['rankResult'] = []
@@ -394,7 +394,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         if len(recall_result_list)>=4:
             region_recall = recall_result_list[0]
             sim_recall = recall_result_list[3]
-            print("sim:",sim_recall)
+            #print("sim:",sim_recall)
             now_video_ids = set('')
             if len(region_recall)>0:
                 for video in region_recall:
@@ -405,7 +405,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
             if len(sim_recall)>0:
                 for video in sim_recall:
                     video_id = video.get('videoId')
-                    print("sim video_id:", video_id)
+                    #print("sim video_id:", video_id)
                     if video_id not in now_video_ids:
                         rov_pool_recall.append(video)
                         now_video_ids.add(video_id)
@@ -1518,6 +1518,8 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
         update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     elif ab_code == 60050 or  ab_code == 60051:
         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054:
+        update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     else:
         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     # log_.info({
@@ -1639,12 +1641,14 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
 
     # redis数据刷新
     update_redis_st = time.time()
-    # if ab_code == 60047 or ab_code == 60048 or  ab_code == 60049:
-    #     update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
-    # elif ab_code == 60050 or ab_code == 60051:
-    #     update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
-    # else:
-    #     update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    if ab_code == 60047 or ab_code == 60048 or  ab_code == 60049:
+         update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    elif ab_code == 60050 or ab_code == 60051:
+         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054:
+         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    else:
+         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     # log_.info({
     #     'logTimestamp': int(time.time() * 1000),
     #     'request_id': request_id,

+ 3 - 3
video_rank.py

@@ -610,16 +610,16 @@ def video_new_rank2(data, size, top_K, flow_pool_P, ab_code):
     pre_str = "k_p:"
     if ab_code==60053 or ab_code==60054:
         pre_str = "k_p2:"
-    print("pre_str:", pre_str)
+    #print("pre_str:", pre_str)
     for recall_item in data['rov_pool_recall']:
         if len(recall_item)<=0:
             continue
         vid = recall_item.get("videoId",0)
         vidKeys.append(pre_str+ str(vid))
         recall_list.append(recall_item)
-    print("vidKeys:", vidKeys)
+    #print("vidKeys:", vidKeys)
     video_scores = redisObj.get_batch_key(vidKeys)
-    print("video_score:",video_scores)
+    #print("video_score:",video_scores)
     for i in range(len(video_scores)):
          try:
             # print(video_scores[i])

+ 2 - 2
video_recall.py

@@ -2148,13 +2148,13 @@ class PoolRecall(object):
         if len(video_ids)<=0:
             return  recall_result
         video_ids = video_ids[:50]
-        print(video_ids)
+        #print(video_ids)
         filter_ = FilterVideos(request_id=self.request_id,
                                app_type=self.app_type, mid=self.mid, uid=self.uid, video_ids=video_ids)
         filtered_viewed_videos = filter_.filter_videos(pool_type='rov')
         if filtered_viewed_videos is None:
             return recall_result
-        print("filtered_viewed_videos:", filtered_viewed_videos)
+        #print("filtered_viewed_videos:", filtered_viewed_videos)
         for vid in filtered_viewed_videos:
             if vid in recall_dict:
                 recall_result.append(recall_dict[vid])