From ec29cafc619635721de4d6a3e03c892bca850c15 Mon Sep 17 00:00:00 2001 From: wangjr Date: Fri, 7 Jan 2022 16:48:45 +0800 Subject: [PATCH 001/188] #1179 --- web_src/js/components/MinioUploader.vue | 2 +- web_src/js/components/ObsUploader.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index 0699f957e..85f1c084a 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -81,7 +81,7 @@ export default { dictInvalidFileType: this.dropzoneParams.data('invalid-input-type'), dictFileTooBig: this.dropzoneParams.data('file-too-big'), dictRemoveFile: this.dropzoneParams.data('remove-file'), - previewTemplate + // previewTemplate }); dropzoneUploader.on('addedfile', (file) => { setTimeout(() => { diff --git a/web_src/js/components/ObsUploader.vue b/web_src/js/components/ObsUploader.vue index 3b5bd3162..c5f34ce2f 100755 --- a/web_src/js/components/ObsUploader.vue +++ b/web_src/js/components/ObsUploader.vue @@ -82,7 +82,7 @@ export default { dictInvalidFileType: this.dropzoneParams.data('invalid-input-type'), dictFileTooBig: this.dropzoneParams.data('file-too-big'), dictRemoveFile: this.dropzoneParams.data('remove-file'), - previewTemplate + // previewTemplate }); dropzoneUploader.on('addedfile', (file) => { setTimeout(() => { From 9e5bc3c86a68807cc869a4f54073adc684cbd042 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 15 Feb 2022 10:16:48 +0800 Subject: [PATCH 002/188] s3 download link --- models/attachment.go | 13 +++++++++++++ modules/structs/attachment.go | 7 ++++--- templates/repo/datasets/dataset_list.tmpl | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) mode change 100644 => 100755 modules/structs/attachment.go diff --git a/models/attachment.go b/models/attachment.go index fd1df9e43..715cd0a90 100755 --- a/models/attachment.go +++ b/models/attachment.go @@ -88,6 +88,7 @@ func (a *Attachment) APIFormat() *api.Attachment { Size: a.Size, UUID: a.UUID, DownloadURL: a.DownloadURL(), + S3DownloadURL: a.S3DownloadURL(), } } @@ -96,6 +97,18 @@ func (a *Attachment) DownloadURL() string { return fmt.Sprintf("%sattachments/%s", setting.AppURL, a.UUID) } +// DownloadURL returns the download url of the attached file +func (a *Attachment) S3DownloadURL() string { + url := "" + if a.Type == TypeCloudBrainOne { + url, _ = storage.Attachments.PresignedGetURL(setting.Attachment.Minio.BasePath+AttachmentRelativePath(a.UUID), a.Name) + } else if a.Type == TypeCloudBrainTwo { + + } + + return url +} + // AttachmentRelativePath returns the relative path func AttachmentRelativePath(uuid string) string { return path.Join(uuid[0:1], uuid[1:2], uuid) diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go old mode 100644 new mode 100755 index 7becd9433..0f3c2ed6a --- a/modules/structs/attachment.go +++ b/modules/structs/attachment.go @@ -16,9 +16,10 @@ type Attachment struct { Size int64 `json:"size"` DownloadCount int64 `json:"download_count"` // swagger:strfmt date-time - Created time.Time `json:"created_at"` - UUID string `json:"uuid"` - DownloadURL string `json:"browser_download_url"` + Created time.Time `json:"created_at"` + UUID string `json:"uuid"` + DownloadURL string `json:"browser_download_url"` + S3DownloadURL string } // EditAttachmentOptions options for editing attachments diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl index e0c69c745..765adf391 100755 --- a/templates/repo/datasets/dataset_list.tmpl +++ b/templates/repo/datasets/dataset_list.tmpl @@ -14,7 +14,7 @@
{{svg "octicon-flame" 16}} {{(.DownloadCount | PrettyNumber)}} - + {{svg "octicon-file-binary" 16}}
{{if eq .DecompressState 1}} From 1acb67d85c2f82f1df26647c88cf8bf7847b62a6 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 15 Feb 2022 10:33:48 +0800 Subject: [PATCH 003/188] =?UTF-8?q?=E8=A7=A3=E5=86=B3#1461?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/user/notification.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/user/notification.go b/routers/user/notification.go index 9724c8108..0fd6df007 100644 --- a/routers/user/notification.go +++ b/routers/user/notification.go @@ -132,7 +132,7 @@ func getNotifications(c *context.Context) { } c.Data["Title"] = c.Tr("notifications") - c.Data["Keyword"] = keyword + //c.Data["Keyword"] = keyword c.Data["Status"] = status c.Data["Notifications"] = notifications From 6b0a34ca6e261a06cf2681bae5460c331366a446 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 15 Feb 2022 11:08:01 +0800 Subject: [PATCH 004/188] obs download link --- models/attachment.go | 2 +- templates/repo/datasets/dataset_list.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/attachment.go b/models/attachment.go index 715cd0a90..a6d4b3715 100755 --- a/models/attachment.go +++ b/models/attachment.go @@ -103,7 +103,7 @@ func (a *Attachment) S3DownloadURL() string { if a.Type == TypeCloudBrainOne { url, _ = storage.Attachments.PresignedGetURL(setting.Attachment.Minio.BasePath+AttachmentRelativePath(a.UUID), a.Name) } else if a.Type == TypeCloudBrainTwo { - + url, _ = storage.ObsGetPreSignedUrl(a.UUID, a.Name) } return url diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl index 765adf391..eed89b709 100755 --- a/templates/repo/datasets/dataset_list.tmpl +++ b/templates/repo/datasets/dataset_list.tmpl @@ -14,7 +14,7 @@
{{svg "octicon-flame" 16}} {{(.DownloadCount | PrettyNumber)}} - + {{svg "octicon-file" 16}} {{svg "octicon-file-binary" 16}}
{{if eq .DecompressState 1}} From 6d2b3062481412a06b7eb0755f1ce99ae223c8d0 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 15 Feb 2022 11:47:36 +0800 Subject: [PATCH 005/188] =?UTF-8?q?#1410=E9=A6=96=E9=A1=B5=E9=80=82?= =?UTF-8?q?=E9=85=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- custom/public/css/git.openi.css | 143 +++++++++++++++++++++++++++++--- public/home/home.js | 10 ++- templates/home.tmpl | 8 +- 3 files changed, 144 insertions(+), 17 deletions(-) diff --git a/custom/public/css/git.openi.css b/custom/public/css/git.openi.css index 502ba8d88..c97b48056 100644 --- a/custom/public/css/git.openi.css +++ b/custom/public/css/git.openi.css @@ -44,6 +44,12 @@ -webkit-line-clamp: 2; -webkit-box-orient: vertical; } +.ui.label{ + font-weight: normal; +} +.active { + color: #0366D6 !important; +} .opacity5{ opacity:0.5;} .radius15{ border-radius:1.5rem !important; } @@ -252,6 +258,11 @@ .homeorg-list .card .ui.small.header .content{ width: calc(100% - 3.25em); } +.homepro-tit{ + background: #FFF; + z-index: 9; + position: relative; +} .homepro-list{ position: relative; z-index: 9; @@ -261,8 +272,8 @@ .homepro-list .ui.card{ border-radius: 15px; background-color: #FFF; - box-shadow: 0px 5px 10px 0px rgba(105, 192, 255, 30); - border: 1px solid rgba(105, 192, 255, 40); + box-shadow: 0px 5px 10px 0px rgba(105, 192, 255, .3); + border: 1px solid rgba(105, 192, 255, .4); min-height: 10.8em; } .homepro-list .ui.card>.content>.header{ @@ -277,26 +288,134 @@ position: relative; } +/**seach**/ +/**搜索导航条适配窄屏**/ +.seachnav{ + overflow-x: auto; + overflow-y: hidden; + scrollbar-width: none; /* firefox */ + -ms-overflow-style: none; /* IE 10+ */ +} +.seachnav::-webkit-scrollbar { + display: none; /* Chrome Safari */ +} +.ui.green.button, .ui.green.buttons .button{ + background-color: #5BB973; +} +.seach .repos--seach{ + padding-bottom: 0; + border-bottom: none; +} +.seach .ui.secondary.pointing.menu{ + border-bottom: none; +} +.seach .ui.secondary.pointing.menu .item > i{ + margin-right: 5px; +} +.seach .ui.secondary.pointing.menu .active.item{ + border-bottom-width: 2px; + margin: 0 0 -1px; +} +.seach .ui.menu .active.item>.label { + background: #1684FC; + color: #FFF; +} +.seach .ui.menu .item>.label:not(.active.item>.label) { + background: #e8e8e8; + color: rgba(0,0,0,.6); +} + +.highlight{ + color: red; +} +.ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content { + width: calc(100% - 3.0em); + margin-left: 0; +} + +.seach .ui.list .list>.item .header, .seach .ui.list>.item .header{ + margin-bottom: 0.5em; + font-size: 1.4rem !important; + font-weight: normal; +} +.seach .time, .seach .time a{ + font-size: 12px; + color: grey; +} + +.seach .list .item.members .ui.avatar.image { + width: 3.2em; + height: 3.2em; +} +.ui.list .list>.item.members>img.image+.content, .ui.list>.item.members>img.image+.content { + width: calc(100% - 4.0em); + margin-left: 0; +} + @media only screen and (max-width: 767px) { .am-mt-30{ margin-top: 1.5rem !important;} .ui.secondary.hometop.segment{ - margin-bottom: 2.0rem; + margin-bottom: 5.0rem; } - .bannerpic, .i-code-pic{ + .bannerpic{ display: none; } - .i-code h2::before { - left: calc(-5.0rem + 6px); + #homenews{ + bottom: -3em; } - .i-code h2.am-bw::before{ - left: calc(-4.0rem + 6px); + #homenews > p { + margin-left: 1.0em; + } + .homenews{ + padding-left: 1.3em !important; + border-radius: 1.5em; + } + .homenews::before{ + left: 2em; + } + .homeorg{ + padding-left: 3.5em; + } + .homeorg-tit::after { + left: -2.3em; + } + .homeorg-list{ + margin: 0 0 2.0em !important; + } + .homeorg-list > .column{ + width: 3em !important; + margin-left: -0.5em; + padding: 0.5rem 0 0 !important; + } + .homeorg-list .card{ + background: none !important; + } + .homeorg-list .card > .content{ + padding: 0 !important; + } + + .homeorg-list > .column .card .ui.header>img{ + width: 3.0em; + height: 3.0em; + border-radius: 2.0em; + border: 2px solid #FFF; + } + .homeorg-list > .column .card .ui.header > .content{ + display: none; } .leftline01{ - width: calc(50% - 4.0rem); + width: 4.0em; + bottom: 4em; + border-radius: 0 0 0 3.0em; + } + .leftline02, .leftline02-2{ + left: 6.0em; + top: calc(-4.0em - 2px); + border-radius: 0 3.0em 3.0em 0; + width: calc(50% - 6.0em); } - .leftline02{ - left: calc(50% - 1.0rem); - top: calc(-3.5rem - 2px); + .leftline02-2 { + width: calc(50% - 8.0em); } } diff --git a/public/home/home.js b/public/home/home.js index f49c8248b..bc8932642 100644 --- a/public/home/home.js +++ b/public/home/home.js @@ -17,7 +17,7 @@ var swiperNewMessage = new Swiper(".newslist", { }, }); var swiperRepo = new Swiper(".homepro-list", { - slidesPerView: 3, + slidesPerView: 1, slidesPerColumn: 2, slidesPerColumnFill:'row', spaceBetween: 30, @@ -29,6 +29,14 @@ var swiperRepo = new Swiper(".homepro-list", { delay: 2500, disableOnInteraction: false, }, + breakpoints: { + 768: { + slidesPerView: 2, + }, + 1024: { + slidesPerView: 3, + }, + }, }); var output = document.getElementById("newmessage"); diff --git a/templates/home.tmpl b/templates/home.tmpl index f43639a14..08893d71e 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -20,7 +20,7 @@

* {{.page_only_dynamic}}

-
+
-
+
@@ -78,7 +78,7 @@

{{.page_dev_env}}

{{.page_dev_env_desc}}

