drop info

db_helper.py

@@ -426,7 +426,7 @@ class RedisHelper(object):
         st_time = time.time()
         conn = self.connect()
         data = conn.mget(keys=keys)
-        print(f"mget time: {(time.time() - st_time) * 1000}")
+        #print(f"mget time: {(time.time() - st_time) * 1000}")
         return data
 
 #hologres_info = config_.HOLOGRES_INFO

recommend.py

@@ -381,7 +381,7 @@ def new_video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     if region_code == '':
         region_code = '-1'
     
-    print("region_code:", region_code)
+    #print("region_code:", region_code)
 
     #size =1000
     pool_recall = PoolRecall(request_id=request_id,
@@ -483,7 +483,7 @@ 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]
@@ -1420,7 +1420,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
 
     # 简单召回 - 排序 - 兜底
     get_result_st = time.time()
-    print("ab_code:", ab_code)
+    #print("ab_code:", ab_code)
     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,

utils.py

@@ -475,7 +475,7 @@ class FilterVideos(object):
         # 获取对应端的过滤参数types
         st_time = time.time()
         types = config_.FILTER_VIEWED_TYPES_CONFIG.get(self.app_type, None)
-        print(types)
+        #print(types)
         if types is None:
             types = config_.FILTER_VIEWED_TYPES_CONFIG.get('other')
         if 6 in types:
@@ -622,40 +622,41 @@ 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_list:",len(filtered_result_list))
+        #print("filtered_result_list:",len(filtered_result_list))
         filtered_viewed_result = list(set(filtered_result_list[0]) & set(filtered_result_list[1]))
         #print(f"view&m_r res: {filtered_viewed_result}\nexecute_time: {(time.time() - st_viewed) * 1000}")
-        print("filtered:",len(filtered_viewed_result))
+        #print("filtered:",len(filtered_viewed_result))
         if not filtered_viewed_result:
-            print("12334")
             return None
         filtered_viewed_videos = [int(video_id) for video_id in filtered_viewed_result]
-        print("result:", len(filtered_viewed_videos))
-        if pool_type == 'flow':
+        #print("result:", len(filtered_viewed_videos))
+        if pool_type != 'flow':
+            return  filtered_viewed_videos
+        else:
             # 流量池视频需过滤屏蔽视频
             if region_code is None or shield_config is None:
                 return filtered_viewed_videos
-        else:
-            shield_key_name_list = shield_config.get(region_code, None)
-            if shield_key_name_list is not None:
-                filtered_shield_video_ids = self.filter_shield_video(
-                   video_ids=filtered_viewed_videos, shield_key_name_list=shield_key_name_list
-                )
-                log_.info({
-                    'logTimestamp': int(time.time() * 1000),
-                    'pool_type': pool_type,
-                    'request_id': self.request_id,
-                    'app_type': self.app_type,
-                    'mid': self.mid,
-                    'uid': self.uid,
-                    'operation': 'shield_filter',
-                    'request_videos': filtered_viewed_videos,
-                    'shield_filter_result': filtered_shield_video_ids,
-                    'executeTime': (time.time() - st_viewed) * 1000
-                 })
-                return filtered_shield_video_ids
             else:
-                return filtered_viewed_videos
+                shield_key_name_list = shield_config.get(region_code, None)
+                if shield_key_name_list is not None:
+                    filtered_shield_video_ids = self.filter_shield_video(
+                       video_ids=filtered_viewed_videos, shield_key_name_list=shield_key_name_list
+                    )
+                    log_.info({
+                        'logTimestamp': int(time.time() * 1000),
+                        'pool_type': pool_type,
+                        'request_id': self.request_id,
+                        'app_type': self.app_type,
+                        'mid': self.mid,
+                        'uid': self.uid,
+                        'operation': 'shield_filter',
+                        'request_videos': filtered_viewed_videos,
+                        'shield_filter_result': filtered_shield_video_ids,
+                        'executeTime': (time.time() - st_viewed) * 1000
+                     })
+                    return filtered_shield_video_ids
+                else:
+                    return filtered_viewed_videos
 
 
 if __name__ == '__main__':

video_rank.py

@@ -184,7 +184,7 @@ def video_new_rank(videoIds, fast_flow_set, flow_set, size, top_K, flow_pool_P):
         except Exception:
             video_items.append((videoIds[i], 0.0))
     sort_items = sorted(video_items, key=lambda k: k[1], reverse=True)
-    print("sort_items:", sort_items)
+    #print("sort_items:", sort_items)
     rov_recall_rank = sort_items
     fast_flow_recall_rank = []
     flow_recall_rank = []
@@ -238,8 +238,8 @@ def video_new_rank(videoIds, fast_flow_set, flow_set, size, top_K, flow_pool_P):
                 i += 1
                 if i>= left_quato:
                     break
-    print("rank_result:", rank_result)
-    print("add_flow_set:", add_flow_set)
+    #print("rank_result:", rank_result)
+    #print("add_flow_set:", add_flow_set)
     return rank_result[:size], add_flow_set
 
 

video_recall.py

@@ -2128,13 +2128,13 @@ class PoolRecall(object):
     def get_region_hour_recall(self, size=4, region_code='-1'):
         pool_key_prefix = config_.RECALL_KEY_NAME_PREFIX_REGION_BY_H
         recall_key = f"{pool_key_prefix}{region_code}:{self.data_key}:{self.rule_key}"
-        print("recall_key:", recall_key)
+        #print("recall_key:", recall_key)
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
-        print(data)
+        #print(data)
         recall_result = []
         if data is not None:
             json_result = json.loads(data)
-            print("json_result:", json_result)
+            #print("json_result:", json_result)
             for per_item in json_result:
                 recall_result.append(
                     {'videoId': per_item[0], 'flowPool': '',
@@ -2148,13 +2148,13 @@ class PoolRecall(object):
         """召回池召回视频"""
         pool_key_prefix = config_.RECALL_KEY_NAME_PREFIX_DUP1_REGION_24H_H
         recall_key = f"{pool_key_prefix}{region_code}:{self.data_key}:{self.rule_key}"
-        print("recall_key:", recall_key)
+        #print("recall_key:", recall_key)
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
         #print(data)
         recall_result = []
         if data is not None:
             json_result = json.loads(data)
-            print("json_result:", json_result)
+            #print("json_result:", json_result)
             for per_item in json_result:
                 recall_result.append(
                     {'videoId': per_item[0], 'flowPool': '',
@@ -2168,7 +2168,7 @@ class PoolRecall(object):
         """召回池召回视频"""
         pool_key_prefix = config_.RECALL_KEY_NAME_PREFIX_DUP2_REGION_24H_H
         recall_key = f"{pool_key_prefix}{region_code}:{self.data_key}:{self.rule_key}"
-        print("recall_key:", recall_key)
+        #print("recall_key:", recall_key)
         data = self.redis_helper.get_data_from_redis(key_name=recall_key)
         #print(data)
         recall_result = []