liqian 3 년 전
부모
커밋
4aec85e139
7개의 변경된 파일26개의 추가작업 그리고 26개의 파일을 삭제
  1. 4 4
      bottom_videos.py
  2. 1 1
      flow_pool_task.sh
  3. 4 4
      pool_predict.py
  4. 9 9
      rov_data_check.py
  5. 1 1
      rov_pool_task.sh
  6. 6 6
      rov_train.py
  7. 1 1
      rov_train_recall_pool_update.sh

+ 4 - 4
bottom_videos.py

@@ -45,7 +45,7 @@ def update_bottom_videos():
             for record in reader:
                 video_id = record['videoid']
                 videos[video_id] = record['play_count']
-        print(videos)
+        # print(videos)
 
         redis_helper = RedisHelper()
         redis_helper.add_data_with_zset(key_name=config_.BOTTOM_KEY_NAME, data=videos)
@@ -60,6 +60,6 @@ def update_bottom_videos():
 if __name__ == '__main__':
     update_bottom_videos()
     # 将日志上传到oss
-    log_cmd = "ossutil cp -r -f {} oss://{}/{}".format(log_.logname, config_.BUCKET_NAME,
-                                                       config_.OSS_FOLDER_LOGS + 'bottom_videos/')
-    os.system(log_cmd)
+    # log_cmd = "ossutil cp -r -f {} oss://{}/{}".format(log_.logname, config_.BUCKET_NAME,
+    #                                                    config_.OSS_FOLDER_LOGS + 'bottom_videos/')
+    # os.system(log_cmd)

+ 1 - 1
flow_pool_task.sh

@@ -1 +1 @@
-python /data/rov-offline/pool_predict.py
+cd /root/rov-offline && /root/anaconda3/bin/python /root/rov-offline/pool_predict.py

+ 4 - 4
pool_predict.py

@@ -123,7 +123,7 @@ if __name__ == '__main__':
         predict(app_type=app_type)
         log_.info('{} predict end...'.format(app_name))
     log_.info('flow pool predict end...')
-    # 将日志上传到oss
-    log_cmd = "ossutil cp -r -f {} oss://{}/{}".format(log_.logname, config_.BUCKET_NAME,
-                                                       config_.OSS_FOLDER_LOGS + 'flow_pool/')
-    os.system(log_cmd)
+    # # 将日志上传到oss
+    # log_cmd = "ossutil cp -r -f {} oss://{}/{}".format(log_.logname, config_.BUCKET_NAME,
+    #                                                    config_.OSS_FOLDER_LOGS + 'flow_pool/')
+    # os.system(log_cmd)

+ 9 - 9
rov_data_check.py

@@ -13,15 +13,15 @@ log_ = Log()
 
 def rov_train_recall_pool_update():
     # 训练数据和预测数据都准备好时,更新模型,预测
-    os.system('sh /data/rov-offline/rov_train_recall_pool_update.sh')
-    # 将日志上传到oss
-    log_cmd = "ossutil cp -r -f {} oss://{}/{}".format(log_.logname, config_.BUCKET_NAME,
-                                                       config_.OSS_FOLDER_LOGS + 'rov_recall_pool/')
-    os.system(log_cmd)
-    # 将data上传到oss
-    data_cmd = "ossutil cp -r -f {} oss://{}/{}".format("/data/rov-offline/data", config_.BUCKET_NAME,
-                                                        config_.OSS_FOLDER_DATA)
-    os.system(data_cmd)
+    os.system('sh /root/rov-offline/rov_train_recall_pool_update.sh')
+    # # 将日志上传到oss
+    # log_cmd = "ossutil cp -r -f {} oss://{}/{}".format(log_.logname, config_.BUCKET_NAME,
+    #                                                    config_.OSS_FOLDER_LOGS + 'rov_recall_pool/')
+    # os.system(log_cmd)
+    # # 将data上传到oss
+    # data_cmd = "ossutil cp -r -f {} oss://{}/{}".format("/data/rov-offline/data", config_.BUCKET_NAME,
+    #                                                     config_.OSS_FOLDER_DATA)
+    # os.system(data_cmd)
 
 
 def data_check(project, table, date):

+ 1 - 1
rov_pool_task.sh

@@ -1 +1 @@
-python /data/rov-offline/rov_data_check.py
+cd /root/rov-offline && /root/anaconda3/bin/python /root/rov-offline/rov_data_check.py

+ 6 - 6
rov_train.py

@@ -200,12 +200,12 @@ def predict_test():
     key_name = config_.RECALL_KEY_NAME_PREFIX + time.strftime('%Y%m%d')
     redis_helper.add_data_with_zset(key_name=key_name, data=redis_data)
     log_.info('test data to redis finished!')
-    # 通知后端更新数据
-    result = request_post(request_url=config_.NOTIFY_BACKEND_UPDATE_ROV_SCORE_URL, request_data={'videos': json_data})
-    if result['code'] == 0:
-        log_.info('notify backend success!')
-    else:
-        log_.error('notify backend fail!')
+    # # 通知后端更新数据
+    # result = request_post(request_url=config_.NOTIFY_BACKEND_UPDATE_ROV_SCORE_URL, request_data={'videos': json_data})
+    # if result['code'] == 0:
+    #     log_.info('notify backend success!')
+    # else:
+    #     log_.error('notify backend fail!')
 
 
 if __name__ == '__main__':

+ 1 - 1
rov_train_recall_pool_update.sh

@@ -1 +1 @@
-python /data/rov-offline/get_data.py && python /data/rov-offline/rov_train.py
+/root/anaconda3/bin/python /root/rov-offline/get_data.py && /root/anaconda3/bin/python /root/rov-offline/rov_train.py