Merge branch 'feature_2023060711_liqian_add_ad_abtest_195-f' 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': {

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 = {}