Merge branch 'abtest-112-20220823' into dev

config.py

@@ -183,10 +183,10 @@ class BaseConfig(object):
         #     'data_key': 'data6', 'rule_key': 'rule3',
         #     'ab_code': AB_CODE['region_rank_by_h'].get('region_rule_rank4_appType_6_data3')
         # },  # 票圈短视频：data-[内容精选,vlog, 票圈视频,票圈短视频], rule-rule3
-        '112': {
-            'data_key': 'data1', 'rule_key': 'rule4',
-            'ab_code': AB_CODE['region_rank_by_h'].get('abtest_112')
-        },  # 召回定位优化实验
+        # '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')

video_recall.py

@@ -1797,19 +1797,21 @@ class PoolRecall(object):
                                 'pushFrom': push_from, 'abCode': self.ab_code}
                                for item in filtered_result if video_score.get(int(item)) is not None]
                 pool_recall_result.extend(temp_result)
-            else:
-                # 将此次获取的末位视频id同步刷新到Redis中，方便下次快速定位到召回位置，过期时间为1天
-                if self.mid and self.ab_code != config_.AB_CODE['region_rank_by_h'].get('abtest_112'):
-                    # mid为空时，不做记录
-                    last_video_key = f'{last_video_key_prefix}{self.app_type}:{self.mid}'
-                    self.redis_helper.set_data_to_redis(key_name=last_video_key, value=data[-1][0],
-                                                        expire_time=expire_time)
+            # else:
+            #     # 将此次获取的末位视频id同步刷新到Redis中，方便下次快速定位到召回位置，过期时间为1天
+            #     if self.mid and self.ab_code != config_.AB_CODE['region_rank_by_h'].get('abtest_112'):
+            #         # mid为空时，不做记录
+            #         last_video_key = f'{last_video_key_prefix}{self.app_type}:{self.mid}'
+            #         self.redis_helper.set_data_to_redis(key_name=last_video_key, value=data[-1][0],
+            #                                             expire_time=expire_time)
             idx += get_size
 
         pool_recall_result.sort(key=lambda x: x.get('rovScore', 0), reverse=True)
 
-        if len(recall_data) > 0 and len(pool_recall_result) == 0 \
-                and self.ab_code == config_.AB_CODE['region_rank_by_h'].get('abtest_112') and self.mid:
+        # if len(recall_data) > 0 and len(pool_recall_result) == 0 \
+        #         and self.ab_code == config_.AB_CODE['region_rank_by_h'].get('abtest_112') and self.mid:
+
+        if len(recall_data) > 0 and len(pool_recall_result) == 0 and self.mid:
             # 召回数据不为空 & 过滤后结果为空 & 位于实验组 & mid不为空时，更新召回获取的末位视频id记录到定位的key中
             last_video_key = f'{last_video_key_prefix}{self.app_type}:{self.mid}'
             self.redis_helper.set_data_to_redis(key_name=last_video_key, value=recall_data[-1][0],