Browse Source

修改任务查询类型

pull/1406/head
liuzx 4 years ago
parent
commit
cf3fd3306e
2 changed files with 15 additions and 7 deletions
  1. +3
    -1
      routers/repo/cloudbrain.go
  2. +12
    -6
      routers/repo/modelarts.go

+ 3
- 1
routers/repo/cloudbrain.go View File

@@ -163,6 +163,8 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
resourceSpecId := form.ResourceSpecId

//检查任务名称是否重复
var jobTypes []string
jobTypes = append(jobTypes, string(models.JobTypeDebug))
tasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
ListOptions: models.ListOptions{
PageSize: setting.UI.IssuePagingNum,
@@ -170,7 +172,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
RepoID: ctx.Repo.Repository.ID,
Type: -1,
JobTypeNot: false,
JobType: string(models.JobTypeDebug),
JobTypes: jobTypes,
})
if err == nil {
for _, task := range tasks {


+ 12
- 6
routers/repo/modelarts.go View File

@@ -135,7 +135,9 @@ func NotebookCreate(ctx *context.Context, form auth.CreateModelArtsNotebookForm)
uuid := form.Attachment
description := form.Description
flavor := form.Flavor

//判断任务名是否重名
var jobTypes []string
jobTypes = append(jobTypes, string(models.JobTypeDebug))
tasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
ListOptions: models.ListOptions{
PageSize: setting.UI.IssuePagingNum,
@@ -143,7 +145,7 @@ func NotebookCreate(ctx *context.Context, form auth.CreateModelArtsNotebookForm)
RepoID: ctx.Repo.Repository.ID,
Type: -1,
JobTypeNot: false,
JobType: string(models.JobTypeDebug),
JobTypes: jobTypes,
})
if err == nil {
for _, task := range tasks {
@@ -803,6 +805,8 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
}

//判断项目内任务名称是否重复
var jobTypes []string
jobTypes = append(jobTypes, string(models.JobTypeTrain))
tasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
ListOptions: models.ListOptions{
PageSize: setting.UI.IssuePagingNum,
@@ -810,7 +814,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
RepoID: repo.ID,
Type: models.TypeCloudBrainTwo,
JobTypeNot: false,
JobType: string(models.JobTypeTrain),
JobTypes: jobTypes,
IsLatestVersion: modelarts.IsLatestVersion,
})
if err == nil {
@@ -1640,13 +1644,15 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
return
}

var jobTypes []string
jobTypes = append(jobTypes, string(models.JobTypeInference))
tasks, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
ListOptions: models.ListOptions{
PageSize: setting.UI.IssuePagingNum,
},
RepoID: repo.ID,
Type: models.TypeCloudBrainTwo,
JobType: string(models.JobTypeInference),
RepoID: repo.ID,
Type: models.TypeCloudBrainTwo,
JobTypes: jobTypes,
})

if err == nil {


Loading…
Cancel
Save