diff --git a/modules/dataset/dataset.go b/modules/dataset/dataset.go index 297ed460d..b07804b53 100644 --- a/modules/dataset/dataset.go +++ b/modules/dataset/dataset.go @@ -1,6 +1,10 @@ package dataset -import "code.gitea.io/gitea/models" +import ( + "strings" + + "code.gitea.io/gitea/models" +) func GetResourceType(cloudbrainType int) string { if cloudbrainType == 0 { @@ -33,3 +37,23 @@ func IsShowDataSetOfCurrentRepo(repoID int64) bool { return true } + +func GetFilterDeletedAttachments(uuids string) (string, string) { + attachments, err := models.GetAttachmentsByUUIDs(strings.Split(uuids, ";")) + if err != nil { + return "", "" + } + uuidR := "" + filenames := "" + for i, attachment := range attachments { + if i == 0 { + uuidR += attachment.UUID + filenames += attachment.Name + } else { + uuidR += ";" + attachment.UUID + filenames += ";" + attachment.Name + } + } + return uuidR, filenames + +} diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 4004b6efc..3c4a09b88 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -15,6 +15,8 @@ import ( "time" "unicode/utf8" + "code.gitea.io/gitea/modules/dataset" + "code.gitea.io/gitea/services/cloudbrain/resource" "code.gitea.io/gitea/services/reward/point/account" @@ -158,16 +160,10 @@ func cloudBrainNewDataPrepare(ctx *context.Context) error { ctx.Data["model_version"] = ctx.Cloudbrain.ModelVersion ctx.Data["pre_train_model_url"] = ctx.Cloudbrain.PreTrainModelUrl ctx.Data["compute_resource"] = ctx.Cloudbrain.ComputeResource - ctx.Data["attachment"] = ctx.Cloudbrain.Uuid + uuids, datasetNames := dataset.GetFilterDeletedAttachments(ctx.Cloudbrain.Uuid) + ctx.Data["attachment"] = uuids + ctx.Data["dataset_name"] = datasetNames ctx.Data["cluster_type"] = models.OpenICluster - _, _, datasetNames, _, err := getDatasUrlListByUUIDS(ctx.Cloudbrain.Uuid) - if err != nil { - log.Info("query dataset error," + err.Error()) - ctx.Data["dataset_name"] = "" - } else { - ctx.Data["dataset_name"] = datasetNames - } - } return nil diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index ba10a0862..dc05690df 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -12,6 +12,8 @@ import ( "strings" "time" + "code.gitea.io/gitea/modules/dataset" + "code.gitea.io/gitea/services/cloudbrain/resource" "code.gitea.io/gitea/services/reward/point/account" @@ -141,20 +143,21 @@ func grampusTrainJobNewDataPrepare(ctx *context.Context, processType string) err } if ctx.Cloudbrain != nil { - ctx.Data["attachment"] = ctx.Cloudbrain.Uuid + uuids, datasetNames := dataset.GetFilterDeletedAttachments(ctx.Cloudbrain.Uuid) + ctx.Data["attachment"] = uuids ctx.Data["boot_file"] = ctx.Cloudbrain.BootFile ctx.Data["image_id"] = ctx.Cloudbrain.ImageID ctx.Data["run_para_list"] = ctx.Cloudbrain.Parameters ctx.Data["description"] = ctx.Cloudbrain.Description ctx.Data["branch_name"] = ctx.Cloudbrain.BranchName ctx.Data["engine_name"] = ctx.Cloudbrain.EngineName - ctx.Data["WorkServerNumber"] = ctx.Cloudbrain.WorkServerNumber + ctx.Data["work_server_number"] = ctx.Cloudbrain.WorkServerNumber if ctx.Cloudbrain.Image != "" { ctx.Data["image"] = ctx.Cloudbrain.Image } else { ctx.Data["image"] = ctx.Cloudbrain.EngineName } - ctx.Data["dataset_name"] = ctx.Cloudbrain.DatasetName + ctx.Data["dataset_name"] = datasetNames ctx.Data["model_name"] = ctx.Cloudbrain.ModelName ctx.Data["model_version"] = ctx.Cloudbrain.ModelVersion diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 1f69d4669..7e03f1633 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -15,6 +15,8 @@ import ( "time" "unicode/utf8" + "code.gitea.io/gitea/modules/dataset" + "code.gitea.io/gitea/modules/modelarts_cd" "code.gitea.io/gitea/services/cloudbrain/resource" "code.gitea.io/gitea/services/reward/point/account" @@ -931,14 +933,11 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error { ctx.ServerError("GetBranches error:", err) return err } - _, _, datasetNames, _, err := getDatasUrlListByUUIDS(task.Uuid) - if err != nil { - log.Info("query dataset error," + err.Error()) - //ctx.ServerError("GetAllUserAttachments failed:", err) - //return err - } else { - ctx.Data["dataset_name"] = datasetNames - } + + uuids, datasetNames := dataset.GetFilterDeletedAttachments(task.Uuid) + + ctx.Data["dataset_name"] = datasetNames + ctx.Data["branches"] = branches ctx.Data["branch_name"] = task.BranchName ctx.Data["description"] = task.Description @@ -947,7 +946,7 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error { ctx.Data["work_server_number"] = task.WorkServerNumber ctx.Data["flavor_name"] = task.FlavorName ctx.Data["engine_name"] = task.EngineName - ctx.Data["attachment"] = task.Uuid + ctx.Data["attachment"] = uuids ctx.Data["flavor_code"] = task.FlavorCode ctx.Data["engine_id"] = task.EngineID ctx.Data["datasetType"] = models.TypeCloudBrainTwo diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index 0955d750a..45a9a0171 100644 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -355,23 +355,32 @@ - {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}} + {{$.i18n.Tr "repo.modelarts.model_name"}} - -
+ +
{{if .ModelName}}{{.ModelName}}{{else}}--{{end}}
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "repo.modelconvert.modelversion"}} - -
+ +
{{if .ModelVersion}}{{.ModelVersion}}{{else}}--{{end}}
+ + + {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} + + +
{{if .CkptName}}{{.CkptName}}{{else}}--{{end}}
+ + + @@ -431,10 +440,28 @@
- {{.Parameters}} + {{if .Parameters}}{{.Parameters}}{{else}}--{{end}}
+ + + {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}} + + + +
+ + + + + {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + + + +
+ + @@ -443,7 +470,7 @@
- {{.Description}} + {{if .Description}}{{.Description}}{{else}}--{{end}}
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 8d9946a09..294d5bad0 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -319,7 +319,7 @@
- {{.VersionName}} + {{if .VersionName}}{{.VersionName}}{{else}}--{{end}}
@@ -351,23 +351,32 @@ + - {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "repo.modelarts.model_name"}} - -
+ +
{{if .ModelName}}{{.ModelName}}{{else}}--{{end}}
- {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} + {{$.i18n.Tr "repo.modelconvert.modelversion"}} + -
- {{.WorkServerNumber}} -
+
{{if .ModelVersion}}{{.ModelVersion}}{{else}}--{{end}}
+ + + + + {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} + + + +
{{if .CkptName}}{{.CkptName}}{{else}}--{{end}}
@@ -408,47 +417,48 @@ + - {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}} + {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} -
- {{range $m ,$n := $.datasetDownload}} - {{if eq .IsDelete true}} - {{.DatasetName}}({{$.i18n.Tr "dataset.file_deleted"}}) - {{else}} - {{.DatasetName}} - {{end}} - - {{end}} +
+ {{if .Parameters}}{{.Parameters}}{{else}}--{{end}}
- {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} + {{$.i18n.Tr "repo.grampus.train_job.ai_center"}} -
- {{.Parameters}} +
+ {{if $.ai_center}}{{$.ai_center}}{{else}}--{{end}}
- {{$.i18n.Tr "repo.grampus.train_job.ai_center"}} + {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + +
+ + + + + {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} + -
- {{$.ai_center}} +
+ {{.WorkServerNumber}}
- {{$.i18n.Tr "repo.modelarts.train_job.description"}} @@ -457,7 +467,7 @@
- {{.Description}} + {{if .Description}}{{.Description}}{{else}}--{{end}}
@@ -466,7 +476,26 @@
- +
+ + + + + + {{range $m ,$n := $.datasetDownload}} + + + + {{end}} + +
{{$.i18n.Tr "dataset.file"}}
+ {{if eq .IsDelete true}} + {{.DatasetName}}({{$.i18n.Tr "dataset.file_deleted"}}) + {{else}} + {{.DatasetName}} + {{end}} +
+
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 2afabdf93..125d11517 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -393,28 +393,31 @@ - {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "repo.modelarts.model_name"}} - -
+ +
{{if .ModelName}}{{.ModelName}}{{else}}--{{end}}
+ + + + + {{$.i18n.Tr "repo.modelconvert.modelversion"}} + + + +
{{if .ModelVersion}}{{.ModelVersion}}{{else}}--{{end}}
+ + + + + {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} + + + +
{{if .CkptName}}{{.CkptName}}{{else}}--{{end}}
- -
@@ -461,22 +464,34 @@
- {{.Parameters}} + {{if .Parameters}}{{.Parameters}}{{else}}--{{end}}
+ - {{$.i18n.Tr "repo.modelarts.train_job.description"}} + {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - -
- {{.Cloudbrain.Description}} -
+ +
+ @@ -488,6 +503,18 @@ + + + {{$.i18n.Tr "repo.modelarts.train_job.description"}} + + + +
+ {{if .Cloudbrain.Description}}{{.Cloudbrain.Description}}{{else}}--{{end}} +
+ + @@ -693,7 +720,6 @@ -