diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 53eaf28c6..07ce7854d 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -204,18 +204,24 @@ func GetCloudbrainTask(ctx *context.APIContext) { // "$ref": "#/responses/Label" var ( + job *models.Cloudbrain err error ) ID := ctx.Params(":id") - job, err := models.GetCloudbrainByID(ID) - if err != nil { + + _, err = strconv.ParseInt(ID, 10, 64) + if err!=nil{ + job, err = models.GetCloudbrainByJobID(ID) - if err != nil { - ctx.NotFound(err) - log.Error("GetCloudbrainByID failed:", err) - return - } + }else{ + job, err = models.GetCloudbrainByID(ID) + + } + + if err != nil { + ctx.NotFound(err) + return } if job.JobType == string(models.JobTypeModelSafety) { routerRepo.GetAiSafetyTaskByJob(job) diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go index d9426749f..1e1a176e5 100755 --- a/routers/api/v1/repo/modelarts.go +++ b/routers/api/v1/repo/modelarts.go @@ -33,18 +33,25 @@ import ( func GetModelArtsNotebook2(ctx *context.APIContext) { var ( + job *models.Cloudbrain err error ) ID := ctx.Params(":id") - job, err := models.GetCloudbrainByID(ID) - if err != nil { + + _, err = strconv.ParseInt(ID, 10, 64) + if err!=nil{ job, err = models.GetCloudbrainByJobID(ID) - if err != nil { - ctx.NotFound(err) - return - } + }else{ + job, err = models.GetCloudbrainByID(ID) + } + + if err != nil { + ctx.NotFound(err) + return + } + err = modelarts.HandleNotebookInfo(job) if err != nil { ctx.NotFound(err)