From ed289fba93da1295d21a3eb03ddc37e33ecae705 Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 25 Mar 2022 16:27:25 +0800 Subject: [PATCH 01/81] fix-1647 --- routers/repo/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 9c670e203..83dba1796 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -1475,7 +1475,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["canDownload"] = cloudbrain.CanDeleteJob(ctx, &VersionListTasks[0].Cloudbrain) + ctx.Data["canDownload"] = canNewJob ctx.HTML(http.StatusOK, tplModelArtsTrainJobShow) } From 9fcbd70f1e5bab1239bc1d986ef120f975210d74 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 28 Mar 2022 17:05:42 +0800 Subject: [PATCH 02/81] fix issue --- web_src/js/index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web_src/js/index.js b/web_src/js/index.js index 902750c5b..f245045db 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2788,6 +2788,9 @@ $(document).ready(async () => { }); } }); + this.on('addedfile',(file)=>{ + console.log("addfile",file) + }) } }); } From ce3d50cd068e6789d0b5b3a3a001dad628bbb582 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 29 Mar 2022 10:23:57 +0800 Subject: [PATCH 03/81] fix issue --- templates/repo/editor/upload.tmpl | 2 +- web_src/js/index.js | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl index 7794c2a2d..08727600c 100644 --- a/templates/repo/editor/upload.tmpl +++ b/templates/repo/editor/upload.tmpl @@ -27,7 +27,7 @@
-
+
{{template "repo/editor/commit_form" .}} diff --git a/web_src/js/index.js b/web_src/js/index.js index f245045db..a832c0b4b 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2769,6 +2769,7 @@ $(document).ready(async () => { dictInvalidFileType: $dropzone.data('invalid-input-type'), dictFileTooBig: $dropzone.data('file-too-big'), dictRemoveFile: $dropzone.data('remove-file'), + dictMaxFilesExceeded:'上次超过限制', init() { this.on('success', (file, data) => { filenameDict[file.name] = data.uuid; @@ -2789,8 +2790,20 @@ $(document).ready(async () => { } }); this.on('addedfile',(file)=>{ - console.log("addfile",file) + console.log("addfile",file,filenameDict,this.files.length) + if(file.size/(1000*1000)>3){ + this.removeFile(file) + $('.maxfilesize.ui.red.message').text('单次最多上传XX个文件，每个文件不超过XXM。') + $('.maxfilesize.ui.red.message').css('display','block') + } + + }); + this.on('maxfilesexceeded',(file)=>{ + this.removeFile(file) + $('.maxfilesize.ui.red.message').text('一次最多只能上传 5 个文件, 上传已达到上限，请勿再添加文件。') + $('.maxfilesize.ui.red.message').css('display','block') }) + } }); } From 2e405768a9a65614ea78aa1de5e1b5b08b59b133 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Fri, 1 Apr 2022 15:22:55 +0800 Subject: [PATCH 04/81] #1639 add repo total size limit --- modules/setting/repository.go | 1 + routers/repo/editor.go | 7 +++++ services/repository/repository.go | 59 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 8af3eaaf4..a9786ca18 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -40,6 +40,7 @@ var ( DisabledRepoUnits []string DefaultRepoUnits []string PrefixArchiveFiles bool + RepoMaxSize int64 // Repository editor settings Editor struct { diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 2fa7976e0..94ced019c 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -5,6 +5,7 @@ package repo import ( + repo_service "code.gitea.io/gitea/services/repository" "encoding/json" "fmt" "io/ioutil" @@ -614,6 +615,12 @@ func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) { message += "\n\n" + form.CommitMessage } + if err := repo_service.CheckRepoSizeLimit(ctx.Repo.Repository, form.Files); err != nil { + //ctx.RenderWithErr(ctx.Tr("repo.editor.directory_is_a_file", part), tplUploadFile, &form) + ctx.RenderWithErr(err.Error(), tplUploadFile, &form) + return + } + if err := repofiles.UploadRepoFiles(ctx.Repo.Repository, ctx.User, &repofiles.UploadRepoFileOptions{ LastCommitID: ctx.Repo.CommitID, OldBranch: oldBranchName, diff --git a/services/repository/repository.go b/services/repository/repository.go index cea16516a..c9080f930 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -5,9 +5,11 @@ package repository import ( + "errors" "fmt" "io/ioutil" "net/http" + "os" "strings" "code.gitea.io/gitea/models" @@ -172,3 +174,60 @@ func RecommendFromPromote(url string) ([]string, error) { } return result, nil } + +func CheckRepoSizeLimit(repo *models.Repository, fileIds []string) error { + if err := CheckRepoNumOnceLimit(len(fileIds)); err != nil { + return err + } + totalSize, err := CountUploadFileSizeByIds(fileIds) + if err != nil { + return errors.New("upload files are invalid") + } + if err := CheckRepoTotalSizeLimit(repo, totalSize); err != nil { + return err + } + return nil +} + +func CheckRepoTotalSizeLimit(repo *models.Repository, uploadFileSize int64) error { + if repo.Size+uploadFileSize > setting.Repository.RepoMaxSize*1024*1024 { + return errors.New(fmt.Sprintf("repository can not exceed %d MB", setting.Repository.RepoMaxSize)) + } + return nil +} + +func CheckRepoNumOnceLimit(uploadFileNum int) error { + if uploadFileNum > setting.Repository.Upload.MaxFiles { + return errors.New(fmt.Sprintf("can not upload more than %d files at a time", setting.Repository.Upload.MaxFiles)) + } + return nil +} + +func CountUploadFileSizeByIds(fileIds []string) (int64, error) { + if len(fileIds) == 0 { + return 0, nil + } + uploads, err := models.GetUploadsByUUIDs(fileIds) + if err != nil { + return 0, fmt.Errorf("CountUploadFileSizeByIds error [uuids: %v]: %v", fileIds, err) + } + var totalSize int64 + for _, upload := range uploads { + size, err := GetUploadFileSize(upload) + if err != nil { + return 0, err + } + totalSize += size + } + return totalSize, nil +} + +func GetUploadFileSize(upload *models.Upload) (int64, error) { + info, err := os.Lstat(upload.LocalPath()) + + if err != nil { + return 0, err + } + return info.Size(), nil + +} From 9281749d32231f60b6380107e1a799e951edb73f Mon Sep 17 00:00:00 2001 From: zouap Date: Sat, 2 Apr 2022 10:05:42 +0800 Subject: [PATCH 05/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/dbsql/issue_foreigntable_for_es.sql | 1 + routers/search.go | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/models/dbsql/issue_foreigntable_for_es.sql b/models/dbsql/issue_foreigntable_for_es.sql index 30fa01550..d6a16cd27 100644 --- a/models/dbsql/issue_foreigntable_for_es.sql +++ b/models/dbsql/issue_foreigntable_for_es.sql @@ -193,6 +193,7 @@ $def$ name=NEW.name, is_closed=NEW.is_closed, num_comments=NEW.num_comments, + updated_unix=NEW.updated_unix, comment=(select array_to_string(array_agg(content order by created_unix desc),',') from public.comment where issue_id=NEW.id) where id=NEW.id; return new; diff --git a/routers/search.go b/routers/search.go index bc1bc5fac..51ded8cb3 100644 --- a/routers/search.go +++ b/routers/search.go @@ -573,7 +573,8 @@ func trimFontHtml(text []rune) string { startRune := rune('<') endRune := rune('>') count := 0 - for i := 0; i < len(text); i++ { + i := 0 + for ; i < len(text); i++ { if text[i] == startRune { //start < re := false j := i + 1 @@ -592,11 +593,14 @@ func trimFontHtml(text []rune) string { } else { return string(text[0:i]) } - } } } - return string(text) + if count%2 == 1 { + return string(text[0:i]) + "" + } else { + return string(text[0:i]) + } } func trimHrefHtml(result string) string { From c9492549de86fa25b18ba33494a1d82a4176d615 Mon Sep 17 00:00:00 2001 From: zouap Date: Sat, 2 Apr 2022 10:28:11 +0800 Subject: [PATCH 06/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/search.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/search.go b/routers/search.go index 51ded8cb3..c5655b9e1 100644 --- a/routers/search.go +++ b/routers/search.go @@ -1129,7 +1129,7 @@ func makePrivateIssueOrPr(issues []*models.Issue, res *SearchRes, Key string, la record["num_comments"] = issue.NumComments record["is_closed"] = issue.IsClosed record["updated_unix"] = issue.UpdatedUnix - record["updated_html"] = timeutil.TimeSinceUnix(repo.UpdatedUnix, language) + record["updated_html"] = timeutil.TimeSinceUnix(issue.UpdatedUnix, language) res.Result = append(res.Result, record) } } From fa0f91d24f537f4bb44a01435e7bfe6aee5417ee Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 6 Apr 2022 16:56:15 +0800 Subject: [PATCH 07/81] fix 1718 --- routers/repo/cloudbrain.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 73b1914e5..322b131c8 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -346,6 +346,24 @@ func CloudBrainRestart(ctx *context.Context) { break } + var hasSameResource bool + if gpuInfos == nil { + json.Unmarshal([]byte(setting.GpuTypes), &gpuInfos) + } + for _, resourceType := range gpuInfos.GpuInfo { + if resourceType.Queue == task.GpuQueue { + hasSameResource = true + continue + } + } + + if !hasSameResource { + log.Error("has no same resource, can not restart", ctx.Data["MsgID"]) + resultCode = "-1" + errorMsg = "the job's version is too old and can not be restarted" + break + } + count, err := models.GetCloudbrainCountByUserID(ctx.User.ID, string(models.JobTypeDebug)) if err != nil { log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"]) From 6eb17718d0f33e13170993ed8a63c7c996035507 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Thu, 7 Apr 2022 09:40:35 +0800 Subject: [PATCH 08/81] fix-1827 --- models/dataset.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/models/dataset.go b/models/dataset.go index 7cac6c468..939aa8634 100755 --- a/models/dataset.go +++ b/models/dataset.go @@ -62,19 +62,20 @@ func (datasets DatasetList) loadAttributes(e Engine) error { } set := make(map[int64]struct{}) + userIdSet := make(map[int64]struct{}) datasetIDs := make([]int64, len(datasets)) for i := range datasets { - set[datasets[i].UserID] = struct{}{} + userIdSet[datasets[i].UserID] = struct{}{} set[datasets[i].RepoID] = struct{}{} datasetIDs[i] = datasets[i].ID } // Load owners. - users := make(map[int64]*User, len(set)) + users := make(map[int64]*User, len(userIdSet)) repos := make(map[int64]*Repository, len(set)) if err := e. Where("id > 0"). - In("id", keysInt64(set)). + In("id", keysInt64(userIdSet)). Find(&users); err != nil { return fmt.Errorf("find users: %v", err) } From d38f55927b3d0e82927c3ac4999f474ffb4aacbb Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 7 Apr 2022 10:31:39 +0800 Subject: [PATCH 09/81] #1639 add error msg for shell --- options/locale/locale_en-US.ini | 4 +++ options/locale/locale_zh-CN.ini | 3 +++ routers/repo/editor.go | 11 ++++++-- routers/repo/http.go | 52 +++++++++++++++++++++++++++++++++--- services/repository/repository.go | 55 ++++++++++++++++++++++++++++++++++++--- 5 files changed, 116 insertions(+), 9 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a990e9aee..f9bebbb86 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1236,6 +1236,10 @@ editor.cannot_commit_to_protected_branch = Cannot commit to protected branch '%s editor.no_commit_to_branch = Unable to commit directly to branch because: editor.user_no_push_to_branch = User cannot push to branch editor.require_signed_commit = Branch requires a signed commit +editor.repo_too_large = Repository can not exceed %d MB +editor.repo_file_invalid = Upload files are invalid +editor.upload_file_too_much = Can not upload more than %d files at a time + commits.desc = Browse source code change history. commits.commits = Commits diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 4e73fbad5..8679554c6 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1244,6 +1244,9 @@ editor.cannot_commit_to_protected_branch=不可以提交到受保护的分支 '% editor.no_commit_to_branch=无法直接提交分支，因为： editor.user_no_push_to_branch=用户不能推送到分支 editor.require_signed_commit=分支需要签名提交 +editor.repo_too_large = 代码仓总大小不能超过%dMB +editor.repo_file_invalid = 提交的文件非法 +editor.upload_file_too_much = 不能同时提交超过%d个文件 commits.desc=浏览代码修改历史 commits.commits=次代码提交 diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 94ced019c..b089a784c 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -616,8 +616,15 @@ func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) { } if err := repo_service.CheckRepoSizeLimit(ctx.Repo.Repository, form.Files); err != nil { - //ctx.RenderWithErr(ctx.Tr("repo.editor.directory_is_a_file", part), tplUploadFile, &form) - ctx.RenderWithErr(err.Error(), tplUploadFile, &form) + if repo_service.IsRepoTooLargeErr(err) { + ctx.RenderWithErr(ctx.Tr("repo.editor.repo_too_large", setting.Repository.RepoMaxSize), tplUploadFile, &form) + } else if repo_service.IsUploadFileInvalidErr(err) { + ctx.RenderWithErr(ctx.Tr("repo.editor.repo_file_invalid"), tplUploadFile, &form) + } else if repo_service.IsUploadFileTooMuchErr(err) { + ctx.RenderWithErr(ctx.Tr("repo.editor.upload_file_too_much", setting.Repository.Upload.MaxFiles), tplUploadFile, &form) + } else { + ctx.RenderWithErr(err.Error(), tplUploadFile, &form) + } return } diff --git a/routers/repo/http.go b/routers/repo/http.go index 87406a2c3..99d38d437 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -365,8 +365,7 @@ func HTTP(ctx *context.Context) { ctx.NotFound("Smart Git HTTP", err) return } - - route.handler(serviceHandler{cfg, w, r, dir, file, cfg.Env}) + route.handler(serviceHandler{cfg, w, r, dir, file, cfg.Env, repo}) return } } @@ -429,6 +428,7 @@ type serviceHandler struct { dir string file string environ []string + repo *models.Repository } func (h *serviceHandler) setHeaderNoCache() { @@ -546,6 +546,19 @@ func serviceRPC(h serviceHandler, service string) { return } } + content, _ := ioutil.ReadAll(reqBody) + //check size + if service == "receive-pack" { + if err := repo_service.CheckRepoTotalSizeLimit(h.repo, int64(len(content))); err != nil { + h.w.WriteHeader(http.StatusOK) + str := GenerateGitErrorBody(err.Error()) + h.w.Write([]byte(str)) + if h.w.Header().Get("Content-Type") == "" { + h.w.Header().Set("Content-Type", "application/x-git-receive-pack-result") + } + return + } + } // set this for allow pre-receive and post-receive execute h.environ = append(h.environ, "SSH_ORIGINAL_COMMAND="+service) @@ -560,7 +573,7 @@ func serviceRPC(h serviceHandler, service string) { } cmd.Stdout = h.w - cmd.Stdin = reqBody + cmd.Stdin = bytes.NewReader(content) cmd.Stderr = &stderr pid := process.GetManager().Add(fmt.Sprintf("%s %s %s [repo_path: %s]", git.GitExecutable, service, "--stateless-rpc", h.dir), cancel) @@ -572,6 +585,39 @@ func serviceRPC(h serviceHandler, service string) { } } +func GenerateGitErrorBody(content string) string { + var builder strings.Builder + builder.WriteString(GenerateErrStartPKTLine()) + builder.WriteString(GeneratePKTLine(content)) + builder.WriteString(GenerateEndPKTLine()) + return builder.String() +} + +func GeneratePKTLine(content string) string { + content = "\u0002\033[31m " + content + " \033[0m" + l := len(content) + prefixLength := 4 + suffix := "\n" + f := strconv.FormatInt(int64(l+prefixLength+len(suffix)), 16) + lf := len(f) + if lf == 1 { + f = "000" + f + } else if lf == 2 { + f = "00" + f + } else if lf == 3 { + f = "0" + f + } + return f + content + suffix +} + +func GenerateEndPKTLine() string { + return "0000" +} + +func GenerateErrStartPKTLine() string { + return "0031\u0001000eunpack err\n0019ok refs/heads/master\n0000" +} + func serviceUploadPack(h serviceHandler) { serviceRPC(h, "upload-pack") } diff --git a/services/repository/repository.go b/services/repository/repository.go index c9080f930..fc4411056 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -5,7 +5,6 @@ package repository import ( - "errors" "fmt" "io/ioutil" "net/http" @@ -181,7 +180,7 @@ func CheckRepoSizeLimit(repo *models.Repository, fileIds []string) error { } totalSize, err := CountUploadFileSizeByIds(fileIds) if err != nil { - return errors.New("upload files are invalid") + return UploadFileInvalidErr{} } if err := CheckRepoTotalSizeLimit(repo, totalSize); err != nil { return err @@ -191,14 +190,14 @@ func CheckRepoSizeLimit(repo *models.Repository, fileIds []string) error { func CheckRepoTotalSizeLimit(repo *models.Repository, uploadFileSize int64) error { if repo.Size+uploadFileSize > setting.Repository.RepoMaxSize*1024*1024 { - return errors.New(fmt.Sprintf("repository can not exceed %d MB", setting.Repository.RepoMaxSize)) + return RepoTooLargeErr{} } return nil } func CheckRepoNumOnceLimit(uploadFileNum int) error { if uploadFileNum > setting.Repository.Upload.MaxFiles { - return errors.New(fmt.Sprintf("can not upload more than %d files at a time", setting.Repository.Upload.MaxFiles)) + return UploadFileTooMuchErr{} } return nil } @@ -231,3 +230,51 @@ func GetUploadFileSize(upload *models.Upload) (int64, error) { return info.Size(), nil } + +type RepoTooLargeErr struct { +} + +func (RepoTooLargeErr) Error() string { + return fmt.Sprintf("Repository can not exceed %d MB. Please remove some unnecessary files and try again", setting.Repository.RepoMaxSize) +} + +func IsRepoTooLargeErr(err error) bool { + _, ok := err.(RepoTooLargeErr) + return ok +} + +type RepoFileTooLargeErr struct { +} + +func (RepoFileTooLargeErr) Error() string { + return "repository file is too large" +} + +func IsRepoFileTooLargeErr(err error) bool { + _, ok := err.(RepoFileTooLargeErr) + return ok +} + +type UploadFileTooMuchErr struct { +} + +func (UploadFileTooMuchErr) Error() string { + return "upload files are too lmuch" +} + +func IsUploadFileTooMuchErr(err error) bool { + _, ok := err.(UploadFileTooMuchErr) + return ok +} + +type UploadFileInvalidErr struct { +} + +func (UploadFileInvalidErr) Error() string { + return "upload files are invalid" +} + +func IsUploadFileInvalidErr(err error) bool { + _, ok := err.(UploadFileInvalidErr) + return ok +} From 4197eaec1303d88b38e751d5269fa37c312e2f04 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 7 Apr 2022 10:42:05 +0800 Subject: [PATCH 10/81] no_record md5 --- models/attachment.go | 1 + models/dataset.go | 9 ++++++++- templates/repo/datasets/index.tmpl | 10 +++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/models/attachment.go b/models/attachment.go index a3fc6fa01..7c95a73dd 100755 --- a/models/attachment.go +++ b/models/attachment.go @@ -51,6 +51,7 @@ type Attachment struct { FileChunk *FileChunk `xorm:"-"` CanDel bool `xorm:"-"` Uploader *User `xorm:"-"` + Md5 string `xorm:"-"` } type AttachmentUsername struct { diff --git a/models/dataset.go b/models/dataset.go index 7cac6c468..c56a8fdc3 100755 --- a/models/dataset.go +++ b/models/dataset.go @@ -1,6 +1,7 @@ package models import ( + "code.gitea.io/gitea/modules/log" "errors" "fmt" "sort" @@ -296,7 +297,13 @@ func getDatasetAttachments(e Engine, typeCloudBrain int, isSigned bool, user *Us if err != nil { return err } - attachment.FileChunk = fileChunks[0] + if len(fileChunks) > 0 { + attachment.Md5 = fileChunks[0].Md5 + } else { + log.Error("has attachment record, but has no file_chunk record") + attachment.Md5 = "no_record" + } + attachment.CanDel = CanDelAttachment(isSigned, user, attachment) sortedRels.Rel[currentIndex].Attachments = append(sortedRels.Rel[currentIndex].Attachments, attachment) } diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 065ada386..e8d9b65e3 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -199,7 +199,7 @@ {{range $k, $v :=.Attachments}} -
+
@@ -266,8 +266,8 @@ {{$.i18n.Tr "preview"}} {{end}} {{if and (.CanDel) (not $.Repository.IsPrivate)}} - {{$.i18n.Tr "dataset.set_public"}} - {{$.i18n.Tr "dataset.set_private"}} + {{$.i18n.Tr "dataset.set_public"}} + {{$.i18n.Tr "dataset.set_private"}} {{end}} +
+
+
+ {{.i18n.Tr "cloudbrain.delete_task"}} +
+
+

