liqian před 1 rokem
rodič
revize
b35ba480de
2 změnil soubory, kde provedl 13 přidání a 13 odebrání
  1. 9 9
      recommend.py
  2. 4 4
      video_recall.py

+ 9 - 9
recommend.py

@@ -231,12 +231,12 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
         #     t.append(gevent.spawn(pool_recall.get_return_video_reall))
     elif flow_pool_abtest_group == 'experimental_flow_set_level':
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
-             gevent.spawn(pool_recall.flow_pool_recall_new_with_level, size, config_.QUICK_FLOW_POOL_ID),
-             gevent.spawn(pool_recall.flow_pool_recall_new_with_level, size)]
+             gevent.spawn(pool_recall.flow_pool_recall_new_with_level, size, config_.QUICK_FLOW_POOL_ID, flow_pool_abtest_group),
+             gevent.spawn(pool_recall.flow_pool_recall_new_with_level, size, flow_pool_abtest_group)]
     else:
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
-             gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
-             gevent.spawn(pool_recall.flow_pool_recall, size)]
+             gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID, flow_pool_abtest_group),
+             gevent.spawn(pool_recall.flow_pool_recall, size, flow_pool_abtest_group)]
     if ab_code == 60058:
         t.append(gevent.spawn(pool_recall.get_U2I_reall, mid))
         t.append(gevent.spawn(pool_recall.get_play_reall, mid))
@@ -465,12 +465,12 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         #     t.append(gevent.spawn(pool_recall.get_return_video_reall, 'rv2:'))
     elif flow_pool_abtest_group == 'experimental_flow_set_level':
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
-             gevent.spawn(pool_recall.flow_pool_recall_new_with_level, size, config_.QUICK_FLOW_POOL_ID),
-             gevent.spawn(pool_recall.flow_pool_recall_new_with_level, size)]
+             gevent.spawn(pool_recall.flow_pool_recall_new_with_level, size, config_.QUICK_FLOW_POOL_ID, flow_pool_abtest_group),
+             gevent.spawn(pool_recall.flow_pool_recall_new_with_level, size, flow_pool_abtest_group)]
     else:
         t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time),
-             gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
-             gevent.spawn(pool_recall.flow_pool_recall, size)]
+             gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID, flow_pool_abtest_group),
+             gevent.spawn(pool_recall.flow_pool_recall, size, flow_pool_abtest_group)]
     if ab_code == 60054 or ab_code == 60066 or ab_code == 60072 or ab_code == 60073 or ab_code == 60074:
         t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
     elif ab_code == 60056 or ab_code == 60071:
@@ -1736,7 +1736,7 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, mid, app_typ
     for key, items in flow_pool_abtest_config.items():
         if int(flow_pool_id_choice) in items:
             flow_pool_abtest_group = key
-    log_.info(f"flow_pool_id_choice: {flow_pool_id_choice}, flow_pool_abtest_group: {flow_pool_abtest_group}")
+    # log_.info(f"flow_pool_id_choice: {flow_pool_id_choice}, flow_pool_abtest_group: {flow_pool_abtest_group}")
 
     return top_K, flow_pool_P, ab_code, rule_key, data_key, expire_time, no_op_flag, old_video_index, rule_key_30day, \
            shield_config, flow_pool_abtest_group

+ 4 - 4
video_recall.py

@@ -437,7 +437,7 @@ class PoolRecall(object):
         # })
         return rov_pool_recall_result[:size]
 
-    def flow_pool_recall(self, size=10, flow_pool_id=None):
+    def flow_pool_recall(self, size=10, flow_pool_id=None, flow_pool_abtest_group=None):
         """从流量池中获取视频"""
         start_time = time.time()
         # 获取存在城市分组数据的城市编码列表
@@ -533,7 +533,7 @@ class PoolRecall(object):
                         flow_pool_recall_result.append(
                             {'videoId': video_id, 'flowPool': flow_pool,
                              'rovScore': video_score[video_id], 'pushFrom': config_.PUSH_FROM['flow_recall'],
-                             'abCode': self.ab_code}
+                             'abCode': self.ab_code, 'flow_pool_abtest_group': flow_pool_abtest_group}
                         )
 
                         flow_pool_recall_videos.append(video_id)
@@ -674,7 +674,7 @@ class PoolRecall(object):
 
         return flow_pool_recall_result[:size]
 
-    def flow_pool_recall_new_with_level(self, size=10, flow_pool_id=None):
+    def flow_pool_recall_new_with_level(self, size=10, flow_pool_id=None, flow_pool_abtest_group=None):
         """从流量池中获取视频"""
         start_time = time.time()
         # 获取存在城市分组数据的城市编码列表
@@ -769,7 +769,7 @@ class PoolRecall(object):
                         flow_pool_recall_result.append(
                             {'videoId': video_id, 'flowPool': flow_pool, 'level': level,
                              'rovScore': random.uniform(0, 100), 'pushFrom': config_.PUSH_FROM['flow_recall'],
-                             'abCode': self.ab_code}
+                             'abCode': self.ab_code, 'flow_pool_abtest_group': flow_pool_abtest_group}
                         )
 
                         flow_pool_recall_videos.append(video_id)