Browse Source

提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>
tags/v1.22.12.1^2
zouap 3 years ago
parent
commit
b4cc2cba5e
3 changed files with 15 additions and 12 deletions
  1. +8
    -7
      models/ai_model_manage.go
  2. +6
    -4
      routers/repo/ai_model_manage.go
  3. +1
    -1
      templates/repo/modelmanage/convertIndex.tmpl

+ 8
- 7
models/ai_model_manage.go View File

@@ -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)


+ 6
- 4
routers/repo/ai_model_manage.go View File

@@ -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)


+ 1
- 1
templates/repo/modelmanage/convertIndex.tmpl View File

@@ -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


Loading…
Cancel
Save