Merge branch 'version-audit-status' of https://git.yishihui.com/algorithm/rov-server into version-audit-status

app.py

@@ -76,6 +76,8 @@ def homepage_recommend():
         client_info = request_data.get('clientInfo')
         ab_exp_info = request_data.get('abExpInfo', None)
         ab_info_data = request_data.get('abInfoData', None)
+        version_audit_status = request_data.get('versionAuditStatus', 2)  # 小程序版本审核参数：1-审核中，2-审核通过，默认：2
+
         # log_.info({'requestUri': '/applet/video/homepage/recommend', 'requestData': request_data})
         # log_.info('homepage_recommend request data: {}'.format(request_data))
         params = Params(request_id=request_id)
@@ -88,7 +90,7 @@ def homepage_recommend():
                                               mid=mid, uid=uid, size=size, app_type=app_type,
                                               algo_type=algo_type, client_info=client_info,
                                               ab_exp_info=ab_exp_info, params=params,
-                                              ab_info_data=ab_info_data)
+                                              ab_info_data=ab_info_data, version_audit_status=version_audit_status)
             result = {'code': 200, 'message': 'success', 'data': {'videos': videos}}
             log_.info({
                 'requestUri': '/applet/video/homepage/recommend',
@@ -97,6 +99,7 @@ def homepage_recommend():
                 'app_type': app_type,
                 'ab_exp_info': ab_exp_info,
                 'ab_info_data': ab_info_data,
+                'version_audit_status': version_audit_status,
                 'category_id': category_id,
                 'mid': mid,
                 'uid': uid,
@@ -154,6 +157,8 @@ def relevant_recommend():
         ab_exp_info = request_data.get('abExpInfo', None)
         page_type = request_data.get('pageType')  # 1:详情页；2:分享页
         ab_info_data = request_data.get('abInfoData', None)
+        version_audit_status = request_data.get('versionAuditStatus', 2)  # 小程序版本审核参数：1-审核中，2-审核通过，默认：2
+
         # log_.info({'requestUri': '/applet/video/relevant/recommend', 'requestData': request_data})
         # log_.info('requestUri = "{}", requestData = "{}"'.format('/applet/video/relevant/recommend', request_data))
         # log_.info('relevant_recommend request data: {}'.format(request_data))
@@ -163,7 +168,8 @@ def relevant_recommend():
         videos = video_relevant_recommend(request_id=request_id,
                                           video_id=video_id, mid=mid, uid=uid, size=page_size, app_type=app_type,
                                           ab_exp_info=ab_exp_info, client_info=client_info, page_type=page_type,
-                                          params=params, ab_info_data=ab_info_data)
+                                          params=params, ab_info_data=ab_info_data,
+                                          version_audit_status=version_audit_status)
 
         result = {'code': 200, 'message': 'success', 'data': {'videos': videos}}
         log_.info({
@@ -173,6 +179,7 @@ def relevant_recommend():
             'app_type': app_type,
             'ab_exp_info': ab_exp_info,
             'ab_info_data': ab_info_data,
+            'version_audit_status': version_audit_status,
             'mid': mid,
             'uid': uid,
             'result': result,

recommend.py

@@ -710,7 +710,7 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, page_type=0)
 
 
 def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
-                             client_info, ab_exp_info, params, ab_info_data):
+                             client_info, ab_exp_info, params, ab_info_data, version_audit_status):
     """
     首页线上推荐逻辑
     :param request_id: request_id
@@ -723,6 +723,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     :param ab_exp_info: ab实验分组参数 [{"expItemId":1, "configValue":{"size":4, "K":3, ...}}, ...]
     :param params:
     :param ab_info_data: app实验分组参数
+    :param version_audit_status: 小程序版本审核参数：1-审核中，2-审核通过
     :return:
     """
 
@@ -763,8 +764,8 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
     #
     # else:
     param_st = time.time()
-    # 特殊mid推荐处理
-    if mid in get_special_mid_list() or app_type == config_.APP_TYPE['PIAO_QUAN_VIDEO_PLUS']:
+    # 特殊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)
         return rank_result
 
@@ -823,7 +824,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
 
 
 def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_exp_info, client_info,
-                             page_type, params, ab_info_data):
+                             page_type, params, ab_info_data, version_audit_status):
     """
     相关推荐逻辑
     :param request_id: request_id
@@ -837,11 +838,12 @@ def video_relevant_recommend(request_id, video_id, mid, uid, size, app_type, ab_
     :param page_type: 页面区分参数  1:详情页；2:分享页
     :param params:
     :param ab_info_data: app实验分组参数
+    :param version_audit_status: 小程序版本审核参数：1-审核中，2-审核通过
     :return: videos type-list
     """
     param_st = time.time()
-    # 特殊mid推荐处理
-    if mid in get_special_mid_list() or app_type == config_.APP_TYPE['PIAO_QUAN_VIDEO_PLUS']:
+    # 特殊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)
         return rank_result