日志及下载日志接口统一。

Signed-off-by: zouap <zouap@pcl.ac.cn>

routers/api/v1/api.go

@@ -952,10 +952,10 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
 					m.Get("/:id/model_list", repo.CloudBrainModelConvertList)
 				}, reqRepoReader(models.UnitTypeModelManage))
-				m.Group("/modelsafety", func() {
-					m.Get("/:id/log", repo.ModelSafetyGetLog)
-					m.Get("/:id/down_log_file", repo.ModelSafetyDownloadLogFile)
-				}, reqRepoReader(models.UnitTypeModelManage))
+				// m.Group("/modelsafety", func() {
+				// 	m.Get("/:id/log", repo.ModelSafetyGetLog)
+				// 	m.Get("/:id/down_log_file", repo.ModelSafetyDownloadLogFile)
+				// }, reqRepoReader(models.UnitTypeModelManage))
 				m.Group("/modelarts", func() {
 					m.Group("/notebook", func() {
 						//m.Get("/:jobid", repo.GetModelArtsNotebook)

routers/api/v1/repo/cloudbrain.go

@@ -494,6 +494,10 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 		ctx.ServerError(err.Error(), err)
 		return
 	}
+	if job.JobType == string(models.JobTypeModelSafety) {
+		ModelSafetyDownloadLogFile(ctx)
+		return
+	}
 
 	logDir := "/model"
 	if job.JobType == string(models.JobTypeInference) || job.JobType == string(models.JobTypeModelSafety) {
@@ -535,6 +539,11 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 		ctx.ServerError(err.Error(), err)
 		return
 	}
+	if job.JobType == string(models.JobTypeModelSafety) {
+		ModelSafetyGetLog(ctx)
+		return
+	}
+
 	lines := ctx.QueryInt("lines")
 	baseLine := ctx.Query("base_line")
 	order := ctx.Query("order")