update filter

utils.py

@@ -127,18 +127,19 @@ class FilterVideos(object):
         if not filtered_pre_result:
             return None
 
+        # 视频状态过滤采用离线定时过滤方案
         # 视频状态过滤
-        st_status = time.time()
-        filtered_status_result = self.filter_video_status(video_ids=filtered_pre_result)
-        et_status = time.time()
-        log_.info('filter by video status: result = {}, execute time = {}ms'.format(
-            filtered_status_result, (et_status - st_status) * 1000))
-        if not filtered_status_result:
-            return None
+        # st_status = time.time()
+        # filtered_status_result = self.filter_video_status(video_ids=filtered_pre_result)
+        # et_status = time.time()
+        # log_.info('filter by video status: result = {}, execute time = {}ms'.format(
+        #     filtered_status_result, (et_status - st_status) * 1000))
+        # if not filtered_status_result:
+        #     return None
 
         # 视频已曝光过滤
         st_viewed = time.time()
-        filtered_viewed_result = self.filter_video_viewed(video_ids=filtered_status_result)
+        filtered_viewed_result = self.filter_video_viewed(video_ids=filtered_pre_result)
         et_viewed = time.time()
         log_.info('filter by viewed: app_type = {}, mid = {}, uid = {}, result = {}, execute time = {}ms'.format(
             self.app_type, self.mid, self.uid, filtered_viewed_result, (et_viewed - st_viewed) * 1000))

video_rank.py

@@ -111,13 +111,14 @@ def bottom_strategy(size, app_type, ab_code):
         bottom_data = bottom_strategy_last(size=size, app_type=app_type, ab_code=ab_code)
         return bottom_data
 
+    # 视频状态过滤采用离线定时过滤方案
     # 状态过滤
-    filter_videos = FilterVideos(app_type=app_type, video_ids=data)
-    filtered_data = filter_videos.filter_video_status(video_ids=data)
-    if len(filtered_data) > size:
-        random_data = numpy.random.choice(filtered_data, size, False)
+    # filter_videos = FilterVideos(app_type=app_type, video_ids=data)
+    # filtered_data = filter_videos.filter_video_status(video_ids=data)
+    if len(data) > size:
+        random_data = numpy.random.choice(data, size, False)
     else:
-        random_data = filtered_data
+        random_data = data
     bottom_data = [{'videoId': item, 'pushFrom': 'bottom_strategy', 'abCode': ab_code} for item in random_data]
     return bottom_data
 
@@ -133,11 +134,12 @@ def bottom_strategy_last(size, app_type, ab_code):
     redis_helper = RedisHelper()
     bottom_data = redis_helper.get_data_zset_with_index(key_name=config_.BOTTOM_KEY_NAME, start=0, end=-1)
     random_data = numpy.random.choice(bottom_data, size * 30, False)
+    # 视频状态过滤采用离线定时过滤方案
     # 状态过滤
-    filter_videos = FilterVideos(app_type=app_type, video_ids=random_data)
-    filtered_data = filter_videos.filter_video_status(video_ids=random_data)
+    # filter_videos = FilterVideos(app_type=app_type, video_ids=random_data)
+    # filtered_data = filter_videos.filter_video_status(video_ids=random_data)
     bottom_data = [{'videoId': video_id, 'pushFrom': 'bottom_strategy_last', 'abCode': ab_code}
-                   for video_id in filtered_data[:size]]
+                   for video_id in random_data[:size]]
     return bottom_data