update

config.py

@@ -70,7 +70,9 @@ class DevelopmentConfig(BaseConfig):
     NOTIFY_BACKEND_UPDATE_ROV_SCORE_URL = 'http://videotest-internal.yishihui.com/longvideoapi/openapi/recommend/updateRovScore'
 
     # logs 上传oss 目标Bucket指定目录
-    OSS_FOLDER = 'rov-offline/dev/'
+    OSS_FOLDER_LOGS = 'rov-offline/dev/logs/'
+    # data 上传oss 目标Bucket指定目录
+    OSS_FOLDER_DATA = 'rov-offline/dev/data/'
 
 
 class TestConfig(BaseConfig):
@@ -102,7 +104,9 @@ class TestConfig(BaseConfig):
     NOTIFY_BACKEND_UPDATE_ROV_SCORE_URL = 'http://videotest-internal.yishihui.com/longvideoapi/openapi/recommend/updateRovScore'
 
     # logs 上传oss 目标Bucket指定目录
-    OSS_FOLDER = 'rov-offline/test/'
+    OSS_FOLDER_LOGS = 'rov-offline/test/logs/'
+    # data 上传oss 目标Bucket指定目录
+    OSS_FOLDER_DATA = 'rov-offline/test/data/'
 
 
 class PreProductionConfig(BaseConfig):
@@ -134,7 +138,9 @@ class PreProductionConfig(BaseConfig):
     NOTIFY_BACKEND_UPDATE_ROV_SCORE_URL = 'http://videopre-internal.piaoquantv.com/longvideoapi/openapi/recommend/updateRovScore'
 
     # logs 上传oss 目标Bucket指定目录
-    OSS_FOLDER = 'rov-offline/pre/'
+    OSS_FOLDER_LOGS = 'rov-offline/pre/logs/'
+    # data 上传oss 目标Bucket指定目录
+    OSS_FOLDER_DATA = 'rov-offline/pre/data/'
 
 
 class ProductionConfig(BaseConfig):
@@ -166,7 +172,9 @@ class ProductionConfig(BaseConfig):
     NOTIFY_BACKEND_UPDATE_ROV_SCORE_URL = 'http://longvideoapi-internal.piaoquantv.com/longvideoapi/openapi/recommend/updateRovScore'
 
     # logs 上传oss 目标Bucket指定目录
-    OSS_FOLDER = 'rov-offline/pro/'
+    OSS_FOLDER_LOGS = 'rov-offline/pro/logs/'
+    # data 上传oss 目标Bucket指定目录
+    OSS_FOLDER_DATA = 'rov-offline/pro/data/'
 
 
 def set_config():

pool_predict.py

@@ -117,6 +117,5 @@ if __name__ == '__main__':
         log_.info('{} predict end...'.format(app_name))
     log_.info('flow pool predict end...')
     # 将日志上传到oss
-    log_cmd = "ossutil cp -r {} oss://{}/{}".format("/data/rov-offline/logs", config_.BUCKET_NAME, config_.OSS_FOLDER)
+    log_cmd = "ossutil cp -r {} oss://{}/{}".format(log_.logname, config_.BUCKET_NAME, config_.OSS_FOLDER_LOGS)
     os.system(log_cmd)
-

rov_data_check.py

@@ -5,18 +5,21 @@ from odps import ODPS
 from datetime import datetime as dt
 from threading import Timer
 from config import set_config
+from log import Log
 
 config_ = set_config()
+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 {} oss://{}/{}".format("/data/rov-offline/logs", config_.BUCKET_NAME, config_.OSS_FOLDER)
+    log_cmd = "ossutil cp -r {} oss://{}/{}".format(log_.logname, config_.BUCKET_NAME, config_.OSS_FOLDER_LOGS)
     os.system(log_cmd)
     # 将data上传到oss
-    data_cmd = "ossutil cp -r {} oss://{}/{}".format("/data/rov-offline/data", config_.BUCKET_NAME, config_.OSS_FOLDER)
+    data_cmd = "ossutil cp -r {} oss://{}/{}".format("/data/rov-offline/data",
+                                                     config_.BUCKET_NAME, config_.OSS_FOLDER_DATA)
     os.system(data_cmd)