From 6702b0ff96e75fcff3bc27cf2b401bfd2de7a354 Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 4 Mar 2022 18:03:14 +0800 Subject: [PATCH] fix-bug --- models/cloudbrain.go | 4 ++-- routers/repo/cloudbrain.go | 4 ++-- routers/repo/modelarts.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 982ccc7a0..71f6b21f0 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1334,9 +1334,9 @@ func GetCloudbrainsNeededStopByRepoID(repoID int64) ([]*Cloudbrain, error) { return cloudBrains, err } -func GetCloudbrainsByRepoIDAndJobType(repoID int64, jobType string) ([]*Cloudbrain, error) { +func GetCloudbrainsByDisplayJobName(repoID int64, jobType string, displayJobName string) ([]*Cloudbrain, error) { cloudBrains := make([]*Cloudbrain, 0) - err := x.Cols("job_id", "job_name", "repo_id", "user_id", "job_type", "display_job_name").Where("repo_id=? AND job_type =?", repoID, jobType).Find(&cloudBrains) + err := x.Cols("job_id", "job_name", "repo_id", "user_id", "job_type", "display_job_name").Where("repo_id=? AND job_type =? AND lower(display_job_name) = lower(?)", repoID, jobType, displayJobName).Find(&cloudBrains) return cloudBrains, err } diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 51cbccc34..71ff62c30 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -187,7 +187,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { resourceSpecId := form.ResourceSpecId repo := ctx.Repo.Repository - tasks, err := models.GetCloudbrainsByRepoIDAndJobType(repo.ID, string(models.JobTypeDebug)) + tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeDebug), displayJobName) if err == nil { for _, task := range tasks { if strings.EqualFold(task.DisplayJobName, displayJobName) { @@ -1224,7 +1224,7 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF repo := ctx.Repo.Repository - tasks, err := models.GetCloudbrainsByRepoIDAndJobType(repo.ID, string(models.JobTypeBenchmark)) + tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeBenchmark), displayJobName) if err == nil { for _, task := range tasks { if strings.EqualFold(task.DisplayJobName, displayJobName) { diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 0990e1184..d5198a0fd 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -205,7 +205,7 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm } } - tasks, err := models.GetCloudbrainsByRepoIDAndJobType(repo.ID, string(models.JobTypeDebug)) + tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeDebug), displayJobName) if err == nil { for _, task := range tasks { if strings.EqualFold(task.DisplayJobName, displayJobName) { @@ -898,7 +898,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) return } //Determine whether the task name of the task in the project is duplicated - tasks, err := models.GetCloudbrainsByRepoIDAndJobType(repo.ID, string(models.JobTypeTrain)) + tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeTrain), displayJobName) if err == nil { for _, task := range tasks { if strings.EqualFold(task.DisplayJobName, displayJobName) { @@ -1731,7 +1731,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference } //Determine whether the task name of the task in the project is duplicated - tasks, err := models.GetCloudbrainsByRepoIDAndJobType(repo.ID, string(models.JobTypeInference)) + tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeInference), displayJobName) if err == nil { for _, task := range tasks { if strings.EqualFold(task.DisplayJobName, displayJobName) {