linfan 1 рік тому
батько
коміт
072e769264
3 змінених файлів з 25 додано та 9 видалено
  1. 20 4
      app.py
  2. 3 3
      rank_service.py
  3. 2 2
      recommend.py

+ 20 - 4
app.py

@@ -55,7 +55,22 @@ def homepage_recommend():
         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
-
+        machineinfoBrand = request_data.get('machineinfoBrand', '')
+        machineinfoModel = request_data.get('machineinfoModel', '')
+        machineinfoPlatform = request_data.get('machineinfoPlatform', '')
+        pagesource = request_data.get('pageSource', '')
+        versioncode = request_data.get('versionCode', 0)
+        recommendsource = request_data.get('recommendSource', '0')
+        sencetype = request_data.get('senceType', 0)
+        env_dict = {}
+        env_dict['app_type'] = app_type
+        env_dict['pagesource'] = pagesource
+        env_dict['versioncode'] = versioncode
+        env_dict['machineinfo_brand'] = machineinfoBrand
+        env_dict['machineinfo_model'] = machineinfoModel
+        env_dict['machineinfo_platform'] = machineinfoPlatform
+        env_dict['recommendsource'] = recommendsource
+        env_dict['sencetype'] = sencetype
         params = Params(request_id=request_id)
         # size默认为10
         if not size:
@@ -73,7 +88,8 @@ def homepage_recommend():
                 ab_exp_info=ab_exp_info,
                 params=params,
                 ab_info_data=ab_info_data,
-                version_audit_status=version_audit_status
+                version_audit_status=version_audit_status,
+                env_dict = env_dict
             )
 
             result = {'code': 200, 'message': 'success', 'data': {'videos': recommend_result['videos']}}
@@ -153,9 +169,9 @@ def relevant_recommend():
         machineinfoModel = request_data.get('machineinfoModel', '')
         machineinfoPlatform = request_data.get('machineinfoPlatform', '')
         pagesource = request_data.get('pageSource', '')
-        versioncode = request_data.get('versionCode', '')
+        versioncode = request_data.get('versionCode', 0)
         recommendsource = request_data.get('recommendSource', '0')
-        sencetype =  request_data.get('senceType', '0')
+        sencetype =  request_data.get('senceType', 0)
         env_dict = {}
         env_dict['app_type'] = app_type
         env_dict['pagesource'] = pagesource

+ 3 - 3
rank_service.py

@@ -21,10 +21,10 @@ def get_featurs(mid, data, size, top_K, flow_pool_P, env_dict=None):
     machineinfo_platform = 'android'
     sencetype = 100078
     machineinfo_model ='M2006C3LC'
-    if env_dict:
-        apptype = env_dict.get('app_type','')
+    if env_dict and len(env_dict)>0:
+        apptype = env_dict.get('app_type',4)
         pagesource = env_dict.get('pagesource', '')
-        versioncode = env_dict.get('versioncode', '')
+        versioncode = env_dict.get('versioncode', 0)
         machineinfo_brand = env_dict.get('machineinfo_brand', '')
         machineinfo_model = env_dict.get('machineinfo_model', '')
         recommendsource = env_dict.get('recommendsource', '0')

+ 2 - 2
recommend.py

@@ -1583,7 +1583,7 @@ def get_recommend_params(recommend_type, ab_exp_info, ab_info_data, mid, app_typ
 
 
 def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
-                             client_info, ab_exp_info, params, ab_info_data, version_audit_status):
+                             client_info, ab_exp_info, params, ab_info_data, version_audit_status, env_dict):
     """
     首页线上推荐逻辑
     :param request_id: request_id
@@ -1688,7 +1688,7 @@ def video_homepage_recommend(request_id, mid, uid, size, app_type, algo_type,
                                      ab_code=ab_code, expire_time=expire_time,
                                      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)
+                                     params=params, rule_key_30day=rule_key_30day, shield_config=shield_config, env_dict=env_dict)
     else:
         result = video_recommend(request_id=request_id,
                              mid=mid, uid=uid, app_type=app_type,