Merge branch 'add_user_tag_20230607' into test

config.py

@@ -972,6 +972,14 @@ class BaseConfig(object):
             'group_class_key': 'class1',
             'no_ad_mid_group_list': NO_AD_MID_GROUP_LIST['class1']
         },  # 所有广告类型本端数据 + 优化1
+        '195-f': {
+            'video': {'data': 'videos5'},
+            'user': {'data': 'user5', 'rule': 'rule2'},
+            'group_class_key': 'class1',
+            'no_ad_mid_group_list': NO_AD_MID_GROUP_LIST['class1'],
+            'care_model_status_param': 1,
+            'care_model_ab_mid_group': 'mean_group',
+        },  # 所有广告类型本端数据 + 优化1 + else非关怀模式人群多出广告
 
         # 票圈短视频
         '196-a': {

utils.py

@@ -341,7 +341,7 @@ class FilterVideos(object):
         if not filtered_viewed_result:
             return None
         filtered_viewed_videos = [int(video_id) for video_id in filtered_viewed_result]
-        if pool_type == 'flow':
+        if pool_type == 'flow' or pool_type=='normal':
             # 流量池视频需过滤屏蔽视频
             if region_code is None or shield_config is None:
                 return filtered_viewed_videos

video_rank.py

@@ -721,8 +721,8 @@ def video_sanke_rank(data, size, top_K, flow_pool_P, ab_Code='', exp_config=None
     """
     if not data['rov_pool_recall'] and not data['flow_pool_recall'] \
             and not data['u2i_recall'] and not data['u2i_recall'] \
-            and not data['u2i_recall'] and not data['u2i_recall'] \
-            and not data['u2i_recall'] and not data['u2i_recall']:
+            and not data['w2v_recall'] and not data['w2v_recall'] \
+            and not data['sim_recall'] and not data['sim_recall']:
         return [], 0
     # 地域分组小时级规则更新数据
     recall_dict = {}

video_recall.py

@@ -2177,7 +2177,7 @@ class PoolRecall(object):
         #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')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         print("filtered_viewed_videos:", filtered_viewed_videos)
@@ -2416,7 +2416,7 @@ class PoolRecall(object):
         #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')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         #print("filtered_viewed_videos:", filtered_viewed_videos)
@@ -2494,7 +2494,7 @@ class PoolRecall(object):
         # 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')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         # print("filtered_viewed_videos:", filtered_viewed_videos)
@@ -2532,7 +2532,7 @@ class PoolRecall(object):
         #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')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         #print("filtered_viewed_videos:", filtered_viewed_videos)
@@ -2706,7 +2706,7 @@ class PoolRecall(object):
         #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')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         #print("filtered_viewed_videos:", filtered_viewed_videos)