全量过滤

config.py

@@ -989,10 +989,10 @@ class BaseConfig(object):
 
     # 调用后端接口过滤参数配置 1-已观看 2-视频状态 3-是否进入老年人社区 4-话题状态 5-推荐状态 6-白名单过滤 7-涉政视频过滤
     FILTER_VIEWED_TYPES_CONFIG = {
-        APP_TYPE['VLOG']: (1, 6,),  # vlog
-        APP_TYPE['LOVE_LIVE']: (1, 6,),  # 票圈视频
-        APP_TYPE['APP']: (1,),  # 票圈视频APP
-        'other': (1, 6, 7,),  # 其他
+        APP_TYPE['VLOG']: (1, 6, 8,),  # vlog
+        APP_TYPE['LOVE_LIVE']: (1, 6, 8,),  # 票圈视频
+        APP_TYPE['APP']: (1, 8,),  # 票圈视频APP
+        'other': (1, 6, 7, 8,),  # 其他
     }
 
     # 召回池分发视频在流量池中存在，该视频是否进行本地分发数-1 开关，1-开/0-关

utils.py

@@ -404,7 +404,7 @@ class FilterVideos(object):
 
         # 视频已曝光过滤
         st_viewed = time.time()
-        filtered_viewed_result = self.filter_video_viewed(video_ids=filtered_pre_result)
+        filtered_viewed_result = self.filter_video_viewed(video_ids=filtered_pre_result, region_code=region_code)
         # print("filtered_pre:", (time.time() - st_viewed) * 1000)
         # et_viewed = time.time()
         # log_.info({
@@ -516,7 +516,7 @@ class FilterVideos(object):
     #     filtered_videos = [int(temp[0]) for temp in data]
     #     return filtered_videos
 
-    def filter_video_viewed(self, video_ids, types=(1, 6,)):
+    def filter_video_viewed(self, video_ids, region_code, types=(1, 6,)):
         """
         调用后端接口过滤用户已观看视频
         :param video_ids: 视频id列表 type-list
@@ -532,7 +532,9 @@ class FilterVideos(object):
                         "mid": self.mid,
                         "uid": self.uid,
                         "types": list(types),
-                        "videoIds": video_ids}
+                        "videoIds": video_ids,
+                        "cityCode": region_code
+                        }
         # print(request_data)
         # 调用http接口
         result = request_post(request_url=config_.VIDEO_FILTER_URL, request_data=request_data, timeout=(0.1, 1))
@@ -798,7 +800,7 @@ class FilterVideos(object):
 
         # 视频已曝光过滤
         st_viewed = time.time()
-        filtered_viewed_result = self.filter_video_viewed_status(video_ids=filtered_pre_result)
+        filtered_viewed_result = self.filter_video_viewed_status(video_ids=filtered_pre_result, region_code=region_code)
         # print("filtered_pre:", (time.time() - st_viewed) * 1000)
         # et_viewed = time.time()
         # log_.info({
@@ -846,7 +848,7 @@ class FilterVideos(object):
         #             return filtered_viewed_videos
         # else:
         #     return filtered_viewed_videos
-    def filter_video_viewed_status(self, video_ids, types=(1, 6,)):
+    def filter_video_viewed_status(self, video_ids, region_code, types=(1, 6,)):
         """
                    调用后端接口过滤用户已观看视频
                    :param video_ids: 视频id列表 type-list
@@ -864,7 +866,9 @@ class FilterVideos(object):
                         "mid": self.mid,
                         "uid": self.uid,
                         "types": types,
-                        "videoIds": video_ids}
+                        "videoIds": video_ids,
+                        "cityCode": region_code
+                        }
         # print(request_data)
         # 调用http接口
         result = request_post(request_url=config_.VIDEO_FILTER_URL, request_data=request_data, timeout=(0.1, 1))