Merge branch 'rov-18-19' into dev

recommend.py

@@ -192,10 +192,22 @@ def video_recommend(mid, uid, size, top_K, flow_pool_P, app_type, algo_type, cli
     # ####### 排序
     start_rank = time.time()
     # log_.info('====== rank')
-    data = {
-        'rov_pool_recall': recall_result_list[0],
-        'flow_pool_recall': recall_result_list[1]
-    }
+    if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
+        if ab_code == config_.AB_CODE['rov_rank_appType_18_19']:
+            data = {
+                'rov_pool_recall': recall_result_list[0],
+                'flow_pool_recall': recall_result_list[1]
+            }
+        else:
+            data = {
+                'rov_pool_recall': recall_result_list[0],
+                'flow_pool_recall': []
+            }
+    else:
+        data = {
+            'rov_pool_recall': recall_result_list[0],
+            'flow_pool_recall': recall_result_list[1]
+        }
     rank_result = video_rank(data=data, size=size, top_K=top_K, flow_pool_P=flow_pool_P)
     end_rank = time.time()
     log_.info('mid: {}, uid: {}, rank_result: {}, execute time = {}ms'.format(