{{.i18n.Tr "cloudbrain.task_delete_confirm"}}

+
+
+
+ {{.i18n.Tr "cloudbrain.operate_cancel"}} +
+
+ {{.i18n.Tr "cloudbrain.operate_confirm"}} +
+
+
-
+ +
{{template "base/footer" .}} + + From 45ec621d6f76b249aae0b2548f8ff017e34db83d Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 7 Apr 2022 10:44:14 +0800 Subject: [PATCH 12/81] add stop status --- templates/admin/cloudbrain/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 02f100e46..6fea2eef7 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -155,7 +155,7 @@ {{else}} - + {{$.i18n.Tr "repo.stop"}} {{end}} From 6400513d3e0654b95c9ef79f099b8f17e4f525f9 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 10:46:19 +0800 Subject: [PATCH 13/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 8e69dac3e..d9c38eb44 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -397,7 +397,7 @@ td, th {
- {{end}} {{template "base/paginate" .}} + {{template "base/paginate" .}}
From 3af7725f62bac7350e81116241790b6b39554642 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 10:51:07 +0800 Subject: [PATCH 14/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index d9c38eb44..4b4446587 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -190,11 +190,11 @@ td, th {
/
{{with .task}} -
{{.DisplayJobName}}
- {{end}} +
{{.jobName}}
+ {{end}}
- + {{with .task}}
@@ -204,7 +204,7 @@ td, th {
- {{if not (eq .StartTime 0)}} + {{if not (eq .task.StartTime 0)}} {{TimeSinceUnix1 .StartTime}} {{else}} {{TimeSinceUnix1 .CreatedUnix}} @@ -241,7 +241,7 @@ td, th {
- {{.DisplayJobName}} + {{.jobName}}
@@ -327,7 +327,7 @@ td, th {
- {{if not (eq .StartTime 0)}} + {{if not (eq .task.StartTime 0)}} {{TimeSinceUnix1 .EndTime}} {{else}} -- @@ -397,6 +397,7 @@ td, th {
+ {{end}} {{template "base/paginate" .}}
@@ -445,17 +446,6 @@ td, th { jobName = urlArr.slice(-1)[0] }) - function loadLog(version_name){ - document.getElementById("mask").style.display = "block" - $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobName}/log?version_name=${version_name}&lines=50&order=asc`, (data) => { - $('input[name=end_line]').val(data.EndLine) - $('input[name=start_line]').val(data.StartLine) - $(`#log_file${version_name}`).text(data.Content) - document.getElementById("mask").style.display = "none" - }).fail(function(err) { - console.log(err); - document.getElementById("mask").style.display = "none" - }); - } + From 9426ce1a533d14559f894f23685df864de865fa1 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 10:51:59 +0800 Subject: [PATCH 15/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 4b4446587..b8fda3f7a 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -189,9 +189,9 @@ td, th { {{$.i18n.Tr "repo.modelarts.notebook"}}
/
- {{with .task}} -
{{.jobName}}
- {{end}} + +
{{.jobName}}
+
{{with .task}} From 877f3535da463138e8fbad3e92358934feda936b Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 10:52:30 +0800 Subject: [PATCH 16/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index b8fda3f7a..e53d94fcc 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -204,7 +204,7 @@ td, th {
- {{if not (eq .task.StartTime 0)}} + {{if not (eq .StartTime 0)}} {{TimeSinceUnix1 .StartTime}} {{else}} {{TimeSinceUnix1 .CreatedUnix}} From a08b745d040c82958827ef5a22426049502b7e31 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 10:53:10 +0800 Subject: [PATCH 17/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index e53d94fcc..4c946fa4a 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -241,7 +241,7 @@ td, th {
- {{.jobName}} + {{$.jobName}}
From deef8665fc3a7b0e31735b7f4669e3e95bb0ca5f Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 10:54:27 +0800 Subject: [PATCH 18/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 4c946fa4a..ecd17ec99 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -327,7 +327,7 @@ td, th {
- {{if not (eq .task.StartTime 0)}} + {{if not (eq .StartTime 0)}} {{TimeSinceUnix1 .EndTime}} {{else}} -- @@ -342,7 +342,7 @@ td, th {
- {{$.datasetname}} + {{.datasetname}}
@@ -356,7 +356,7 @@ td, th {
- {{$.resource_spec}} + {{.resource_spec}}
From f0423473ac3efffb79b13e13202f675274ca8deb Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 10:55:19 +0800 Subject: [PATCH 19/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index ecd17ec99..867f6f591 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -342,7 +342,7 @@ td, th {
- {{.datasetname}} + {{$.datasetDownloadLink}}
From 836f91aba01c1e16fe0f95459213867c5dcb273c Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 10:57:27 +0800 Subject: [PATCH 20/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 867f6f591..5cfb964b1 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -342,7 +342,7 @@ td, th {
- {{$.datasetDownloadLink}} + {{.DatasetName}}
From 0c4310afb1998261436e3c326bf9f7b4a6e380f4 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 7 Apr 2022 11:03:10 +0800 Subject: [PATCH 21/81] #1639 update --- routers/repo/http.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routers/repo/http.go b/routers/repo/http.go index 99d38d437..e3ab329ba 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -594,6 +594,8 @@ func GenerateGitErrorBody(content string) string { } func GeneratePKTLine(content string) string { + //\033[31m ... \033[0m + //mark the text red in shell content = "\u0002\033[31m " + content + " \033[0m" l := len(content) prefixLength := 4 From f7862ac693cc9e0aef8cfa6b1008b7f594b935c6 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 11:05:40 +0800 Subject: [PATCH 22/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- routers/repo/modelarts.go | 10 +++++++--- templates/repo/modelarts/notebook/show.tmpl | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 32d9db9ce..f003407c2 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -2,8 +2,6 @@ package repo import ( "archive/zip" - "code.gitea.io/gitea/modules/notification" - "code.gitea.io/gitea/modules/timeutil" "encoding/json" "errors" "io" @@ -16,6 +14,9 @@ import ( "time" "unicode/utf8" + "code.gitea.io/gitea/modules/notification" + "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/base" @@ -283,7 +284,10 @@ func NotebookShow(ctx *context.Context) { } } } - + if modelarts.FlavorInfos == nil { + json.Unmarshal([]byte(setting.FlavorInfos), &modelarts.FlavorInfos) + } + ctx.Data["resource_spec"] = modelarts.FlavorInfos.FlavorInfo ctx.Data["datasetDownloadLink"] = datasetDownloadLink ctx.Data["task"] = task ctx.Data["ID"] = ID diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 5cfb964b1..68c94cdca 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -356,7 +356,7 @@ td, th {
- {{.resource_spec}} + {{$.resource_spec}}
From 7623fcdca9dbd38b4e938757a7121e583d62541c Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 11:08:14 +0800 Subject: [PATCH 23/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- routers/repo/modelarts.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index f003407c2..4b7582d4b 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -284,6 +284,10 @@ func NotebookShow(ctx *context.Context) { } } } + user, err := models.GetUserByID(task.UserID) + if err == nil { + task.User = user + } if modelarts.FlavorInfos == nil { json.Unmarshal([]byte(setting.FlavorInfos), &modelarts.FlavorInfos) } From 5e7ada52c0f1bcc3a78872e87dac2f1f23140583 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 11:30:00 +0800 Subject: [PATCH 24/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- modules/modelarts/modelarts.go | 1 + routers/repo/modelarts.go | 12 +++++++++++- templates/repo/modelarts/notebook/show.tmpl | 24 +++++------------------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 538fcfbd9..b1e7b269e 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -280,6 +280,7 @@ func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, desc RepoID: ctx.Repo.Repository.ID, JobID: jobResult.ID, JobName: jobName, + FlavorCode: flavor, DisplayJobName: displayJobName, JobType: string(models.JobTypeDebug), Type: models.TypeCloudBrainTwo, diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 4b7582d4b..1f4a275d1 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -4,6 +4,7 @@ import ( "archive/zip" "encoding/json" "errors" + "fmt" "io" "io/ioutil" "net/http" @@ -291,7 +292,16 @@ func NotebookShow(ctx *context.Context) { if modelarts.FlavorInfos == nil { json.Unmarshal([]byte(setting.FlavorInfos), &modelarts.FlavorInfos) } - ctx.Data["resource_spec"] = modelarts.FlavorInfos.FlavorInfo + if modelarts.FlavorInfos != nil { + ctx.Data["resource_spec"] = modelarts.FlavorInfos.FlavorInfo[0].Desc + for _, f := range modelarts.FlavorInfos.FlavorInfo { + if fmt.Sprint(f.Value) == task.FlavorCode { + ctx.Data["resource_spec"] = f.Desc + break + } + } + } + ctx.Data["datasetDownloadLink"] = datasetDownloadLink ctx.Data["task"] = task ctx.Data["ID"] = ID diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 68c94cdca..35180cedd 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -56,7 +56,7 @@ margin:10px 5px ; } .tab_2_content { - min-height: 560px; + min-height: 460px; margin-left: 10px; } .ac-grid { @@ -189,9 +189,9 @@ td, th { {{$.i18n.Tr "repo.modelarts.notebook"}}
/
- -
{{.jobName}}
- + {{with .task}} +
{{.DisplayJobName}}
+ {{end}}
{{with .task}} @@ -241,7 +241,7 @@ td, th {
- {{$.jobName}} + {{.DisplayJobName}}
@@ -297,20 +297,6 @@ td, th { - - - {{$.i18n.Tr "cloudbrain.dataset_storage_path"}} - - - -
- {{$.dataset_path}} -
- - - - -
From b6e31fcd9cd8b830a1c1d286582a758330412e51 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 14:22:47 +0800 Subject: [PATCH 25/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- routers/repo/modelarts.go | 15 ++++++++++++++- templates/repo/modelarts/notebook/show.tmpl | 6 +++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 1f4a275d1..3f835ee5d 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -281,6 +281,7 @@ func NotebookShow(ctx *context.Context) { if task.Uuid != "" && task.UserID == ctx.User.ID { attachment, err := models.GetAttachmentByUUID(task.Uuid) if err == nil { + task.DatasetName = attachment.Name datasetDownloadLink = attachment.S3DownloadURL() } } @@ -301,7 +302,19 @@ func NotebookShow(ctx *context.Context) { } } } - + if task.TrainJobDuration == "" { + if task.Duration == 0 { + var duration int64 + if task.Status == string(models.JobRunning) { + duration = time.Now().Unix() - int64(task.CreatedUnix) + } else { + duration = int64(task.UpdatedUnix) - int64(task.CreatedUnix) + } + task.Duration = duration + } + task.TrainJobDuration = models.ConvertDurationToStr(task.Duration) + } + ctx.Data["duration"] = task.TrainJobDuration ctx.Data["datasetDownloadLink"] = datasetDownloadLink ctx.Data["task"] = task ctx.Data["ID"] = ID diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 35180cedd..f8122bead 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -328,7 +328,7 @@ td, th {
- {{.DatasetName}} + {{.DatasetName}}
@@ -360,12 +360,12 @@ td, th { - 描述 + {{$.i18n.Tr "cloudbrain.description"}}
- -- + {{.Description}}
From 3bd8962f72f9bd2736c8b1949e1dbb758f5ad1c6 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 14:30:02 +0800 Subject: [PATCH 26/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 48 +++++++++++++++-------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index f8122bead..93116944b 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -274,6 +274,21 @@ td, th { + + + + {{$.i18n.Tr "admin.auths.updated"}} + + + +
+ + {{TimeSinceUnix1 .UpdatedUnix}} + +
+ + + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} @@ -285,6 +300,15 @@ td, th { + + + + + +
+ + + - -
{{$.i18n.Tr "cloudbrain.mirror"}} @@ -297,30 +321,8 @@ td, th {
-
-
- - - - - - - - - + diff --git a/templates/repo/modelarts/notebook/show--.tmpl-- b/templates/repo/modelarts/notebook/show--.tmpl-- deleted file mode 100644 index 59474ee49..000000000 --- a/templates/repo/modelarts/notebook/show--.tmpl-- +++ /dev/null @@ -1,68 +0,0 @@ -{{template "base/head" .}} -
-{{template "repo/header" .}} -
-
- {{template "base/alert" .}} - -

-
- - {{.i18n.Tr "repo.cloudbrain"}} - -
/
- - {{$.i18n.Tr "repo.modelarts.notebook"}} - -
/
- {{with .task}} -
{{.DisplayJobName}}
- {{end}} -
-

-
-
- {{with .task}} -

任务名称: {{.DisplayJobName}}

- {{end}} -
-
-

任务详情:

- {{with .result}} -
- {{$.i18n.Tr "repo.cloudbrain.endtime"}} - -
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .EndTime}} - {{else}} - -- - {{end}} -
-
{{$.i18n.Tr "repo.modelarts.train_job.dataset"}} From ec2e7a7a93a6240f681051e395483456b028a164 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 15:03:26 +0800 Subject: [PATCH 27/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?= =?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 --- routers/repo/cloudbrain.go | 12 +++++ templates/repo/cloudbrain/show.tmpl | 4 +- templates/repo/modelarts/notebook/show--.tmpl-- | 68 ------------------------- 3 files changed, 14 insertions(+), 70 deletions(-) delete mode 100644 templates/repo/modelarts/notebook/show--.tmpl-- diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 73b1914e5..10497d720 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -417,6 +417,18 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo return } + if cloudbrain.ResourceSpecs == nil { + json.Unmarshal([]byte(setting.ResourceSpecs), &cloudbrain.ResourceSpecs) + } + for _, tmp := range cloudbrain.ResourceSpecs.ResourceSpec { + if tmp.Id == task.ResourceSpecId { + ctx.Data["GpuNum"] = tmp.GpuNum + ctx.Data["CpuNum"] = tmp.CpuNum + ctx.Data["MemMiB"] = tmp.MemMiB + ctx.Data["ShareMemMiB"] = tmp.ShareMemMiB + } + } + if result != nil { jobRes, _ := models.ConvertToJobResultPayload(result.Payload) jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB") diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 895a5c14f..fb8e04996 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -357,7 +357,7 @@ td, th {
- {{if not (eq .StartTime 0)}} + {{if not (eq .EndTime 0)}} {{TimeSinceUnix1 .EndTime}} {{else}} -- @@ -386,7 +386,7 @@ td, th {
- {{$.resource_spec}} + {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
- - - - - - - - - - - - - - - - - - - - - - - - - - -
状态 {{.Status}}
描述 {{$.task.Description}}
镜像名称 {{$.task.Image}}
数据集下载地址 {{$.datasetDownloadLink}}
开始时间 {{.CreateTime}}
最后更新时间 {{.LatestUpdateTime}}
- {{end}} -
- - - - - - -{{template "base/footer" .}} From 90ea5dc8d29b470b798ce63c1eef2a72e5f90e1c Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 15:26:33 +0800 Subject: [PATCH 28/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?= =?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 --- routers/repo/cloudbrain.go | 9 +++++++++ templates/repo/cloudbrain/show.tmpl | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 10497d720..cb16a6b0d 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -429,6 +429,15 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo } } + if gpuInfos == nil { + json.Unmarshal([]byte(setting.GpuTypes), &gpuInfos) + } + for _, tmp := range gpuInfos.GpuInfo { + if tmp.Queue == task.GpuQueue { + ctx.Data["gpu_type"] = tmp.Value + } + } + if result != nil { jobRes, _ := models.ConvertToJobResultPayload(result.Payload) jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB") diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index fb8e04996..76927c7f1 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -330,12 +330,12 @@ td, th { - {{$.i18n.Tr "repo.cloudbrain.platform"}} + {{$.i18n.Tr "cloudbrain.gpu_type"}}
- {{$.result.Platform}} + {{$.gpu_type}}
From 9dee6a695e80a7442e4c9848f938c381ee268122 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 15:28:02 +0800 Subject: [PATCH 29/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 93116944b..684ad99a1 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -330,7 +330,7 @@ td, th {
- {{.DatasetName}} + {{.DatasetName}}
From 58192375b3a154c44ef2a90b5f0d4b212fc203b4 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 15:52:29 +0800 Subject: [PATCH 30/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?= =?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_business_analysis.go | 1 - models/user_business_struct.go | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index db226b14b..65ce642d5 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -720,7 +720,6 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time, useMetrics.NotActivateRegistUser = getMapKeyStringValue("NotActivateRegistUser", userMetrics) useMetrics.TotalActivateRegistUser = getMapKeyStringValue("TotalActivateRegistUser", userMetrics) useMetrics.TotalHasActivityUser = getMapKeyStringValue("TotalHasActivityUser", userMetrics) - useMetrics.DataDate = currentTimeNow.Format("2006-01-02 15:04:05") statictisSess.Insert(&useMetrics) return nil diff --git a/models/user_business_struct.go b/models/user_business_struct.go index 1a7625d82..17d9f046f 100644 --- a/models/user_business_struct.go +++ b/models/user_business_struct.go @@ -344,11 +344,10 @@ type UserAnalysisPara struct { } type UserMetrics struct { - CountDate int64 `xorm:"pk"` - ActivateRegistUser int `xorm:"NOT NULL DEFAULT 0"` - NotActivateRegistUser int `xorm:"NOT NULL DEFAULT 0"` - HasActivityUser int `xorm:"NOT NULL DEFAULT 0"` - TotalActivateRegistUser int `xorm:"NOT NULL DEFAULT 0"` - TotalHasActivityUser int `xorm:"NOT NULL DEFAULT 0"` - DataDate string `xorm:"NULL"` + CountDate int64 `xorm:"pk"` + ActivateRegistUser int `xorm:"NOT NULL DEFAULT 0"` + NotActivateRegistUser int `xorm:"NOT NULL DEFAULT 0"` + HasActivityUser int `xorm:"NOT NULL DEFAULT 0"` + TotalActivateRegistUser int `xorm:"NOT NULL DEFAULT 0"` + TotalHasActivityUser int `xorm:"NOT NULL DEFAULT 0"` } From 1a3b0ad9b67392f739c4e6460e9b9b546e3de98b Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 7 Apr 2022 15:59:49 +0800 Subject: [PATCH 31/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?= =?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 --- routers/repo/cloudbrain.go | 9 --------- templates/repo/cloudbrain/show.tmpl | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 516b25576..2848b8e19 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -447,15 +447,6 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo } } - if gpuInfos == nil { - json.Unmarshal([]byte(setting.GpuTypes), &gpuInfos) - } - for _, tmp := range gpuInfos.GpuInfo { - if tmp.Queue == task.GpuQueue { - ctx.Data["gpu_type"] = tmp.Value - } - } - if result != nil { jobRes, _ := models.ConvertToJobResultPayload(result.Payload) jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB") diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 76927c7f1..781c66d67 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -335,7 +335,7 @@ td, th {
- {{$.gpu_type}} + {{$.resource_type}}
From 06f12db08d2bf59aac5c9b8937b5a77be43b7c8e Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 7 Apr 2022 17:18:57 +0800 Subject: [PATCH 32/81] fix-1647 --- routers/repo/cloudbrain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 2848b8e19..0d007a27d 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -579,7 +579,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo ctx.Data["code_path"] = cloudbrain.CodeMountPath ctx.Data["dataset_path"] = cloudbrain.DataSetMountPath ctx.Data["model_path"] = cloudbrain.ModelMountPath - ctx.Data["canDownload"] = cloudbrain.CanDeleteJob(ctx, task) + ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task) ctx.HTML(200, tpName) } From 42eb60bdbd41536138ad912dbb7ea7ca5ae18266 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 7 Apr 2022 17:53:59 +0800 Subject: [PATCH 33/81] fix-1647 --- routers/repo/modelarts.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 3072ab70f..c29e55402 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -1584,7 +1584,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["canDownload"] = canNewJob + ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, &VersionListTasks[0].Cloudbrain) ctx.HTML(http.StatusOK, tplModelArtsTrainJobShow) } @@ -2215,7 +2215,7 @@ func InferenceJobShow(ctx *context.Context) { ctx.Data["jobName"] = task.JobName ctx.Data["displayJobName"] = task.DisplayJobName ctx.Data["task"] = task - ctx.Data["canDownload"] = cloudbrain.CanDeleteJob(ctx, task) + ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task) tempUids := []int64{} tempUids = append(tempUids, task.UserID) From a69443231f2a79328444156bfe1f5f28e45f3103 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 7 Apr 2022 18:01:11 +0800 Subject: [PATCH 34/81] get restart --- routers/repo/modelarts.go | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 3f835ee5d..f3c78d039 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -249,7 +249,7 @@ func NotebookShow(ctx *context.Context) { debugListType := ctx.Query("debugListType") var ID = ctx.Params(":id") - task, err := models.GetCloudbrainByID(ID) + task, err := models.GetCloudbrainByIDWithDeleted(ID) if err != nil { ctx.Data["error"] = err.Error() ctx.RenderWithErr(err.Error(), tplModelArtsNotebookShow, nil) @@ -264,16 +264,22 @@ func NotebookShow(ctx *context.Context) { } if result != nil { - task.Status = result.Status - err = models.UpdateJob(task) - if err != nil { - ctx.Data["error"] = err.Error() - ctx.RenderWithErr(err.Error(), tplModelArtsNotebookShow, nil) - return + if task.DeletedAt.IsZero() { //normal record + if task.Status != result.Status { + task.Status = result.Status + err = models.UpdateJob(task) + if err != nil { + ctx.Data["error"] = err.Error() + ctx.RenderWithErr(err.Error(), tplModelArtsNotebookShow, nil) + return + } + } + } else { //deleted record + } - result.CreateTime = time.Unix(int64(result.CreateAt/1000), 0).Format("2006-01-02 15:04:05") - result.LatestUpdateTime = time.Unix(int64(result.UpdateAt/1000), 0).Format("2006-01-02 15:04:05") + //result.CreateTime = time.Unix(int64(result.CreateAt/1000), 0).Format("2006-01-02 15:04:05") + //result.LatestUpdateTime = time.Unix(int64(result.UpdateAt/1000), 0).Format("2006-01-02 15:04:05") } datasetDownloadLink := "-" @@ -319,7 +325,7 @@ func NotebookShow(ctx *context.Context) { ctx.Data["task"] = task ctx.Data["ID"] = ID ctx.Data["jobName"] = task.JobName - ctx.Data["result"] = result + //ctx.Data["result"] = result ctx.Data["debugListType"] = debugListType ctx.HTML(200, tplModelArtsNotebookShow) } From 6d3e76bb9fc347697337e276b9c6b6b62eb74b34 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:08:58 +0800 Subject: [PATCH 35/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/less/openi.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 4f25e5ffd..e324f7e6c 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -935,7 +935,7 @@ display: block; color: red; } .ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content { - width: calc(100% - 4.0em); + width: calc(100%-4em); margin-left: 0; } From 12b6d6efe09ef477e08533d302d85a023a7c31e8 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:35:04 +0800 Subject: [PATCH 36/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/user/settings/organization.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 00b73f94d..6e5cb3872 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -23,7 +23,7 @@ -
+
{{.Name}}
From f4df450f0435df5f8af60855b329fd6d4003f6ab Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:35:33 +0800 Subject: [PATCH 37/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/less/openi.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index e324f7e6c..af27172c2 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -934,8 +934,13 @@ display: block; .highlight{ color: red; } + + .ui.list .list>.item>img.image+.contentnew, .ui.list>.item>img.image+.contentnew { + margin-left: 0; + } + .ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content { - width: calc(100%-4em); + width: calc(100%-4.0em); margin-left: 0; } From fe86b78aad6f0502e189afe1e45df111c16d1d14 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:46:25 +0800 Subject: [PATCH 38/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/less/openi.less | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index af27172c2..bdadf559f 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -936,6 +936,7 @@ display: block; } .ui.list .list>.item>img.image+.contentnew, .ui.list>.item>img.image+.contentnew { + width: calc(100%-10em); margin-left: 0; } From 4b30c1bc56ff3f2d2dd96029eb3c982804696595 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 09:56:50 +0800 Subject: [PATCH 39/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/user/settings/organization.tmpl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 6e5cb3872..ae92218b0 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -16,16 +16,17 @@
{{range .Orgs}}
+ + +
+ {{.Name}} +
{{$.CsrfTokenHtml}}
- -
- {{.Name}} -
{{end}}
From 91d1458a06ad60db347ac3c961373a5202f4dd63 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 10:15:01 +0800 Subject: [PATCH 40/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/user/settings/organization.tmpl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index ae92218b0..6e5cb3872 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -16,17 +16,16 @@
{{range .Orgs}}
- - -
- {{.Name}} -
{{$.CsrfTokenHtml}}
+ +
+ {{.Name}} +
{{end}}
From 914cef287d089552205ebc4b37b27cffd4aeed3b Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 8 Apr 2022 10:33:41 +0800 Subject: [PATCH 41/81] mod restart time --- templates/repo/modelarts/notebook/show.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 684ad99a1..70a68fed4 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -282,8 +282,11 @@ td, th {
- - {{TimeSinceUnix1 .UpdatedUnix}} + {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + {{TimeSinceUnix1 .UpdatedUnix}} + {{end}}
From 9731860d9ca1729e0b6189d11454048e0243b965 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Fri, 8 Apr 2022 10:58:46 +0800 Subject: [PATCH 42/81] #1639 add file total size limit --- modules/setting/repository.go | 3 +++ routers/repo/editor.go | 2 +- routers/repo/http.go | 2 +- services/repository/repository.go | 31 ++++++++++++++++++++++++++++++- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/modules/setting/repository.go b/modules/setting/repository.go index a9786ca18..54ed13c2f 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -55,6 +55,7 @@ var ( AllowedTypes []string `delim:"|"` FileMaxSize int64 MaxFiles int + TotalMaxSize int64 } `ini:"-"` // Repository local settings @@ -122,12 +123,14 @@ var ( AllowedTypes []string `delim:"|"` FileMaxSize int64 MaxFiles int + TotalMaxSize int64 }{ Enabled: true, TempPath: "data/tmp/uploads", AllowedTypes: []string{}, FileMaxSize: 3, MaxFiles: 5, + TotalMaxSize: 100, }, // Repository local settings diff --git a/routers/repo/editor.go b/routers/repo/editor.go index b089a784c..8e13735df 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -615,7 +615,7 @@ func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) { message += "\n\n" + form.CommitMessage } - if err := repo_service.CheckRepoSizeLimit(ctx.Repo.Repository, form.Files); err != nil { + if err := repo_service.CheckPushSizeLimit4Web(ctx.Repo.Repository, form.Files); err != nil { if repo_service.IsRepoTooLargeErr(err) { ctx.RenderWithErr(ctx.Tr("repo.editor.repo_too_large", setting.Repository.RepoMaxSize), tplUploadFile, &form) } else if repo_service.IsUploadFileInvalidErr(err) { diff --git a/routers/repo/http.go b/routers/repo/http.go index e3ab329ba..26d58bd54 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -549,7 +549,7 @@ func serviceRPC(h serviceHandler, service string) { content, _ := ioutil.ReadAll(reqBody) //check size if service == "receive-pack" { - if err := repo_service.CheckRepoTotalSizeLimit(h.repo, int64(len(content))); err != nil { + if err := repo_service.CheckPushSizeLimit4Http(h.repo, int64(len(content))); err != nil { h.w.WriteHeader(http.StatusOK) str := GenerateGitErrorBody(err.Error()) h.w.Write([]byte(str)) diff --git a/services/repository/repository.go b/services/repository/repository.go index fc4411056..d0cd52653 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -174,7 +174,7 @@ func RecommendFromPromote(url string) ([]string, error) { return result, nil } -func CheckRepoSizeLimit(repo *models.Repository, fileIds []string) error { +func CheckPushSizeLimit4Web(repo *models.Repository, fileIds []string) error { if err := CheckRepoNumOnceLimit(len(fileIds)); err != nil { return err } @@ -188,6 +188,16 @@ func CheckRepoSizeLimit(repo *models.Repository, fileIds []string) error { return nil } +func CheckPushSizeLimit4Http(repo *models.Repository, uploadFileSize int64) error { + if err := CheckRepoOnceTotalSizeLimit(uploadFileSize); err != nil { + return err + } + if err := CheckRepoTotalSizeLimit(repo, uploadFileSize); err != nil { + return err + } + return nil +} + func CheckRepoTotalSizeLimit(repo *models.Repository, uploadFileSize int64) error { if repo.Size+uploadFileSize > setting.Repository.RepoMaxSize*1024*1024 { return RepoTooLargeErr{} @@ -195,6 +205,13 @@ func CheckRepoTotalSizeLimit(repo *models.Repository, uploadFileSize int64) erro return nil } +func CheckRepoOnceTotalSizeLimit(uploadFileSize int64) error { + if uploadFileSize > setting.Repository.Upload.TotalMaxSize*1024*1024 { + return UploadFileTooLargeErr{} + } + return nil +} + func CheckRepoNumOnceLimit(uploadFileNum int) error { if uploadFileNum > setting.Repository.Upload.MaxFiles { return UploadFileTooMuchErr{} @@ -243,6 +260,18 @@ func IsRepoTooLargeErr(err error) bool { return ok } +type UploadFileTooLargeErr struct { +} + +func (UploadFileTooLargeErr) Error() string { + return fmt.Sprintf("Upload files can not exceed %d MB at a time", setting.Repository.Upload.TotalMaxSize) +} + +func IsUploadFileTooLargeErr(err error) bool { + _, ok := err.(UploadFileTooLargeErr) + return ok +} + type RepoFileTooLargeErr struct { } From bb44f675c021443fbec70f3e5b4f7f388cf8d27c Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 8 Apr 2022 14:29:52 +0800 Subject: [PATCH 43/81] del unuse code --- routers/repo/modelarts.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 0b3405bcb..933571a0b 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -277,9 +277,6 @@ func NotebookShow(ctx *context.Context) { } else { //deleted record } - - //result.CreateTime = time.Unix(int64(result.CreateAt/1000), 0).Format("2006-01-02 15:04:05") - //result.LatestUpdateTime = time.Unix(int64(result.UpdateAt/1000), 0).Format("2006-01-02 15:04:05") } datasetDownloadLink := "-" @@ -325,7 +322,6 @@ func NotebookShow(ctx *context.Context) { ctx.Data["task"] = task ctx.Data["ID"] = ID ctx.Data["jobName"] = task.JobName - //ctx.Data["result"] = result ctx.Data["debugListType"] = debugListType ctx.HTML(200, tplModelArtsNotebookShow) } From b7b56ec19636a594d25f51febf238e901e4647db Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 15:25:53 +0800 Subject: [PATCH 44/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/repo/cloudbrain/show.tmpl | 18 ++++++++++++++++-- templates/user/settings/organization.tmpl | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 58168d1e2..a4858dbb7 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -919,6 +919,7 @@ cloudbrain_helper=Use GPU/NPU resources to open notebooks, model training tasks, cloudbrain.exitinfo=Exit Information cloudbrain.platform=Platform cloudbrain.endtime=End Time +cloudbrain.runinfo=Task Runtime Information model_manager = Model model_noright=No right model_rename=Duplicate model name, please modify model name. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 28041428f..bec5000e1 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -966,6 +966,7 @@ cloudbrain.mirror_description = 镜像描述 cloudbrain.exitinfo=退出信息 cloudbrain.platform=平台 cloudbrain.endtime=结束时间 +cloudbrain.runinfo=任务运行简况 record_begintime_get_err=无法获取统计开始时间。 parameter_is_wrong=输入参数错误，请检查输入参数。 total_count_get_error=查询总页数失败。 diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 781c66d67..6fbff5956 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -198,7 +198,7 @@ td, th {
- +
@@ -226,6 +226,7 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} + {{$.i18n.Tr "repo.cloudbrain.runinfo"}}
@@ -432,7 +433,20 @@ td, th {
- +
+
+ +
+ + {{$.result.JobStatus.AppExitDiagnostics}} + +
+ +
+ +
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index 6e5cb3872..00b73f94d 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -23,7 +23,7 @@
-
+
{{.Name}}
From 7c9764bd7c03019cfc797b112d2b697de62c29f9 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:32:21 +0800 Subject: [PATCH 45/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 58 +++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 6fbff5956..c22012d3b 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -226,7 +226,7 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.cloudbrain.runinfo"}} + >{{$.i18n.Tr "repo.cloudbrain.runinfo"}}
@@ -418,17 +418,6 @@ td, th {
-
-
- {{$.i18n.Tr "repo.cloudbrain.exitinfo"}} - -
-
-
- - {{$.result.JobStatus.AppExitDiagnostics}} - -
@@ -439,8 +428,9 @@ td, th {
- - {{$.result.JobStatus.AppExitDiagnostics}} + + +
@@ -499,17 +489,35 @@ td, th { jobName = urlArr.slice(-1)[0] }) - function loadLog(version_name){ - document.getElementById("mask").style.display = "block" - $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobName}/log?version_name=${version_name}&lines=50&order=asc`, (data) => { - $('input[name=end_line]').val(data.EndLine) - $('input[name=start_line]').val(data.StartLine) - $(`#log_file${version_name}`).text(data.Content) - document.getElementById("mask").style.display = "none" - }).fail(function(err) { - console.log(err); - document.getElementById("mask").style.display = "none" - }); + function parseLog(){ + let jsonValue = document.getElementById("json_value").value; + let jsonObj = JSON.parse(jsonValue); + let podRoleName = jsonObj["podRoleName"]; + let html = ""; + if (podRoleName != null){ + let task0 = podRoleName["task1-0"]; + let podEvents = jsonObj["podEvents"]; + let podEventArray = podEvents[task0]; + if(podEventArray != null){ + for(int i=0; i < podEventArray.length;i++){ + html +="

" +podEventArray[i]["reason"] + "

"; + html +="

" +podEventArray[i]["message"] + "

"; + html +="

" +podEventArray[i]["action"] + "

"; + } + } + let extras= jsonObj["extras"]; + if(extras != null){ + html +="

" +extras["reason"] + "

"; + html +="

" +extras["message"] + "

"; + html +="

" +extras["action"] + "

"; + } + + document.getElementById("info_display").innerHTML=html; + } + + + } + From d08854f28470c5c9c52c38e08a34d269c8099863 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:33:33 +0800 Subject: [PATCH 46/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index c22012d3b..3e2cc06be 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -226,7 +226,7 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} - >{{$.i18n.Tr "repo.cloudbrain.runinfo"}} + {{$.i18n.Tr "repo.cloudbrain.runinfo"}}
From 83652d406747c3ee8029c1c725e3ecf82acebe50 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:39:35 +0800 Subject: [PATCH 47/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 83 +++++++++++++------------------------ 1 file changed, 29 insertions(+), 54 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 3e2cc06be..3040fce8d 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -167,6 +167,34 @@ td, th { padding-top: 0.5rem ; } + +
@@ -226,7 +254,7 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.cloudbrain.runinfo"}} + {{$.i18n.Tr "repo.cloudbrain.runinfo"}}
@@ -468,56 +496,3 @@ td, th {
{{template "base/footer" .}} - From 4c307c9d8b124c13daba0dda412967f68009eaf9 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:41:55 +0800 Subject: [PATCH 48/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- public/home/search.js | 26 ++++++++++++++++++++ templates/repo/cloudbrain/show.tmpl | 48 ++++++++++++++++++------------------- 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/public/home/search.js b/public/home/search.js index e23d27549..8a8e940cb 100644 --- a/public/home/search.js +++ b/public/home/search.js @@ -129,6 +129,32 @@ function search(){ } } +function parseLog(){ + let jsonValue = document.getElementById("json_value").value; + let jsonObj = JSON.parse(jsonValue); + let podRoleName = jsonObj["podRoleName"]; + let html = ""; + if (podRoleName != null){ + let task0 = podRoleName["task1-0"]; + let podEvents = jsonObj["podEvents"]; + let podEventArray = podEvents[task0]; + if(podEventArray != null){ + for(int i=0; i < podEventArray.length;i++){ + html +="

" +podEventArray[i]["reason"] + "

"; + html +="

" +podEventArray[i]["message"] + "

"; + html +="

" +podEventArray[i]["action"] + "

"; + } + } + let extras= jsonObj["extras"]; + if(extras != null){ + html +="

" +extras["reason"] + "

"; + html +="

" +extras["message"] + "

"; + html +="

" +extras["action"] + "

"; + } + document.getElementById("info_display").innerHTML=html; + } + } + function emptySearch(){ initDiv(false); initPageInfo(); diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 3040fce8d..2a164e8de 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -168,31 +168,31 @@ td, th { }
From 6f06a8484204016406143c899c04eaa81ccc8ae6 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:48:36 +0800 Subject: [PATCH 49/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 63 +++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 2a164e8de..ed17e6ec2 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -167,33 +167,7 @@ td, th { padding-top: 0.5rem ; } - +
@@ -496,3 +470,38 @@ td, th {
{{template "base/footer" .}} + \ No newline at end of file From f29ed8688115a1c5d235c5b560fd7083abd6751e Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:52:10 +0800 Subject: [PATCH 50/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index ed17e6ec2..204362ddb 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -56,7 +56,7 @@ margin:10px 5px ; } .tab_2_content { - min-height: 560px; + min-height: 460px; margin-left: 10px; } .ac-grid { @@ -497,9 +497,11 @@ td, th { } let extras= jsonObj["extras"]; if(extras != null){ - html +="

" +extras["reason"] + "

"; - html +="

" +extras["message"] + "

"; - html +="

" +extras["action"] + "

"; + for(var i=0; i < extras.length;i++){ + html +="

" +extras[i]["reason"] + "

"; + html +="

" +extras[i]["message"] + "

"; + html +="

" +extras[i]["action"] + "

"; + } } } document.getElementById("info_display").innerHTML=html; From 8573b98eda977929fa2b00293cee61116a17333e Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 16:56:45 +0800 Subject: [PATCH 51/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 204362ddb..986e1c0cc 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -56,7 +56,7 @@ margin:10px 5px ; } .tab_2_content { - min-height: 460px; + min-height: 360px; margin-left: 10px; } .ac-grid { From 5836f132090c6add7acd8905950e91f1929cba16 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 17:20:06 +0800 Subject: [PATCH 52/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 161 ++++++++++++++++++++---------------- 1 file changed, 89 insertions(+), 72 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 986e1c0cc..94e3dd4a5 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -258,20 +258,58 @@ td, th {
+ + + {{$.i18n.Tr "repo.cloudbrain_creator"}} + + + +
+ {{.User.Name}} +
+ + + + + 计算资源 + + +
+ CPU/GPU +
+ + + + + 任务类型 + + +
+ DEBUG +
+ + + + + {{$.i18n.Tr "cloudbrain.gpu_type"}} + + + +
+ {{$.resource_type}} +
+ + - {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} + 创建时间
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} {{TimeSinceUnix1 .CreatedUnix}} - {{end}}
@@ -287,132 +325,111 @@ td, th {
- - - {{$.i18n.Tr "cloudbrain.mirror"}} - - - -
- {{.Image}} -
- - - - - - {{$.i18n.Tr "cloudbrain.dataset_storage_path"}} - - - -
- {{$.dataset_path}} -
- - - - - - {{$.i18n.Tr "cloudbrain.code_storage_path"}} - + - -
- {{$.code_path}} -
- - - +
+ + - + + + - - - - + - + + @@ -490,7 +507,7 @@ td, th { let podEventArray = podEvents[task0]; if(podEventArray != null){ for(var i=0; i < podEventArray.length;i++){ - html +="

" +podEventArray[i]["reason"] + "

"; + html +="

[" +podEventArray[i]["reason"] + "]

"; html +="

" +podEventArray[i]["message"] + "

"; html +="

" +podEventArray[i]["action"] + "

"; } @@ -498,7 +515,7 @@ td, th { let extras= jsonObj["extras"]; if(extras != null){ for(var i=0; i < extras.length;i++){ - html +="

" +extras[i]["reason"] + "

"; + html +="

[" +extras[i]["reason"] + "]

"; html +="

" +extras[i]["message"] + "

"; html +="

" +extras[i]["action"] + "

"; } From 1e1537cadf201fa457c77dc8329cb7f97694b128 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 8 Apr 2022 17:34:29 +0800 Subject: [PATCH 53/81] fix issue --- templates/explore/datasets.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl index ff18a3da3..b8b805865 100644 --- a/templates/explore/datasets.tmpl +++ b/templates/explore/datasets.tmpl @@ -216,3 +216,6 @@ {{template "base/footer" .}} + \ No newline at end of file From b045af3db98e666581f2fd09cb22a9bdb7568a56 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 8 Apr 2022 17:41:14 +0800 Subject: [PATCH 54/81] fix issue --- templates/explore/datasets.tmpl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl index b8b805865..8211e8f20 100644 --- a/templates/explore/datasets.tmpl +++ b/templates/explore/datasets.tmpl @@ -184,9 +184,15 @@
+ {{if eq .UserID 0}} + {{else}} + + + + {{end}} 创建于：{{TimeSinceUnix1 .CreatedUnix}}
@@ -215,7 +221,4 @@ -{{template "base/footer" .}} - \ No newline at end of file +{{template "base/footer" .}} \ No newline at end of file From 1f46cbc181628daf718e867c31c3d50887298fc7 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 8 Apr 2022 17:47:35 +0800 Subject: [PATCH 55/81] fix issue --- templates/explore/datasets.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl index 8211e8f20..a1692cf35 100644 --- a/templates/explore/datasets.tmpl +++ b/templates/explore/datasets.tmpl @@ -121,10 +121,10 @@
- {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.latest"}} + {{.i18n.Tr "repo.issues.filter_sort.oldest"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}
From e052756d25cb792b2f2a36a7f262af21ec7d06db Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 17:50:13 +0800 Subject: [PATCH 56/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- options/locale/locale_zh-CN.ini | 2 + templates/repo/cloudbrain/show.tmpl | 86 ++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 49 deletions(-) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index bec5000e1..1d1d9ab0f 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -967,6 +967,8 @@ cloudbrain.exitinfo=退出信息 cloudbrain.platform=平台 cloudbrain.endtime=结束时间 cloudbrain.runinfo=任务运行简况 +cloudbrain.time.starttime=开始运行时间 +cloudbrain.time.endtime=结束运行时间 record_begintime_get_err=无法获取统计开始时间。 parameter_is_wrong=输入参数错误，请检查输入参数。 total_count_get_error=查询总页数失败。 diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 94e3dd4a5..34104f3c7 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -271,7 +271,7 @@ td, th { + + - - - - - - - + + + + + - - + + + @@ -401,38 +408,19 @@ td, th { - - - - - - - + +
+ {{$.i18n.Tr "cloudbrain.mirror"}} + +
+ {{.Image}} +
+
- {{$.i18n.Tr "cloudbrain.gpu_type"}} + {{$.i18n.Tr "repo.modelarts.train_job.dataset"}} -
- {{$.resource_type}} +
+ {{$.datasetname}}
- ExitCode + {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
- {{$.result.JobStatus.AppExitCode}} + {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
- {{$.i18n.Tr "repo.cloudbrain.endtime"}} + {{$.i18n.Tr "cloudbrain.dataset_storage_path"}} -
- {{if not (eq .EndTime 0)}} - {{TimeSinceUnix1 .EndTime}} - {{else}} - -- - {{end}} +
+ {{$.dataset_path}}
- {{$.i18n.Tr "repo.modelarts.train_job.dataset"}} + {{$.i18n.Tr "cloudbrain.model_storage_path"}} -
- {{$.datasetname}} +
+ {{$.model_path}}
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "cloudbrain.code_storage_path"}} -
- {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}} +
+ {{$.code_path}}
- {{$.i18n.Tr "repo.cloudbrain_creator"}} + 开始运行时间 -
- {{.User.Name}} +
+ {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}}
- {{$.i18n.Tr "cloudbrain.model_storage_path"}} + 结束运行时间 -
- {{$.model_path}} +
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}}
- 计算资源 + {{$.i18n.Tr "repo.modelarts.computing_resources"}}
@@ -281,7 +281,7 @@ td, th {
- 任务类型 + {{$.i18n.Tr "cloudbrain.task_type"}}
@@ -300,32 +300,39 @@ td, th {
+ {{$.i18n.Tr "repo.cloudbrain.time.starttime"}} +
- 创建时间 - -
- - {{TimeSinceUnix1 .CreatedUnix}} - -
-
- {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} - +
+ {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} + -
- {{$.duration}} -
-
+
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}} +
+
- 开始运行时间 - -
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - -- - {{end}} -
-
- 结束运行时间 + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} -
- {{if not (eq .EndTime 0)}} - {{TimeSinceUnix1 .EndTime}} - {{else}} - -- - {{end}} +
+ {{$.duration}}
From 9e355ac65b8cecb657a280c27093ed481337c431 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 8 Apr 2022 17:51:41 +0800 Subject: [PATCH 57/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- options/locale/locale_en-US.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a4858dbb7..049454ddc 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -920,6 +920,8 @@ cloudbrain.exitinfo=Exit Information cloudbrain.platform=Platform cloudbrain.endtime=End Time cloudbrain.runinfo=Task Runtime Information +cloudbrain.time.starttime=Start run time +cloudbrain.time.endtime=End run time model_manager = Model model_noright=No right model_rename=Duplicate model name, please modify model name. From d8de9704fbd925012633a85ea79c8f8489bde8f6 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 11 Apr 2022 10:06:19 +0800 Subject: [PATCH 58/81] fix issue --- templates/custom/select_dataset.tmpl | 2 +- templates/custom/select_dataset_train.tmpl | 134 +++++++++++++++++++++++++ templates/repo/cloudbrain/trainjob/new.tmpl | 16 +-- templates/repo/modelarts/inferencejob/new.tmpl | 20 +--- templates/repo/modelarts/trainjob/new.tmpl | 21 +--- 5 files changed, 147 insertions(+), 46 deletions(-) create mode 100644 templates/custom/select_dataset_train.tmpl diff --git a/templates/custom/select_dataset.tmpl b/templates/custom/select_dataset.tmpl index dc5ca6c9e..273477dd2 100644 --- a/templates/custom/select_dataset.tmpl +++ b/templates/custom/select_dataset.tmpl @@ -135,4 +135,4 @@ -
\ No newline at end of file +
diff --git a/templates/custom/select_dataset_train.tmpl b/templates/custom/select_dataset_train.tmpl new file mode 100644 index 000000000..2771200b6 --- /dev/null +++ b/templates/custom/select_dataset_train.tmpl @@ -0,0 +1,134 @@ + + +
+     + + + {{.i18n.Tr "dataset.select_dataset"}} + +
+ + +
+ + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias} ${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
+
+ + + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
+
+ + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
+
+ + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
+
+ + + +
+ + +
+ + + +
diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index e33920b20..e7254e410 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -169,9 +169,9 @@
{{if .bootFile}} - + {{else}} - + {{end}} @@ -179,17 +179,9 @@ 查看样例
-
- - - 训练脚本存储在/code中，数据集存储在/dataset中，训练输出请存储在/model中以供后续下载。 -
+ {{template "custom/select_dataset_train" .}} + 训练脚本存储在/code中，数据集存储在/dataset中，训练输出请存储在/model中以供后续下载。
{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}} diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl index 5e7347abf..6c8681432 100644 --- a/templates/repo/modelarts/inferencejob/new.tmpl +++ b/templates/repo/modelarts/inferencejob/new.tmpl @@ -169,24 +169,10 @@
-
-      - - - - -
- + {{template "custom/select_dataset_train" .}} + {{.i18n.Tr "cloudbrain.dataset_path_rule"}}
-   + {{if .bootFile}} {{else}} diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl index 963250bcb..3629de442 100755 --- a/templates/repo/modelarts/trainjob/new.tmpl +++ b/templates/repo/modelarts/trainjob/new.tmpl @@ -158,29 +158,18 @@
{{if .bootFile}} - + {{else}} - + {{end}} {{.i18n.Tr "cloudbrain.view_sample"}}
-
- - - {{.i18n.Tr "cloudbrain.dataset_path_rule"}} -
- + + {{template "custom/select_dataset_train" .}} + {{.i18n.Tr "cloudbrain.dataset_path_rule"}}
{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}} From 2a65969622e2ec00b3b8b34e8079688016a45e7c Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 10:11:48 +0800 Subject: [PATCH 59/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 7 +-- templates/repo/modelarts/notebook/show.tmpl | 68 +++++++++++++++++------------ 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 34104f3c7..f0de9c791 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -275,7 +275,7 @@ td, th {
- CPU/GPU + {{.ComputeResource}}
@@ -285,7 +285,7 @@ td, th {
- DEBUG + {{.JobType}}
@@ -331,10 +331,7 @@ td, th {
- - -
diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 684ad99a1..3fdea7d07 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -256,38 +256,28 @@ td, th {
- - - {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} - + + {{$.i18n.Tr "repo.cloudbrain_creator"}} + - -
- - {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - {{TimeSinceUnix1 .CreatedUnix}} - {{end}} - -
- + +
+ {{.User.Name}} +
+ - - {{$.i18n.Tr "admin.auths.updated"}} + {{$.i18n.Tr "repo.modelarts.computing_resources"}} - -
- - {{TimeSinceUnix1 .UpdatedUnix}} - +
+ {{.ComputeResource}}
- + + @@ -348,25 +338,47 @@ td, th {
+ + + {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} + - + +
+
+ {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}} +
+
+ + + + - {{$.i18n.Tr "repo.cloudbrain_creator"}} + {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} -
- {{.User.Name}} +
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}}
+ {{$.i18n.Tr "cloudbrain.description"}} -
+
{{.Description}}
From 4a6dbb748be503f8709574bb904c642e3c84c4a4 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 10:19:43 +0800 Subject: [PATCH 60/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 4 ++-- templates/repo/modelarts/notebook/show.tmpl | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index f0de9c791..440843bfc 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -306,7 +306,7 @@ td, th { -
+
{{if not (eq .StartTime 0)}} {{TimeSinceUnix1 .StartTime}} {{else}} @@ -322,7 +322,7 @@ td, th { -
+
{{if not (eq .EndTime 0)}} {{TimeSinceUnix1 .EndTime}} {{else}} diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 3fdea7d07..b9408a867 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -290,7 +290,17 @@ td, th {
- + + + 数据集下载地址 + + + +
+ {{$.datasetDownloadLink}} +
+ + From faa8253f04bdf1b15343af2f31801567ef7a04b2 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 10:39:07 +0800 Subject: [PATCH 61/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 36 ++++++++++++++++++----------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index b9408a867..9f99b3c64 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -101,6 +101,10 @@ line-height: 30px; padding-bottom: 20px; } +.ti-text-form-contentline60{ + line-height: 60px; + padding-bottom: 20px; +} .ti-form>tbody>tr>td { vertical-align: top; white-space: normal; @@ -114,6 +118,11 @@ td, th { text-overflow: ellipsis; white-space: nowrap; } +.text-span-new { + width: 450px; + overflow: hidden; + text-overflow: ellipsis; +} .redo-color{ color: #3291F8; } @@ -290,13 +299,24 @@ td, th {
- + - 数据集下载地址 + {{$.i18n.Tr "cloudbrain.description"}}
+ {{.Description}} +
+ + + + + 数据集下载地址 + + + +
{{$.datasetDownloadLink}}
@@ -382,17 +402,7 @@ td, th { - - - {{$.i18n.Tr "cloudbrain.description"}} - - - -
- {{.Description}} -
- - +
From 120c60b2728e6b6e5ef6d51ca7450c394b15ffaf Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 10:54:19 +0800 Subject: [PATCH 62/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 9f99b3c64..4c77a66da 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -119,9 +119,11 @@ td, th { white-space: nowrap; } .text-span-new { - width: 450px; + width: 800px; overflow: hidden; text-overflow: ellipsis; + height: 120px; + word-break: break-all; } .redo-color{ color: #3291F8; From 5b4a6d1b25a227d8e9ae8b5572cb15477ef3063f Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 11:02:09 +0800 Subject: [PATCH 63/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/repo/modelarts/notebook/show.tmpl | 11 ++++------- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 049454ddc..661911883 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -922,6 +922,7 @@ cloudbrain.endtime=End Time cloudbrain.runinfo=Task Runtime Information cloudbrain.time.starttime=Start run time cloudbrain.time.endtime=End run time +cloudbrain.datasetdownload=Dataset download url model_manager = Model model_noright=No right model_rename=Duplicate model name, please modify model name. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 1d1d9ab0f..c30fbdf8c 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -969,6 +969,7 @@ cloudbrain.endtime=结束时间 cloudbrain.runinfo=任务运行简况 cloudbrain.time.starttime=开始运行时间 cloudbrain.time.endtime=结束运行时间 +cloudbrain.datasetdownload=数据集下载地址 record_begintime_get_err=无法获取统计开始时间。 parameter_is_wrong=输入参数错误，请检查输入参数。 total_count_get_error=查询总页数失败。 diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 4c77a66da..fbf60caa3 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -101,10 +101,7 @@ line-height: 30px; padding-bottom: 20px; } -.ti-text-form-contentline60{ - line-height: 60px; - padding-bottom: 20px; -} + .ti-form>tbody>tr>td { vertical-align: top; white-space: normal; @@ -307,17 +304,17 @@ td, th { -
+
{{.Description}}
- 数据集下载地址 + {{$.i18n.Tr "repo.cloudbrain.datasetdownload"}} - +
{{$.datasetDownloadLink}}
From b2357f2d2e477474d11d0f7d00d033e5efc9bdfc Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 11 Apr 2022 11:04:04 +0800 Subject: [PATCH 64/81] fix issue --- options/locale/locale_en-US.ini | 2 ++ options/locale/locale_zh-CN.ini | 2 ++ templates/repo/editor/upload.tmpl | 4 ++-- web_src/js/index.js | 22 ++++++++++++++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f9bebbb86..781d5634f 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2836,6 +2836,8 @@ uploading = Uploading upload_complete = Uploading complete failed = Upload Failed enable_minio_support = Enable minio support to use the dataset service +max_file_tooltips= Upload a maximum of ? files at a time, each file does not exceed ? MB. +max_size-tooltips= You can only upload a maximum of ? files at a time. The upload limit has been reached, please do not add more files. [notification] notifications = Notifications diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 8679554c6..5a047ce9e 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2842,6 +2842,8 @@ uploading=正在上传 upload_complete=上传完成 failed=上传失败 enable_minio_support=启用minio支持以使用数据集服务 +max_file_tooltips=单次最多上传?个文件，每个文件不超过? MB。 +max_size-tooltips=一次最多只能上传?个文件, 上传已达到上限，请勿再添加文件。 [notification] notifications=通知 diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl index 08727600c..7eae567c2 100644 --- a/templates/repo/editor/upload.tmpl +++ b/templates/repo/editor/upload.tmpl @@ -27,10 +27,10 @@
-
+
{{template "repo/editor/commit_form" .}}
-{{template "base/footer" .}} +{{template "base/footer" .}} \ No newline at end of file diff --git a/web_src/js/index.js b/web_src/js/index.js index a04b76936..3127e2110 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2751,9 +2751,23 @@ $(document).ready(async () => { $('td[data-href]').click(function () { window.location = $(this).data('href'); }); + // 在String原型对象上添加format方法 + String.prototype.format = function(){ + let str = this; + if(arguments.length == 0){ + return str; + }else{ + Object.keys(arguments).forEach((item,index)=>{ + str = str.replace(/\?/,arguments[item]) + }) + return str + } + } // Dropzone const $dropzone = $('#dropzone'); + let maxFileTooltips=$dropzone.data('max-file-tooltips').format($dropzone.data('max-file'),$dropzone.data('max-size')) + let maxSizeTooltips=$dropzone.data('max-size-tooltips').format($dropzone.data('max-file')) if ($dropzone.length > 0) { const filenameDict = {}; @@ -2769,7 +2783,6 @@ $(document).ready(async () => { dictInvalidFileType: $dropzone.data('invalid-input-type'), dictFileTooBig: $dropzone.data('file-too-big'), dictRemoveFile: $dropzone.data('remove-file'), - dictMaxFilesExceeded:'上次超过限制', init() { this.on('success', (file, data) => { filenameDict[file.name] = data.uuid; @@ -2790,17 +2803,18 @@ $(document).ready(async () => { } }); this.on('addedfile',(file)=>{ - console.log("addfile",file,filenameDict,this.files.length) if(file.size/(1000*1000)>3){ this.removeFile(file) - $('.maxfilesize.ui.red.message').text('单次最多上传XX个文件，每个文件不超过XXM。') + $('.maxfilesize.ui.red.message').text(maxFileTooltips) $('.maxfilesize.ui.red.message').css('display','block') + }else{ + $('.maxfilesize.ui.red.message').css('display','none') } }); this.on('maxfilesexceeded',(file)=>{ this.removeFile(file) - $('.maxfilesize.ui.red.message').text('一次最多只能上传 5 个文件, 上传已达到上限，请勿再添加文件。') + $('.maxfilesize.ui.red.message').text(maxSizeTooltips) $('.maxfilesize.ui.red.message').css('display','block') }) From 929ed1b28ec66aab677431ca0a5f6f8ecd36c248 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 11:09:27 +0800 Subject: [PATCH 65/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index fbf60caa3..93c7068d3 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -298,29 +298,29 @@ td, th {
- + - {{$.i18n.Tr "cloudbrain.description"}} + {{$.i18n.Tr "repo.cloudbrain.datasetdownload"}}
- {{.Description}} + {{$.datasetDownloadLink}}
- + - {{$.i18n.Tr "repo.cloudbrain.datasetdownload"}} + {{$.i18n.Tr "cloudbrain.description"}}
- {{$.datasetDownloadLink}} + {{.Description}}
- - + +
From aff84ba79e0736e263f110ae726a906dd8ed052e Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 11 Apr 2022 12:10:59 +0800 Subject: [PATCH 66/81] #1639 rollback --- routers/repo/http.go | 54 +++------------------------------------------------- 1 file changed, 3 insertions(+), 51 deletions(-) diff --git a/routers/repo/http.go b/routers/repo/http.go index 26d58bd54..87406a2c3 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -365,7 +365,8 @@ func HTTP(ctx *context.Context) { ctx.NotFound("Smart Git HTTP", err) return } - route.handler(serviceHandler{cfg, w, r, dir, file, cfg.Env, repo}) + + route.handler(serviceHandler{cfg, w, r, dir, file, cfg.Env}) return } } @@ -428,7 +429,6 @@ type serviceHandler struct { dir string file string environ []string - repo *models.Repository } func (h *serviceHandler) setHeaderNoCache() { @@ -546,19 +546,6 @@ func serviceRPC(h serviceHandler, service string) { return } } - content, _ := ioutil.ReadAll(reqBody) - //check size - if service == "receive-pack" { - if err := repo_service.CheckPushSizeLimit4Http(h.repo, int64(len(content))); err != nil { - h.w.WriteHeader(http.StatusOK) - str := GenerateGitErrorBody(err.Error()) - h.w.Write([]byte(str)) - if h.w.Header().Get("Content-Type") == "" { - h.w.Header().Set("Content-Type", "application/x-git-receive-pack-result") - } - return - } - } // set this for allow pre-receive and post-receive execute h.environ = append(h.environ, "SSH_ORIGINAL_COMMAND="+service) @@ -573,7 +560,7 @@ func serviceRPC(h serviceHandler, service string) { } cmd.Stdout = h.w - cmd.Stdin = bytes.NewReader(content) + cmd.Stdin = reqBody cmd.Stderr = &stderr pid := process.GetManager().Add(fmt.Sprintf("%s %s %s [repo_path: %s]", git.GitExecutable, service, "--stateless-rpc", h.dir), cancel) @@ -585,41 +572,6 @@ func serviceRPC(h serviceHandler, service string) { } } -func GenerateGitErrorBody(content string) string { - var builder strings.Builder - builder.WriteString(GenerateErrStartPKTLine()) - builder.WriteString(GeneratePKTLine(content)) - builder.WriteString(GenerateEndPKTLine()) - return builder.String() -} - -func GeneratePKTLine(content string) string { - //\033[31m ... \033[0m - //mark the text red in shell - content = "\u0002\033[31m " + content + " \033[0m" - l := len(content) - prefixLength := 4 - suffix := "\n" - f := strconv.FormatInt(int64(l+prefixLength+len(suffix)), 16) - lf := len(f) - if lf == 1 { - f = "000" + f - } else if lf == 2 { - f = "00" + f - } else if lf == 3 { - f = "0" + f - } - return f + content + suffix -} - -func GenerateEndPKTLine() string { - return "0000" -} - -func GenerateErrStartPKTLine() string { - return "0031\u0001000eunpack err\n0019ok refs/heads/master\n0000" -} - func serviceUploadPack(h serviceHandler) { serviceRPC(h, "upload-pack") } From 8679849c3d582854214994f03b4a33d6597981ab Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 11 Apr 2022 14:36:00 +0800 Subject: [PATCH 67/81] fix issue --- options/locale/locale_en-US.ini | 2 +- options/locale/locale_zh-CN.ini | 2 +- web_src/js/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 781d5634f..976387dd9 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2837,7 +2837,7 @@ upload_complete = Uploading complete failed = Upload Failed enable_minio_support = Enable minio support to use the dataset service max_file_tooltips= Upload a maximum of ? files at a time, each file does not exceed ? MB. -max_size-tooltips= You can only upload a maximum of ? files at a time. The upload limit has been reached, please do not add more files. +max_size_tooltips= You can only upload a maximum of ? files at a time. The upload limit has been reached, please do not add more files. [notification] notifications = Notifications diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 5a047ce9e..6e4b2dc59 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2843,7 +2843,7 @@ upload_complete=上传完成 failed=上传失败 enable_minio_support=启用minio支持以使用数据集服务 max_file_tooltips=单次最多上传?个文件，每个文件不超过? MB。 -max_size-tooltips=一次最多只能上传?个文件, 上传已达到上限，请勿再添加文件。 +max_size_tooltips=一次最多只能上传?个文件, 上传已达到上限，请勿再添加文件。 [notification] notifications=通知 diff --git a/web_src/js/index.js b/web_src/js/index.js index 3127e2110..8cbf86fb2 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2803,7 +2803,7 @@ $(document).ready(async () => { } }); this.on('addedfile',(file)=>{ - if(file.size/(1000*1000)>3){ + if(file.size/(1000*1000)>$dropzone.data('max-size')){ this.removeFile(file) $('.maxfilesize.ui.red.message').text(maxFileTooltips) $('.maxfilesize.ui.red.message').css('display','block') From cb128d6719494ea73a76388597df7a1a44816a36 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 11 Apr 2022 14:49:47 +0800 Subject: [PATCH 68/81] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=80=82=E9=85=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=8F=8A=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=8E=A8=E8=8D=90=E9=A1=B9=E7=9B=AE=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/org/navber.tmpl | 7 ++---- templates/org/select_pro.tmpl | 53 +++++++++++++++++-------------------------- 2 files changed, 23 insertions(+), 37 deletions(-) diff --git a/templates/org/navber.tmpl b/templates/org/navber.tmpl index f7e88c1e9..772d9f67e 100755 --- a/templates/org/navber.tmpl +++ b/templates/org/navber.tmpl @@ -42,18 +42,15 @@ .active{ color:#0366D6 !important; } - .mleft{ - margin-left: 30% !important; - } .mbom{ margin-bottom: 10px !important; }
-
+
{{with .Org}} - + {{svg "octicon-home" 16}} {{$.i18n.Tr "org.home"}} {{end}} diff --git a/templates/org/select_pro.tmpl b/templates/org/select_pro.tmpl index 5105fa40e..97c6dec6e 100755 --- a/templates/org/select_pro.tmpl +++ b/templates/org/select_pro.tmpl @@ -83,47 +83,36 @@ {{ range .tags}} {{if eq .TagName "精选项目"}} -
+
{{ range .RepoList}}
-
-
- {{if .Alias}}{{.Alias}}{{else}}{{.Name}}{{end}} +
+
+ {{if .Alias}}{{.Alias}}{{else}}{{.Name}}{{end}}
-
+
+

{{.Description}} -

- - -
+

{{if .Topics }} -
- {{range .Topics}} - {{if ne . "" }}{{.}}{{end}} - {{end}} - -
- {{end}} - -
- -
-
-
- - {{svg "octicon-eye" 16}} {{.NumWatches}} - - - {{svg "octicon-star" 16}} {{.NumStars}} - - - {{svg "octicon-git-branch" 16}} {{.NumForks}} - - +

+ {{range .Topics}} + {{if ne . "" }}{{.}}{{end}} + {{end}} +

+ {{end}}
+
+ + {{svg "octicon-eye" 16}} {{.NumWatches}}     + {{svg "octicon-star" 16}} {{.NumStars}}     + {{svg "octicon-git-branch" 16}} {{.NumForks}} +
+
+
{{end}}
From 985a66b0f1f175f8d600a7dd6b6bed86c55e9ef4 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 11 Apr 2022 14:55:36 +0800 Subject: [PATCH 69/81] #1639 update default value --- modules/setting/repository.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 54ed13c2f..dceb48f16 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -106,6 +106,7 @@ var ( DisabledRepoUnits: []string{}, DefaultRepoUnits: []string{}, PrefixArchiveFiles: true, + RepoMaxSize: 1024, // Repository editor settings Editor: struct { @@ -128,9 +129,9 @@ var ( Enabled: true, TempPath: "data/tmp/uploads", AllowedTypes: []string{}, - FileMaxSize: 3, - MaxFiles: 5, - TotalMaxSize: 100, + FileMaxSize: 30, + MaxFiles: 10, + TotalMaxSize: 1024, }, // Repository local settings From c72907b4a896d86474d926251f6eba9ae1649815 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:02:50 +0800 Subject: [PATCH 70/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 2 +- templates/repo/modelarts/notebook/show.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 440843bfc..1decec169 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -56,7 +56,7 @@ margin:10px 5px ; } .tab_2_content { - min-height: 360px; + min-height: 380px; margin-left: 10px; } .ac-grid { diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 93c7068d3..92f69cec7 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -119,7 +119,7 @@ td, th { width: 800px; overflow: hidden; text-overflow: ellipsis; - height: 120px; + height: 80px; word-break: break-all; } .redo-color{ From c18fae72d166294e319f031c0452f4c58369f28a Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:06:06 +0800 Subject: [PATCH 71/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 1decec169..379e15536 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -431,7 +431,7 @@ td, th { -
+
From 1562809c87461c6d008e3d74a7d1bb1e8c0c8c60 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:07:21 +0800 Subject: [PATCH 72/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/cloudbrain/show.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 379e15536..c2bd0744d 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -492,7 +492,7 @@ td, th { let podEventArray = podEvents[task0]; if(podEventArray != null){ for(var i=0; i < podEventArray.length;i++){ - html +="

[" +podEventArray[i]["reason"] + "]

"; + html +="

[" +podEventArray[i]["reason"] + "]

"; html +="

" +podEventArray[i]["message"] + "

"; html +="

" +podEventArray[i]["action"] + "

"; } @@ -500,7 +500,7 @@ td, th { let extras= jsonObj["extras"]; if(extras != null){ for(var i=0; i < extras.length;i++){ - html +="

[" +extras[i]["reason"] + "]

"; + html +="

[" +extras[i]["reason"] + "]

"; html +="

" +extras[i]["message"] + "

"; html +="

" +extras[i]["action"] + "

"; } From 5bda2a741365109251aa679fc30c5ce703b2be88 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:13:17 +0800 Subject: [PATCH 73/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/search.js | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/public/home/search.js b/public/home/search.js index 8a8e940cb..e23d27549 100644 --- a/public/home/search.js +++ b/public/home/search.js @@ -129,32 +129,6 @@ function search(){ } } -function parseLog(){ - let jsonValue = document.getElementById("json_value").value; - let jsonObj = JSON.parse(jsonValue); - let podRoleName = jsonObj["podRoleName"]; - let html = ""; - if (podRoleName != null){ - let task0 = podRoleName["task1-0"]; - let podEvents = jsonObj["podEvents"]; - let podEventArray = podEvents[task0]; - if(podEventArray != null){ - for(int i=0; i < podEventArray.length;i++){ - html +="

" +podEventArray[i]["reason"] + "

"; - html +="

" +podEventArray[i]["message"] + "

"; - html +="

" +podEventArray[i]["action"] + "

"; - } - } - let extras= jsonObj["extras"]; - if(extras != null){ - html +="

" +extras["reason"] + "

"; - html +="

" +extras["message"] + "

"; - html +="

" +extras["action"] + "

"; - } - document.getElementById("info_display").innerHTML=html; - } - } - function emptySearch(){ initDiv(false); initPageInfo(); From 6f62ee768c18aa60a1acbd4f7890f2e75781dd1a Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 11 Apr 2022 15:15:34 +0800 Subject: [PATCH 74/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/less/openi.less | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index bdadf559f..c59416cf0 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -935,13 +935,8 @@ display: block; color: red; } - .ui.list .list>.item>img.image+.contentnew, .ui.list>.item>img.image+.contentnew { - width: calc(100%-10em); - margin-left: 0; - } - .ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content { - width: calc(100%-4.0em); + width: calc(100% - 4.0em); margin-left: 0; } From 4233fe4d9660d7ea319cb51611bb980ef1bca1fd Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 11 Apr 2022 15:29:26 +0800 Subject: [PATCH 75/81] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcard=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/org/select_pro.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/org/select_pro.tmpl b/templates/org/select_pro.tmpl index 97c6dec6e..a43e5eafe 100755 --- a/templates/org/select_pro.tmpl +++ b/templates/org/select_pro.tmpl @@ -109,7 +109,7 @@ {{svg "octicon-eye" 16}} {{.NumWatches}}     {{svg "octicon-star" 16}} {{.NumStars}}     {{svg "octicon-git-branch" 16}} {{.NumForks}} -
+
From bac12a8d2d0397c5c8fee6bf1473ceea5a67cd42 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 11 Apr 2022 15:55:02 +0800 Subject: [PATCH 76/81] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=8F=8A=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=AD=97=E4=BD=93=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/org/select_pro.tmpl | 18 +++++++++--------- web_src/less/openi.less | 13 +++++++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/templates/org/select_pro.tmpl b/templates/org/select_pro.tmpl index a43e5eafe..8472d78dd 100755 --- a/templates/org/select_pro.tmpl +++ b/templates/org/select_pro.tmpl @@ -85,7 +85,7 @@
{{ range .RepoList}} -
+
@@ -103,14 +103,14 @@ {{end}}

{{end}} -
-
- - {{svg "octicon-eye" 16}} {{.NumWatches}}     - {{svg "octicon-star" 16}} {{.NumStars}}     - {{svg "octicon-git-branch" 16}} {{.NumForks}} - -
+
+
+
+ + {{svg "octicon-eye" 16}} {{.NumWatches}}     + {{svg "octicon-star" 16}} {{.NumStars}}     + {{svg "octicon-git-branch" 16}} {{.NumForks}} +
diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 4f25e5ffd..54c4ec91e 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -12,6 +12,11 @@ a { .ui .text.yellow a:hover { color: #f2711c!important } +.ui.small.label.topic{ + margin-bottom: 0; + font-weight: 400; +} + .mb-1 { margin-bottom: 8px !important; } @@ -142,6 +147,14 @@ footer { width:auto; margin:10px auto; } +.ui.card>.extra, .ui.cards>.card>.extra{ + border-top:none; + padding: 0 .5em 1em; +} +.ui.card>.content + .extra.content, .ui.cards>.card>.content + .extra.content{ + padding-bottom: 0; +} + #index-project .ui.card>.content, #index-project.ui.cards>.card>.content{ padding: 0.5em 0.2em; } From cbed2e39edbe63f5ac58d762a5042d0b0542e73c Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 11 Apr 2022 16:40:11 +0800 Subject: [PATCH 77/81] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E9=A1=B9=E7=9B=AEcard=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/org/select_pro.tmpl | 2 +- web_src/less/openi.less | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/org/select_pro.tmpl b/templates/org/select_pro.tmpl index 8472d78dd..36dfda83d 100755 --- a/templates/org/select_pro.tmpl +++ b/templates/org/select_pro.tmpl @@ -87,7 +87,7 @@ {{ range .RepoList}}
-
+
{{if .Alias}}{{.Alias}}{{else}}{{.Name}}{{end}}
diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 54c4ec91e..d86eae40e 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -148,12 +148,9 @@ footer { margin:10px auto; } .ui.card>.extra, .ui.cards>.card>.extra{ - border-top:none; + border-top:none !important; padding: 0 .5em 1em; } -.ui.card>.content + .extra.content, .ui.cards>.card>.content + .extra.content{ - padding-bottom: 0; -} #index-project .ui.card>.content, #index-project.ui.cards>.card>.content{ padding: 0.5em 0.2em; From 3984edb96c9f20c43e2d9f913e02bb8d06c74e8b Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 11 Apr 2022 16:48:14 +0800 Subject: [PATCH 78/81] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E9=A1=B5=E8=84=9A=E4=BF=A1=E6=81=AF=E4=B8=8E=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/less/openi.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/openi.less b/web_src/less/openi.less index d86eae40e..c50598bc8 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -149,7 +149,7 @@ footer { } .ui.card>.extra, .ui.cards>.card>.extra{ border-top:none !important; - padding: 0 .5em 1em; + padding: .5em .5em 1em; } #index-project .ui.card>.content, #index-project.ui.cards>.card>.content{ From ef7dab984048da2902c302ddff93dd27411d22f7 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 11 Apr 2022 17:38:49 +0800 Subject: [PATCH 79/81] fix issue --- web_src/js/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 8cbf86fb2..7df46e139 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2766,11 +2766,10 @@ $(document).ready(async () => { // Dropzone const $dropzone = $('#dropzone'); - let maxFileTooltips=$dropzone.data('max-file-tooltips').format($dropzone.data('max-file'),$dropzone.data('max-size')) - let maxSizeTooltips=$dropzone.data('max-size-tooltips').format($dropzone.data('max-file')) if ($dropzone.length > 0) { const filenameDict = {}; - + let maxFileTooltips=$dropzone.data('max-file-tooltips').format($dropzone.data('max-file'),$dropzone.data('max-size')) + let maxSizeTooltips=$dropzone.data('max-size-tooltips').format($dropzone.data('max-file')) await createDropzone('#dropzone', { url: $dropzone.data('upload-url'), headers: {'X-Csrf-Token': csrf}, From 64e85b94ca03666c657dc3161fc44d580336524d Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 12 Apr 2022 08:56:10 +0800 Subject: [PATCH 80/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 933571a0b..e2b75e704 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -279,7 +279,7 @@ func NotebookShow(ctx *context.Context) { } } - datasetDownloadLink := "-" + datasetDownloadLink := "" if ctx.IsSigned { if task.Uuid != "" && task.UserID == ctx.User.ID { attachment, err := models.GetAttachmentByUUID(task.Uuid) From 157d6b9fbf158d6edc89c11ac88773a5ab176a24 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 12 Apr 2022 10:38:58 +0800 Subject: [PATCH 81/81] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?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 --- templates/repo/modelarts/notebook/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 92f69cec7..4bb049a94 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -119,7 +119,7 @@ td, th { width: 800px; overflow: hidden; text-overflow: ellipsis; - height: 80px; + height: 20%; word-break: break-all; } .redo-color{