From b4cc2cba5edb37786ead8e4f281ba72b8104d501 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 5 Dec 2022 17:45:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/ai_model_manage.go | 15 ++++++++------- routers/repo/ai_model_manage.go | 10 ++++++---- templates/repo/modelmanage/convertIndex.tmpl | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go index 2c38bd130..6f791010f 100644 --- a/models/ai_model_manage.go +++ b/models/ai_model_manage.go @@ -86,8 +86,9 @@ type AiModelQueryOptions struct { SortType string New int // JobStatus CloudbrainStatus - Type int - Status int + Type int + Status int + IsOnlyThisRepo bool } func (a *AiModelConvert) IsGpuTrainTask() bool { @@ -427,11 +428,11 @@ func QueryModel(opts *AiModelQueryOptions) ([]*AiModelManage, int64, error) { builder.Eq{"ai_model_manage.status": opts.Status}, ) } - orCon := builder.NewCond() - orCon = orCon.And(builder.Eq{"ai_model_manage.is_private": false}) - - cond = cond.Or(orCon) - + if !opts.IsOnlyThisRepo { + orCon := builder.NewCond() + orCon = orCon.And(builder.Eq{"ai_model_manage.is_private": false}) + cond = cond.Or(orCon) + } count, err := sess.Where(cond).Count(new(AiModelManage)) if err != nil { return nil, 0, fmt.Errorf("Count: %v", err) diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go index 06f601517..c03fa8703 100644 --- a/routers/repo/ai_model_manage.go +++ b/routers/repo/ai_model_manage.go @@ -1193,15 +1193,17 @@ func QueryModelListForPredict(ctx *context.Context) { if pageSize <= 0 { pageSize = -1 } + IsOnlyThisRepo := ctx.QueryBool("isOnlyThisRepo") modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{ ListOptions: models.ListOptions{ Page: page, PageSize: pageSize, }, - RepoID: repoId, - Type: ctx.QueryInt("type"), - New: -1, - Status: 0, + RepoID: repoId, + Type: ctx.QueryInt("type"), + New: -1, + Status: 0, + IsOnlyThisRepo: IsOnlyThisRepo, }) if err != nil { ctx.ServerError("Cloudbrain", err) diff --git a/templates/repo/modelmanage/convertIndex.tmpl b/templates/repo/modelmanage/convertIndex.tmpl index 725a29526..1b435fce9 100644 --- a/templates/repo/modelmanage/convertIndex.tmpl +++ b/templates/repo/modelmanage/convertIndex.tmpl @@ -487,7 +487,7 @@ } function loadModelList(){ - $.get(`${repolink}/modelmanage/query_model_for_predict?repoId=${repoId}&type=-1`, (data) => { + $.get(`${repolink}/modelmanage/query_model_for_predict?repoId=${repoId}&type=-1&isOnlyThisRepo=true`, (data) => { modelData = data let nameList = data.nameList const n_length = nameList.length