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

app.py

@@ -93,7 +93,7 @@ def homepage_recommend():
             size = 10
         if category_id in config_.CATEGORY['recommend']:
             # 推荐
-            recommend_result, fea_info = video_homepage_recommend(
+            recommend_result = video_homepage_recommend(
                 request_id=request_id,
                 mid=mid,
                 uid=uid,
@@ -127,7 +127,7 @@ def homepage_recommend():
                 'recommendOperation': recommend_result.get('recommendOperation', ''),
                 'result': result,
                 'executeTime': (time.time() - start_time) * 1000,
-                'fea_info': fea_info
+                'fea_info': recommend_result.get('fea_info', {})
             }
             log_.info(log_message)
             # log_.info('category_id: {}, mid: {}, uid: {}, result: {}, execute time = {}ms'.format(
@@ -217,7 +217,7 @@ def relevant_recommend():
             env_dict['recomTraceId'] = recomTraceId
             log_.error("feature error", env_dict)
         params = Params(request_id=request_id)
-        recommend_result, fea_info = video_relevant_recommend(
+        recommend_result = video_relevant_recommend(
             request_id=request_id,
             video_id=video_id,
             mid=mid,
@@ -251,7 +251,7 @@ def relevant_recommend():
             'recommendOperation': recommend_result.get('recommendOperation', ''),
             'result': result,
             'executeTime': (time.time() - start_time) * 1000,
-            'fea_info': fea_info
+            'fea_info': recommend_result.get('fea_info', {})
         }
         log_.info(log_message)
 

recommend.py

@@ -696,7 +696,7 @@ def video_old_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type
         env_dict['recall_list'] = rec_recall_list
         env_dict['vid_day_fea_list'] = vid_day_fea_list
         env_dict['vid_hour_fea_list'] = vid_hour_fea_list
-        env_json = json.dumps(env_dict)
+        env_json = env_dict
     #4.
     rank_result, flow_num  = video_new_rank2(data=data, size=size, top_K=top_K, flow_pool_P=float(flow_pool_P), ab_code=ab_code, mid=mid, exp_config=exp_config, env_dict=env_dict)
     #print(rank_result)
@@ -1683,6 +1683,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     # else:
     recommend_result = {}
     param_st = time.time()
+    recommend_result['fea_info'] = env_dict
     # 特殊mid 和 小程序审核版本推荐处理
     if mid in get_special_mid_list() or version_audit_status == 1:
         rank_result = special_mid_recommend(request_id=request_id, mid=mid, uid=uid, app_type=app_type, size=size)
@@ -1709,8 +1710,6 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     get_result_st = time.time()
     #print("ab_code:", ab_code)
     #new pipeline
-
-    fea_info = json.dumps(env_dict)
     if ab_code == 60047 or ab_code == 60048 or ab_code == 60049:
         result = new_video_recommend(request_id=request_id,
                              mid=mid, uid=uid, app_type=app_type,
@@ -1736,6 +1735,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
                                      rule_key=rule_key, data_key=data_key, no_op_flag=no_op_flag,
                                      old_video_index=old_video_index, video_id= None,
                                      params=params, rule_key_30day=rule_key_30day, shield_config=shield_config, env_dict=env_dict)
+        recommend_result['fea_info'] = fea_info
     else:
         result = video_recommend(request_id=request_id,
                              mid=mid, uid=uid, app_type=app_type,
@@ -1785,7 +1785,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     # })
     recommend_result['updateRedisDataTime'] = (time.time() - update_redis_st) * 1000
 
-    return recommend_result, fea_info
+    return recommend_result
     # return rank_result
 
 
@@ -1809,6 +1809,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
     """
     recommend_result = {}
     param_st = time.time()
+    recommend_result['fea_info'] = env_dict
     # 特殊mid 和 小程序审核版本推荐处理
     if mid in get_special_mid_list() or version_audit_status == 1:
         rank_result = special_mid_recommend(request_id=request_id, mid=mid, uid=uid, app_type=app_type, size=size)
@@ -1831,7 +1832,6 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
     #     'executeTime': (time.time() - param_st) * 1000
     # })
     recommend_result['getRecommendParamsTime'] = (time.time() - param_st) * 1000
-    fea_info = json.dumps(env_dict)
     # 简单召回 - 排序 - 兜底
     get_result_st = time.time()
     #print("ab_code:", ab_code)
@@ -1855,6 +1855,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
                                  rule_key=rule_key, data_key=data_key, no_op_flag=no_op_flag,
                                  old_video_index=old_video_index, video_id=video_id,
                                  params=params, rule_key_30day=rule_key_30day, shield_config=shield_config, env_dict = env_dict)
+        recommend_result['fea_info'] = fea_info
     else:
         result = video_recommend(request_id=request_id,
                              mid=mid, uid=uid, app_type=app_type,
@@ -1907,7 +1908,7 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
     # })
     recommend_result['updateRedisDataTime'] = (time.time() - update_redis_st) * 1000
 
-    return recommend_result, fea_info
+    return recommend_result
     # return rank_result