From 0eebea40be8d8618592410c2b3bfb17b58fc2ce1 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 17 Oct 2022 10:25:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8F=8A=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3=E7=BB=9F=E4=B8=80=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/api/v1/api.go | 8 ++++---- routers/api/v1/repo/cloudbrain.go | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 825c49161..41efa8ac9 100755 --- a/routers/api/v1/api.go +++ b/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) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index f16f31c50..6cf44b9d7 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/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")