Merge branch 'ad-abtest-update-2023051811' into dev

config.py

@@ -10,7 +10,7 @@ class BaseConfig(object):
         'LOVE_LIVE': 4,  # 票圈视频
         'LONG_VIDEO': 5,  # 内容精选
         'SHORT_VIDEO': 6,  # 票圈短视频
-        'WAN_NENG_VIDEO': 17,  # 万能影视屋
+        'WAN_NENG_VIDEO': 17,  # 万能影视屋(票圈|信仰之路)
         'LAO_HAO_KAN_VIDEO': 18,  # 老好看视频
         'ZUI_JING_QI': 19,  # 票圈最惊奇
         'APP': 13,  # 票圈视频APP
@@ -145,7 +145,9 @@ class BaseConfig(object):
             'abtest_262': 60046,
             'abtest_316': 60047,
             'abtest_319': 60048,
-            'abtest_320': 60049
+            'abtest_320': 60049,
+            'abtest_322': 60050,
+            'abtest_323': 60051,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -330,9 +332,13 @@ class BaseConfig(object):
             'data_key': 'data10', 'rule_key': 'rule19',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_319')
         },
-        '320': {
-            'data_key': 'data10', 'rule_key': 'rule19',
-            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_320')
+        '322': {
+            'data_key': 'data10', 'rule_key': 'rule7',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_322')
+        },
+        '323': {
+            'data_key': 'data10', 'rule_key': 'rule7',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_323')
         }
     }
 
@@ -1049,6 +1055,16 @@ class BaseConfig(object):
             'group_class_key': 'class1',
             'no_ad_mid_group_list': NO_AD_MID_GROUP_LIST['class1']
         },  # 所有广告类型本端数据
+
+        # 票圈|信仰之路
+        '324-a': {
+            'video': {'data': 'videos0'},
+            'user': {'data': 'user0', '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',
+        },  # 未开启关怀模式人群多出广告 + 所有广告类型数据
     }
 
     # 用户组有广告时的分享率预测结果存放 redis key 前缀，完整格式：ad:users:group:predict:share:rate:{user_data_key}:{date}

recommend.py

@@ -1342,6 +1342,15 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
                              rule_key=rule_key, data_key=data_key,
                              no_op_flag=no_op_flag, old_video_index=old_video_index,
                              params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
+    elif ab_code == 60050 or ab_code == 60051:
+        result = video_recommend(request_id=request_id,
+                                 mid=mid, uid=uid, app_type=app_type,
+                                 size=size, top_K=top_K, flow_pool_P=flow_pool_P,
+                                 algo_type=algo_type, client_info=client_info,
+                                 ab_code=ab_code, expire_time=expire_time,
+                                 rule_key=rule_key, data_key=data_key,
+                                 no_op_flag=no_op_flag, old_video_index=old_video_index,
+                                 params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
     else:
         result = video_recommend(request_id=request_id,
                              mid=mid, uid=uid, app_type=app_type,
@@ -1373,6 +1382,8 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     update_redis_st = time.time()
     if ab_code == 60047 or  ab_code == 60048 or  ab_code == 60049:
         update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    elif ab_code == 60050 or  ab_code == 60051:
+        update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     else:
         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     # log_.info({
@@ -1446,6 +1457,15 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
                                  old_video_index=old_video_index, video_id=video_id,
                                  params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
         # log_.info({
+    elif ab_code == 60050 or ab_code == 60051:
+        result = video_recommend(request_id=request_id,
+                                 mid=mid, uid=uid, app_type=app_type,
+                                 size=size, top_K=top_K, flow_pool_P=flow_pool_P,
+                                 algo_type='', client_info=client_info,
+                                 ab_code=ab_code, expire_time=expire_time,
+                                 rule_key=rule_key, data_key=data_key, no_op_flag=no_op_flag,
+                                 old_video_index=old_video_index, video_id=video_id,
+                                 params=params, rule_key_30day=rule_key_30day, shield_config=shield_config)
     else:
         result = video_recommend(request_id=request_id,
                              mid=mid, uid=uid, app_type=app_type,
@@ -1478,6 +1498,8 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
     update_redis_st = time.time()
     if ab_code == 60047 or ab_code == 60048 or  ab_code == 60049:
         update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    elif ab_code == 60050 or ab_code == 60051:
+        update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     else:
         update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     # log_.info({