From b697d06f749c7e788c15eca4b947ca4ce9e91604 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 13 Dec 2021 16:18:03 +0800 Subject: [PATCH 1/6] #820 add PageIsIssueList=true --- routers/repo/milestone.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/repo/milestone.go b/routers/repo/milestone.go index e30e6371f..41f1f88bc 100644 --- a/routers/repo/milestone.go +++ b/routers/repo/milestone.go @@ -268,6 +268,7 @@ func MilestoneIssuesAndPulls(ctx *context.Context) { ctx.Data["CanWriteIssues"] = ctx.Repo.CanWriteIssuesOrPulls(false) ctx.Data["CanWritePulls"] = ctx.Repo.CanWriteIssuesOrPulls(true) + ctx.Data["PageIsIssueList"] = true ctx.HTML(200, tplMilestoneIssues) } From 5219c3a9a24ef9302958f0c9fe10708ccd5aa4f9 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 15 Dec 2021 11:55:30 +0800 Subject: [PATCH 2/6] fix-1051 --- templates/repo/home.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 34c3a3121..08bf3e825 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -337,7 +337,8 @@ {{end}}
- 全部 {{svg "octicon-chevron-right" 16}} + + 全部 {{svg "octicon-chevron-right" 16}}
From 6f68574bca6256e5c57f1ee6197eed7b242e317c Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 21 Dec 2021 08:40:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9commit=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/js/components/Contributors.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web_src/js/components/Contributors.vue b/web_src/js/components/Contributors.vue index 1384b4e49..cd85f6ae9 100644 --- a/web_src/js/components/Contributors.vue +++ b/web_src/js/components/Contributors.vue @@ -45,6 +45,8 @@ export default { data() { return { url:'', + url_infor:'', + href_:'', contributors_list:[], contributors_list_page:[], currentPage:1, @@ -56,7 +58,7 @@ export default { methods: { getContributorsList(){ - this.$axios.get(this.url+'/list').then((res)=>{ + this.$axios.get(this.url+'/list?'+this.url_infor).then((res)=>{ this.contributors_list = res.data.contributor_info this.totalNum = this.contributors_list.length this.contributors_list_page = this.contributors_list.slice(0,this.pageSize) @@ -78,6 +80,10 @@ created(){ this.url = url; let strIndex = this.url.indexOf("contributors") this.url_code = this.url.substr(0,strIndex) + + this.href_ = window.location.href; + let index = this.href_.indexOf("?") + this.url_infor = this.href_.substring(index+1,this.href_.length) this.getContributorsList() }, From 454c3c634b94298b7068e2e1e9ed9be19ec5a2aa Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 21 Dec 2021 11:14:23 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=85=A5=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=9A=84Bug?= 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 | 4 +++ options/locale/locale_zh-CN.ini | 1 + routers/repo/ai_model_manage.go | 67 +++++++++++++++++++++++++++++++++++++++++ routers/routes/routes.go | 1 + 4 files changed, 73 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c95aec81e..b58021ea2 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -778,6 +778,10 @@ datasets = Datasets datasets.desc = Enable Dataset cloudbrain_helper=Use GPU/NPU resources to open notebooks, model training tasks, etc. +model_manager = Model +model_noright=No right +model_rename=Duplicate model name, please modify model name. + debug=Debug stop=Stop delete=Delete diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index edeb1356e..f5a52f2cb 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -784,6 +784,7 @@ cloudbrain_helper=使用GPU/NPU资源，开启Notebook、模型训练任务等 model_manager = 模型 model_noright=无权限操作 +model_rename=模型名称重复，请修改模型名称 debug=调试 stop=停止 diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go index ad68f5b99..22b551206 100644 --- a/routers/repo/ai_model_manage.go +++ b/routers/repo/ai_model_manage.go @@ -105,6 +105,23 @@ func saveModelByParameters(jobId string, versionName string, name string, versio return nil } +func SaveNewNameModel(ctx *context.Context) { + name := ctx.Query("Name") + if name == "" { + ctx.Error(500, fmt.Sprintf("name or version is null.")) + return + } + + aimodels := models.QueryModelByName(name, ctx.Repo.Repository.ID) + if len(aimodels) > 0 { + ctx.Error(500, ctx.Tr("repo.model_rename")) + return + } + SaveModel(ctx) + + log.Info("save model end.") +} + func SaveModel(ctx *context.Context) { log.Info("save model start.") JobId := ctx.Query("JobId") @@ -569,3 +586,53 @@ func ModifyModelInfo(ctx *context.Context) { } } + +func QueryModelListForPredict(ctx *context.Context) { + repoId := ctx.Repo.Repository.ID + modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{ + ListOptions: models.ListOptions{ + Page: -1, + PageSize: -1, + }, + RepoID: repoId, + Type: -1, + New: -1, + }) + if err != nil { + ctx.ServerError("Cloudbrain", err) + return + } + log.Info("query return count=" + fmt.Sprint(count)) + + nameList := make([]string, 0) + + nameMap := make(map[string][]*models.AiModelManage) + for _, model := range modelResult { + if _, value := nameMap[model.Name]; !value { + models := make([]*models.AiModelManage, 0) + models = append(models, model) + nameMap[model.Name] = models + nameList = append(nameList, model.Name) + } else { + nameMap[model.Name] = append(nameMap[model.Name], model) + } + } + + mapInterface := make(map[string]interface{}) + mapInterface["nameList"] = nameList + mapInterface["nameMap"] = nameMap + ctx.JSON(http.StatusOK, mapInterface) +} + +func QueryModelFileForPredict(ctx *context.Context) { + id := ctx.Query("ID") + model, err := models.QueryModelById(id) + if err != nil { + log.Error("no such model!", err.Error()) + ctx.ServerError("no such model:", err) + return + } + prefix := model.Path[len(setting.Bucket)+2:] + fileinfos, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, prefix) + ctx.JSON(http.StatusOK, fileinfos) +} diff --git a/routers/routes/routes.go b/routers/routes/routes.go index cfd962603..784efc6be 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -977,6 +977,7 @@ func RegisterRoutes(m *macaron.Macaron) { }, context.RepoRef()) m.Group("/modelmanage", func() { m.Post("/create_model", reqRepoModelManageWriter, repo.SaveModel) + m.Post("/create_new_model", reqRepoModelManageWriter, repo.SaveNewNameModel) m.Delete("/delete_model", repo.DeleteModel) m.Put("/modify_model", repo.ModifyModelInfo) m.Get("/show_model", reqRepoModelManageReader, repo.ShowModelTemplate) From eb2832498c98f1cbb0d867d1c7a1ddab34c1a6bf Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 21 Dec 2021 11:18:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=85=A5=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/ai_model_manage.go | 50 ----------------------------------------- 1 file changed, 50 deletions(-) diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go index 22b551206..669bdf9fa 100644 --- a/routers/repo/ai_model_manage.go +++ b/routers/repo/ai_model_manage.go @@ -586,53 +586,3 @@ func ModifyModelInfo(ctx *context.Context) { } } - -func QueryModelListForPredict(ctx *context.Context) { - repoId := ctx.Repo.Repository.ID - modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{ - ListOptions: models.ListOptions{ - Page: -1, - PageSize: -1, - }, - RepoID: repoId, - Type: -1, - New: -1, - }) - if err != nil { - ctx.ServerError("Cloudbrain", err) - return - } - log.Info("query return count=" + fmt.Sprint(count)) - - nameList := make([]string, 0) - - nameMap := make(map[string][]*models.AiModelManage) - for _, model := range modelResult { - if _, value := nameMap[model.Name]; !value { - models := make([]*models.AiModelManage, 0) - models = append(models, model) - nameMap[model.Name] = models - nameList = append(nameList, model.Name) - } else { - nameMap[model.Name] = append(nameMap[model.Name], model) - } - } - - mapInterface := make(map[string]interface{}) - mapInterface["nameList"] = nameList - mapInterface["nameMap"] = nameMap - ctx.JSON(http.StatusOK, mapInterface) -} - -func QueryModelFileForPredict(ctx *context.Context) { - id := ctx.Query("ID") - model, err := models.QueryModelById(id) - if err != nil { - log.Error("no such model!", err.Error()) - ctx.ServerError("no such model:", err) - return - } - prefix := model.Path[len(setting.Bucket)+2:] - fileinfos, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, prefix) - ctx.JSON(http.StatusOK, fileinfos) -} From 441ea3688d5bde6c0f05ec5e950b9403ba050e8c Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 22 Dec 2021 11:47:19 +0800 Subject: [PATCH 6/6] add del status --- routers/repo/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index d2a094bc8..1578e2f28 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -274,7 +274,7 @@ func NotebookDel(ctx *context.Context) { return } - if task.Status != string(models.JobStopped) { + if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped){ log.Error("the job(%s) has not been stopped", task.JobName) ctx.ServerError("the job has not been stopped", errors.New("the job has not been stopped")) return