Merge branch 'feature_2023112716_liqian_abtest_510_update' into pre-master

recommend.py

@@ -1570,38 +1570,38 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, mid, app_typ
             #         no_op_flag = True
 
             # 老好看视频 宗教人群实验
-            if '228' in ab_exp_code_list:
-                # 天主教
-                religion_param = config_.AB_EXP_CODE['228']
-                religion_class_name = religion_param.get('religion_class_name')
-                religion_class_flag = get_religion_class_with_mid(mid=mid, religion_class_name=religion_class_name)
-                if religion_class_flag == 1:
-                    ab_code = religion_param.get('ab_code')
-                    rule_key = religion_param.get('rule_key')
-                    data_key = religion_param.get('data_key')
-                    rule_key_30day = religion_param.get('30day_rule_key')
-
-            elif '229' in ab_exp_code_list:
-                # 基督教
-                religion_param = config_.AB_EXP_CODE['229']
-                religion_class_name = religion_param.get('religion_class_name')
-                religion_class_flag = get_religion_class_with_mid(mid=mid, religion_class_name=religion_class_name)
-                if religion_class_flag == 1:
-                    ab_code = religion_param.get('ab_code')
-                    rule_key = religion_param.get('rule_key')
-                    data_key = religion_param.get('data_key')
-                    rule_key_30day = religion_param.get('30day_rule_key')
-
-            else:
-                for code, param in config_.AB_EXP_CODE.items():
-                    if code in ab_exp_code_list:
-                        ab_code = param.get('ab_code')
-                        rule_key = param.get('rule_key')
-                        data_key = param.get('data_key')
-                        rule_key_30day = param.get('30day_rule_key')
-                        shield_config = param.get('shield_config', config_.SHIELD_CONFIG)
-                        rank_key_prefix = param.get('rank_key_prefix', 'rank:score1:')
-                        break
+            # if '228' in ab_exp_code_list:
+            #     # 天主教
+            #     religion_param = config_.AB_EXP_CODE['228']
+            #     religion_class_name = religion_param.get('religion_class_name')
+            #     religion_class_flag = get_religion_class_with_mid(mid=mid, religion_class_name=religion_class_name)
+            #     if religion_class_flag == 1:
+            #         ab_code = religion_param.get('ab_code')
+            #         rule_key = religion_param.get('rule_key')
+            #         data_key = religion_param.get('data_key')
+            #         rule_key_30day = religion_param.get('30day_rule_key')
+
+            # elif '229' in ab_exp_code_list:
+            #     # 基督教
+            #     religion_param = config_.AB_EXP_CODE['229']
+            #     religion_class_name = religion_param.get('religion_class_name')
+            #     religion_class_flag = get_religion_class_with_mid(mid=mid, religion_class_name=religion_class_name)
+            #     if religion_class_flag == 1:
+            #         ab_code = religion_param.get('ab_code')
+            #         rule_key = religion_param.get('rule_key')
+            #         data_key = religion_param.get('data_key')
+            #         rule_key_30day = religion_param.get('30day_rule_key')
+
+            
+            for code, param in config_.AB_EXP_CODE.items():
+                if code in ab_exp_code_list:
+                    ab_code = param.get('ab_code')
+                    rule_key = param.get('rule_key')
+                    data_key = param.get('data_key')
+                    rule_key_30day = param.get('30day_rule_key')
+                    shield_config = param.get('shield_config', config_.SHIELD_CONFIG)
+                    rank_key_prefix = param.get('rank_key_prefix', 'rank:score1:')
+                    break
 
             """
             # 推荐条数 10->4 实验

video_recall.py

@@ -2026,6 +2026,7 @@ class PoolRecall(object):
         if region_code == '-1':
             t = [
                 # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'day_24h'),
+                gevent.spawn(self.recall_region_dup_24h, region_code, size, 'h', expire_time),
                 gevent.spawn(self.recall_region_dup_24h, region_code, size, '24h_dup2', expire_time),
                 gevent.spawn(self.recall_region_dup_24h, region_code, size, '24h_dup3', expire_time)
             ]