diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 6dd1cb32f..ce0be2a90 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -951,6 +951,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("/modelarts", func() { m.Group("/notebook", func() { //m.Get("/:jobid", repo.GetModelArtsNotebook) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 7f58576ed..8456014db 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -383,7 +383,7 @@ func CloudbrainForModelConvertGetLog(ctx *context.Context) { ctx.JSON(http.StatusOK, result) } -func CloudbrainForModelSafetyGetLog(ctx *context.Context) { +func ModelSafetyGetLog(ctx *context.APIContext) { ID := ctx.Params(":id") job, err := models.GetCloudbrainByID(ID) if err != nil { @@ -393,13 +393,17 @@ func CloudbrainForModelSafetyGetLog(ctx *context.Context) { } if job.JobType == string(models.JobTypeModelSafety) { if job.Type == models.TypeCloudBrainOne { - + CloudbrainGetLog(ctx) } else if job.Type == models.TypeCloudBrainTwo { - + TrainJobForModelConvertGetLog(ctx) } } - result := "" - ctx.JSON(http.StatusOK, result) + //result := "" + //ctx.JSON(http.StatusOK, result) +} + +func ModelSafetyDownloadLogFile(ctx *context.Context) { + } func CloudbrainDownloadLogFile(ctx *context.Context) { @@ -443,7 +447,7 @@ func CloudbrainDownloadLogFile(ctx *context.Context) { } } -func CloudbrainGetLog(ctx *context.Context) { +func CloudbrainGetLog(ctx *context.APIContext) { ID := ctx.Params(":id") job, err := models.GetCloudbrainByID(ID) if err != nil { diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go index 4cba1ffbd..58baf1a0c 100644 --- a/routers/repo/aisafety.go +++ b/routers/repo/aisafety.go @@ -443,6 +443,7 @@ func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) { } else { if result.Data.Code == 0 { job.ResultJson = result.Data.StandardJson + job.Status = string(models.JobSucceeded) err = models.UpdateJob(job) if err != nil { log.Error("UpdateJob failed:", err)