Merge branch 'fix-1156' of https://git.openi.org.cn/OpenI/aiforge into fix-1156

models/cloudbrain.go

@@ -19,8 +19,8 @@ type JobType string
 type ModelArtsJobStatus string
 
 const (
-	NPUResource  = "NPU"
-	GPUResource  = "CPU/GPU"
+	NPUResource = "NPU"
+	GPUResource = "CPU/GPU"
 
 	JobWaiting   CloudbrainStatus = "WAITING"
 	JobStopped   CloudbrainStatus = "STOPPED"
@@ -210,7 +210,7 @@ type CloudbrainsOptions struct {
 	JobType         string
 	VersionName     string
 	IsLatestVersion string
-	JobTypeNot		bool
+	JobTypeNot      bool
 }
 
 type TaskPod struct {
@@ -975,7 +975,9 @@ func QueryModelTrainJobList(repoId int64) ([]*CloudbrainInfo, int, error) {
 	cond = cond.And(
 		builder.Eq{"Status": "COMPLETED"},
 	)
-
+	cond = cond.And(
+		builder.Eq{"job_type": "TRAIN"},
+	)
 	cloudbrains := make([]*CloudbrainInfo, 0)
 	if err := sess.Select("job_id,job_name").Table(&Cloudbrain{}).Where(cond).OrderBy("created_unix DESC").
 		Find(&cloudbrains); err != nil {

routers/repo/ai_model_manage.go

@@ -474,6 +474,23 @@ func ShowOneVersionOtherModel(ctx *context.Context) {
 
 func ShowModelTemplate(ctx *context.Context) {
 	ctx.Data["isModelManage"] = true
+	repoId := ctx.Repo.Repository.ID
+	Type := -1
+	_, count, _ := models.QueryModel(&models.AiModelQueryOptions{
+		ListOptions: models.ListOptions{
+			Page:     1,
+			PageSize: 2,
+		},
+		RepoID: repoId,
+		Type:   Type,
+		New:    MODEL_LATEST,
+	})
+	ctx.Data["MODEL_COUNT"] = count
+
+	_, trainCount, _ := models.QueryModelTrainJobList(repoId)
+	log.Info("query train count=" + fmt.Sprint(trainCount))
+
+	ctx.Data["TRAIN_COUNT"] = trainCount
 	ctx.HTML(200, tplModelManageIndex)
 }