From bb42d5f31984c891bd1019d6c3734c79fcaa9918 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 1 Aug 2022 11:15:13 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=9B=B8=E5=85=B3Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/storage/minio_ext.go | 62 ++++++++++++++++++++++++++++++++++++++++---- modules/storage/obs.go | 23 ---------------- routers/search.go | 7 +++-- 3 files changed, 62 insertions(+), 30 deletions(-) diff --git a/modules/storage/minio_ext.go b/modules/storage/minio_ext.go index 4c0cbac55..05b692335 100755 --- a/modules/storage/minio_ext.go +++ b/modules/storage/minio_ext.go @@ -179,30 +179,82 @@ func GetOneLevelAllObjectUnderDirMinio(bucket string, prefixRootPath string, rel output, err := core.ListObjects(bucket, Prefix, "", "", 1000) fileInfos := make([]FileInfo, 0) prefixLen := len(Prefix) + fileMap := make(map[string]bool, 0) if err == nil { for _, val := range output.Contents { + log.Info("val key=" + val.Key) var isDir bool var fileName string if val.Key == Prefix { continue } - if strings.HasSuffix(val.Key, "/") { + fileName = val.Key[prefixLen:] + log.Info("fileName =" + fileName) + files := strings.Split(fileName, "/") + if fileMap[files[0]] { + continue + } else { + fileMap[files[0]] = true + } + ParenDir := relativePath + fileName = files[0] + if len(files) > 1 { isDir = true - fileName = val.Key[prefixLen : len(val.Key)-1] - relativePath += val.Key[prefixLen:] + ParenDir += fileName + "/" } else { isDir = false - fileName = val.Key[prefixLen:] } + fileInfo := FileInfo{ ModTime: val.LastModified.Local().Format("2006-01-02 15:04:05"), FileName: fileName, Size: val.Size, IsDir: isDir, - ParenDir: relativePath, + ParenDir: ParenDir, } fileInfos = append(fileInfos, fileInfo) + + // log.Info("val key=" + val.Key) + // var isDir bool + // var fileName string + // if val.Key == Prefix { + // continue + // } + + // fileName = val.Key[prefixLen:] + // log.Info("fileName =" + fileName) + // files := strings.Split(fileName, "/") + // if fileMap[files[0]] { + // continue + // } else { + // fileMap[files[0]] = true + // } + // ParenDir := relativePath + // fileName = files[0] + // if len(files) > 1 { + // isDir = true + // ParenDir += fileName + "/" + // } else { + // isDir = false + // } + + // // if strings.HasSuffix(val.Key, "/") { + // // isDir = true + // // fileName = val.Key[prefixLen : len(val.Key)-1] + // // relativePath += val.Key[prefixLen:] + // // } else { + // // isDir = false + // // fileName = val.Key[prefixLen:] + // // } + // fileInfo := FileInfo{ + // ModTime: val.LastModified.Local().Format("2006-01-02 15:04:05"), + // FileName: fileName, + // Size: val.Size, + // IsDir: isDir, + // ParenDir: relativePath, + // } + // fileInfos = append(fileInfos, fileInfo) } return fileInfos, err } else { diff --git a/modules/storage/obs.go b/modules/storage/obs.go index 29b7998f7..2cb3af927 100755 --- a/modules/storage/obs.go +++ b/modules/storage/obs.go @@ -395,29 +395,6 @@ func GetOneLevelAllObjectUnderDir(bucket string, prefixRootPath string, relative } else { isDir = false } - - // if strings.Contains(val.Key[prefixLen:len(val.Key)-1], "/") { - - // files := strings.Split(fileName, "/") - // fileName = files[0] - // isDir = true - // if fileMap[files[0]] { - // continue - // } else { - // fileMap[files[0]] = true - // } - // } else { - // if strings.HasSuffix(val.Key, "/") { - // isDir = true - // fileName = val.Key[prefixLen : len(val.Key)-1] - // relativePath += val.Key[prefixLen:] - // } else { - // isDir = false - // fileName = val.Key[prefixLen:] - // } - // fileMap[fileName] = true - // } - fileInfo := FileInfo{ ModTime: val.LastModified.Local().Format("2006-01-02 15:04:05"), FileName: fileName, diff --git a/routers/search.go b/routers/search.go index 628350424..72bf97bf4 100644 --- a/routers/search.go +++ b/routers/search.go @@ -314,7 +314,7 @@ func searchRepo(ctx *context.Context, TableName string, Key string, Page int, Pa res, err := client.Search(TableName).Query(boolQ).SortBy(getSort(SortBy, ascending, "num_stars", false)...).From(from).Size(Size).Highlight(queryHighlight("alias", "description", "topics")).Do(ctx.Req.Context()) if err == nil { esresult := makeRepoResult(res, Key, OnlyReturnNum, language) - setForkRepoOrder(esresult) + setForkRepoOrder(esresult, SortBy) resultObj.Total = resultObj.PrivateTotal + esresult.Total isNeedSort := false if len(resultObj.Result) > 0 { @@ -347,7 +347,10 @@ func searchRepo(ctx *context.Context, TableName string, Key string, Page int, Pa } } -func setForkRepoOrder(esresult *SearchRes) { +func setForkRepoOrder(esresult *SearchRes, SortBy string) { + if SortBy == "default" || SortBy == "" { + return + } forkidMap := make(map[string]int, 0) for index, re := range esresult.Result { if re["fork_id"] != nil { From faaf5ebdf23a8afa7ec12cd5e849d748186160c1 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 1 Aug 2022 16:29:11 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/models/user.go b/models/user.go index a423a843b..6cf3fadb3 100755 --- a/models/user.go +++ b/models/user.go @@ -1768,7 +1768,6 @@ func (opts *SearchUserOptions) toConds() builder.Cond { if !opts.IsActive.IsNone() { cond = cond.And(builder.Eq{"is_active": opts.IsActive.IsTrue()}) } - return cond } @@ -1780,12 +1779,15 @@ func SearchUsers(opts *SearchUserOptions) (users []*User, _ int64, _ error) { if err != nil { return nil, 0, fmt.Errorf("Count: %v", err) } - + orderby := opts.OrderBy.String() if len(opts.OrderBy) == 0 { - opts.OrderBy = SearchOrderByAlphabetically + orderby = SearchOrderByAlphabetically.String() + lowerKeyword := strings.ToLower(opts.Keyword) + if len(opts.Keyword) > 0 { + orderby = " CASE when lower_name='" + lowerKeyword + "' then 0 when charindex('" + lowerKeyword + "',lower_name)>0 then 1 else 2 END ASC" + } } - - sess := x.Where(cond).OrderBy(opts.OrderBy.String()) + sess := x.Where(cond).OrderBy(orderby) if opts.Page != 0 { sess = opts.setSessionPagination(sess) } From d2c9eb1c803dcc017eb820db6377eeb6a2e0a91e Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 1 Aug 2022 16:39:52 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index 6cf3fadb3..dcbb9be3d 100755 --- a/models/user.go +++ b/models/user.go @@ -1784,7 +1784,7 @@ func SearchUsers(opts *SearchUserOptions) (users []*User, _ int64, _ error) { orderby = SearchOrderByAlphabetically.String() lowerKeyword := strings.ToLower(opts.Keyword) if len(opts.Keyword) > 0 { - orderby = " CASE when lower_name='" + lowerKeyword + "' then 0 when charindex('" + lowerKeyword + "',lower_name)>0 then 1 else 2 END ASC" + orderby = " CASE when lower_name='" + lowerKeyword + "' then 0 when strpos(lower_name,'" + lowerKeyword + "')>0 then 1 else 2 END ASC" } } sess := x.Where(cond).OrderBy(orderby) From 252995b0eb164df3b23210815ed301af1fbaabaa Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 1 Aug 2022 17:08:14 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/self/dataset_preview.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/public/self/dataset_preview.js b/public/self/dataset_preview.js index e6b79dd7d..81620e1a0 100644 --- a/public/self/dataset_preview.js +++ b/public/self/dataset_preview.js @@ -123,13 +123,13 @@ function loadimg(uuid,filename){ function loadimg(){ var length = labeltastresult[fileindex].pic_image_field.length; -  if(labeltastresult[fileindex].pic_image_field.substring(length - 5) == ".json"  -     || labeltastresult[fileindex].pic_image_field.substring(length - 4) == ".xml" -     || labeltastresult[fileindex].pic_image_field.substring(length - 4) == ".txt" -     || labeltastresult[fileindex].pic_image_field.substring(length - 4) == ".csv" -     || labeltastresult[fileindex].pic_image_field.substring(length - 3) == ".md" -     || labeltastresult[fileindex].pic_image_field.substring(length - 3) == ".py" -     || labeltastresult[fileindex].pic_image_field.substring(length - 3) == ".sh"){ +  if(labeltastresult[fileindex].pic_image_field.substring(length - 5).toLowerCase() == ".json"  +     || labeltastresult[fileindex].pic_image_field.substring(length - 4).toLowerCase() == ".xml" +     || labeltastresult[fileindex].pic_image_field.substring(length - 4).toLowerCase() == ".txt" +     || labeltastresult[fileindex].pic_image_field.substring(length - 4).toLowerCase() == ".csv" +     || labeltastresult[fileindex].pic_image_field.substring(length - 3).toLowerCase() == ".md" +     || labeltastresult[fileindex].pic_image_field.substring(length - 3).toLowerCase() == ".py" +     || labeltastresult[fileindex].pic_image_field.substring(length - 3).toLowerCase() == ".sh"){ //文本 canvas.style.display="none"; @@ -138,11 +138,11 @@ function loadimg(){ $('#textcontent').height(canvas.height-40) $("#textcontent").text(textContent); }else{ - if(labeltastresult[fileindex].pic_image_field.substring(length - 5) == ".jpeg"  -    || labeltastresult[fileindex].pic_image_field.substring(length - 4) == ".jpg" -    || labeltastresult[fileindex].pic_image_field.substring(length - 4) == ".bmp" -    || labeltastresult[fileindex].pic_image_field.substring(length - 4) == ".gif" -    || labeltastresult[fileindex].pic_image_field.substring(length - 4) == ".png"){ + if(labeltastresult[fileindex].pic_image_field.substring(length - 5).toLowerCase() == ".jpeg"  +    || labeltastresult[fileindex].pic_image_field.substring(length - 4).toLowerCase() == ".jpg" +    || labeltastresult[fileindex].pic_image_field.substring(length - 4).toLowerCase() == ".bmp" +    || labeltastresult[fileindex].pic_image_field.substring(length - 4).toLowerCase() == ".gif" +    || labeltastresult[fileindex].pic_image_field.substring(length - 4).toLowerCase() == ".png"){ canvas.style.display="block"; document.getElementById("textcontent").style.display="none"; img.src = ip + "/getgiteaimage?uuid=" + dataset_id + "&filename=" + labeltastresult[fileindex].pic_image_field; From 72faea06549cbbde59bdf4323af2863c7e38560d Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 2 Aug 2022 15:30:07 +0800 Subject: [PATCH 05/16] #2586 Signed-off-by: zouap --- models/user_business_analysis.go | 11 ++++- routers/repo/cloudbrain.go | 2 +- routers/repo/modelarts.go | 69 +++++++++++++++------------- templates/repo/cloudbrain/trainjob/show.tmpl | 4 +- 4 files changed, 52 insertions(+), 34 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index a36bd4736..0c67a569a 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -412,7 +412,16 @@ func QueryUserStaticDataAll(opts *UserBusinessAnalysisQueryOptions) ([]*UserBusi func QueryDataForUserDefineFromDb(opts *UserBusinessAnalysisQueryOptions, key string) ([]*UserBusinessAnalysis, int64) { statictisSess := xStatistic.NewSession() defer statictisSess.Close() - cond := "data_date='" + key + "'" + + var cond = builder.NewCond() + cond = cond.And( + builder.Eq{"data_date": key}, + ) + if len(opts.UserName) > 0 { + cond = cond.And( + builder.Like{"name", opts.UserName}, + ) + } allCount, err := statictisSess.Where(cond).Count(new(UserBusinessAnalysis)) if err == nil { if allCount > 0 { diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 32c5ea9f6..15c7a26fe 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -886,7 +886,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo } } - + ctx.Data["datasetDownload"] = GetCloudBrainDataSetInfo(task.Uuid, false) ctx.Data["task"] = task labelName := strings.Fields(task.LabelName) ctx.Data["LabelName"] = labelName diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 43f4a6e73..4be1389a2 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -302,34 +302,7 @@ func NotebookShow(ctx *context.Context) { datasetDownload := make([]models.DatasetDownload, 0) if ctx.IsSigned { if task.Uuid != "" && task.UserID == ctx.User.ID { - uuidList := strings.Split(task.Uuid, ";") - for _, uuidStr := range uuidList { - attachment, err := models.GetAttachmentByUUID(uuidStr) - if err != nil { - log.Error("GetAttachmentByUUID failed:%v", err.Error()) - return - } - dataset, err := models.GetDatasetByID(attachment.DatasetID) - if err != nil { - log.Error("GetDatasetByID failed:%v", err.Error()) - return - } - repo, err := models.GetRepositoryByID(dataset.RepoID) - if err != nil { - log.Error("GetRepositoryByID failed:%v", err.Error()) - return - } - datasetDownload = append(datasetDownload, models.DatasetDownload{ - DatasetName: attachment.Name, - DatasetDownloadLink: attachment.S3DownloadURL(), - RepositoryLink: repo.Link() + "/datasets", - }) - - } - // datasetName, err := GetDatasetNameByUUID(task.Uuid) - // if err == nil { - // task.DatasetName = datasetName - // } + datasetDownload = GetCloudBrainDataSetInfo(task.Uuid, true) } } user, err := models.GetUserByID(task.UserID) @@ -375,6 +348,39 @@ func NotebookShow(ctx *context.Context) { ctx.HTML(200, tplModelArtsNotebookShow) } +func GetCloudBrainDataSetInfo(uuid string, isNeedDown bool) []models.DatasetDownload { + datasetDownload := make([]models.DatasetDownload, 0) + + uuidList := strings.Split(uuid, ";") + for _, uuidStr := range uuidList { + attachment, err := models.GetAttachmentByUUID(uuidStr) + if err != nil { + log.Error("GetAttachmentByUUID failed:%v", err.Error()) + return datasetDownload + } + dataset, err := models.GetDatasetByID(attachment.DatasetID) + if err != nil { + log.Error("GetDatasetByID failed:%v", err.Error()) + return datasetDownload + } + repo, err := models.GetRepositoryByID(dataset.RepoID) + if err != nil { + log.Error("GetRepositoryByID failed:%v", err.Error()) + return datasetDownload + } + url := "" + if isNeedDown { + url = attachment.S3DownloadURL() + } + datasetDownload = append(datasetDownload, models.DatasetDownload{ + DatasetName: attachment.Name, + DatasetDownloadLink: url, + RepositoryLink: repo.Link() + "/datasets", + }) + } + return datasetDownload +} + func setShowSpecBySpecialPoolConfig(ctx *context.Context, findSpec bool, task *models.Cloudbrain) { modelarts.InitSpecialPool() if modelarts.SpecialPools != nil && !findSpec { @@ -1758,7 +1764,7 @@ func TrainJobShow(ctx *context.Context) { return } ctx.Data["canNewJob"] = canNewJob - + datasetList := make([][]models.DatasetDownload, 0) //将运行参数转化为epoch_size = 3, device_target = Ascend的格式 for i, task := range VersionListTasks { @@ -1781,7 +1787,7 @@ func TrainJobShow(ctx *context.Context) { } else { VersionListTasks[i].Parameters = "" } - + datasetList = append(datasetList, GetCloudBrainDataSetInfo(task.Uuid, false)) VersionListTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain) VersionListTasks[i].CanModify = cloudbrain.CanModifyJob(ctx, &task.Cloudbrain) } @@ -1793,6 +1799,7 @@ func TrainJobShow(ctx *context.Context) { ctx.Data["displayJobName"] = VersionListTasks[0].DisplayJobName ctx.Data["version_list_task"] = VersionListTasks ctx.Data["version_list_count"] = VersionListCount + ctx.Data["datasetList"] = datasetList ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, &VersionListTasks[0].Cloudbrain) ctx.HTML(http.StatusOK, tplModelArtsTrainJobShow) } @@ -2515,7 +2522,7 @@ func InferenceJobShow(ctx *context.Context) { ctx.Data["displayJobName"] = task.DisplayJobName ctx.Data["task"] = task ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task) - + ctx.Data["datasetDownload"] = GetCloudBrainDataSetInfo(task.Uuid, false) tempUids := []int64{} tempUids = append(tempUids, task.UserID) JobCreater, err := models.GetUserNamesByIDs(tempUids) diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index e4d8ff346..ca4e84a08 100644 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -428,7 +428,9 @@
- {{.DatasetName}} + {{range $m ,$n := $.datasetDownload}} + {{.DatasetName}} + {{end}}
From faba3350fddc554d822eb72dbef1913c41753b59 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 2 Aug 2022 15:40:08 +0800 Subject: [PATCH 06/16] #2586 Signed-off-by: zouap --- templates/repo/cloudbrain/inference/show.tmpl | 4 +++- templates/repo/cloudbrain/show.tmpl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/repo/cloudbrain/inference/show.tmpl b/templates/repo/cloudbrain/inference/show.tmpl index 055e403bd..c57a6fc66 100644 --- a/templates/repo/cloudbrain/inference/show.tmpl +++ b/templates/repo/cloudbrain/inference/show.tmpl @@ -468,7 +468,9 @@
- {{.DatasetName}} + {{range $m ,$n := $.datasetDownload}} + {{.DatasetName}} + {{end}}
diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 0c53f7fce..d111fe123 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -412,7 +412,9 @@
- {{.DatasetName}} + {{range $m ,$n := $.datasetDownload}} + {{.DatasetName}} + {{end}}
From 15a85da2949e99a3cc237e40bbb9e8e98feda432 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 2 Aug 2022 15:42:46 +0800 Subject: [PATCH 07/16] #2586 Signed-off-by: zouap --- templates/repo/grampus/trainjob/show.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 5d4321736..8111ec735 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -428,7 +428,9 @@
- {{.DatasetName}} + {{range $m ,$n := $.datasetDownload}} + {{.DatasetName}} + {{end}}
From efed4b0819d12138a79468acf90d73935120ca8e Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 2 Aug 2022 17:33:14 +0800 Subject: [PATCH 08/16] #2586 Signed-off-by: zouap --- routers/repo/grampus.go | 2 +- templates/repo/modelarts/inferencejob/show.tmpl | 4 +++- templates/repo/modelarts/trainjob/show.tmpl | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index 76f2bd98c..65dcbcb11 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -695,7 +695,7 @@ func GrampusTrainJobShow(ctx *context.Context) { taskList := make([]*models.Cloudbrain, 0) taskList = append(taskList, task) ctx.Data["version_list_task"] = taskList - + ctx.Data["datasetDownload"] = GetCloudBrainDataSetInfo(task.Uuid, false) ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task) ctx.Data["displayJobName"] = task.DisplayJobName diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl index 14bb5cf24..fcecaee47 100644 --- a/templates/repo/modelarts/inferencejob/show.tmpl +++ b/templates/repo/modelarts/inferencejob/show.tmpl @@ -409,7 +409,9 @@ td, th {
- {{.DatasetName}} + {{range $m ,$n := $.datasetDownload}} + {{.DatasetName}} + {{end}}
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index e61fafcdd..f20d25bed 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -460,7 +460,13 @@
- {{.DatasetName}} + {{range $m ,$n := $.datasetDownload}} + {{if eq $k $m}} + {{range $f ,$g := $n}} + {{.DatasetName}} + {{end}} + {{end}} + {{end}}
From bc17f9a9c4c7b44d762b46c481737e11c2cc2787 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 2 Aug 2022 17:43:36 +0800 Subject: [PATCH 09/16] #2586 Signed-off-by: zouap --- templates/repo/modelarts/trainjob/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index f20d25bed..c0c0418ba 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -460,7 +460,7 @@
- {{range $m ,$n := $.datasetDownload}} + {{range $m ,$n := $.datasetList}} {{if eq $k $m}} {{range $f ,$g := $n}} {{.DatasetName}} From 5f9e214c9614bd3f0c515484910bbdda699df539 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 3 Aug 2022 09:47:51 +0800 Subject: [PATCH 10/16] #2586 Signed-off-by: zouap --- templates/repo/modelmanage/showinfo.tmpl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl index a4577fe20..159e89cbf 100644 --- a/templates/repo/modelmanage/showinfo.tmpl +++ b/templates/repo/modelmanage/showinfo.tmpl @@ -125,6 +125,10 @@ + 训练任务 + + + {{$.i18n.Tr "repo.modelarts.code_version"}} @@ -279,6 +283,8 @@ function transObj(data){ WorkServerNumber:TrainTaskInfo.WorkServerNumber || '--', Parameters:Parameters, EngineName:EngineName, + DisplayJobName:TrainTaskInfo.DisplayJobName || '--', + TrainJobVersionName:TrainTaskInfo.VersionName || '--', } let initModelAcc = { Accuracy: modelAcc.Accuracy || '--', @@ -365,6 +371,11 @@ function renderInfo(obj,accObj,id){ $('#CodeBranch').append(html) } + else if(key==="DisplayJobName"){ + let versionName = obj["TrainJobVersionName"] + let html = `${versionName}` + $('#DisplayJobName').append(html) + } else if(key==="Parameters"){ if(obj[key]==='--'){ $(`#${key}`).text(obj[key]) From 7a37c2875d2e2e1842119828e3fca71388fdf355 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 3 Aug 2022 10:09:25 +0800 Subject: [PATCH 11/16] #2586 Signed-off-by: zouap --- templates/repo/modelmanage/showinfo.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl index 159e89cbf..93852b052 100644 --- a/templates/repo/modelmanage/showinfo.tmpl +++ b/templates/repo/modelmanage/showinfo.tmpl @@ -284,7 +284,7 @@ function transObj(data){ Parameters:Parameters, EngineName:EngineName, DisplayJobName:TrainTaskInfo.DisplayJobName || '--', - TrainJobVersionName:TrainTaskInfo.VersionName || '--', + TrainJobVersionName:TrainTaskInfo.VersionName || '', } let initModelAcc = { Accuracy: modelAcc.Accuracy || '--', @@ -372,6 +372,8 @@ function renderInfo(obj,accObj,id){ } else if(key==="DisplayJobName"){ + $(`#${key}`).text(obj[key]) + $(`#${key}`).attr("title",obj[key]) let versionName = obj["TrainJobVersionName"] let html = `${versionName}` $('#DisplayJobName').append(html) From dc1bc115d88de2002e7673fb29e69167b2da57e2 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 3 Aug 2022 10:39:45 +0800 Subject: [PATCH 12/16] #2586 Signed-off-by: zouap --- templates/repo/modelmanage/showinfo.tmpl | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl index 93852b052..a4201910f 100644 --- a/templates/repo/modelmanage/showinfo.tmpl +++ b/templates/repo/modelmanage/showinfo.tmpl @@ -126,7 +126,11 @@ 训练任务 - + + + + + {{$.i18n.Tr "repo.modelarts.code_version"}} @@ -201,6 +205,7 @@ {{template "base/footer" .}}