-
+
@@ -158,4 +158,4 @@ -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} From 755688bb6f857f3a7830c3110b91e47ae20db264 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 15 Feb 2022 17:04:06 +0800 Subject: [PATCH 006/188] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E9=80=9A=E7=9F=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/action.go | 2 ++ modules/notification/action/action.go | 15 +++++++++++++++ modules/notification/base/notifier.go | 2 ++ modules/notification/base/null.go | 4 ++++ modules/notification/notification.go | 7 +++++++ routers/repo/attachment.go | 4 +++- 6 files changed, 33 insertions(+), 1 deletion(-) diff --git a/models/action.go b/models/action.go index 003dc1b20..deb16f6c3 100755 --- a/models/action.go +++ b/models/action.go @@ -49,6 +49,8 @@ const ( ActionApprovePullRequest // 21 ActionRejectPullRequest // 22 ActionCommentPull // 23 + + ActionUploadAttachment //24 ) // Action represents user operation type and other information to diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go index 9956940f3..ba279a3c7 100644 --- a/modules/notification/action/action.go +++ b/modules/notification/action/action.go @@ -314,3 +314,18 @@ func (a *actionNotifier) NotifySyncDeleteRef(doer *models.User, repo *models.Rep log.Error("notifyWatchers: %v", err) } } + +func NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { + if err := models.NotifyWatchers(&models.Action{ + ActUserID: repo.OwnerID, + ActUser: repo.MustOwner(), + OpType: models.ActionUploadAttachment, + RepoID: repo.ID, + Repo: repo, + IsPrivate: repo.IsPrivate, + RefName: attachment.Name, + Content: attachment.UUID, + }); err != nil { + log.Error("notifyWatchers: %v", err) + } +} diff --git a/modules/notification/base/notifier.go b/modules/notification/base/notifier.go index 0b3e1173b..95331131f 100644 --- a/modules/notification/base/notifier.go +++ b/modules/notification/base/notifier.go @@ -53,4 +53,6 @@ type Notifier interface { NotifySyncPushCommits(pusher *models.User, repo *models.Repository, refName, oldCommitID, newCommitID string, commits *repository.PushCommits) NotifySyncCreateRef(doer *models.User, repo *models.Repository, refType, refFullName string) NotifySyncDeleteRef(doer *models.User, repo *models.Repository, refType, refFullName string) + + NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) } diff --git a/modules/notification/base/null.go b/modules/notification/base/null.go index d2fd51d71..6450c1f0f 100644 --- a/modules/notification/base/null.go +++ b/modules/notification/base/null.go @@ -150,3 +150,7 @@ func (*NullNotifier) NotifySyncCreateRef(doer *models.User, repo *models.Reposit // NotifySyncDeleteRef places a place holder function func (*NullNotifier) NotifySyncDeleteRef(doer *models.User, repo *models.Repository, refType, refFullName string) { } + +func (*NullNotifier) NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { + +} diff --git a/modules/notification/notification.go b/modules/notification/notification.go index d12024663..7b0203a5c 100644 --- a/modules/notification/notification.go +++ b/modules/notification/notification.go @@ -37,6 +37,13 @@ func NewContext() { RegisterNotifier(action.NewNotifier()) } +// NotifyUploadAttachment notifies attachment upload message to notifiers +func NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { + for _, notifier := range notifiers { + notifier.NotifyUploadAttachment(doer, repo, attachment) + } +} + // NotifyCreateIssueComment notifies issue comment related message to notifiers func NotifyCreateIssueComment(doer *models.User, repo *models.Repository, issue *models.Issue, comment *models.Comment) { diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go index 8443d6488..dc15be9f1 100755 --- a/routers/repo/attachment.go +++ b/routers/repo/attachment.go @@ -20,11 +20,11 @@ import ( "code.gitea.io/gitea/modules/labelmsg" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/minio_ext" + "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/upload" "code.gitea.io/gitea/modules/worker" - gouuid "github.com/satori/go.uuid" ) @@ -846,6 +846,8 @@ func CompleteMultipart(ctx *context.Context) { return } + notification.NotifyUploadAttachment(ctx.User, ctx.Repo.Repository, attachment) + if attachment.DatasetID != 0 { if isCanDecompress(attachment.Name) { if typeCloudBrain == models.TypeCloudBrainOne { From 80ec65ea46c6450143ed3a96a404423eb567646b Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Tue, 15 Feb 2022 17:11:05 +0800 Subject: [PATCH 007/188] =?UTF-8?q?=E4=BA=91=E8=84=91=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=BF=90=E7=BB=B4=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 58 ++++++++++++++++++--- routers/admin/cloudbrains.go | 98 ++++++++++++++++++++++++++++++++++++ routers/routes/routes.go | 3 ++ 3 files changed, 151 insertions(+), 8 deletions(-) create mode 100644 routers/admin/cloudbrains.go diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 82c4c6b83..1a8496355 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -209,17 +209,20 @@ type GetImagesPayload struct { type CloudbrainsOptions struct { ListOptions - RepoID int64 // include all repos if empty - UserID int64 - JobID string - SortType string - CloudbrainIDs []int64 - // JobStatus CloudbrainStatus + RepoID int64 // include all repos if empty + UserID int64 + JobID string + SortType string + CloudbrainIDs []int64 + JobStatus []string + JobStatusNot bool + Keyword string Type int JobTypes []string VersionName string IsLatestVersion string JobTypeNot bool + NeedRepoInfo bool } type TaskPod struct { @@ -1015,7 +1018,32 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { cond = cond.And(builder.In("cloudbrain.id", opts.CloudbrainIDs)) } - count, err := sess.Where(cond).Count(new(Cloudbrain)) + if len(opts.JobStatus) > 0 { + if opts.JobStatusNot { + cond = cond.And( + builder.NotIn("cloudbrain.status", opts.JobStatus), + ) + } else { + cond = cond.And( + builder.In("cloudbrain.status", opts.JobStatus), + ) + } + } + + var count int64 + var err error + condition := "cloudbrain.user_id = `user`.id" + if len(opts.Keyword) == 0 { + count, err = sess.Where(cond).Count(new(Cloudbrain)) + } else { + lowerKeyWord := strings.ToLower(opts.Keyword) + + cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}), builder.Like{"`user`.lower_name", lowerKeyWord}) + count, err = sess.Table(&Cloudbrain{}).Where(cond). + Join("left", "`user`", condition).Count(new(CloudbrainInfo)) + + } + if err != nil { return nil, 0, fmt.Errorf("Count: %v", err) } @@ -1033,11 +1061,25 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { sess.OrderBy("cloudbrain.created_unix DESC") cloudbrains := make([]*CloudbrainInfo, 0, setting.UI.IssuePagingNum) if err := sess.Table(&Cloudbrain{}).Where(cond). - Join("left", "`user`", "cloudbrain.user_id = `user`.id"). + Join("left", "`user`", condition). Find(&cloudbrains); err != nil { return nil, 0, fmt.Errorf("Find: %v", err) } + if opts.NeedRepoInfo { + var ids []int64 + for _, task := range cloudbrains { + ids = append(ids, task.RepoID) + } + repositoryMap, err := GetRepositoriesMapByIDs(ids) + if err == nil { + for _, task := range cloudbrains { + task.Repo = repositoryMap[task.RepoID] + } + } + + } + return cloudbrains, count, nil } diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go new file mode 100644 index 000000000..8bc4bb03d --- /dev/null +++ b/routers/admin/cloudbrains.go @@ -0,0 +1,98 @@ +package admin + +import ( + "strings" + + "code.gitea.io/gitea/modules/modelarts" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" +) + +const ( + tplCloudBrains base.TplName = "admin/cloudbrain/list" +) + +func CloudBrains(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("admin.cloudBrains") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminCloudBrains"] = true + + listType := ctx.Query("listType") + jobType := ctx.Query("jobType") + jobStatus := ctx.Query("jobStatus") + + ctx.Data["ListType"] = listType + ctx.Data["JobType"] = jobType + ctx.Data["JobStatus"] = jobStatus + + page := ctx.QueryInt("page") + if page <= 0 { + page = 1 + } + debugType := modelarts.DebugType + if listType == models.GPUResource { + debugType = models.TypeCloudBrainOne + } else if listType == models.NPUResource { + debugType = models.TypeCloudBrainTwo + } + + var jobTypes []string + jobTypeNot := false + if jobType == string(models.JobTypeDebug) { + jobTypes = append(jobTypes, string(models.JobTypeSnn4imagenet), string(models.JobTypeBrainScore), string(models.JobTypeDebug)) + } else if jobType != "all" && jobType != "" { + jobTypes = append(jobTypes, jobType) + } + + var jobStatuses []string + jobStatusNot := false + if jobStatus == "other" { + jobStatusNot = true + jobStatuses = append(jobStatuses, string(models.ModelArtsTrainJobWaiting), string(models.ModelArtsTrainJobFailed), string(models.ModelArtsRunning), string(models.ModelArtsTrainJobCompleted), + string(models.ModelArtsStarting), string(models.ModelArtsRestarting), string(models.ModelArtsStartFailed), + string(models.ModelArtsStopping), string(models.ModelArtsStopped)) + } else if jobStatus != "all" && jobStatus != "" { + jobStatuses = append(jobStatuses, jobStatus) + } + + keyword := strings.Trim(ctx.Query("q"), " ") + + ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{ + ListOptions: models.ListOptions{ + Page: page, + PageSize: setting.UI.IssuePagingNum, + }, + Keyword: keyword, + Type: debugType, + JobTypeNot: jobTypeNot, + JobStatusNot: jobStatusNot, + JobStatus: jobStatuses, + JobTypes: jobTypes, + NeedRepoInfo: true, + }) + if err != nil { + ctx.ServerError("Get job failed:", err) + return + } + + for i, task := range ciTasks { + ciTasks[i].CanDebug = true + ciTasks[i].CanDel = true + ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource + } + + pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5) + pager.SetDefaultParams(ctx) + pager.AddParam(ctx, "listType", "ListType") + ctx.Data["Page"] = pager + ctx.Data["PageIsCloudBrain"] = true + ctx.Data["Tasks"] = ciTasks + ctx.Data["CanCreate"] = true + ctx.Data["Keyword"] = keyword + + ctx.HTML(200, tplCloudBrains) + +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 9690c115d..a915daf64 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -507,6 +507,9 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("", admin.Datasets) // m.Post("/delete", admin.DeleteDataset) }) + m.Group("/cloudbrains", func() { + m.Get("", admin.CloudBrains) + }) m.Group("/^:configType(hooks|system-hooks)$", func() { m.Get("", admin.DefaultOrSystemWebhooks) From d1f43bf7f51766eff183161908e85703c620cfc3 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 15 Feb 2022 17:14:41 +0800 Subject: [PATCH 008/188] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E9=80=9A=E7=9F=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/notification/action/action.go | 2 +- modules/notification/notification.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go index ba279a3c7..4c40df114 100644 --- a/modules/notification/action/action.go +++ b/modules/notification/action/action.go @@ -315,7 +315,7 @@ func (a *actionNotifier) NotifySyncDeleteRef(doer *models.User, repo *models.Rep } } -func NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { +func (a *actionNotifier) NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { if err := models.NotifyWatchers(&models.Action{ ActUserID: repo.OwnerID, ActUser: repo.MustOwner(), diff --git a/modules/notification/notification.go b/modules/notification/notification.go index 7b0203a5c..3179dd5f9 100644 --- a/modules/notification/notification.go +++ b/modules/notification/notification.go @@ -6,6 +6,7 @@ package notification import ( "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification/action" "code.gitea.io/gitea/modules/notification/base" "code.gitea.io/gitea/modules/notification/indexer" @@ -39,7 +40,9 @@ func NewContext() { // NotifyUploadAttachment notifies attachment upload message to notifiers func NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { + log.Info("send attachment to db.") for _, notifier := range notifiers { + log.Info("send attachment to notifiers.") notifier.NotifyUploadAttachment(doer, repo, attachment) } } From 075516d5ab43f296ca2991112a02c07ba9f5bbde Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 15 Feb 2022 17:21:57 +0800 Subject: [PATCH 009/188] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E9=80=9A=E7=9F=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/notification/action/action.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go index 4c40df114..cc86d927a 100644 --- a/modules/notification/action/action.go +++ b/modules/notification/action/action.go @@ -318,7 +318,7 @@ func (a *actionNotifier) NotifySyncDeleteRef(doer *models.User, repo *models.Rep func (a *actionNotifier) NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { if err := models.NotifyWatchers(&models.Action{ ActUserID: repo.OwnerID, - ActUser: repo.MustOwner(), + ActUser: doer, OpType: models.ActionUploadAttachment, RepoID: repo.ID, Repo: repo, From 9c460221646f6d7aefc469341c76118144d9abb5 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 15 Feb 2022 17:54:03 +0800 Subject: [PATCH 010/188] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E9=80=9A=E7=9F=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/attachment.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go index dc15be9f1..91c0e7d28 100755 --- a/routers/repo/attachment.go +++ b/routers/repo/attachment.go @@ -845,8 +845,9 @@ func CompleteMultipart(ctx *context.Context) { ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err)) return } - - notification.NotifyUploadAttachment(ctx.User, ctx.Repo.Repository, attachment) + dataset, _ := models.GetDatasetByID(attachment.DatasetID) + repository, _ := models.GetRepositoryByID(dataset.RepoID) + notification.NotifyUploadAttachment(ctx.User, repository, attachment) if attachment.DatasetID != 0 { if isCanDecompress(attachment.Name) { @@ -867,7 +868,6 @@ func CompleteMultipart(ctx *context.Context) { labelmsg.SendDecompressAttachToLabelOBS(string(attachjson)) } } else { - dataset, _ := models.GetDatasetByID(attachment.DatasetID) var labelMap map[string]string labelMap = make(map[string]string) labelMap["UUID"] = uuid From 43cb44f26b28aaaad851a5e74e58e4e765a0d824 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 16 Feb 2022 09:09:25 +0800 Subject: [PATCH 011/188] no cache when download --- routers/repo/download.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/repo/download.go b/routers/repo/download.go index 5b8982102..f1b6e09b7 100755 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -28,7 +28,8 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error { buf = buf[:n] } - ctx.Resp.Header().Set("Cache-Control", "public,max-age=86400") + //ctx.Resp.Header().Set("Cache-Control", "public,max-age=86400") + ctx.Resp.Header().Set("Cache-Control", "max-age=0") name = path.Base(name) // Google Chrome dislike commas in filenames, so let's change it to a space From b5caaea9859012e224a99753acd24d8e1cc48e67 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 16 Feb 2022 10:31:43 +0800 Subject: [PATCH 012/188] fix 1503 --- modules/modelarts/resty.go | 4 +++- routers/repo/modelarts.go | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index afc5a14c0..28fcdd49a 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -30,9 +30,11 @@ const ( errorCodeExceedLimit = "ModelArts.0118" //notebook 2.0 - urlNotebook2 = "/notebooks" + urlNotebook2 = "/notebooks" + //error code modelartsIllegalToken = "ModelArts.6401" + NotebookNotFound = "ModelArts.6404" ) func getRestyClient() *resty.Client { diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 7e9ae3c09..9dea34c82 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -307,7 +307,7 @@ func NotebookDebug2(ctx *context.Context) { ctx.RenderWithErr(err.Error(), tplModelArtsNotebookIndex, nil) return } - + ctx.Redirect(result.Url) } @@ -387,7 +387,7 @@ func NotebookManage(ctx *context.Context) { log.Error("ManageNotebook2(%s) failed:%v", task.JobName, err.Error(), ctx.Data["MsgID"]) resultCode = "-1" errorMsg = err.Error() - if strings.Contains(err.Error(), "ModelArts.6404") { + if strings.Contains(err.Error(), modelarts.NotebookNotFound) { errorMsg = "the job's version is too old and can not be restarted" } break @@ -428,8 +428,12 @@ func NotebookDel(ctx *context.Context) { _, err := modelarts.DelNotebook2(jobID) if err != nil { log.Error("DelNotebook2(%s) failed:%v", task.JobName, err.Error()) - ctx.ServerError("DelNotebook2 failed", err) - return + if strings.Contains(err.Error(), modelarts.NotebookNotFound) { + log.Info("old notebook version") + } else { + ctx.ServerError("DelNotebook2 failed", err) + return + } } err = models.DeleteJob(task) From e5ca2fcd0d200a89a4a8c1ec6fef5ff1c4e60f1f Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 16 Feb 2022 11:29:30 +0800 Subject: [PATCH 013/188] =?UTF-8?q?=E4=BA=91=E8=84=91=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options/locale/locale_en-US.ini | 4 ++ options/locale/locale_zh-CN.ini | 3 + routers/admin/cloudbrains.go | 119 +++++++++++++++++++++++++++++++- routers/routes/routes.go | 1 + 4 files changed, 126 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b3ede3b06..318348d56 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -864,9 +864,13 @@ confirm_choice = confirm cloudbran1_tips = Only data in zip format can create cloudbrain tasks cloudbrain_creator=Creator cloudbrain_task = Task Name +cloudbrain_task_type = Task Type +cloudbrain_task_name=Cloud Brain Task Name cloudbrain_operate = Operate cloudbrain_status_createtime = Status/Createtime cloudbrain_status_runtime = Running Time +cloudbrain_jobname_err=Name must start with a lowercase letter or number,can include lowercase letter,number,_ and -,can not end with _, and can be up to 36 characters long. +cloudbrain_query_fail=Failed to query cloudbrain information. record_begintime_get_err=Can not get the record begin time. parameter_is_wrong=The input parameter is wrong. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 86e88184c..58b0b79b3 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -868,10 +868,13 @@ confirm_choice=确定 cloudbran1_tips=只有zip格式的数据集才能发起云脑任务 cloudbrain_creator=创建者 cloudbrain_task=任务名称 +cloudbrain_task_type=任务类型 +cloudbrain_task_name=云脑侧任务名称 cloudbrain_operate=操作 cloudbrain_status_createtime=状态/创建时间 cloudbrain_status_runtime = 运行时长 cloudbrain_jobname_err=只能以小写字母或数字开头且只包含小写字母、数字、_和-，不能以_结尾，最长36个字符。 +cloudbrain_query_fail=查询云脑任务失败。 record_begintime_get_err=无法获取统计开始时间。 parameter_is_wrong=输入参数错误，请检查输入参数。 diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go index 8bc4bb03d..2058925e5 100644 --- a/routers/admin/cloudbrains.go +++ b/routers/admin/cloudbrains.go @@ -1,18 +1,27 @@ package admin import ( + "net/http" + "net/url" + "strconv" "strings" + "time" + + "github.com/360EntSecGroup-Skylar/excelize/v2" "code.gitea.io/gitea/modules/modelarts" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" ) const ( - tplCloudBrains base.TplName = "admin/cloudbrain/list" + tplCloudBrains base.TplName = "admin/cloudbrain/list" + EXCEL_DATE_FORMAT = "20060102150405" + CREATE_TIME_FORMAT = "2006/01/02 15:04:05.00" ) func CloudBrains(ctx *context.Context) { @@ -96,3 +105,111 @@ func CloudBrains(ctx *context.Context) { ctx.HTML(200, tplCloudBrains) } + +func DownloadCloudBrains(ctx *context.Context) { + + page := 1 + + pageSize := 300 + + var cloudBrain = ctx.Tr("repo.cloudbrain") + fileName := getFileName(cloudBrain) + + _, total, err := models.Cloudbrains(&models.CloudbrainsOptions{ + ListOptions: models.ListOptions{ + Page: page, + PageSize: 1, + }, + Type: modelarts.DebugType, + NeedRepoInfo: false, + }) + + if err != nil { + log.Warn("Can not get cloud brain info", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.cloudbrain_query_fail")) + return + } + + totalPage := getTotalPage(total, pageSize) + + f := excelize.NewFile() + + index := f.NewSheet(cloudBrain) + f.DeleteSheet("Sheet1") + + for k, v := range allHeader(ctx) { + f.SetCellValue(cloudBrain, k, v) + } + + var row = 2 + for i := 0; i < totalPage; i++ { + + pageRecords, _, err := models.Cloudbrains(&models.CloudbrainsOptions{ + ListOptions: models.ListOptions{ + Page: page, + PageSize: pageSize, + }, + Type: modelarts.DebugType, + NeedRepoInfo: true, + }) + if err != nil { + log.Warn("Can not get cloud brain info", err) + continue + } + for _, record := range pageRecords { + + for k, v := range allValues(row, record, ctx) { + f.SetCellValue(cloudBrain, k, v) + } + row++ + + } + + page++ + } + f.SetActiveSheet(index) + + ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(fileName)) + ctx.Resp.Header().Set("Content-Type", "application/octet-stream") + + f.WriteTo(ctx.Resp) +} + +func allValues(row int, rs *models.CloudbrainInfo, ctx *context.Context) map[string]string { + return map[string]string{getCellName("A", row): rs.JobName, getCellName("B", row): rs.Status, getCellName("C", row): rs.JobType, getCellName("D", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("E", row): getDurationTime(rs), + getCellName("F", row): rs.ComputeResource, getCellName("G", row): rs.Name, getCellName("H", row): rs.Repo.OwnerName + "/" + rs.Repo.Alias, getCellName("I", row): rs.JobName, + } +} + +func getDurationTime(rs *models.CloudbrainInfo) string { + if rs.JobType == "TRAIN" || rs.JobType == "INFERENCE" { + return rs.TrainJobDuration + } else { + return "-" + } +} + +func getFileName(baseName string) string { + return baseName + "_" + time.Now().Format(EXCEL_DATE_FORMAT) + ".xlsx" + +} + +func getTotalPage(total int64, pageSize int) int { + + another := 0 + if int(total)%pageSize != 0 { + another = 1 + } + return int(total)/pageSize + another + +} + +func allHeader(ctx *context.Context) map[string]string { + + return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.modelarts.status"), "C1": ctx.Tr("repo.cloudbrain_task_type"), "D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.dura_time"), "F1": ctx.Tr("repo.modelarts.computing_resources"), "G1": ctx.Tr("repo.cloudbrain_creator"), "H1": ctx.Tr("repo.repo_name"), "I1": ctx.Tr("repo.cloudbrain_task_name")} + +} + +func getCellName(col string, row int) string { + return col + strconv.Itoa(row) +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a915daf64..9e0dcf930 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -509,6 +509,7 @@ func RegisterRoutes(m *macaron.Macaron) { }) m.Group("/cloudbrains", func() { m.Get("", admin.CloudBrains) + m.Get("/download", admin.DownloadCloudBrains) }) m.Group("/^:configType(hooks|system-hooks)$", func() { From f7ada1132460da5ecabaf6c65e1947ed76e088e6 Mon Sep 17 00:00:00 2001 From: wangjr Date: Wed, 16 Feb 2022 15:19:14 +0800 Subject: [PATCH 014/188] =?UTF-8?q?fix-1456=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options/locale/locale_en-US.ini | 3 +++ options/locale/locale_zh-CN.ini | 3 +++ templates/org/select_pro.tmpl | 25 +++++++++++++------------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b3ede3b06..148f07dee 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2078,6 +2078,9 @@ custom_select_courses = Customize selected courses recommend_remain_pro = Remain save_fail_tips = The upper limit is exceeded select_again = Select more than 9, please select again! +custom_select_projects = Customize selected projects +customize = Customize +selected_project=Selected Projects form.name_reserved = The organization name '%s' is reserved. form.name_pattern_not_allowed = The pattern '%s' is not allowed in an organization name. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 86e88184c..b527ef005 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2088,6 +2088,9 @@ custom_select_courses = 自定义精选课程 recommend_remain_pro = 还能推荐 save_fail_tips = 最多可选9个，保存失败 select_again = 选择超过9个，请重新选择！ +custom_select_projects = 自定义精选项目 +customize = 自定义 +selected_project=精选项目 form.name_reserved=组织名称 '%s' 是被保留的。 form.name_pattern_not_allowed=组织名称中不允许使用 "%s"。 diff --git a/templates/org/select_pro.tmpl b/templates/org/select_pro.tmpl index 70b2a9bb3..5105fa40e 100755 --- a/templates/org/select_pro.tmpl +++ b/templates/org/select_pro.tmpl @@ -70,11 +70,11 @@
{{if .tags}} - 精选项目 + {{.i18n.Tr "org.selected_project"}} {{if .IsOrganizationOwner}} - {{svg "octicon-gear" 16}}自定义 + {{svg "octicon-gear" 16}}{{.i18n.Tr "org.customize"}} {{end}} {{end}} @@ -137,10 +137,10 @@
-

自定义精选项目

+

{{.i18n.Tr "org.custom_select_projects"}}

-

最多可选9个公开项目

+

{{.i18n.Tr "org.max_selectedPro"}}

@@ -223,12 +223,12 @@ function saveSeletedPro(typeTag){ var saveData=[]; $('input[name="select_pro_name"]:checked').each(function(){ - console.log('值',this.dataset.repoid) + // console.log('值',this.dataset.repoid) saveData.push(parseInt(this.dataset.repoid)); }) if(saveData.length>9){ - alert("最多可选9个，保存失败") + alert("{{.i18n.Tr "org.save_fail_tips"}}") return } // saveData = getSelecteDataID(); @@ -242,7 +242,7 @@ data:JSON.stringify({'repoList':saveData }), success:function(res){ - console.log('保存成功'); + // console.log('保存成功'); location.reload() } @@ -270,15 +270,15 @@ filterData.push(data[i]) } } - console.log("选中的值:",selectedData) - console.log("筛选包括选中的值:",filterData) + // console.log("选中的值:",selectedData) + // console.log("筛选包括选中的值:",filterData) var showData=[]; for(i=0;i{ return item.RepoID!=selectedData[i].RepoID }); } - console.log("筛选后不包括选中的值:",filterData) + // console.log("筛选后不包括选中的值:",filterData) $("#org_list").empty() if(searchValue!=""){ if (filterData.length!=0){ @@ -307,7 +307,7 @@ num++ if(num>9){ document.getElementById(id).checked=false - alert("选择超过9个，请重新选择！") + alert("{{.i18n.Tr "org.select_again"}}") return } } @@ -315,7 +315,8 @@ } var show_num = 9-num; - document.getElementById("recommend").innerHTML="还能推荐"+show_num+"个" + let rec = "{{.i18n.Tr "org.recommend_remain_pro"}}" + document.getElementById("recommend").innerHTML=rec +" : "+ show_num } From ce27bf3d25e81b157fca8827343988d15e13884b Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 15:33:26 +0800 Subject: [PATCH 015/188] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/action.go | 8 +++++++- modules/cloudbrain/cloudbrain.go | 13 ++++++++++--- modules/modelarts/modelarts.go | 15 ++++++++------- modules/notification/action/action.go | 8 ++++---- modules/notification/base/notifier.go | 2 +- modules/notification/base/null.go | 2 +- modules/notification/notification.go | 4 ++-- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 2 +- routers/repo/ai_model_manage.go | 3 ++- routers/repo/attachment.go | 2 +- routers/repo/cloudbrain.go | 2 +- services/socketwrap/clientManager.go | 2 +- templates/user/dashboard/feeds.tmpl | 20 ++++++++++++++++++++ 14 files changed, 60 insertions(+), 24 deletions(-) diff --git a/models/action.go b/models/action.go index deb16f6c3..95d87206f 100755 --- a/models/action.go +++ b/models/action.go @@ -50,7 +50,13 @@ const ( ActionRejectPullRequest // 22 ActionCommentPull // 23 - ActionUploadAttachment //24 + ActionUploadAttachment //24 + ActionCreateDebugGPUTask //25 + ActionCreateDebugNPUTask //26 + ActionCreateTrainTask //27 + ActionCreateInferenceTask // 28 + ActionCreateBenchMarkTask //29 + ActionCreateNewModelTask //30 ) // Action represents user operation type and other information to diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index f15443b30..b86a2d3f4 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -1,16 +1,17 @@ package cloudbrain import ( - "code.gitea.io/gitea/modules/storage" "encoding/json" "errors" "strconv" - "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/notification" + "code.gitea.io/gitea/modules/setting" ) const ( @@ -221,13 +222,19 @@ func GenerateTask(ctx *context.Context, jobName, image, command, uuid, codePath, ComputeResource: models.GPUResource, BenchmarkTypeID: benchmarkTypeID, BenchmarkChildTypeID: benchmarkChildTypeID, - Description: description, + Description: description, }) if err != nil { return err } + if string(models.JobTypeBenchmark) == jobType { + notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, jobName, models.ActionCreateBenchMarkTask) + } else { + notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, jobName, models.ActionCreateDebugGPUTask) + } + return nil } diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index 8af2a93e5..dffe7d05e 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" ) @@ -258,7 +259,7 @@ func GenerateTask(ctx *context.Context, jobName, uuid, description, flavor strin if err != nil { return err } - + notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobResult.ID, jobName, models.ActionCreateDebugNPUTask) return nil } @@ -292,12 +293,12 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error log.Error("GetAttachmentByUUID(%s) failed:%v", strconv.FormatInt(jobResult.JobID, 10), err.Error()) return err } - + jobId := strconv.FormatInt(jobResult.JobID, 10) err = models.CreateCloudbrain(&models.Cloudbrain{ Status: TransTrainJobStatus(jobResult.Status), UserID: ctx.User.ID, RepoID: ctx.Repo.Repository.ID, - JobID: strconv.FormatInt(jobResult.JobID, 10), + JobID: jobId, JobName: req.JobName, JobType: string(models.JobTypeTrain), Type: models.TypeCloudBrainTwo, @@ -328,7 +329,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error log.Error("CreateCloudbrain(%s) failed:%v", req.JobName, err.Error()) return err } - + notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobId, req.JobName, models.ActionCreateTrainTask) return nil } @@ -512,12 +513,12 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e log.Error("GetAttachmentByUUID(%s) failed:%v", strconv.FormatInt(jobResult.JobID, 10), err.Error()) return err } - + jobID := strconv.FormatInt(jobResult.JobID, 10) err = models.CreateCloudbrain(&models.Cloudbrain{ Status: TransTrainJobStatus(jobResult.Status), UserID: ctx.User.ID, RepoID: ctx.Repo.Repository.ID, - JobID: strconv.FormatInt(jobResult.JobID, 10), + JobID: jobID, JobName: req.JobName, JobType: string(models.JobTypeInference), Type: models.TypeCloudBrainTwo, @@ -552,6 +553,6 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e log.Error("CreateCloudbrain(%s) failed:%v", req.JobName, err.Error()) return err } - + notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.JobName, models.ActionCreateInferenceTask) return nil } diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go index cc86d927a..9adc0eac1 100644 --- a/modules/notification/action/action.go +++ b/modules/notification/action/action.go @@ -315,16 +315,16 @@ func (a *actionNotifier) NotifySyncDeleteRef(doer *models.User, repo *models.Rep } } -func (a *actionNotifier) NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { +func (a *actionNotifier) NotifyOtherTask(doer *models.User, repo *models.Repository, id string, name string, optype models.ActionType) { if err := models.NotifyWatchers(&models.Action{ ActUserID: repo.OwnerID, ActUser: doer, - OpType: models.ActionUploadAttachment, + OpType: optype, RepoID: repo.ID, Repo: repo, IsPrivate: repo.IsPrivate, - RefName: attachment.Name, - Content: attachment.UUID, + RefName: name, + Content: id, }); err != nil { log.Error("notifyWatchers: %v", err) } diff --git a/modules/notification/base/notifier.go b/modules/notification/base/notifier.go index 95331131f..4a8e16f18 100644 --- a/modules/notification/base/notifier.go +++ b/modules/notification/base/notifier.go @@ -54,5 +54,5 @@ type Notifier interface { NotifySyncCreateRef(doer *models.User, repo *models.Repository, refType, refFullName string) NotifySyncDeleteRef(doer *models.User, repo *models.Repository, refType, refFullName string) - NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) + NotifyOtherTask(doer *models.User, repo *models.Repository, id string, name string) } diff --git a/modules/notification/base/null.go b/modules/notification/base/null.go index 6450c1f0f..792dfe6b8 100644 --- a/modules/notification/base/null.go +++ b/modules/notification/base/null.go @@ -151,6 +151,6 @@ func (*NullNotifier) NotifySyncCreateRef(doer *models.User, repo *models.Reposit func (*NullNotifier) NotifySyncDeleteRef(doer *models.User, repo *models.Repository, refType, refFullName string) { } -func (*NullNotifier) NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { +func (*NullNotifier) NotifyOtherTask(doer *models.User, repo *models.Repository, id string, name string, optype models.ActionType) { } diff --git a/modules/notification/notification.go b/modules/notification/notification.go index 3179dd5f9..92b108e3b 100644 --- a/modules/notification/notification.go +++ b/modules/notification/notification.go @@ -39,11 +39,11 @@ func NewContext() { } // NotifyUploadAttachment notifies attachment upload message to notifiers -func NotifyUploadAttachment(doer *models.User, repo *models.Repository, attachment *models.Attachment) { +func NotifyOtherTask(doer *models.User, repo *models.Repository, id string, name string, optype models.ActionType) { log.Info("send attachment to db.") for _, notifier := range notifiers { log.Info("send attachment to notifiers.") - notifier.NotifyUploadAttachment(doer, repo, attachment) + notifier.NotifyOtherTask(doer, repo, id, name, optype) } } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 739d515bc..a42af2824 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2638,6 +2638,7 @@ mirror_sync_create = synced new reference %[2]s to %[2]s at %[3]s from mirror approve_pull_request = `approved %s#%[2]s` reject_pull_request = `suggested changes for %s#%[2]s` +upload_dataset=`upload dataset %s#%[2]s` [tool] ago = %s ago diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 935b6112b..4cf2d330a 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2646,7 +2646,7 @@ mirror_sync_create=从镜像同步了新的引用 %[2]s mirror_sync_delete=从镜像同步并从 %[3]s 删除了引用 %[2]s approve_pull_request=`同意了 %s#%[2]s` reject_pull_request=`建议变更 %s#%[2]s` - +upload_dataset=`上传了数据集 %s#%[2]s` [tool] ago=%s前 from_now=%s 之后 diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go index fe4d9794c..e2040e0d2 100644 --- a/routers/repo/ai_model_manage.go +++ b/routers/repo/ai_model_manage.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" uuid "github.com/satori/go.uuid" @@ -113,7 +114,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio models.UpdateRepositoryUnits(ctx.Repo.Repository, units, deleteUnitTypes) log.Info("save model end.") - + notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, id, name, models.ActionCreateNewModelTask) return nil } diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go index 91c0e7d28..d5d73c7e4 100755 --- a/routers/repo/attachment.go +++ b/routers/repo/attachment.go @@ -847,7 +847,7 @@ func CompleteMultipart(ctx *context.Context) { } dataset, _ := models.GetDatasetByID(attachment.DatasetID) repository, _ := models.GetRepositoryByID(dataset.RepoID) - notification.NotifyUploadAttachment(ctx.User, repository, attachment) + notification.NotifyOtherTask(ctx.User, repository, fmt.Sprint(attachment.Type), attachment.Name, models.ActionUploadAttachment) if attachment.DatasetID != 0 { if isCanDecompress(attachment.Name) { diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 6621081fd..f48d724d4 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -445,7 +445,7 @@ func CloudBrainStop(ctx *context.Context) { task := ctx.Cloudbrain for { - if task.Status == string(models.JobStopped) || task.Status == string(models.JobFailed) || task.Status == string(models.JobSucceeded){ + if task.Status == string(models.JobStopped) || task.Status == string(models.JobFailed) || task.Status == string(models.JobSucceeded) { log.Error("the job(%s) has been stopped", task.JobName, ctx.Data["msgID"]) resultCode = "-1" errorMsg = "system error" diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go index 601c0f7a8..09c816c16 100644 --- a/services/socketwrap/clientManager.go +++ b/services/socketwrap/clientManager.go @@ -10,7 +10,7 @@ import ( "github.com/elliotchance/orderedmap" ) -var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23} +var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23, 24, 25, 26, 27, 28, 29, 30} type ClientsManager struct { Clients *orderedmap.OrderedMap diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index a1b4218dc..09baa10e6 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -69,6 +69,26 @@ {{$.i18n.Tr "action.reject_pull_request" .GetRepoLink $index .ShortRepoPath | Str2html}} {{else if eq .GetOpType 23}} {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 24}} + {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .Content .RefName | Str2html}} + {{else if eq .GetOpType 25}} + + {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 26}} + + {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 27}} + + {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 28}} + + {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 29}} + + {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 30}} + {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} {{end}}

From 9c26f857120fe3ecd7e3b2b4b09e72fda144ee3c Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 15:34:59 +0800 Subject: [PATCH 016/188] =?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/user_data_analysis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index e71e8cb3a..d513be5c3 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -16,7 +16,7 @@ import ( ) const ( - PAGE_SIZE = 2000 + PAGE_SIZE = 10 ) func queryUserDataPage(ctx *context.Context, tableName string, queryObj interface{}) { From b24e2a4c6b0575360b22df4df8fe2651d7995487 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 16 Feb 2022 15:44:44 +0800 Subject: [PATCH 017/188] fix-1399 --- routers/repo/repo_statistic.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go index dce183f49..d9545f696 100755 --- a/routers/repo/repo_statistic.go +++ b/routers/repo/repo_statistic.go @@ -106,7 +106,7 @@ func RepoStatisticDaily(date string) { repoStat := models.RepoStatistic{ RepoID: repo.ID, Date: date, - Name: repo.Name, + Name: repo.Alias, IsPrivate: repo.IsPrivate, IsMirror: repo.IsMirror, OwnerName: repo.OwnerName, @@ -282,7 +282,7 @@ func RepoStatisticDaily(date string) { } func getDistinctProjectName(repo *models.Repository) string { - return repo.OwnerName + "/" + repo.Name + return repo.OwnerName + "/" + repo.Alias } func getDatasetSize(repo *models.Repository) (int64, error) { From 98e06e4e14b2691267816f07733d7f7f8dedc82a Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 15:49:28 +0800 Subject: [PATCH 018/188] =?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/user_data_analysis.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index d513be5c3..7414de426 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -66,8 +66,10 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac for { re, _ := models.QueryUserStaticDataByTableName(int(indexTotal), PAGE_SIZE, tableName, queryObj, "") log.Info("return count=" + fmt.Sprint(count)) - for i, userRecord := range re { - rows := fmt.Sprint(i + 2) + row := 1 + for _, userRecord := range re { + row++ + rows := fmt.Sprint(row) xlsx.SetCellValue(sheetName, "A"+rows, userRecord.ID) xlsx.SetCellValue(sheetName, "B"+rows, userRecord.Name) xlsx.SetCellValue(sheetName, "C"+rows, userRecord.CodeMergeCount) From c29769ca904a6fd22d4befe581172e7afaa04bf9 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 15:57:22 +0800 Subject: [PATCH 019/188] =?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/user_data_analysis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index 7414de426..2dab5814c 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -63,10 +63,10 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac _, count := models.QueryUserStaticDataByTableName(1, 1, tableName, queryObj, userName) var indexTotal int64 indexTotal = 0 + row := 1 for { re, _ := models.QueryUserStaticDataByTableName(int(indexTotal), PAGE_SIZE, tableName, queryObj, "") log.Info("return count=" + fmt.Sprint(count)) - row := 1 for _, userRecord := range re { row++ rows := fmt.Sprint(row) From f898888b6a38f7be0c9bb4745dc2836db233f2ca Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 16:14:04 +0800 Subject: [PATCH 020/188] =?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 --- custom/public/css/git.openi.css | 8 ++++---- public/home/home.js | 32 +++++++++++++++++++++++--------- templates/home.tmpl | 6 +++++- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/custom/public/css/git.openi.css b/custom/public/css/git.openi.css index c97b48056..828e4ee0d 100644 --- a/custom/public/css/git.openi.css +++ b/custom/public/css/git.openi.css @@ -256,14 +256,14 @@ box-shadow: none !important; } .homeorg-list .card .ui.small.header .content{ - width: calc(100% - 3.25em); + width: calc(100% - 3.75em); } .homepro-tit{ background: #FFF; z-index: 9; position: relative; } -.homepro-list{ +.homepro-list, .homeorg-list{ position: relative; z-index: 9; padding: 1.0em 1.0em 3.0em; @@ -280,9 +280,9 @@ line-height: 40px !important; } -.homepro-list .swiper-pagination-bullet-active{ +.homepro-list .swiper-pagination-bullet-active, .homeorg-list .swiper-pagination-bullet-active{ width: 40px; - border-radius: 4px; + border-radius: 4px; } .i-env > div{ position: relative; diff --git a/public/home/home.js b/public/home/home.js index bc8932642..47bee87ad 100644 --- a/public/home/home.js +++ b/public/home/home.js @@ -7,26 +7,40 @@ if(isEmpty(token)){ } } -var swiperNewMessage = new Swiper(".newslist", { - direction: "vertical", - slidesPerView: 10, - loop: true, +var swiperRepo = new Swiper(".homepro-list", { + slidesPerView: 1, + slidesPerColumn: 2, + slidesPerColumnFill:'row', + spaceBetween: 30, + pagination: { + el: ".swiper-pagination", + clickable: true, + }, autoplay: { delay: 2500, disableOnInteraction: false, }, + breakpoints: { + 768: { + slidesPerView: 2, + }, + 1024: { + slidesPerView: 3, + }, + }, }); -var swiperRepo = new Swiper(".homepro-list", { + +var swiperOrg = new Swiper(".homeorg-list", { slidesPerView: 1, - slidesPerColumn: 2, + slidesPerColumn: 4, slidesPerColumnFill:'row', - spaceBetween: 30, + spaceBetween: 15, pagination: { el: ".swiper-pagination", clickable: true, }, autoplay: { - delay: 2500, + delay: 4500, disableOnInteraction: false, }, breakpoints: { @@ -400,7 +414,7 @@ function displayOrg(json){ if (json != null && json.length > 0){ for(var i = 0; i < json.length;i++){ var record = json[i] - html += "
"; + html += "
"; html += " "; html += "
"; html += "
"; diff --git a/templates/home.tmpl b/templates/home.tmpl index 08893d71e..d21197602 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -42,7 +42,11 @@ {{.page_recommend_org_more}}
-
+
+
+ +
+
From a92f6548105298729b5debc82040d085ac01533c Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 16:17:35 +0800 Subject: [PATCH 021/188] =?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/home.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/home/home.js b/public/home/home.js index 47bee87ad..fa5d6fc45 100644 --- a/public/home/home.js +++ b/public/home/home.js @@ -6,7 +6,15 @@ if(isEmpty(token)){ token = meta.attr("content"); } } - +var swiperNewMessage = new Swiper(".newslist", { + direction: "vertical", + slidesPerView: 10, + loop: true, + autoplay: { + delay: 2500, + disableOnInteraction: false, + }, +}); var swiperRepo = new Swiper(".homepro-list", { slidesPerView: 1, slidesPerColumn: 2, From c969874a5fc6fdf18542b0676c4ce318fe8efa95 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 16:23:14 +0800 Subject: [PATCH 022/188] =?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/home.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/home/home.js b/public/home/home.js index fa5d6fc45..7d5cbe4b1 100644 --- a/public/home/home.js +++ b/public/home/home.js @@ -438,4 +438,5 @@ function displayOrg(json){ } } orgDiv.innerHTML = html; + swiperOrg.updateSlides(); } From f1acf29f2da6af2b8b1bfeb380be413afd2a72b3 Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 16 Feb 2022 16:24:07 +0800 Subject: [PATCH 023/188] fix-jobid --- routers/repo/cloudbrain.go | 8 ++++---- routers/routes/routes.go | 4 +++- templates/repo/debugjob/index.tmpl | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 0599fb03f..cea87feec 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -351,13 +351,13 @@ func CloudBrainShow(ctx *context.Context) { func cloudBrainShow(ctx *context.Context, tpName base.TplName) { ctx.Data["PageIsCloudBrain"] = true - var jobID = ctx.Params(":jobid") - task, err := models.GetCloudbrainByJobID(jobID) + var jobName = ctx.Params(":jobname") + task, err := models.GetCloudbrainByName(jobName) if err != nil { ctx.Data["error"] = err.Error() } - result, err := cloudbrain.GetJob(jobID) + result, err := cloudbrain.GetJob(task.JobID) if err != nil { ctx.Data["error"] = err.Error() } @@ -422,7 +422,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) { ctx.Data["duration"] = util.AddZero(duration/3600000) + ":" + util.AddZero(duration%3600000/60000) + ":" + util.AddZero(duration%60000/1000) ctx.Data["task"] = task - ctx.Data["jobID"] = jobID + ctx.Data["jobID"] = task.JobID ctx.Data["jobName"] = task.JobName version_list_task := make([]*models.Cloudbrain, 0) version_list_task = append(version_list_task, task) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index aa85b8f2b..de355352f 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -974,8 +974,10 @@ func RegisterRoutes(m *macaron.Macaron) { }, context.RepoRef()) m.Group("/cloudbrain", func() { - m.Group("/:jobid", func() { + m.Group("/:jobname", func() { m.Get("", reqRepoCloudBrainReader, repo.CloudBrainShow) + }) + m.Group("/:jobid", func() { m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDebug) m.Post("/commit_image", cloudbrain.AdminOrJobCreaterRight, bindIgnErr(auth.CommitImageCloudBrainForm{}), repo.CloudBrainCommitImage) m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainStop) diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index f7773cf2d..8cf58dc4f 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -287,7 +287,7 @@
- + {{.JobName}}
From 11d80da292b0a51321d0a43465355751df297803 Mon Sep 17 00:00:00 2001 From: wangjr Date: Wed, 16 Feb 2022 16:31:31 +0800 Subject: [PATCH 024/188] =?UTF-8?q?fix-1453=20=E4=BF=AE=E6=94=B9=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E6=95=B0?= =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=E6=95=B0=E4=B8=BA1=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8D=95=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options/locale/locale_en-US.ini | 3 +++ options/locale/locale_zh-CN.ini | 2 ++ templates/org/home.tmpl | 16 ++++++++++++++-- templates/org/home_courses.tmpl | 16 ++++++++++++++-- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 148f07dee..f277ff8fc 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2059,6 +2059,9 @@ people = People teams = Teams lower_members = members lower_repositories = repositories +lower_member=member +lower_repository = repository + create_new_team = New Team create_team = Create Team org_desc = Description diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index b527ef005..197481358 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2069,6 +2069,8 @@ people=组织成员 teams=组织团队 lower_members=名成员 lower_repositories=个项目 +lower_member=名成员 +lower_repository=个项目 create_new_team=新建团队 create_team=创建团队 org_desc=组织描述 diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index e03c28a9e..aa0704434 100755 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -67,8 +67,20 @@
{{.Name}}

- {{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · - {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}} + {{.NumMembers}} + {{if le .NumMembers 1}} + {{$.i18n.Tr "org.lower_member"}} + {{else}} + {{$.i18n.Tr "org.lower_members"}} + {{end}} + · + {{.NumRepos}} + {{if le .NumRepos 1}} + {{$.i18n.Tr "org.lower_repository"}} + {{else}} + {{$.i18n.Tr "org.lower_repository"}} + {{end}} +

{{end}} diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl index dd287c87f..c411a014b 100644 --- a/templates/org/home_courses.tmpl +++ b/templates/org/home_courses.tmpl @@ -221,8 +221,20 @@ {{end}} From 55fbf7fbbf9074f8c01d44dcd7be6a14814b630d Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 17:12:05 +0800 Subject: [PATCH 025/188] =?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 --- custom/public/css/git.openi.css | 153 +++++++++++++++++++++++--- modules/notification/base/notifier.go | 2 +- options/locale/locale_en-US.ini | 6 + options/locale/locale_zh-CN.ini | 9 +- templates/user/dashboard/feeds.tmpl | 18 +-- 5 files changed, 158 insertions(+), 30 deletions(-) diff --git a/custom/public/css/git.openi.css b/custom/public/css/git.openi.css index 502ba8d88..b849d0cd4 100644 --- a/custom/public/css/git.openi.css +++ b/custom/public/css/git.openi.css @@ -44,6 +44,12 @@ -webkit-line-clamp: 2; -webkit-box-orient: vertical; } +.ui.label{ + font-weight: normal; +} +.active { + color: #0366D6 !important; +} .opacity5{ opacity:0.5;} .radius15{ border-radius:1.5rem !important; } @@ -250,9 +256,13 @@ box-shadow: none !important; } .homeorg-list .card .ui.small.header .content{ - width: calc(100% - 3.25em); + width: calc(100% - 3.75em); +} +.homepro-tit{ + z-index: 9; + position: relative; } -.homepro-list{ +.homepro-list, .homeorg-list{ position: relative; z-index: 9; padding: 1.0em 1.0em 3.0em; @@ -261,42 +271,153 @@ .homepro-list .ui.card{ border-radius: 15px; background-color: #FFF; - box-shadow: 0px 5px 10px 0px rgba(105, 192, 255, 30); - border: 1px solid rgba(105, 192, 255, 40); + box-shadow: 0px 5px 10px 0px rgba(105, 192, 255, .3); + border: 1px solid rgba(105, 192, 255, .4); min-height: 10.8em; } .homepro-list .ui.card>.content>.header{ line-height: 40px !important; } -.homepro-list .swiper-pagination-bullet-active{ +.homepro-list .swiper-pagination-bullet-active, .homeorg-list .swiper-pagination-bullet-active{ width: 40px; - border-radius: 4px; + border-radius: 4px; } .i-env > div{ position: relative; } +/**seach**/ +/**搜索导航条适配窄屏**/ +.seachnav{ + overflow-x: auto; + overflow-y: hidden; + scrollbar-width: none; /* firefox */ + -ms-overflow-style: none; /* IE 10+ */ +} +.seachnav::-webkit-scrollbar { + display: none; /* Chrome Safari */ +} +.ui.green.button, .ui.green.buttons .button{ + background-color: #5BB973; +} +.seach .repos--seach{ + padding-bottom: 0; + border-bottom: none; +} +.seach .ui.secondary.pointing.menu{ + border-bottom: none; +} +.seach .ui.secondary.pointing.menu .item > i{ + margin-right: 5px; +} +.seach .ui.secondary.pointing.menu .active.item{ + border-bottom-width: 2px; + margin: 0 0 -1px; +} +.seach .ui.menu .active.item>.label { + background: #1684FC; + color: #FFF; +} +.seach .ui.menu .item>.label:not(.active.item>.label) { + background: #e8e8e8; + color: rgba(0,0,0,.6); +} + +.highlight{ + color: red; +} +.ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content { + width: calc(100% - 3.0em); + margin-left: 0; +} + +.seach .ui.list .list>.item .header, .seach .ui.list>.item .header{ + margin-bottom: 0.5em; + font-size: 1.4rem !important; + font-weight: normal; +} +.seach .time, .seach .time a{ + font-size: 12px; + color: grey; +} + +.seach .list .item.members .ui.avatar.image { + width: 3.2em; + height: 3.2em; +} +.ui.list .list>.item.members>img.image+.content, .ui.list>.item.members>img.image+.content { + width: calc(100% - 4.0em); + margin-left: 0; +} + @media only screen and (max-width: 767px) { .am-mt-30{ margin-top: 1.5rem !important;} .ui.secondary.hometop.segment{ - margin-bottom: 2.0rem; + margin-bottom: 5.0rem; } - .bannerpic, .i-code-pic{ + .bannerpic{ display: none; } - .i-code h2::before { - left: calc(-5.0rem + 6px); + #homenews{ + bottom: -3em; } - .i-code h2.am-bw::before{ - left: calc(-4.0rem + 6px); + #homenews > p { + margin-left: 1.0em; + } + .homenews{ + padding-left: 1.3em !important; + border-radius: 1.5em; + } + .homenews::before{ + left: 2em; + } + .homepro-tit > p{ + background: #FFF; + } + .homeorg{ + padding-left: 3.5em; + } + .homeorg-tit::after { + left: -2.3em; + } + .homeorg-list{ + margin: 0 0 2.0em !important; + } + .homeorg-list > .column{ + width: 3em !important; + margin-left: -0.5em; + padding: 0.5rem 0 0 !important; + } + .homeorg-list .card{ + background: none !important; + } + .homeorg-list .card > .content{ + padding: 0 !important; + } + + .homeorg-list > .column .card .ui.header>img{ + width: 3.0em; + height: 3.0em; + border-radius: 2.0em; + border: 2px solid #FFF; + } + .homeorg-list > .column .card .ui.header > .content{ + display: none; } .leftline01{ - width: calc(50% - 4.0rem); + width: 4.0em; + bottom: 4em; + border-radius: 0 0 0 3.0em; + } + .leftline02, .leftline02-2{ + left: 6.0em; + top: calc(-4.0em - 2px); + border-radius: 0 3.0em 3.0em 0; + width: calc(50% - 6.0em); } - .leftline02{ - left: calc(50% - 1.0rem); - top: calc(-3.5rem - 2px); + .leftline02-2 { + width: calc(50% - 8.0em); } } diff --git a/modules/notification/base/notifier.go b/modules/notification/base/notifier.go index 4a8e16f18..8f5436c75 100644 --- a/modules/notification/base/notifier.go +++ b/modules/notification/base/notifier.go @@ -54,5 +54,5 @@ type Notifier interface { NotifySyncCreateRef(doer *models.User, repo *models.Repository, refType, refFullName string) NotifySyncDeleteRef(doer *models.User, repo *models.Repository, refType, refFullName string) - NotifyOtherTask(doer *models.User, repo *models.Repository, id string, name string) + NotifyOtherTask(doer *models.User, repo *models.Repository, id string, name string, optype models.ActionType) } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a42af2824..c768ad005 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2639,6 +2639,12 @@ mirror_sync_delete = synced and deleted reference %[2]s at %s#%[2]s` reject_pull_request = `suggested changes for %s#%[2]s` upload_dataset=`upload dataset %s#%[2]s` +task_gpudebugjob=`created CPU/GPU type debugging task%s#%[2]s` +task_npudebugjob=`created NPU type debugging task %s#%[2]s` +task_trainjob=`created training task%s#%[2]s` +task_inferencejob=`created reasoning task %s#%[2]s` +task_benchmark=`created profiling task %s#%[2]s` +task_createmodel=`created new model %s#%[2]s` [tool] ago = %s ago diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 4cf2d330a..bddff4ac6 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2646,7 +2646,14 @@ mirror_sync_create=从镜像同步了新的引用 %[2]s mirror_sync_delete=从镜像同步并从 %[3]s 删除了引用 %[2]s approve_pull_request=`同意了 %s#%[2]s` reject_pull_request=`建议变更 %s#%[2]s` -upload_dataset=`上传了数据集 %s#%[2]s` +upload_dataset=`上传了数据集文件 %s#%[2]s` +task_gpudebugjob=`创建了CPU/GPU类型调试任务 %s#%[2]s` +task_npudebugjob=`创建了NPU类型调试任务 %s#%[2]s` +task_trainjob=`创建了训练任务 %s#%[2]s` +task_inferencejob=`创建了推理任务 %s#%[2]s` +task_benchmark=`创建了评测任务 %s#%[2]s` +task_createmodel=`导入了新模型 %s#%[2]s` + [tool] ago=%s前 from_now=%s 之后 diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 09baa10e6..55d9ca7f6 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -73,23 +73,17 @@ {{else if eq .GetOpType 24}} {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 25}} - - {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 26}} - - {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{$.i18n.Tr "action.task_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 27}} - - {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{$.i18n.Tr "action.task_trainjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 28}} - - {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{$.i18n.Tr "action.task_inferencejob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 29}} - - {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{$.i18n.Tr "action.task_benchmark" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 30}} - - {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{$.i18n.Tr "action.task_createmodel" .GetRepoLink .RefName .RefName | Str2html}} {{end}}

{{if or (eq .GetOpType 5) (eq .GetOpType 18)}} From 2cf4fd77254d575ee38e8d94236ac756a32d28df Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 17:12:52 +0800 Subject: [PATCH 026/188] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- custom/public/css/git.openi.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/custom/public/css/git.openi.css b/custom/public/css/git.openi.css index 828e4ee0d..b849d0cd4 100644 --- a/custom/public/css/git.openi.css +++ b/custom/public/css/git.openi.css @@ -259,7 +259,6 @@ width: calc(100% - 3.75em); } .homepro-tit{ - background: #FFF; z-index: 9; position: relative; } @@ -373,6 +372,9 @@ .homenews::before{ left: 2em; } + .homepro-tit > p{ + background: #FFF; + } .homeorg{ padding-left: 3.5em; } From cd86c87e92f47267972366762f43cae35c7c64b2 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 17:23:37 +0800 Subject: [PATCH 027/188] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- custom/public/css/git.openi.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/custom/public/css/git.openi.css b/custom/public/css/git.openi.css index b849d0cd4..8e2c25b2d 100644 --- a/custom/public/css/git.openi.css +++ b/custom/public/css/git.openi.css @@ -419,6 +419,9 @@ .leftline02-2 { width: calc(50% - 8.0em); } + .i-env .ui.cards>.card>.content .description{ + display: none; + } } @media only screen and (min-width: 768px) and (max-width: 991px) { From 5b8cbca5c11c6b27e642a6cf61e15a1949f929ec Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 16 Feb 2022 17:30:20 +0800 Subject: [PATCH 028/188] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/user_data_analysis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index 2dab5814c..b4adfc347 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -16,7 +16,7 @@ import ( ) const ( - PAGE_SIZE = 10 + PAGE_SIZE = 2000 ) func queryUserDataPage(ctx *context.Context, tableName string, queryObj interface{}) { From b728b7fa32d146d22ddd72b52fd178d121ccfc8a Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 16 Feb 2022 17:43:16 +0800 Subject: [PATCH 029/188] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain.go | 2 +- routers/admin/cloudbrains.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 1a8496355..e411c16de 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1038,7 +1038,7 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { } else { lowerKeyWord := strings.ToLower(opts.Keyword) - cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}), builder.Like{"`user`.lower_name", lowerKeyWord}) + cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}, builder.Like{"`user`.lower_name", lowerKeyWord})) count, err = sess.Table(&Cloudbrain{}).Where(cond). Join("left", "`user`", condition).Count(new(CloudbrainInfo)) diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go index 2058925e5..471902097 100644 --- a/routers/admin/cloudbrains.go +++ b/routers/admin/cloudbrains.go @@ -93,7 +93,7 @@ func CloudBrains(ctx *context.Context) { ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource } - pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5) + pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, getTotalPage(count, setting.UI.IssuePagingNum)) pager.SetDefaultParams(ctx) pager.AddParam(ctx, "listType", "ListType") ctx.Data["Page"] = pager From 9003ab4ddb6037efe29abb81d78d993a383552c8 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 17 Feb 2022 10:25:30 +0800 Subject: [PATCH 030/188] =?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 | 14 +++++++------- options/locale/locale_zh-CN.ini | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c768ad005..7b2bb0f34 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2638,13 +2638,13 @@ mirror_sync_create = synced new reference %[2]s to %[2]s at %[3]s from mirror approve_pull_request = `approved %s#%[2]s` reject_pull_request = `suggested changes for %s#%[2]s` -upload_dataset=`upload dataset %s#%[2]s` -task_gpudebugjob=`created CPU/GPU type debugging task%s#%[2]s` -task_npudebugjob=`created NPU type debugging task %s#%[2]s` -task_trainjob=`created training task%s#%[2]s` -task_inferencejob=`created reasoning task %s#%[2]s` -task_benchmark=`created profiling task %s#%[2]s` -task_createmodel=`created new model %s#%[2]s` +upload_dataset=`upload dataset %` +task_gpudebugjob=`created CPU/GPU type debugging task%s` +task_npudebugjob=`created NPU type debugging task %s` +task_trainjob=`created training task%s` +task_inferencejob=`created reasoning task %s` +task_benchmark=`created profiling task %s` +task_createmodel=`created new model %s` [tool] ago = %s ago diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index bddff4ac6..3646c5721 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2646,13 +2646,13 @@ mirror_sync_create=从镜像同步了新的引用 %[2]s mirror_sync_delete=从镜像同步并从 %[3]s 删除了引用 %[2]s approve_pull_request=`同意了 %s#%[2]s` reject_pull_request=`建议变更 %s#%[2]s` -upload_dataset=`上传了数据集文件 %s#%[2]s` -task_gpudebugjob=`创建了CPU/GPU类型调试任务 %s#%[2]s` -task_npudebugjob=`创建了NPU类型调试任务 %s#%[2]s` -task_trainjob=`创建了训练任务 %s#%[2]s` -task_inferencejob=`创建了推理任务 %s#%[2]s` -task_benchmark=`创建了评测任务 %s#%[2]s` -task_createmodel=`导入了新模型 %s#%[2]s` +upload_dataset=`上传了数据集文件 %s` +task_gpudebugjob=`创建了CPU/GPU类型调试任务 %s` +task_npudebugjob=`创建了NPU类型调试任务 %s` +task_trainjob=`创建了训练任务 %s` +task_inferencejob=`创建了推理任务 %s` +task_benchmark=`创建了评测任务 %s` +task_createmodel=`导入了新模型 %s` [tool] ago=%s前 From aac79cc0fd7f54fc262e1c63d6d8117512c073f2 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 17 Feb 2022 11:43:39 +0800 Subject: [PATCH 031/188] =?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 +- public/home/home.js | 52 +++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7b2bb0f34..156cc4b38 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2638,7 +2638,7 @@ mirror_sync_create = synced new reference %[2]s to %[2]s at %[3]s from mirror approve_pull_request = `approved %s#%[2]s` reject_pull_request = `suggested changes for %s#%[2]s` -upload_dataset=`upload dataset %` +upload_dataset=`upload dataset %s` task_gpudebugjob=`created CPU/GPU type debugging task%s` task_npudebugjob=`created NPU type debugging task %s` task_trainjob=`created training task%s` diff --git a/public/home/home.js b/public/home/home.js index 3312307bd..fcdd39a5c 100644 --- a/public/home/home.js +++ b/public/home/home.js @@ -103,11 +103,14 @@ socket.onmessage = function (e) { actionName = actionName.replace("{oldRepoName}",record.Content); html += recordPrefix + actionName; html += " " + getRepoLink(record) + "" + } + else if(record.OpType == "24" || record.OpType == "25" || record.OpType == "26" || record.OpType == "27" || record.OpType == "28" || record.OpType == "29" || record.OpType == "30"){ + html += recordPrefix + actionName; + html += " " + record.RefName + "" } else{ continue; } - if(record.Repo != null){ var time = getTime(record.CreatedUnix,currentTime); html += " " + time; @@ -115,15 +118,6 @@ socket.onmessage = function (e) { html += "
"; html += "
"; } - /* -
- -
- zhoupzh 合并了合并请求 OpenI/aiforge#116822 分钟前 -
-
- */ - } console.log("html=" + html) output.innerHTML = html; @@ -131,6 +125,26 @@ socket.onmessage = function (e) { swiperNewMessage.updateProgress(); }; +function getTaskLink(record){ + var re = getRepoLink(record); + if(record.OpType == 24){ + return re + "/datasets?type=" + record.Content; + }else if(record.OpType == 25){ + return re + "/cloudbrain/" + record.Content; + }else if(record.OpType == 26){ + return re + "/modelarts/notebook/" + record.Content; + }else if(record.OpType == 27){ + return re + "/modelarts/train-job/" + record.Content; + }else if(record.OpType == 28){ + return re + "/modelarts/inference-job/" + record.Content; + }else if(record.OpType == 29){ + return re + "/cloudbrain/benchmark/" + record.Content; + }else if(record.OpType == 30){ + return re + "/modelmanage/show_model_info?name=" + record.RefName; + } + return re; +} + function getMsg(record){ var html =""; html += "
"; @@ -248,7 +262,14 @@ var actionNameZH={ "15":"重新开启了合并请求", "17":"从 {repoName} 删除分支 {deleteBranchName}", "22":"建议变更", - "23":"评论了合并请求" + "23":"评论了合并请求", + "24":"上传了数据集文件", + "25":"创建了CPU/GPU类型调试任务", + "26":"创建了NPU类型调试任务", + "27":"创建了训练任务", + "28":"创建了推理任务", + "29":"创建了评测任务", + "30":"导入了新模型" }; var actionNameEN={ @@ -266,7 +287,14 @@ var actionNameEN={ "15":" reopened pull request", "17":" deleted branch {deleteBranchName} from {repoName}", "22":" proposed changes", - "23":" commented on pull request" + "23":" commented on pull request", + "24":" upload dataset ", + "25":" created CPU/GPU type debugging task ", + "26":" created NPU type debugging task ", + "27":" created training task", + "28":" created reasoning task", + "29":" created profiling task", + "30":" created new model" }; var repoAndOrgZH={ From ad9494faedbf022987e72d0e3035b803aa9a632f Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 17 Feb 2022 14:46:24 +0800 Subject: [PATCH 032/188] fix-bug --- routers/api/v1/api.go | 3 ++- routers/api/v1/repo/cloudbrain.go | 23 +++++++++++------------ routers/api/v1/repo/modelarts.go | 1 + routers/repo/cloudbrain.go | 2 +- routers/repo/modelarts.go | 1 + routers/routes/routes.go | 10 ---------- templates/repo/debugjob/index.tmpl | 30 ++++++++++++++++-------------- 7 files changed, 32 insertions(+), 38 deletions(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 72a68a6d3..c6c5703b3 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -878,7 +878,8 @@ func RegisterRoutes(m *macaron.Macaron) { }, reqAdmin()) }, reqAnyRepoReader()) m.Group("/cloudbrain", func() { - m.Get("/:jobid", repo.GetCloudbrainTask) + // m.Get("/:jobid", repo.GetCloudbrainTask) + m.Get("/:jobname", repo.GetCloudbrainTask) m.Get("/:jobid/log", repo.CloudbrainGetLog) }, reqRepoReader(models.UnitTypeCloudBrain)) m.Group("/modelarts", func() { diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index dd468783d..35044a894 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -6,11 +6,12 @@ package repo import ( - "code.gitea.io/gitea/modules/log" "net/http" "sort" "time" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/cloudbrain" "code.gitea.io/gitea/modules/context" @@ -48,14 +49,12 @@ func GetCloudbrainTask(ctx *context.APIContext) { err error ) - jobID := ctx.Params(":jobid") - repoID := ctx.Repo.Repository.ID - job, err := models.GetRepoCloudBrainByJobID(repoID, jobID) + jobName := ctx.Params(":jobname") + job, err := models.GetCloudbrainByName(jobName) if err != nil { - ctx.NotFound(err) - return + ctx.Data["error"] = err.Error() } - jobResult, err := cloudbrain.GetJob(jobID) + jobResult, err := cloudbrain.GetJob(job.JobID) if err != nil { ctx.NotFound(err) return @@ -84,7 +83,7 @@ func GetCloudbrainTask(ctx *context.APIContext) { } ctx.JSON(http.StatusOK, map[string]interface{}{ - "JobID": result.Config.JobID, + "JobName": result.Config.JobName, "JobStatus": result.JobStatus.State, "SubState": result.JobStatus.SubState, "CreatedTime": time.Unix(result.JobStatus.CreatedTime/1000, 0).Format("2006-01-02 15:04:05"), @@ -104,7 +103,7 @@ func CloudbrainGetLog(ctx *context.Context) { var hits []models.Hits result, err := cloudbrain.GetJobLog(jobID) - if err != nil{ + if err != nil { log.Error("GetJobLog failed: %v", err, ctx.Data["MsgID"]) ctx.ServerError(err.Error(), err) return @@ -115,7 +114,7 @@ func CloudbrainGetLog(ctx *context.Context) { if len(result.Hits.Hits) >= cloudbrain.LogPageSize { for { resultNext, err := cloudbrain.GetJobAllLog(result.ScrollID) - if err != nil{ + if err != nil { log.Error("GetJobAllLog failed: %v", err, ctx.Data["MsgID"]) } else { for _, hit := range resultNext.Hits.Hits { @@ -142,8 +141,8 @@ func CloudbrainGetLog(ctx *context.Context) { } ctx.JSON(http.StatusOK, map[string]interface{}{ - "JobID": jobID, - "Content": content, + "JobID": jobID, + "Content": content, }) return diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go index c9f8761c9..27df10e16 100755 --- a/routers/api/v1/repo/modelarts.go +++ b/routers/api/v1/repo/modelarts.go @@ -77,6 +77,7 @@ func GetModelArtsNotebook2(ctx *context.APIContext) { ctx.JSON(http.StatusOK, map[string]interface{}{ "JobID": jobID, + "JobName": job.JobName, "JobStatus": result.Status, }) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index cea87feec..cff7f6e94 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -422,7 +422,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) { ctx.Data["duration"] = util.AddZero(duration/3600000) + ":" + util.AddZero(duration%3600000/60000) + ":" + util.AddZero(duration%60000/1000) ctx.Data["task"] = task - ctx.Data["jobID"] = task.JobID + // ctx.Data["jobID"] = task.JobID ctx.Data["jobName"] = task.JobName version_list_task := make([]*models.Cloudbrain, 0) version_list_task = append(version_list_task, task) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 9dea34c82..a6a7c9d96 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -268,6 +268,7 @@ func NotebookShow(ctx *context.Context) { ctx.Data["task"] = task ctx.Data["jobID"] = jobID + ctx.Data["jobName"] = task.JobName ctx.Data["result"] = result ctx.HTML(200, tplModelArtsNotebookShow) } diff --git a/routers/routes/routes.go b/routers/routes/routes.go index de355352f..840d6cf47 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -1031,7 +1031,6 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/modelarts", func() { m.Group("/notebook", func() { - /* v1.0 m.Group("/:jobid", func() { m.Get("", reqRepoCloudBrainReader, repo.NotebookShow) m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.NotebookDebug) @@ -1040,15 +1039,6 @@ func RegisterRoutes(m *macaron.Macaron) { }) m.Get("/create", reqRepoCloudBrainWriter, repo.NotebookNew) m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsNotebookForm{}), repo.NotebookCreate) - */ - m.Group("/:jobid", func() { - m.Get("", reqRepoCloudBrainReader, repo.NotebookShow) - m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.NotebookDebug2) - m.Post("/:action", reqRepoCloudBrainWriter, repo.NotebookManage) - m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.NotebookDel) - }) - m.Get("/create", reqRepoCloudBrainWriter, repo.NotebookNew) - m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsNotebookForm{}), repo.Notebook2Create) }) m.Group("/train-job", func() { diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index 8cf58dc4f..f093f0258 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -293,7 +293,7 @@
- + {{.Status}}
@@ -607,6 +607,7 @@ function loadJobStatus() { $(".job-status").each((index, job) => { const jobID = job.dataset.jobid; + const jobName = job.dataset.jobname; const repoPath = job.dataset.repopath; const computeResource = job.dataset.resource const initArray = ['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED','UNAVAILABLE','DELETED','RESIZE_FAILED'] @@ -615,38 +616,39 @@ return } const diffResource = computeResource == "NPU" ? 'modelarts/notebook' : 'cloudbrain' - $.get(`/api/v1/repos/${repoPath}/${diffResource}/${jobID}`, (data) => { - const jobID = data.JobID + const diffApi = computeResource == "NPU" ? jobID : jobName + $.get(`/api/v1/repos/${repoPath}/${diffResource}/${diffApi}`, (data) => { + const jobName = data.JobName const status = data.JobStatus if (status != job.textContent.trim()) { - $('#' + jobID+'-icon').removeClass().addClass(status) - $('#' + jobID+ '-text').text(status) + $('#' + jobName+'-icon').removeClass().addClass(status) + $('#' + jobName+ '-text').text(status) } if(status==="RUNNING"){ - $('#model-debug-'+jobID).removeClass('disabled').addClass('blue').text('调试').css("margin","0 1rem") - $('#model-image-'+jobID).removeClass('disabled').addClass('blue') + $('#model-debug-'+jobName).removeClass('disabled').addClass('blue').text('调试').css("margin","0 1rem") + $('#model-image-'+jobName).removeClass('disabled').addClass('blue') } if(status!=="RUNNING"){ // $('#model-debug-'+jobID).removeClass('blue') // $('#model-debug-'+jobID).addClass('disabled') - $('#model-image-'+jobID).removeClass('blue').addClass('disabled') + $('#model-image-'+jobName).removeClass('blue').addClass('disabled') } if(["CREATING","STOPPING","WAITING","STARTING"].includes(status)){ - $('#model-debug-'+jobID).removeClass('blue').addClass('disabled') + $('#model-debug-'+jobName).removeClass('blue').addClass('disabled') } if(['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED'].includes(status)){ - $('#model-debug-'+jobID).removeClass('disabled').addClass('blue').text('再次调试').css("margin","0") + $('#model-debug-'+jobName).removeClass('disabled').addClass('blue').text('再次调试').css("margin","0") } if(["RUNNING","WAITING"].includes(status)){ - $('#stop-model-debug-'+jobID).removeClass('disabled').addClass('blue') + $('#stop-model-debug-'+jobName).removeClass('disabled').addClass('blue') } if(["CREATING","STOPPING","STARTING","STOPPED","FAILED","START_FAILED","SUCCEEDED"].includes(status)){ - $('#stop-model-debug-'+jobID).removeClass('blue').addClass('disabled') + $('#stop-model-debug-'+jobName).removeClass('blue').addClass('disabled') } if(status==="STOPPED" || status==="FAILED"|| status==="START_FAILED"){ - $('#model-delete-'+jobID).removeClass('disabled').addClass('blue') + $('#model-delete-'+jobName).removeClass('disabled').addClass('blue') }else{ - $('#model-delete-'+jobID).removeClass('blue').addClass('disabled') + $('#model-delete-'+jobName).removeClass('blue').addClass('disabled') } }).fail(function(err) { console.log(err); From 341e91b2360b866d7261b4c1edf97f62fb614ff6 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 17 Feb 2022 14:59:49 +0800 Subject: [PATCH 033/188] fix-bug --- routers/routes/routes.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 840d6cf47..0f1abe5e8 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -1031,14 +1031,22 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/modelarts", func() { m.Group("/notebook", func() { + // m.Group("/:jobid", func() { + // m.Get("", reqRepoCloudBrainReader, repo.NotebookShow) + // m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.NotebookDebug) + // m.Post("/:action", reqRepoCloudBrainWriter, repo.NotebookManage) + // m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.NotebookDel) + // }) + // m.Get("/create", reqRepoCloudBrainWriter, repo.NotebookNew) + // m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsNotebookForm{}), repo.NotebookCreate) m.Group("/:jobid", func() { m.Get("", reqRepoCloudBrainReader, repo.NotebookShow) - m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.NotebookDebug) + m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.NotebookDebug2) m.Post("/:action", reqRepoCloudBrainWriter, repo.NotebookManage) m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.NotebookDel) }) m.Get("/create", reqRepoCloudBrainWriter, repo.NotebookNew) - m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsNotebookForm{}), repo.NotebookCreate) + m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsNotebookForm{}), repo.Notebook2Create) }) m.Group("/train-job", func() { From 84928acefa7d7a504cb0019d3f87376c6c0db5cf Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 17 Feb 2022 15:03:31 +0800 Subject: [PATCH 034/188] fix 1509 --- routers/repo/cloudbrain.go | 3 ++- routers/repo/modelarts.go | 3 ++- templates/repo/debugjob/index.tmpl | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 0599fb03f..5f9e81901 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -582,12 +582,13 @@ func logErrorAndUpdateJobStatus(err error, taskInfo *models.Cloudbrain) { } func CloudBrainDel(ctx *context.Context) { + var listType = ctx.Query("debugListType") if err := deleteCloudbrainJob(ctx); err != nil { log.Error("deleteCloudbrainJob failed: %v", err, ctx.Data["msgID"]) ctx.ServerError(err.Error(), err) return } - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all") + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=" + listType) } func deleteCloudbrainJob(ctx *context.Context) error { diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 9dea34c82..8d5d03353 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -417,6 +417,7 @@ func NotebookManage(ctx *context.Context) { func NotebookDel(ctx *context.Context) { var jobID = ctx.Params(":jobid") + var listType = ctx.Query("debugListType") task := ctx.Cloudbrain if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped) { @@ -442,7 +443,7 @@ func NotebookDel(ctx *context.Context) { return } - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all") + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=" + listType) } func TrainJobIndex(ctx *context.Context) { diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index f7773cf2d..ef06d12b6 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -366,7 +366,7 @@
- + {{$.CsrfTokenHtml}} {{if .CanDel}} From dda9a7ee777ea6c7fedf381b41d06a633b1508d2 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 17 Feb 2022 15:04:53 +0800 Subject: [PATCH 035/188] fix-bug --- routers/routes/routes.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 0f1abe5e8..de355352f 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -1031,14 +1031,16 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/modelarts", func() { m.Group("/notebook", func() { - // m.Group("/:jobid", func() { - // m.Get("", reqRepoCloudBrainReader, repo.NotebookShow) - // m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.NotebookDebug) - // m.Post("/:action", reqRepoCloudBrainWriter, repo.NotebookManage) - // m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.NotebookDel) - // }) - // m.Get("/create", reqRepoCloudBrainWriter, repo.NotebookNew) - // m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsNotebookForm{}), repo.NotebookCreate) + /* v1.0 + m.Group("/:jobid", func() { + m.Get("", reqRepoCloudBrainReader, repo.NotebookShow) + m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.NotebookDebug) + m.Post("/:action", reqRepoCloudBrainWriter, repo.NotebookManage) + m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.NotebookDel) + }) + m.Get("/create", reqRepoCloudBrainWriter, repo.NotebookNew) + m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsNotebookForm{}), repo.NotebookCreate) + */ m.Group("/:jobid", func() { m.Get("", reqRepoCloudBrainReader, repo.NotebookShow) m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.NotebookDebug2) From 53dd2b0a8b0fc1e070a454d14fd6d171c878aabf Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 17 Feb 2022 15:18:24 +0800 Subject: [PATCH 036/188] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/user/dashboard/feeds.tmpl | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 20c9bd91b..8c2715613 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -115,7 +115,23 @@
- {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}} + {{if eq .GetOpType 24}} + + {{else if eq .GetOpType 25}} + + {{else if eq .GetOpType 26}} + + {{else if eq .GetOpType 27}} + + {{else if eq .GetOpType 28}} + + {{else if eq .GetOpType 29}} + + {{else if eq .GetOpType 30}} + + {{else}} + {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}} + {{end}}
From c6464007d8a3da73aa45160c807a280701de00ed Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 17 Feb 2022 16:20:25 +0800 Subject: [PATCH 037/188] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=87=BA=E9=94=99=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=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 --- routers/repo/cloudbrain.go | 3 +++ templates/repo/cloudbrain/benchmark/new.tmpl | 16 +++++++++++++--- templates/user/dashboard/feeds.tmpl | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 0599fb03f..88fea0d8f 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1200,6 +1200,9 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF benchmarkTypeID := form.BenchmarkTypeID benchmarkChildTypeID := form.BenchmarkChildTypeID + ctx.Data["description"] = form.Description + ctx.Data["benchmarkTypeID"] = benchmarkTypeID + ctx.Data["benchmark_child_types_id_hidden"] = benchmarkChildTypeID if !jobNamePattern.MatchString(jobName) { cloudBrainNewDataPrepare(ctx) ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tplCloudBrainBenchmarkNew, &form) diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl index 081e44e48..6f498e834 100755 --- a/templates/repo/cloudbrain/benchmark/new.tmpl +++ b/templates/repo/cloudbrain/benchmark/new.tmpl @@ -83,7 +83,7 @@
- +
@@ -102,11 +102,16 @@  
+ @@ -182,12 +187,17 @@ function setChildType(){ let type_id = $('#benchmark_types_id').val(); + let child_selected_id = $('#benchmark_child_types_id_hidden').val(); $.get(`${repolink}/cloudbrain/benchmark/get_child_types?benchmark_type_id=${type_id}`, (data) => { console.log(JSON.stringify(data)) const n_length = data['child_types'].length let html='' for (let i=0;i${data['child_types'][i].value}`; + if(child_selected_id == data['child_types'][i].id){ + html += ``; + }else{ + html += ``; + } } document.getElementById("benchmark_child_types_id").innerHTML=html; }) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 8c2715613..9724de269 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -124,7 +124,7 @@ {{else if eq .GetOpType 27}} {{else if eq .GetOpType 28}} - + {{else if eq .GetOpType 29}} {{else if eq .GetOpType 30}} From 13f1ab8725ebcf041437b02362d767fdd7e670cf Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 17 Feb 2022 16:35:50 +0800 Subject: [PATCH 038/188] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=87=BA=E9=94=99=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=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 --- routers/repo/cloudbrain.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 88fea0d8f..a330c7572 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1098,6 +1098,9 @@ func GetChildTypes(ctx *context.Context) { } func CloudBrainBenchmarkNew(ctx *context.Context) { + ctx.Data["description"] = "" + ctx.Data["benchmarkTypeID"] = "" + ctx.Data["benchmark_child_types_id_hidden"] = "" err := cloudBrainNewDataPrepare(ctx) if err != nil { ctx.ServerError("get new cloudbrain info failed", err) From fc560c8680358a56b11285f4c8436c78e9e9f094 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 17 Feb 2022 16:46:50 +0800 Subject: [PATCH 039/188] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=87=BA=E9=94=99=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=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/repo/cloudbrain/benchmark/new.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl index 6f498e834..a8f60c86f 100755 --- a/templates/repo/cloudbrain/benchmark/new.tmpl +++ b/templates/repo/cloudbrain/benchmark/new.tmpl @@ -102,7 +102,7 @@   +
From 840e7324903958bf92d09dd38b38ea2f78244ea5 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 17 Feb 2022 17:15:35 +0800 Subject: [PATCH 044/188] fix-1515 --- routers/routes/routes.go | 5 ++++- templates/repo/cloudbrain/benchmark/index.tmpl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index de355352f..55b24e97a 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -992,8 +992,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/benchmark", func() { m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchmarkIndex) - m.Group("/:jobid", func() { + m.Group("/:jobname", func() { m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchMarkShow) + }) + m.Group("/:jobid", func() { + // m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchMarkShow) m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainStop) m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.BenchmarkDel) m.Get("/rate", reqRepoCloudBrainReader, repo.GetRate) diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl index ef81199fe..03bb35f08 100644 --- a/templates/repo/cloudbrain/benchmark/index.tmpl +++ b/templates/repo/cloudbrain/benchmark/index.tmpl @@ -99,7 +99,7 @@
- + {{.JobName}} From dcd509ada3d6aa95a31acb07e7d0a9b2bdb9c144 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 17 Feb 2022 17:33:29 +0800 Subject: [PATCH 045/188] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=87=BA=E9=94=99=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=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 --- public/home/home.js | 4 ++-- templates/user/dashboard/feeds.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index 55736f686..8fb64b611 100644 --- a/public/home/home.js +++ b/public/home/home.js @@ -152,7 +152,7 @@ function getTaskLink(record){ if(record.OpType == 24){ return re + "/datasets?type=" + record.Content; }else if(record.OpType == 25){ - return re + "/cloudbrain/" + record.Content; + return re + "/cloudbrain/" + record.RefName; }else if(record.OpType == 26){ return re + "/modelarts/notebook/" + record.Content; }else if(record.OpType == 27){ @@ -160,7 +160,7 @@ function getTaskLink(record){ }else if(record.OpType == 28){ return re + "/modelarts/inference-job/" + record.Content; }else if(record.OpType == 29){ - return re + "/cloudbrain/benchmark/" + record.Content; + return re + "/cloudbrain/benchmark/" + record.RefName; }else if(record.OpType == 30){ return re + "/modelmanage/show_model_info?name=" + record.RefName; } diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 9724de269..519dcda8f 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -73,7 +73,7 @@ {{else if eq .GetOpType 24}} {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 25}} - {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .Content .RefName | Str2html}} + {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .RefName .RefName | Str2html}} {{else if eq .GetOpType 26}} {{$.i18n.Tr "action.task_npudebugjob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 27}} @@ -81,7 +81,7 @@ {{else if eq .GetOpType 28}} {{$.i18n.Tr "action.task_inferencejob" .GetRepoLink .Content .RefName | Str2html}} {{else if eq .GetOpType 29}} - {{$.i18n.Tr "action.task_benchmark" .GetRepoLink .Content .RefName | Str2html}} + {{$.i18n.Tr "action.task_benchmark" .GetRepoLink .RefName .RefName | Str2html}} {{else if eq .GetOpType 30}} {{$.i18n.Tr "action.task_createmodel" .GetRepoLink .RefName .RefName | Str2html}} {{end}} From d6c77937eef04e748e644b222441a855ae05564b Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Fri, 18 Feb 2022 08:58:37 +0800 Subject: [PATCH 046/188] fix-1469 --- modules/context/auth.go | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/modules/context/auth.go b/modules/context/auth.go index 61a7b029b..dba2c3269 100755 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -6,12 +6,14 @@ package context import ( + "encoding/base64" + "net/http" + "strings" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "encoding/base64" - "net/http" "gitea.com/macaron/csrf" "gitea.com/macaron/macaron" @@ -94,7 +96,14 @@ func Toggle(options *ToggleOptions) macaron.Handler { return } - ctx.SetCookie("redirect_to", setting.AppSubURL+ctx.Req.URL.RequestURI(), 0, setting.AppSubURL) + tempUrl := ctx.Req.URL.RequestURI() + + if strings.Contains(tempUrl, "action/star?") || strings.Contains(tempUrl, "action/watch?") { + redirectForStarAndWatch(ctx, tempUrl) + + } else { + ctx.SetCookie("redirect_to", setting.AppSubURL+ctx.Req.URL.RequestURI(), 0, setting.AppSubURL) + } ctx.Redirect(setting.AppSubURL + "/user/login") return } else if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm { @@ -159,6 +168,17 @@ func Toggle(options *ToggleOptions) macaron.Handler { } } +func redirectForStarAndWatch(ctx *Context, tempUrl string) { + splits := strings.Split(tempUrl, "?") + if len(splits) > 1 { + redirectArguments := strings.Split(splits[1], "=") + + if len(redirectArguments) > 0 && redirectArguments[0] == "redirect_to" { + ctx.SetCookie("redirect_to", setting.AppSubURL+strings.Replace(redirectArguments[1], "%2f", "/", -1), 0, setting.AppSubURL) + } + } +} + func basicAuth(ctx *Context) bool { var siteAuth = base64.StdEncoding.EncodeToString([]byte(setting.CBAuthUser + ":" + setting.CBAuthPassword)) auth := ctx.Req.Header.Get("Authorization") From 45958ca5aab507146730c1d68db92fb927af61da Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Fri, 18 Feb 2022 09:27:18 +0800 Subject: [PATCH 047/188] =?UTF-8?q?fix-1399=E5=90=8E=E7=AB=AF=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/repo_statistic.go | 8 ++++++++ routers/api/v1/repo/repo_dashbord.go | 22 +++++++++++----------- routers/repo/repo_statistic.go | 3 ++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/models/repo_statistic.go b/models/repo_statistic.go index d3eb65c30..809cb26c4 100755 --- a/models/repo_statistic.go +++ b/models/repo_statistic.go @@ -12,6 +12,7 @@ type RepoStatistic struct { ID int64 `xorm:"pk autoincr" json:"-"` RepoID int64 `xorm:"unique(s) NOT NULL" json:"repo_id"` Name string `xorm:"INDEX" json:"name"` + Alias string `xorm:"INDEX" json:"alias"` OwnerName string `json:"ownerName"` IsPrivate bool `json:"isPrivate"` IsMirror bool `json:"isMirror"` @@ -63,6 +64,13 @@ type RepoStatistic struct { UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated" json:"-"` } +func (repo *RepoStatistic) DisplayName() string { + if repo.Alias == "" { + return repo.Name + } + return repo.Alias +} + func DeleteRepoStatDaily(date string) error { sess := xStatistic.NewSession() defer sess.Close() diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go index 46596330f..959fb4c9f 100644 --- a/routers/api/v1/repo/repo_dashbord.go +++ b/routers/api/v1/repo/repo_dashbord.go @@ -297,7 +297,7 @@ func allProjectsPeroidHeader(ctx *context.Context) map[string]string { } func allProjectsPeroidValues(row int, rs *models.RepoStatistic, ctx *context.Context) map[string]string { - return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): rs.Name, getCellName("C", row): rs.OwnerName, getCellName("D", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("E", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64), + return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): rs.DisplayName(), getCellName("C", row): rs.OwnerName, getCellName("D", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("E", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64), getCellName("F", row): strconv.FormatInt(rs.NumVisits, 10), getCellName("G", row): strconv.FormatInt(rs.NumDownloads, 10), getCellName("H", row): strconv.FormatInt(rs.NumPulls, 10), getCellName("I", row): strconv.FormatInt(rs.NumCommits, 10), getCellName("J", row): strconv.FormatInt(rs.NumWatches, 10), getCellName("K", row): strconv.FormatInt(rs.NumStars, 10), getCellName("L", row): strconv.FormatInt(rs.NumForks, 10), getCellName("M", row): strconv.FormatInt(rs.NumIssues, 10), getCellName("N", row): strconv.FormatInt(rs.NumClosedIssues, 10), getCellName("O", row): strconv.FormatInt(rs.NumContributor, 10), @@ -317,7 +317,7 @@ func allProjectsOpenIHeader() map[string]string { func allProjectsOpenIValues(row int, rs *models.RepoStatistic, ctx *context.Context) map[string]string { - return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): rs.Name, getCellName("C", row): rs.OwnerName, getCellName("D", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("E", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64), + return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): rs.DisplayName(), getCellName("C", row): rs.OwnerName, getCellName("D", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("E", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64), getCellName("F", row): strconv.FormatFloat(rs.Impact, 'f', 2, 64), getCellName("G", row): strconv.FormatFloat(rs.Completeness, 'f', 2, 64), getCellName("H", row): strconv.FormatFloat(rs.Liveness, 'f', 2, 64), getCellName("I", row): strconv.FormatFloat(rs.ProjectHealth, 'f', 2, 64), getCellName("J", row): strconv.FormatFloat(rs.TeamHealth, 'f', 2, 64), getCellName("K", row): strconv.FormatFloat(rs.Growth, 'f', 2, 64), getCellName("L", row): strconv.FormatInt(rs.NumWatches, 10), getCellName("M", row): strconv.FormatInt(rs.NumStars, 10), getCellName("N", row): strconv.FormatInt(rs.NumForks, 10), getCellName("O", row): strconv.FormatInt(rs.NumDownloads, 10), @@ -466,10 +466,10 @@ func generateCountSql(beginTime time.Time, endTime time.Time, latestDate string, countSql := "SELECT count(*) FROM " + "(SELECT repo_id FROM repo_statistic where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " group by repo_id) A," + - "(SELECT repo_id,name,is_private,radar_total from public.repo_statistic where date='" + latestDate + "') B" + + "(SELECT repo_id,name,alias,is_private,radar_total from public.repo_statistic where date='" + latestDate + "') B" + " where A.repo_id=B.repo_id" if q != "" { - countSql = countSql + " and LOWER(B.name) like '%" + strings.ToLower(q) + "%'" + countSql = countSql + " and LOWER(B.alias) like '%" + strings.ToLower(q) + "%'" } return countSql } @@ -482,22 +482,22 @@ func generateOpenICountSql(latestDate string) string { } func generateTypeAllSql(beginTime time.Time, endTime time.Time, latestDate string, q string, orderBy string, page int, pageSize int) string { - sql := "SELECT A.repo_id,name,owner_name,is_private,radar_total,num_watches,num_visits,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor FROM " + + sql := "SELECT A.repo_id,name,alias,owner_name,is_private,radar_total,num_watches,num_visits,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor FROM " + "(SELECT repo_id,sum(num_visits) as num_visits " + " FROM repo_statistic where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " group by repo_id) A," + - "(SELECT repo_id,name,owner_name,is_private,radar_total,num_watches,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor from public.repo_statistic where date='" + latestDate + "') B" + + "(SELECT repo_id,name,alias,owner_name,is_private,radar_total,num_watches,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor from public.repo_statistic where date='" + latestDate + "') B" + " where A.repo_id=B.repo_id" if q != "" { - sql = sql + " and LOWER(name) like '%" + strings.ToLower(q) + "%'" + sql = sql + " and LOWER(alias) like '%" + strings.ToLower(q) + "%'" } sql = sql + " order by " + orderBy + " desc,repo_id" + " limit " + strconv.Itoa(pageSize) + " offset " + strconv.Itoa((page-1)*pageSize) return sql } func generateTypeAllOpenISql(latestDate string, page int, pageSize int) string { - sql := "SELECT id, repo_id, date, num_watches, num_stars, num_forks, num_downloads, num_comments, num_visits, num_closed_issues, num_versions, num_dev_months, repo_size, dataset_size, num_models, num_wiki_views, num_commits, num_issues, num_pulls, issue_fixed_rate, num_contributor, num_key_contributor, num_contributors_growth, num_commits_growth, num_commit_lines_growth, num_issues_growth, num_comments_growth, impact, completeness, liveness, project_health, team_health, growth, radar_total, name, is_private, owner_name FROM " + + sql := "SELECT id, repo_id, date, num_watches, num_stars, num_forks, num_downloads, num_comments, num_visits, num_closed_issues, num_versions, num_dev_months, repo_size, dataset_size, num_models, num_wiki_views, num_commits, num_issues, num_pulls, issue_fixed_rate, num_contributor, num_key_contributor, num_contributors_growth, num_commits_growth, num_commit_lines_growth, num_issues_growth, num_comments_growth, impact, completeness, liveness, project_health, team_health, growth, radar_total, name,alias, is_private, owner_name FROM " + " public.repo_statistic where date='" + latestDate + "'" sql = sql + " order by radar_total desc,repo_id" + " limit " + strconv.Itoa(pageSize) + " offset " + strconv.Itoa((page-1)*pageSize) @@ -506,14 +506,14 @@ func generateTypeAllOpenISql(latestDate string, page int, pageSize int) string { func generatePageSql(beginTime time.Time, endTime time.Time, latestDate string, q string, orderBy string, page int, pageSize int) string { - sql := "SELECT A.repo_id,name,owner_name,is_private,radar_total,num_watches,num_visits,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor FROM " + + sql := "SELECT A.repo_id,name,alias,owner_name,is_private,radar_total,num_watches,num_visits,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor FROM " + "(SELECT repo_id,sum(num_watches_added) as num_watches,sum(num_visits) as num_visits, sum(num_downloads_added) as num_downloads,sum(num_pulls_added) as num_pulls,sum(num_commits_added) as num_commits,sum(num_stars_added) as num_stars,sum(num_forks_added) num_forks,sum(num_issues_added) as num_issues,sum(num_closed_issues_added) as num_closed_issues,sum(num_contributor_added) as num_contributor " + " FROM repo_statistic where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " group by repo_id) A," + - "(SELECT repo_id,name,owner_name,is_private,radar_total from public.repo_statistic where date='" + latestDate + "') B" + + "(SELECT repo_id,name,alias,owner_name,is_private,radar_total from public.repo_statistic where date='" + latestDate + "') B" + " where A.repo_id=B.repo_id" if q != "" { - sql = sql + " and LOWER(B.name) like '%" + strings.ToLower(q) + "%'" + sql = sql + " and LOWER(B.alias) like '%" + strings.ToLower(q) + "%'" } sql = sql + " order by " + orderBy + " desc,A.repo_id" + " limit " + strconv.Itoa(pageSize) + " offset " + strconv.Itoa((page-1)*pageSize) return sql diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go index d9545f696..06f45e608 100755 --- a/routers/repo/repo_statistic.go +++ b/routers/repo/repo_statistic.go @@ -106,7 +106,8 @@ func RepoStatisticDaily(date string) { repoStat := models.RepoStatistic{ RepoID: repo.ID, Date: date, - Name: repo.Alias, + Name: repo.Name, + Alias: repo.Alias, IsPrivate: repo.IsPrivate, IsMirror: repo.IsMirror, OwnerName: repo.OwnerName, From d72bf77a3310d0b52f0fc6c887d68c2f361eebf7 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 18 Feb 2022 09:32:00 +0800 Subject: [PATCH 048/188] #1494 create qrcode4bind --- modules/auth/wechat/access_token.go | 44 ++++++++++ modules/auth/wechat/client.go | 95 +++++++++++++++++++++ modules/auth/wechat/event.go | 1 + modules/auth/wechat/qr_code.go | 6 ++ modules/redis/redis_client/client.go | 54 ++++++++++++ modules/redis/redis_key/key_base.go | 16 ++++ modules/redis/redis_key/wechat_redis_key.go | 11 +++ modules/setting/setting.go | 18 +++- routers/authentication/wechat.go | 67 +++++++++++++++ routers/routes/routes.go | 8 ++ 10 files changed, 318 insertions(+), 2 deletions(-) create mode 100644 modules/auth/wechat/access_token.go create mode 100644 modules/auth/wechat/client.go create mode 100644 modules/auth/wechat/event.go create mode 100644 modules/auth/wechat/qr_code.go create mode 100644 modules/redis/redis_client/client.go create mode 100644 modules/redis/redis_key/key_base.go create mode 100644 modules/redis/redis_key/wechat_redis_key.go create mode 100644 routers/authentication/wechat.go diff --git a/modules/auth/wechat/access_token.go b/modules/auth/wechat/access_token.go new file mode 100644 index 000000000..a312db215 --- /dev/null +++ b/modules/auth/wechat/access_token.go @@ -0,0 +1,44 @@ +package wechat + +import ( + "code.gitea.io/gitea/modules/redis/redis_client" + "code.gitea.io/gitea/modules/redis/redis_key" + "time" +) + +const EMPTY_REDIS_VAL = "Nil" + +func GetWechatAccessToken() string { + token, _ := redis_client.Get(redis_key.WechatAccessTokenKey()) + if token != "" { + if token == EMPTY_REDIS_VAL { + return "" + } + live, _ := redis_client.TTL(token) + //refresh wechat access token when expire time less than 5 minutes + if live > 0 && live < 300 { + refreshAccessTokenCache() + } + return token + } + return refreshAccessTokenCache() +} + +func refreshAccessTokenCache() string { + r := callAccessToken() + + var token string + if r != nil { + token = r.Access_token + } + + if token == "" { + redis_client.Setex(redis_key.WechatAccessTokenKey(), EMPTY_REDIS_VAL, 10*time.Second) + return "" + } + + redis_client.Setex(redis_key.WechatAccessTokenKey(), token, time.Duration(r.Expires_in)*time.Second) + + return token + +} diff --git a/modules/auth/wechat/client.go b/modules/auth/wechat/client.go new file mode 100644 index 000000000..edf010b33 --- /dev/null +++ b/modules/auth/wechat/client.go @@ -0,0 +1,95 @@ +package wechat + +import ( + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "encoding/json" + "github.com/go-resty/resty/v2" + "time" +) + +var ( + client *resty.Client +) + +const ( + GRANT_TYPE = "client_credential" + ACCESS_TOKEN_PATH = "/cgi-bin/token" + QR_CODE_Path = "/cgi-bin/qrcode/create" + ACTION_QR_STR_SCENE = "QR_STR_SCENE" +) + +type AccessTokenResponse struct { + Access_token string + Expires_in int +} + +type QRCodeResponse struct { + Ticket string `json:"ticket"` + Expire_Seconds int `json:"expire_seconds"` + Url string `json:"url"` +} + +type QRCodeRequest struct { + Action_name string `json:"action_name"` + Action_info ActionInfo `json:"action_info"` + Expire_seconds int `json:"expire_seconds"` +} + +type ActionInfo struct { + Scene Scene +} + +type Scene struct { + Scene_str string +} + +func getWechatRestyClient() *resty.Client { + if client == nil { + client = resty.New() + client.SetTimeout(time.Duration(setting.WechatApiTimeoutSeconds) * time.Second) + } + return client +} + +func callAccessToken() *AccessTokenResponse { + client := getWechatRestyClient() + + var result AccessTokenResponse + _, err := client.R(). + SetQueryParam("grant_type", GRANT_TYPE). + SetQueryParam("appid", setting.WechatAppId). + SetQueryParam("secret", setting.WechatAppSecret). + SetResult(&result). + Get(setting.WechatApiHost + ACCESS_TOKEN_PATH) + if err != nil { + log.Error("get wechat access token failed,e=%v", err) + return nil + } + return &result +} + +func callQRCodeCreate(sceneStr string) *QRCodeResponse { + client := getWechatRestyClient() + + body := &QRCodeRequest{ + Action_name: ACTION_QR_STR_SCENE, + Action_info: ActionInfo{Scene: Scene{Scene_str: sceneStr}}, + Expire_seconds: setting.WechatQRCodeExpireSeconds, + } + bodyJson, _ := json.Marshal(body) + var result QRCodeResponse + r, err := client.R(). + SetHeader("Content-Type", "application/json"). + SetQueryParam("access_token", GetWechatAccessToken()). + SetBody(bodyJson). + SetResult(&result). + Post(setting.WechatApiHost + QR_CODE_Path) + if err != nil || result.Url == "" { + log.Error("create QR code failed,e=%v", err) + return nil + } + //todo 识别token失效的错误码，重试机制 + log.Info("%v", r) + return &result +} diff --git a/modules/auth/wechat/event.go b/modules/auth/wechat/event.go new file mode 100644 index 000000000..ecd4201a5 --- /dev/null +++ b/modules/auth/wechat/event.go @@ -0,0 +1 @@ +package wechat diff --git a/modules/auth/wechat/qr_code.go b/modules/auth/wechat/qr_code.go new file mode 100644 index 000000000..1e462861e --- /dev/null +++ b/modules/auth/wechat/qr_code.go @@ -0,0 +1,6 @@ +package wechat + +func GetWechatQRCode4Bind(sceneStr string) *QRCodeResponse { + r := callQRCodeCreate(sceneStr) + return r +} diff --git a/modules/redis/redis_client/client.go b/modules/redis/redis_client/client.go new file mode 100644 index 000000000..0590f13b1 --- /dev/null +++ b/modules/redis/redis_client/client.go @@ -0,0 +1,54 @@ +package redis_client + +import ( + "code.gitea.io/gitea/modules/labelmsg" + "fmt" + "math" + "strconv" + "time" +) + +//todo redis连接池 +func Setex(key, value string, timeout time.Duration) (bool, error) { + redisClient := labelmsg.Get() + defer redisClient.Close() + + seconds := int(math.Floor(timeout.Seconds())) + reply, err := redisClient.Do("SETEX", key, seconds, value) + if err != nil { + return false, err + } + if reply != "OK" { + return false, nil + } + return true, nil + +} + +func Get(key string) (string, error) { + redisClient := labelmsg.Get() + defer redisClient.Close() + + reply, err := redisClient.Do("GET", key) + if err != nil { + return "", err + } + if reply == nil { + return "", err + } + return fmt.Sprint(reply), nil + +} + +func TTL(key string) (int, error) { + redisClient := labelmsg.Get() + defer redisClient.Close() + + reply, err := redisClient.Do("TTL", key) + if err != nil { + return 0, err + } + n, _ := strconv.Atoi(fmt.Sprint(reply)) + return n, nil + +} diff --git a/modules/redis/redis_key/key_base.go b/modules/redis/redis_key/key_base.go new file mode 100644 index 000000000..0efc6ed38 --- /dev/null +++ b/modules/redis/redis_key/key_base.go @@ -0,0 +1,16 @@ +package redis_key + +import "strings" + +const KEY_SEPARATE = ":" + +func KeyJoin(keys ...string) string { + var build strings.Builder + for _, v := range keys { + build.WriteString(v) + build.WriteString(KEY_SEPARATE) + } + s := build.String() + s = strings.TrimSuffix(s, KEY_SEPARATE) + return s +} diff --git a/modules/redis/redis_key/wechat_redis_key.go b/modules/redis/redis_key/wechat_redis_key.go new file mode 100644 index 000000000..def7e93ee --- /dev/null +++ b/modules/redis/redis_key/wechat_redis_key.go @@ -0,0 +1,11 @@ +package redis_key + +const PREFIX = "wechat" + +func WechatBindingUserIdKey(sceneStr string) string { + return KeyJoin(PREFIX, sceneStr, "scene_userId") +} + +func WechatAccessTokenKey() string { + return KeyJoin(PREFIX, "access_token") +} diff --git a/modules/setting/setting.go b/modules/setting/setting.go index c6828f9f7..227a05656 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -470,7 +470,7 @@ var ( BenchmarkTypes string BenchmarkGpuTypes string BenchmarkResourceSpecs string - BenchmarkMaxDuration int64 + BenchmarkMaxDuration int64 //snn4imagenet config IsSnn4imagenetEnabled bool @@ -512,7 +512,7 @@ var ( ProfileID string PoolInfos string Flavor string - DebugHost string + DebugHost string //train-job ResourcePools string Engines string @@ -529,6 +529,13 @@ var ( ElkTimeFormat string PROJECT_LIMIT_PAGES []string + //wechat config + WechatApiHost string + WechatApiTimeoutSeconds int + WechatAppId string + WechatAppSecret string + WechatQRCodeExpireSeconds int + //nginx proxy PROXYURL string RadarMap = struct { @@ -1342,6 +1349,13 @@ func NewContext() { ElkTimeFormat = sec.Key("ELKTIMEFORMAT").MustString("date_time") PROJECT_LIMIT_PAGES = strings.Split(sec.Key("project_limit_pages").MustString(""), ",") + sec = Cfg.Section("wechat") + WechatApiHost = sec.Key("HOST").MustString("https://api.weixin.qq.com") + WechatApiTimeoutSeconds = sec.Key("TIMEOUT_SECONDS").MustInt(3) + WechatAppId = sec.Key("APP_ID").MustString("wxba77b915a305a57d") + WechatAppSecret = sec.Key("APP_SECRET").MustString("e48e13f315adc32749ddc7057585f198") + WechatQRCodeExpireSeconds = sec.Key("QR_CODE_EXPIRE_SECONDS").MustInt(120) + SetRadarMapConfig() sec = Cfg.Section("warn_mail") diff --git a/routers/authentication/wechat.go b/routers/authentication/wechat.go new file mode 100644 index 000000000..d9004ace9 --- /dev/null +++ b/routers/authentication/wechat.go @@ -0,0 +1,67 @@ +package authentication + +import ( + "code.gitea.io/gitea/modules/auth/wechat" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/redis/redis_client" + "code.gitea.io/gitea/modules/redis/redis_key" + "code.gitea.io/gitea/modules/setting" + "errors" + "fmt" + gouuid "github.com/satori/go.uuid" + "time" +) + +type QRCodeResponse struct { + Url string + Ticket string + SceneStr string + ExpireSeconds int +} + +// GetQRCode4Bind get QR code for wechat binding +func GetQRCode4Bind(ctx *context.Context) { + userId := ctx.User.ID + + r, err := createQRCode4Bind(userId) + if err != nil { + ctx.JSON(200, map[string]interface{}{ + "code": 9, + "msg": "Get QR code failed", + }) + return + } + + ctx.JSON(200, map[string]interface{}{ + "code": 0, + "msg": "success", + "data": r, + }) +} + +func createQRCode4Bind(userId int64) (*QRCodeResponse, error) { + sceneStr := gouuid.NewV4().String() + r := wechat.GetWechatQRCode4Bind(sceneStr) + if r == nil { + return nil, errors.New("createQRCode4Bind failed") + } + + isOk, err := redis_client.Setex(redis_key.WechatBindingUserIdKey(sceneStr), fmt.Sprint(userId), time.Duration(setting.WechatQRCodeExpireSeconds)*time.Second) + if err != nil { + log.Error("createQRCode4Bind failed.e=%v", err) + return nil, err + } + if !isOk { + log.Error("createQRCode4Bind failed.redis reply is not ok") + return nil, errors.New("reply is not ok when set WechatBindingUserIdKey") + } + + result := &QRCodeResponse{ + Url: r.Url, + Ticket: r.Ticket, + SceneStr: sceneStr, + ExpireSeconds: setting.WechatQRCodeExpireSeconds, + } + return result, nil +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index aa85b8f2b..9613b43cd 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -6,6 +6,7 @@ package routes import ( "bytes" + "code.gitea.io/gitea/routers/authentication" "encoding/gob" "net/http" "path" @@ -391,6 +392,13 @@ func RegisterRoutes(m *macaron.Macaron) { }, ignSignInAndCsrf, reqSignIn) m.Post("/login/oauth/access_token", bindIgnErr(auth.AccessTokenForm{}), ignSignInAndCsrf, user.AccessTokenOAuth) + m.Group("/authentication/wechat", func() { + m.Get("/qrCode4Bind", authentication.GetQRCode4Bind) + m.Post("/grant", bindIgnErr(auth.GrantApplicationForm{}), user.GrantApplicationOAuth) + // TODO manage redirection + m.Post("/authorize", bindIgnErr(auth.AuthorizationForm{}), user.AuthorizeOAuth) + }, reqSignIn) + m.Group("/user/settings", func() { m.Get("", userSetting.Profile) m.Post("", bindIgnErr(auth.UpdateProfileForm{}), userSetting.ProfilePost) From e11c27ea6de18b5fc71d7fbf7769ce750903498f Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 18 Feb 2022 09:34:04 +0800 Subject: [PATCH 049/188] fix issue --- package-lock.json | 130 +++++ package.json | 2 + templates/admin/cloudbrain/list.tmpl | 489 ++++++++++++++++++ templates/admin/navbar.tmpl | 3 + templates/org/member/course_members.tmpl | 1 - .../repo/cloudbrain/benchmark/index.tmpl | 1 - templates/repo/cloudbrain/benchmark/new.tmpl | 1 - templates/repo/createCourse.tmpl | 2 - templates/repo/debugjob/index.tmpl | 41 +- templates/repo/modelarts/trainjob/index.tmpl | 1 - templates/repo/modelmanage/showinfo.tmpl | 1 - templates/repo/repo_name.tmpl | 4 +- templates/user/dashboard/issues.tmpl | 3 - templates/user/dashboard/milestones.tmpl | 3 - templates/user/profile.tmpl | 1 + tsconfig.json | 0 web_src/js/components/Images.vue | 5 - web_src/js/components/UserAnalysis.vue | 6 - web_src/js/excel/Export2Excel.js | 3 +- web_src/js/excel/util.js | 1 - web_src/js/index.js | 17 +- webpack.config.js | 10 + 22 files changed, 670 insertions(+), 55 deletions(-) create mode 100644 templates/admin/cloudbrain/list.tmpl create mode 100644 tsconfig.json diff --git a/package-lock.json b/package-lock.json index a8e5e3e25..7b706207b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13869,6 +13869,130 @@ "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", "dev": true }, + "ts-loader": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-4.0.0.tgz", + "integrity": "sha512-iissbnuJkqbB3YAmnWyEbmdNcGcoiiXopKHKyqdoCrFQVi9pnplXeveQDXJnQOCYNNcb2pjT2zzSYTX6c9QtAA==", + "dev": true, + "requires": { + "chalk": "^2.3.0", + "enhanced-resolve": "^4.0.0", + "loader-utils": "^1.0.2", + "micromatch": "^3.1.4", + "semver": "^5.0.1" + }, + "dependencies": { + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } + } + } + }, "tslib": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", @@ -13928,6 +14052,12 @@ "is-typedarray": "^1.0.0" } }, + "typescript": { + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", + "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", + "dev": true + }, "ua-parser-js": { "version": "0.7.21", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz", diff --git a/package.json b/package.json index ba5459a07..e5f829bf1 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,8 @@ "script-loader": "0.7.2", "stylelint": "13.3.3", "stylelint-config-standard": "20.0.0", + "ts-loader": "4.0.0", + "typescript": "4.5.5", "updates": "10.2.11" }, "browserslist": [ diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl new file mode 100644 index 000000000..b22d491d2 --- /dev/null +++ b/templates/admin/cloudbrain/list.tmpl @@ -0,0 +1,489 @@ + +{{template "base/head" .}} + +
+
+
+
+
+
+
+
+
+ +
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} + +
+
+
+ +
+ + +
+ +
+
+
+
全部任务类型
+ +
+ 全部任务类型 + DEBUG + TRAIN + INFERENCE +
+
+
+
全部计算资源
+ +
+ 全部计算资源 + CPU/GPU + NPU +
+
+
+
全部状态
+ +
+ 全部状态 + STARTING + RESTARTING + START_FAILED + STOPPING + STOPPED + WAITING + COMPLETED + FAILED + OTHER + +
+
+
+
+ + 下载此报告 +
+ +
+ +
+ + +
+
+
+ {{$.i18n.Tr "repo.cloudbrain_task"}} +
+
+ 任务类型 +
+
+ {{$.i18n.Tr "repo.modelarts.status"}} +
+
+ {{$.i18n.Tr "repo.modelarts.createtime"}} +
+
+ {{$.i18n.Tr "repo.cloudbrain_status_runtime"}} +
+
+ {{$.i18n.Tr "repo.modelarts.computing_resources"}} +
+
+ {{$.i18n.Tr "repo.cloudbrain_creator"}} +
+
+ 项目 +
+
+ 云脑侧名称 +
+
+ {{$.i18n.Tr "repo.cloudbrain_operate"}} +
+
+
+ + {{range .Tasks}} +
+
+ + +
+ {{if eq .JobType "DEBUG"}} + + {{.JobName}} + + {{else if eq .JobType "INFERENCE"}} + + {{.JobName}} + + {{else if eq .JobType "TRAIN"}} + + {{.JobName}} + + {{else if eq .JobType "BENCHMARK"}} + + {{.JobName}} + + {{end}} +
+ + +
+ {{.JobType}} +
+ +
+ + {{.Status}} + +
+ +
+ {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} +
+ +
+ {{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}} +
+ +
+ {{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}} +
+ +
+ {{if .User.Name}} + + {{else}} + + {{end}} +
+ +
+ {{.Repo.OwnerName}}/{{.Repo.Alias}} +
+ +
+ + {{.JobName}} +
+ +
+ {{if eq .JobType "DEBUG"}} +
+
+ {{$.CsrfTokenHtml}} + {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} + + {{$.i18n.Tr "repo.debug"}} + + {{else}} + + {{$.i18n.Tr "repo.debug_again"}} + + {{end}} +
+
+ {{end}} + +
+ {{if eq .JobType "DEBUG" "BENCHMARK"}} +
+ {{$.CsrfTokenHtml}} + + {{$.i18n.Tr "repo.stop"}} + +
+ {{else}} + + {{$.i18n.Tr "repo.stop"}} + + {{end}} +
+ + + +
+ {{$.CsrfTokenHtml}} + + {{$.i18n.Tr "repo.delete"}} + +
+
+
+
+ {{end}} +
+
+ + +
+
+
+ +
+
+
+
+ + +
+
+
+ 删除任务 +
+ +
+

你确认删除该任务么？此任务一旦删除不可恢复。

+
+
+
+ 取消操作 +
+
+ 确定操作 +
+
+
+
+
+ +{{template "base/footer" .}} + + diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 2b9f8b7c4..47a9ee811 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -14,6 +14,9 @@ {{.i18n.Tr "admin.datasets"}} + + 云脑任务 + {{.i18n.Tr "admin.hooks"}} diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl index 83018739f..5ae6bec89 100644 --- a/templates/org/member/course_members.tmpl +++ b/templates/org/member/course_members.tmpl @@ -120,7 +120,6 @@ \ No newline at end of file diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index f7773cf2d..d45df324e 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -324,11 +324,11 @@ {{$.CsrfTokenHtml}} {{if .CanDebug}} {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} - + {{$.i18n.Tr "repo.debug"}} {{else}} - + {{$.i18n.Tr "repo.debug_again"}} {{end}} @@ -350,11 +350,11 @@ {{$.CsrfTokenHtml}} {{if .CanDel}} {{if eq .ComputeResource "CPU/GPU" }} - + {{$.i18n.Tr "repo.stop"}} {{else}} - + {{$.i18n.Tr "repo.stop"}} {{end}} @@ -369,7 +369,7 @@ {{$.CsrfTokenHtml}} {{if .CanDel}} - + {{$.i18n.Tr "repo.delete"}} {{else}} @@ -490,7 +490,6 @@ \ No newline at end of file + \ No newline at end of file diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 85d1fb65c..eb0d76e5b 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -208,6 +208,3 @@
{{template "base/footer" .}} - \ No newline at end of file diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 1c0ee84fc..4038ce5b0 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -117,6 +117,3 @@
{{template "base/footer" .}} - \ No newline at end of file diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index d42ed4058..fa5e0c9b7 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -141,6 +141,7 @@ {{if eq .TabName "activity"}} {{if .EnableHeatmap}} +
diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 000000000..e69de29bb diff --git a/web_src/js/components/Images.vue b/web_src/js/components/Images.vue index 6fe26d532..a56d81e4c 100644 --- a/web_src/js/components/Images.vue +++ b/web_src/js/components/Images.vue @@ -310,7 +310,6 @@ export default { }, handleCurrentChange(val){ - console.log(val) this.params.page = val this.getImageList() @@ -350,7 +349,6 @@ export default { }) }, copyUrl(url){ - console.log(url) const cInput = document.createElement('input') cInput.value = url document.body.appendChild(cInput) @@ -380,16 +378,13 @@ export default { clearP(value){ - console.log("sorce value",value) if(!value) return '' const reg = /\<\/?p\>/g; value = value.replace(reg,'') - console.log("repalace:",value) return value }, transformTimestamp(timestamp){ - console.log("timestamp",timestamp) let a = new Date(timestamp).getTime(); const date = new Date(a); const Y = date.getFullYear() + '-'; diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue index 5650e164f..682dbc78c 100755 --- a/web_src/js/components/UserAnalysis.vue +++ b/web_src/js/components/UserAnalysis.vue @@ -200,7 +200,6 @@ var saveFileName='' var Date=(this.params.startDate).split('-') var startDate=Date[0]+''+Date[1]+''+Date[2] - console.log(startDate) Date=(this.params.endDate).split('-') var endDate=Date[0]+Date[1]+Date[2] saveFileName = '用户分析_'+this.search+''+startDate+'_'+endDate @@ -258,7 +257,6 @@ getUserList(type_val,index){ this.type_val = type_val this.dynamic = index; - console.log("dj:"+type_val) var now = new Date(); // 当前日期 var nowDayOfWeek = now.getDay(); // 今天本周的第几天 var nowDay = now.getDate(); // 当前日 @@ -324,7 +322,6 @@ // console.log("res.data:"+res.data.data) this.totalNum = res.data.count - console.log("res.count:"+res.data.count) }) @@ -354,9 +351,7 @@ }, filters:{ - transformTimestamp(timestamp){ - console.log("timestamp",timestamp) let a = new Date(timestamp*1000); const date = new Date(a); const Y = date.getFullYear() + '/'; @@ -366,7 +361,6 @@ const m = (date.getMinutes() <10 ? '0'+date.getMinutes() : date.getMinutes());// + ':' ; // const s = (date.getSeconds() <10 ? '0'+date.getSeconds() : date.getSeconds()) ; // 秒 const dateString = Y + M + D + h + m ;//+ s; - console.log('dateString', dateString); // > dateString 2021-07-06 14:23 return dateString; }, }, diff --git a/web_src/js/excel/Export2Excel.js b/web_src/js/excel/Export2Excel.js index 3c6d022af..85921f7ad 100755 --- a/web_src/js/excel/Export2Excel.js +++ b/web_src/js/excel/Export2Excel.js @@ -100,7 +100,6 @@ export function export_table_to_excel(id) { /* original data */ var data = oo[0]; var ws_name = "SheetJS"; - console.log(data); var wb = new Workbook(), ws = sheet_from_array_of_arrays(data); @@ -118,7 +117,7 @@ export function export_table_to_excel(id) { } function formatJson(jsonData) { - console.log(jsonData) + } export function export_json_to_excel(th, jsonData, defaultTitle) { diff --git a/web_src/js/excel/util.js b/web_src/js/excel/util.js index b600e5e37..809b5b51b 100755 --- a/web_src/js/excel/util.js +++ b/web_src/js/excel/util.js @@ -3,7 +3,6 @@ export function export2Excel(columns,list,filename){ const { export_json_to_excel } = require('./Export2Excel'); let tHeader = [] let filterVal = [] - console.log(columns) if(!columns){ return; } diff --git a/web_src/js/index.js b/web_src/js/index.js index 6bc0d2b88..3e38c2c42 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -41,6 +41,7 @@ import DataAnalysis from './components/DataAnalysis.vue' import Contributors from './components/Contributors.vue' import Model from './components/Model.vue'; + Vue.use(ElementUI); Vue.prototype.$axios = axios; Vue.prototype.qs = qs; @@ -3584,14 +3585,16 @@ function initVueApp() { } initVueComponents(); - + new Vue({ delimiters: ['${', '}'], el, data: { + page:parseInt(new URLSearchParams(window.location.search).get('page')), searchLimit: Number( (document.querySelector('meta[name=_search_limit]') || {}).content ), + page:1, suburl: AppSubUrl, uid: Number( (document.querySelector('meta[name=_context_uid]') || {}).content @@ -3600,6 +3603,15 @@ function initVueApp() { }, components: { ActivityTopAuthors + }, + mounted(){ + this.page = parseInt(new URLSearchParams(window.location.search).get('page')) + }, + methods:{ + handleCurrentChange:function (val) { + window.location.href='/admin/cloudbrains?page='+val + this.page = val + } } }); } @@ -3688,8 +3700,6 @@ function initVueModel() { } function initVueDataAnalysis() { const el = document.getElementById('data_analysis'); - console.log("el",el) - if (!el) { return; } @@ -3756,7 +3766,6 @@ function initFilterBranchTagDropdown(selector) { }); }); $data.remove(); - console.log("-this",this) new Vue({ delimiters: ['${', '}'], el: this, diff --git a/webpack.config.js b/webpack.config.js index a08810ebc..cd3635427 100755 --- a/webpack.config.js +++ b/webpack.config.js @@ -115,6 +115,15 @@ module.exports = { }, ], }, + { + test: /\.ts$/, + use: [ + { + loader: "ts-loader", + } + ], + exclude: /node_modules/ + }, { test: /\.js$/, exclude: /node_modules/, @@ -252,6 +261,7 @@ module.exports = { alias: { vue$: 'vue/dist/vue.esm.js', // needed because vue's default export is the runtime only }, + extensions: ['.tsx', '.ts', '.js'] }, watchOptions: { ignored: [ From 697f16f4a8d0af96e1b40a46c356e66633b37212 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 18 Feb 2022 09:59:49 +0800 Subject: [PATCH 050/188] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/benchmark/index.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl index ef81199fe..0da3173f2 100644 --- a/templates/repo/cloudbrain/benchmark/index.tmpl +++ b/templates/repo/cloudbrain/benchmark/index.tmpl @@ -99,8 +99,8 @@
- - + + {{.JobName}}
From fc11cb5b54804d41c5c6243b4e0953ceee4b5712 Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 18 Feb 2022 10:16:06 +0800 Subject: [PATCH 051/188] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BA=91=E8=84=91=E4=BB=BB=E5=8A=A1=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/repo/cloudbrain.go | 16 ++++++++++++++-- routers/repo/modelarts.go | 16 +++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 0599fb03f..506e2852e 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -587,7 +587,13 @@ func CloudBrainDel(ctx *context.Context) { ctx.ServerError(err.Error(), err) return } - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all") + + var isAdminPage = ctx.Query(":isadminpage") + if ctx.IsUserSiteAdmin() && isAdminPage == "true" { + ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains") + } else { + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all") + } } func deleteCloudbrainJob(ctx *context.Context) error { @@ -1343,5 +1349,11 @@ func BenchmarkDel(ctx *context.Context) { ctx.ServerError(err.Error(), err) return } - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark") + + var isAdminPage = ctx.Query(":isadminpage") + if ctx.IsUserSiteAdmin() && isAdminPage == "true" { + ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains") + } else { + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark") + } } diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 7e9ae3c09..6e06f98fb 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -307,7 +307,7 @@ func NotebookDebug2(ctx *context.Context) { ctx.RenderWithErr(err.Error(), tplModelArtsNotebookIndex, nil) return } - + ctx.Redirect(result.Url) } @@ -438,7 +438,12 @@ func NotebookDel(ctx *context.Context) { return } - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all") + var isAdminPage = ctx.Query(":isadminpage") + if ctx.IsUserSiteAdmin() && isAdminPage == "true" { + ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains") + } else { + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all") + } } func TrainJobIndex(ctx *context.Context) { @@ -1543,7 +1548,12 @@ func TrainJobDel(ctx *context.Context) { DeleteJobStorage(VersionListTasks[0].JobName) } - ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job") + var isAdminPage = ctx.Query(":isadminpage") + if ctx.IsUserSiteAdmin() && isAdminPage == "true" { + ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains") + } else { + ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job") + } } func TrainJobStop(ctx *context.Context) { From c6ecb9e1839e4bf29839e1a16d7fb4d8bc4c1628 Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 18 Feb 2022 10:21:35 +0800 Subject: [PATCH 052/188] fix-bug --- routers/repo/cloudbrain.go | 4 ++-- routers/repo/modelarts.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 506e2852e..ba5fc8a05 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -588,7 +588,7 @@ func CloudBrainDel(ctx *context.Context) { return } - var isAdminPage = ctx.Query(":isadminpage") + var isAdminPage = ctx.Query("isadminpage") if ctx.IsUserSiteAdmin() && isAdminPage == "true" { ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains") } else { @@ -1350,7 +1350,7 @@ func BenchmarkDel(ctx *context.Context) { return } - var isAdminPage = ctx.Query(":isadminpage") + var isAdminPage = ctx.Query("isadminpage") if ctx.IsUserSiteAdmin() && isAdminPage == "true" { ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains") } else { diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 6e06f98fb..7fb8a3c35 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -438,7 +438,7 @@ func NotebookDel(ctx *context.Context) { return } - var isAdminPage = ctx.Query(":isadminpage") + var isAdminPage = ctx.Query("isadminpage") if ctx.IsUserSiteAdmin() && isAdminPage == "true" { ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains") } else { @@ -1548,7 +1548,7 @@ func TrainJobDel(ctx *context.Context) { DeleteJobStorage(VersionListTasks[0].JobName) } - var isAdminPage = ctx.Query(":isadminpage") + var isAdminPage = ctx.Query("isadminpage") if ctx.IsUserSiteAdmin() && isAdminPage == "true" { ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains") } else { From 03107e36e9a94efef5b7db0b3d85c4a25711dd7e Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 18 Feb 2022 10:30:15 +0800 Subject: [PATCH 053/188] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/cloudbrain.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 11257de9e..daf8c277e 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -369,6 +369,8 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) { ctx.Data["resource_spec"] = spec taskRoles := jobRes.TaskRoles if jobRes.JobStatus.State != string(models.JobFailed) { + accuracyJson, _ := json.Marshal(taskRoles) + log.Info("taskRoles=" + string(accuracyJson)) taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) ctx.Data["taskRes"] = taskRes task.Status = taskRes.TaskStatuses[0].State From 00da2c7bac85af4338bd1d4eee9cbbef06394cb2 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 18 Feb 2022 10:33:01 +0800 Subject: [PATCH 054/188] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/cloudbrain.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index daf8c277e..76c0b1b8a 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -356,12 +356,13 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) { if err != nil { ctx.Data["error"] = err.Error() } - + log.Info("task.JobID=" + task.JobID) result, err := cloudbrain.GetJob(task.JobID) if err != nil { ctx.Data["error"] = err.Error() } - + accuracyJson, _ := json.Marshal(result) + log.Info(" task result=" + string(accuracyJson)) if result != nil { jobRes, _ := models.ConvertToJobResultPayload(result.Payload) jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB") @@ -369,8 +370,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) { ctx.Data["resource_spec"] = spec taskRoles := jobRes.TaskRoles if jobRes.JobStatus.State != string(models.JobFailed) { - accuracyJson, _ := json.Marshal(taskRoles) - log.Info("taskRoles=" + string(accuracyJson)) + taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) ctx.Data["taskRes"] = taskRes task.Status = taskRes.TaskStatuses[0].State From 400d2b5654cdc4362b38406f48c91846457fd298 Mon Sep 17 00:00:00 2001 From: wangjr Date: Fri, 18 Feb 2022 10:37:06 +0800 Subject: [PATCH 055/188] =?UTF-8?q?fix-1463=E9=A1=B9=E7=9B=AE=E7=AE=80?= =?UTF-8?q?=E4=BB=8B=E6=9C=AA=E7=99=BB=E5=BD=95=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/home.tmpl | 7 ++++--- web_src/js/components/EditAboutInfo.vue | 19 +++++++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index c9edff0c3..d571f32f8 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -255,9 +255,9 @@ {{end}}
-
-

简介

- +
+

简介

+

{{if .Repository.DescriptionHTML}} {{.Repository.DescriptionHTML}} @@ -356,5 +356,6 @@ // $("#contributorInfo > a:nth-child(n+25)").show(); // }); // }); +console.log("repo-desc::::",document.getElementById("repo-desc").dataset.issigned) {{template "base/footer" .}} diff --git a/web_src/js/components/EditAboutInfo.vue b/web_src/js/components/EditAboutInfo.vue index 425cf4bcc..f9bb872ad 100644 --- a/web_src/js/components/EditAboutInfo.vue +++ b/web_src/js/components/EditAboutInfo.vue @@ -1,7 +1,7 @@