diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 2459e6b7a..b76294ddd 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -62,6 +62,7 @@ type Cloudbrain struct { Type int `xorm:"INDEX DEFAULT 0"` VersionID int64 `xorm:"INDEX DEFAULT 0"` VersionName string + Uuid string User *User `xorm:"-"` Repo *Repository `xorm:"-"` @@ -636,18 +637,20 @@ type GetTrainJobResult struct { //DataSource []DataSource `json:"data_source"` //SpecID int64 `json:"spec_id"` EngineID int64 `json:"engine_id"` + EngineName string `json:"engine_name"` + EngineVersion string `json:"engine_version"` //ModelID int64 `json:"model_id"` TrainUrl string `json:"train_url"` //训练作业的输出文件OBS路径URL LogUrl string `json:"log_url"` //UserImageUrl string `json:"user_image_url"` //UserCommand string `json:"user_command"` - CreateVersion bool `json:"create_version"` //Volumes []Volumes `json:"volumes"` Flavor Flavor `json:"flavor"` PoolID string `json:"pool_id"` PoolName string `json:"pool_name"` NasMountPath string `json:"nas_mount_path"` NasShareAddr string `json:"nas_share_addr"` + DatasetName string } type GetTrainJobLogResult struct { diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index 551353bd5..0ee88acca 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -107,6 +107,7 @@ func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, SubTaskName: SubTaskName, JobType: jobType, Type: models.TypeCloudBrainOne, + Uuid: uuid, }) if err != nil { diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index fda8d46c8..676d4a6a5 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -129,6 +129,7 @@ func GenerateTask(ctx *context.Context, jobName, uuid, description string) error JobName: jobName, JobType: string(models.JobTypeDebug), Type: models.TypeCloudBrainNotebook, + Uuid: uuid, }) if err != nil { @@ -173,6 +174,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) error { Type: models.TypeCloudBrainTrainJob, VersionID: jobResult.VersionID, VersionName: jobResult.VersionName, + Uuid: req.Uuid, }) if err != nil { diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 644bcb52b..d6396e8f7 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -427,6 +427,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) EngineID: int64(engineID), LogUrl: logObsPath, PoolID: poolID, + Uuid: uuid, } err := modelarts.GenerateTrainJob(ctx, req) @@ -537,6 +538,13 @@ func TrainJobShow(ctx *context.Context) { return } + attach, err := models.GetAttachmentByUUID(task.Uuid) + if err != nil { + log.Error("GetAttachmentByUUID(%s) failed:%v", jobID, err.Error()) + ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobIndex, nil) + return + } + result, err := modelarts.GetTrainJob(jobID, strconv.FormatInt(task.VersionID, 10)) if err != nil { log.Error("GetJob(%s) failed:%v", jobID, err.Error()) @@ -547,6 +555,7 @@ func TrainJobShow(ctx *context.Context) { if result != nil { result.CreateTime = time.Unix(int64(result.LongCreateTime/1000), 0).Format("2006-01-02 15:04:05") result.Status = modelarts.TransTrainJobStatus(result.IntStatus) + result.DatasetName = attach.Name } ctx.Data["task"] = task diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl index f3be13c3f..4b097dd9e 100755 --- a/templates/repo/modelarts/trainjob/index.tmpl +++ b/templates/repo/modelarts/trainjob/index.tmpl @@ -125,6 +125,27 @@ + + +
+ +
{{template "base/footer" .}} diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 95e336cc6..47cf9de59 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -66,7 +66,7 @@ {{.i18n.Tr "repo.modelarts.train_job.AI_driver"}} - {{.result.BootFileUrl}} + {{.result.EngineName}} | {{.result.EngineVersion}} {{.i18n.Tr "repo.modelarts.train_job.start_file"}} @@ -74,7 +74,7 @@ {{.i18n.Tr "repo.modelarts.train_job.dataset"}} - {{.result.BootFileUrl}} + {{.result.DatasetName}} {{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}