Browse Source

fix-bug

tags/V1.22.3.1^2
liuzx 3 years ago
parent
commit
6702b0ff96
3 changed files with 7 additions and 7 deletions
  1. +2
    -2
      models/cloudbrain.go
  2. +2
    -2
      routers/repo/cloudbrain.go
  3. +3
    -3
      routers/repo/modelarts.go

+ 2
- 2
models/cloudbrain.go View File

@@ -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
}



+ 2
- 2
routers/repo/cloudbrain.go View File

@@ -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) {


+ 3
- 3
routers/repo/modelarts.go View File

@@ -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) {


Loading…
Cancel
Save