From cde34795b1e122fa3e025f4280bfeaf43d742a7b Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Thu, 9 Jun 2022 11:30:34 +0800
Subject: [PATCH] download npu log

---
 routers/repo/modelarts.go | 39 +++++++++++++++++++++++++++++++++++----
 routers/routes/routes.go  |  1 +
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 95ca8df62..6a94ef0e7 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -2251,7 +2251,6 @@ func ModelDownload(ctx *context.Context) {
 	versionName := ctx.Query("version_name")
 	parentDir := ctx.Query("parent_dir")
 	fileName := ctx.Query("file_name")
-	log.Info("DownloadSingleModelFile start.")
 	task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName)
 	if err != nil {
 		log.Error("GetCloudbrainByJobID(%s) failed:%v", task.JobName, err.Error())
@@ -2259,7 +2258,6 @@ func ModelDownload(ctx *context.Context) {
 	}
 
 	path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, setting.OutPutPath, versionName, parentDir, fileName), "/")
-	log.Info("Download path is:%s", path)
 
 	url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
 	if err != nil {
@@ -2267,6 +2265,7 @@ func ModelDownload(ctx *context.Context) {
 		ctx.ServerError("GetObsCreateSignedUrl", err)
 		return
 	}
+	ctx.Resp.Header().Set("Cache-Control", "max-age=0")
 	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
 }
 
@@ -2278,13 +2277,11 @@ func ResultDownload(ctx *context.Context) {
 	versionName := ctx.Query("version_name")
 	parentDir := ctx.Query("parent_dir")
 	fileName := ctx.Query("file_name")
-	log.Info("DownloadResult start.")
 	task := ctx.Cloudbrain
 	if err != nil {
 		ctx.Data["error"] = err.Error()
 	}
 	path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, "result/", versionName, parentDir, fileName), "/")
-	log.Info("Download path is:%s", path)
 
 	url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
 	if err != nil {
@@ -2292,6 +2289,7 @@ func ResultDownload(ctx *context.Context) {
 		ctx.ServerError("GetObsCreateSignedUrl", err)
 		return
 	}
+	ctx.Resp.Header().Set("Cache-Control", "max-age=0")
 	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
 }
 func DeleteJobStorage(jobName string) error {
@@ -2390,3 +2388,36 @@ func SetJobCount(ctx *context.Context) {
 	}
 	ctx.Data["jobCount"] = jobCount
 }
+
+func TrainJobDownloadLogFile(ctx *context.Context) {
+	var (
+		err error
+	)
+
+	var jobID = ctx.Params(":jobid")
+	versionName := ctx.Query("version_name")
+	task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName)
+	if err != nil {
+		log.Error("GetCloudbrainByJobIDAndVersionName(%s) failed:%v", task.JobName, err.Error(), ctx.Data["msgID"])
+		ctx.ServerError("GetCloudbrainByJobIDAndVersionName", err)
+		return
+	}
+
+	resultLogFile, err := modelarts.GetTrainJobLogFileNames(jobID, strconv.FormatInt(task.VersionID, 10))
+	if err != nil {
+		log.Error("GetTrainJobLogFileNames(%s) failed:%v", jobID, err.Error(), ctx.Data["msgID"])
+		ctx.ServerError("GetTrainJobLogFileNames", err)
+		return
+	}
+
+	path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, versionName, resultLogFile.LogFileList[0]), "/")
+
+	url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
+	if err != nil {
+		log.Error("GetObsCreateSignedUrlByBucketAndKey failed: %v", err.Error(), ctx.Data["msgID"])
+		ctx.ServerError("GetObsCreateSignedUrlByBucketAndKey", err)
+		return
+	}
+	ctx.Resp.Header().Set("Cache-Control", "max-age=0")
+	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
+}
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 7ba8fe61a..278c40204 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1136,6 +1136,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.TrainJobStop)
 					m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.TrainJobDel)
 					m.Get("/model_download", cloudbrain.AdminOrJobCreaterRightForTrain, repo.ModelDownload)
+					m.Get("/download_log_file", cloudbrain.AdminOrJobCreaterRightForTrain, repo.TrainJobDownloadLogFile)
 					m.Get("/create_version", reqWechatBind, cloudbrain.AdminOrJobCreaterRightForTrain, repo.TrainJobNewVersion)
 					m.Post("/create_version", reqWechatBind, cloudbrain.AdminOrJobCreaterRightForTrain, bindIgnErr(auth.CreateModelArtsTrainJobForm{}), repo.TrainJobCreateVersion)
 				})