add abtest:117 & update rov_pool_recall_with_region

config.py

@@ -122,6 +122,7 @@ class BaseConfig(object):
             'region_rule_rank6_appType_13_data2': 60017,
             'abtest_112': 60018,
             'abtest_082': 60019,
+            'abtest_117': 60020,
         },  # 地域分组小时级规则实验
 
         'rank_by_24h': {
@@ -182,7 +183,11 @@ class BaseConfig(object):
         '112': {
             'data_key': 'data1', 'rule_key': 'rule4',
             'ab_code': AB_CODE['region_rank_by_h'].get('abtest_112')
-        }  # 召回定位优化实验
+        },  # 召回定位优化实验
+        '117': {
+            'data_key': 'data6', 'rule_key': 'rule7',
+            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_117')
+        },  # vlog 全数据实验 data-[vlog: 0.25, 票圈视频: 0.25, 票圈视频: 0.25, 票圈短视频: 0.25], rule-rule7
     }
 
     # 小程序小时级列表key不同实验标识

video_recall.py

@@ -1190,60 +1190,41 @@ class PoolRecall(object):
         if province_code == '':
             province_code = '-1'
 
-        # if self.ab_code == config_.AB_CODE['region_rank_by_h'].get('region_rule_rank2'):
-        #     if province_code == '-1':
-        #         t = [gevent.spawn(self.region_dup_recall, province_code, 2, size, expire_time)]
-        #     else:
-        #         t = [gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'region_24h'),
-        #              gevent.spawn(self.region_dup_recall, province_code, 2, size, expire_time)]
-
-        # if self.ab_code == config_.AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1'):
-        if self.ab_code in [config_.AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1'),
-                            config_.AB_CODE['region_rank_by_h'].get('abtest_082'),
-                            config_.AB_CODE['region_rank_by_h'].get('abtest_112')]:
-
-            if province_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, province_code, size, '24h_dup2', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup3', expire_time)]
-            else:
-                t = [
-                    # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size),
-                     # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'region_24h'),
-                     # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'day_24h'),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_h', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_24h', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup2', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup3', expire_time)]
-        # elif self.ab_code == config_.AB_CODE['region_rank_by_h'].get('region_rule_rank6_appType_0_data1'):
+        # if self.ab_code in [config_.AB_CODE['region_rank_by_h'].get('region_rule_rank5_appType_0_data1'),
+        #                     config_.AB_CODE['region_rank_by_h'].get('abtest_082'),
+        #                     config_.AB_CODE['region_rank_by_h'].get('abtest_112')]:
+
+        if province_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, province_code, size, '24h_dup2', expire_time),
+                 gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup3', expire_time)]
+        else:
+            t = [
+                # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size),
+                 # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'region_24h'),
+                 # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'day_24h'),
+                 gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_h', expire_time),
+                 gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_24h', expire_time),
+                 gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup2', expire_time),
+                 gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup3', expire_time)]
+        # else:
         #     if province_code == '-1':
-        #         t = [
-        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup2', expire_time),
-        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup3', expire_time)]
+        #         # t = [gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'day_24h')]
+        #         t = [gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup2', expire_time)]
+        #
         #     else:
         #         t = [
+        #             # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size),
+        #              # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'region_24h'),
+        #              # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'day_24h'),
         #              gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_h', expire_time),
         #              gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_24h', expire_time),
-        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup2', expire_time),
-        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, '48h_dup3', expire_time)]
-        else:
-            if province_code == '-1':
-                # t = [gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'day_24h')]
-                t = [gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup2', expire_time)]
-
-            else:
-                t = [
-                    # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size),
-                     # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'region_24h'),
-                     # gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size, 'day_24h'),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_h', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, 'region_24h', expire_time),
-                     gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup2', expire_time),
-
-                     # gevent.spawn(self.region_dup_recall, province_code, 1, size, expire_time),
-                     # gevent.spawn(self.region_dup_recall, province_code, 2, size, expire_time)
-                     ]
+        #              gevent.spawn(self.recall_region_dup_24h, province_code, size, '24h_dup2', expire_time),
+        #
+        #              # gevent.spawn(self.region_dup_recall, province_code, 1, size, expire_time),
+        #              # gevent.spawn(self.region_dup_recall, province_code, 2, size, expire_time)
+        #              ]
         gevent.joinall(t)
         region_recall_result_list = [i.get() for i in t]
         # 将已获取到的视频按顺序去重合并