linfan 2 anos atrás
pai
commit
68b5e0a834
2 arquivos alterados com 17 adições e 14 exclusões
  1. 12 12
      recommend.py
  2. 5 2
      video_rank.py

+ 12 - 12
recommend.py

@@ -257,7 +257,7 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
     #              gevent.spawn(pool_recall.flow_pool_recall, size)]
     gevent.joinall(t)
     recall_result_list = [i.get() for i in t]
-
+    print(recall_result_list)
     # end_recall = time.time()
     # log_.info({
     #     'logTimestamp': int(time.time() * 1000),
@@ -443,7 +443,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         exp_config = pool_recall.get_flow_exp_8_config()
     elif ab_code == 60057:
         exp_config = pool_recall.get_flow_exp_6_config()
-    #print("exp_config:", exp_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)]
@@ -467,7 +467,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
     gevent.joinall(t)
     recall_result_list = [i.get() for i in t]
 
-    #print("recall:",recall_result_list)
+    print("recall:", recall_result_list)
     if len(recall_result_list)<0:
         result['recallResult']= []
         result['rankResult'] = []
@@ -1667,15 +1667,15 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     #                     app_type=app_type, mid=mid, uid=uid)
     # redis数据刷新
     update_redis_st = time.time()
-    if ab_code == 60047 or  ab_code == 60048 or  ab_code == 60049:
-        update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
-    elif ab_code == 60050 or  ab_code == 60051:
-        update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
-    elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054 or ab_code == 60055 \
-            or ab_code == 60056 or ab_code==60057:
-        update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
-    else:
-        update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    # if ab_code == 60047 or  ab_code == 60048 or  ab_code == 60049:
+    #     update_flow_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    # elif ab_code == 60050 or  ab_code == 60051:
+    #     update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    # elif ab_code == 60052 or ab_code == 60053 or ab_code == 60054 or ab_code == 60055 \
+    #         or ab_code == 60056 or ab_code==60057:
+    #     update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
+    # else:
+    #     update_redis_data(result=rank_result, app_type=app_type, mid=mid, top_K=top_K)
     # log_.info({
     #     'logTimestamp': int(time.time() * 1000),
     #     'request_id': request_id,

+ 5 - 2
video_rank.py

@@ -46,6 +46,7 @@ def video_rank(data, size, top_K, flow_pool_P):
                        if item.get('pushFrom') == config_.PUSH_FROM['rov_recall_30day']]
     day_30_recall_rank = sorted(day_30_recall, key=lambda k: k.get('rovScore', 0), reverse=True)
 
+
     # 地域分组小时级规则更新数据
     region_h_recall = [item for item in data['rov_pool_recall']
                          if item.get('pushFrom') == config_.PUSH_FROM['rov_recall_region_h']]
@@ -54,6 +55,7 @@ def video_rank(data, size, top_K, flow_pool_P):
     region_24h_recall = [item for item in data['rov_pool_recall']
                          if item.get('pushFrom') == config_.PUSH_FROM['rov_recall_region_24h']]
     region_24h_recall_rank = sorted(region_24h_recall, key=lambda k: k.get('rovScore', 0), reverse=True)
+    print("region_24h_recall:", len(region_24h_recall_rank))
 
     # 地域分组天级规则更新数据
     # region_day_recall = [item for item in data['rov_pool_recall']
@@ -64,11 +66,12 @@ def video_rank(data, size, top_K, flow_pool_P):
     rule_24h_recall = [item for item in data['rov_pool_recall']
                        if item.get('pushFrom') == config_.PUSH_FROM['rov_recall_24h']]
     rule_24h_recall_rank = sorted(rule_24h_recall, key=lambda k: k.get('rovScore', 0), reverse=True)
+    print("rule_24h_recall_rank:", len(rule_24h_recall_rank))
     # 相对24h规则筛选后剩余更新数据
     rule_24h_dup_recall = [item for item in data['rov_pool_recall']
                            if item.get('pushFrom') == config_.PUSH_FROM['rov_recall_24h_dup']]
     rule_24h_dup_recall_rank = sorted(rule_24h_dup_recall, key=lambda k: k.get('rovScore', 0), reverse=True)
-
+    print("rule_24h_dup_recall_rank:", len(rule_24h_dup_recall_rank))
     # 相对48h规则更新数据
     rule_48h_recall = [item for item in data['rov_pool_recall']
                        if item.get('pushFrom') == config_.PUSH_FROM['rov_recall_48h']]
@@ -639,7 +642,7 @@ def video_new_rank2(data, size, top_K, flow_pool_P, ab_code, exp_config=None):
                 recall_list[i]['sort_score'] = 0.0
     #sort_items = sorted(video_items, key=lambda k: k[1], reverse=True)
     rov_recall_rank =sorted(recall_list, key=lambda k: k.get('sort_score', 0), reverse=True)
-    #print(rov_recall_rank)
+    print(rov_recall_rank)
     flow_recall_rank = sorted(data['flow_pool_recall'], key=lambda k: k.get('rovScore', 0), reverse=True)
     rov_recall_rank, flow_recall_rank = remove_duplicate(rov_recall=rov_recall_rank, flow_recall=flow_recall_rank,
                                                      top_K=top_K)