diff --git a/entity/ai_task.go b/entity/ai_task.go index 5e4a2d8f0c..da78e29abf 100644 --- a/entity/ai_task.go +++ b/entity/ai_task.go @@ -143,6 +143,7 @@ type AITaskDetailInfo struct { FailedReason string `json:"failed_reason"` UserId int64 `json:"-"` AppName string `json:"app_name"` + HasInternet int `json:"has_internet"` } func (a *AITaskDetailInfo) Tr(language string) { diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 0df9f82378..46669d1e1c 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -310,6 +310,7 @@ type Cloudbrain struct { Spec *Specification `xorm:"-"` Config *CloudbrainConfig `xorm:"-"` AppName string //超算任务的应用类型 + HasInternet int } type CloudbrainShow struct { diff --git a/models/resource_queue.go b/models/resource_queue.go index 7da02bedec..6a97fddd6d 100644 --- a/models/resource_queue.go +++ b/models/resource_queue.go @@ -100,11 +100,13 @@ type ResourceQueueListRes struct { } type ResourceQueueCodesRes struct { - ID int64 - QueueCode string - Cluster string - AiCenterCode string - AiCenterName string + ID int64 + QueueCode string + Cluster string + AiCenterCode string + AiCenterName string + ComputeResource string + AccCardType string } func (ResourceQueueCodesRes) TableName() string { diff --git a/services/ai_task_service/task/opt_handler.go b/services/ai_task_service/task/opt_handler.go index 2950b174f1..42087db55e 100644 --- a/services/ai_task_service/task/opt_handler.go +++ b/services/ai_task_service/task/opt_handler.go @@ -107,6 +107,7 @@ func (DefaultCreationHandler) BuildRequest4Restart(ctx *context.CreationContext) IsFileNoteBookRequest: task.BootFile != "", IsRestartRequest: true, DatasetNames: task.DatasetName, + HasInternet: models.SpecInternetQuery(task.HasInternet), } log.Info("BuildRequest4Restart success.displayJobName=%s jobType=%s cluster=%s", ctx.Request.DisplayJobName, ctx.Request.JobType, ctx.Request.Cluster) return nil @@ -422,6 +423,7 @@ func (DefaultCreationHandler) InsertCloudbrainRecord4Async(ctx *context.Creation UpdatedUnix: timeutil.TimeStampNow(), GpuQueue: ctx.Spec.QueueCode, AppName: req.AppName, + HasInternet: int(req.HasInternet), } err := models.CreateCloudbrain(c) @@ -595,6 +597,7 @@ func (DefaultCreationHandler) CreateCloudbrainRecord4Restart(ctx *context.Creati SubTaskName: models.SubTaskName, ModelId: req.PretrainModelId, GpuQueue: ctx.Spec.QueueCode, + HasInternet: int(req.HasInternet), } err := models.RestartCloudbrain(ctx.SourceCloudbrain, c) diff --git a/services/ai_task_service/task/task_service.go b/services/ai_task_service/task/task_service.go index c7d7a477d0..048648aca9 100644 --- a/services/ai_task_service/task/task_service.go +++ b/services/ai_task_service/task/task_service.go @@ -138,6 +138,7 @@ func buildAITaskInfo(task *models.Cloudbrain, creator *models.User, config *enti EngineName: task.EngineName, UserId: task.UserID, AppName: task.AppName, + HasInternet: task.HasInternet, }, nil } diff --git a/web_src/vuepages/apis/modules/modelbase.js b/web_src/vuepages/apis/modules/modelbase.js index 492f8d76d4..c6511c3cc1 100644 --- a/web_src/vuepages/apis/modules/modelbase.js +++ b/web_src/vuepages/apis/modules/modelbase.js @@ -52,13 +52,15 @@ export const stopTrainJob = (params) => { url: `/api/v1/repos/${params.userName}/openi-notebook/modelarts/train-job/${params.jobId}/stop_version`, method: 'post', params: {}, + data: {}, }); } // 删除训练任务 export const deleteTrainJob = (params) => { return service({ - url: `/api/v1/repos/${params.userName}/openi-notebook/modelarts/train-job/${params.jobId}/del_version`, + // url: `/api/v1/repos/${params.userName}/openi-notebook/modelarts/train-job/${params.jobId}/del_version`, + url: `/api/v1/${params.userName}/openi-notebook/ai_task/del?id=${params.id}`, method: 'post', params: {}, }); diff --git a/web_src/vuepages/components/cloudbrain/details/ConfigInfo.vue b/web_src/vuepages/components/cloudbrain/details/ConfigInfo.vue index 8ffab07567..fdc99014bd 100644 --- a/web_src/vuepages/components/cloudbrain/details/ConfigInfo.vue +++ b/web_src/vuepages/components/cloudbrain/details/ConfigInfo.vue @@ -1,15 +1,18 @@