Merge branch 'rov_20230804' of algorithm/rov-server into master

recommend.py

@@ -215,33 +215,33 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
         exp_config = pool_recall.get_video_recall_config()
     #print("exp_config:", exp_config)
     if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
-        t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time, ab_code, exp_config)]
+        t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time)]
         if ab_code==60058:
-            t.append(gevent.spawn(pool_recall.get_U2I_reall, mid, exp_config))
-            t.append(gevent.spawn(pool_recall.get_play_reall, mid, exp_config))
+            t.append(gevent.spawn(pool_recall.get_U2I_reall, mid))
+            t.append(gevent.spawn(pool_recall.get_play_reall, mid))
         elif  ab_code==60059:
-            t.append(gevent.spawn(pool_recall.get_word2vec_item_reall, exp_config))
+            t.append(gevent.spawn(pool_recall.get_word2vec_item_reall))
         elif  ab_code==60061 or ab_code==60063:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter, exp_config))
+            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
         elif  ab_code==60062:
-            t.append(gevent.spawn(pool_recall.get_U2U2I_reall, mid, exp_config))
+            t.append(gevent.spawn(pool_recall.get_U2U2I_reall, mid))
         elif  ab_code==60064:
-            t.append(gevent.spawn(pool_recall.get_return_video_reall, exp_config))
+            t.append(gevent.spawn(pool_recall.get_return_video_reall))
     else:
-        t = [gevent.spawn(pool_recall.rov_pool_recall_with_region, size, expire_time, ab_code, exp_config),
+        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)]
         if ab_code==60058:
-            t.append(gevent.spawn(pool_recall.get_U2I_reall, mid, exp_config))
-            t.append(gevent.spawn(pool_recall.get_play_reall, mid, exp_config))
+            t.append(gevent.spawn(pool_recall.get_U2I_reall, mid))
+            t.append(gevent.spawn(pool_recall.get_play_reall, mid))
         elif ab_code == 60059:
-            t.append(gevent.spawn(pool_recall.get_word2vec_item_reall, exp_config))
+            t.append(gevent.spawn(pool_recall.get_word2vec_item_reall))
         elif ab_code == 60061 or ab_code==60063:
-            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter, exp_config))
+            t.append(gevent.spawn(pool_recall.get_sim_hot_item_reall_filter))
         elif ab_code == 60062:
-            t.append(gevent.spawn(pool_recall.get_U2U2I_reall, mid, exp_config))
+            t.append(gevent.spawn(pool_recall.get_U2U2I_reall, mid))
         elif  ab_code==60064:                                                                         
-            t.append(gevent.spawn(pool_recall.get_return_video_reall, exp_config))
+            t.append(gevent.spawn(pool_recall.get_return_video_reall))
     # 最惊奇相关推荐实验
     # elif ab_code == config_.AB_CODE['top_video_relevant_appType_19']:
     #     t = [gevent.spawn(pool_recall.relevant_recall_19, video_id, size, expire_time),
@@ -346,14 +346,14 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
     #else:
     #print("data['hot_recall']", data['hot_recall'])
     # 60058: u2itag, 60059:word2vec, 60061: sim_recall, 60062: u2u2i
-    if ab_code == 60058 or ab_code == 60059 or ab_code == 60060 or ab_code == 60061 \
-        or ab_code == 60062 or ab_code== 60063 or ab_code == 60064:
-        rank_result, flow_num = video_sank_pos_rank(data=data, size=size, top_K=top_K, flow_pool_P=float(flow_pool_P), ab_Code=ab_code, exp_config=exp_config)
-        result['flow_num'] = flow_num
-        if rank_result:
-            result['rank_num'] = len(rank_result)
-    else:
-        rank_result = video_rank(data=data, size=size, top_K=top_K, flow_pool_P=float(flow_pool_P))
+    # if ab_code == 60058 or ab_code == 60059 or ab_code == 60060 or ab_code == 60061 \
+    #     or ab_code == 60062 or ab_code== 60063 or ab_code == 60064:
+    #     rank_result, flow_num = video_sank_pos_rank(data=data, size=size, top_K=top_K, flow_pool_P=float(flow_pool_P), ab_Code=ab_code, exp_config=exp_config)
+    #     result['flow_num'] = flow_num
+    #     if rank_result:
+    #         result['rank_num'] = len(rank_result)
+    # else:
+    rank_result = video_rank(data=data, size=size, top_K=top_K, flow_pool_P=float(flow_pool_P))
 
     # 老视频实验
     # if ab_code in [config_.AB_CODE['old_video']]: