fix-bug

models/ai_model_manage.go

@@ -33,7 +33,6 @@ type AiModelManage struct {
 	CodeBranch        string             `xorm:"varchar(400) NULL" json:"codeBranch"`
 	CodeCommitID      string             `xorm:"NULL" json:"codeCommitID"`
 	UserId            int64              `xorm:"NOT NULL" json:"userId"`
-	IsPrivate         bool               `xorm:"DEFAULT true" json:"isPrivate"`
 	UserName          string             `json:"userName"`
 	UserRelAvatarLink string             `json:"userRelAvatarLink"`
 	TrainTaskInfo     string             `xorm:"text NULL" json:"trainTaskInfo"`
@@ -41,7 +40,6 @@ type AiModelManage struct {
 	UpdatedUnix       timeutil.TimeStamp `xorm:"updated" json:"updatedUnix"`
 	IsCanOper         bool               `json:"isCanOper"`
 	IsCanDelete       bool               `json:"isCanDelete"`
-	IsCanDownload     bool               `json:"isCanDownload"`
 }
 
 type AiModelConvert struct {
@@ -86,10 +84,8 @@ type AiModelQueryOptions struct {
 	SortType string
 	New      int
 	// JobStatus     CloudbrainStatus
-	Type           int
-	Status         int
-	IsOnlyThisRepo bool
-	IsQueryPrivate bool
+	Type   int
+	Status int
 }
 
 func (a *AiModelConvert) IsGpuTrainTask() bool {
@@ -292,30 +288,15 @@ func ModifyModelDescription(id string, description string) error {
 	return nil
 }
 
-func ModifyModelPrivate(id string, isPrivate bool) error {
+func ModifyLocalModel(id string, name, label, description string, engine int) error {
 	var sess *xorm.Session
 	sess = x.ID(id)
 	defer sess.Close()
-	re, err := sess.Cols("is_private").Update(&AiModelManage{
-		IsPrivate: isPrivate,
-	})
-	if err != nil {
-		return err
-	}
-	log.Info("success to update isPrivate from  db.re=" + fmt.Sprint((re)))
-	return nil
-}
-
-func ModifyLocalModel(id string, name, label, description string, engine int, isPrivate bool) error {
-	var sess *xorm.Session
-	sess = x.ID(id)
-	defer sess.Close()
-	re, err := sess.Cols("name", "label", "description", "engine", "is_private").Update(&AiModelManage{
+	re, err := sess.Cols("name", "label", "description", "engine").Update(&AiModelManage{
 		Description: description,
 		Name:        name,
 		Label:       label,
 		Engine:      int64(engine),
-		IsPrivate:   isPrivate,
 	})
 	if err != nil {
 		return err
@@ -430,11 +411,7 @@ func QueryModel(opts *AiModelQueryOptions) ([]*AiModelManage, int64, error) {
 			builder.Eq{"ai_model_manage.status": opts.Status},
 		)
 	}
-	if !opts.IsQueryPrivate {
-		cond = cond.And(
-			builder.Eq{"ai_model_manage.is_private": false},
-		)
-	}
+
 	count, err := sess.Where(cond).Count(new(AiModelManage))
 	if err != nil {
 		return nil, 0, fmt.Errorf("Count: %v", err)

models/cloudbrain.go

@@ -204,7 +204,6 @@ type Cloudbrain struct {
 	BenchmarkTypeRankLink string      `xorm:"-"`
 	StartTime             timeutil.TimeStamp
 	EndTime               timeutil.TimeStamp
-	Cleared               bool   `xorm:"DEFAULT false"`
 	Spec                  *Specification `xorm:"-"`
 }
 
@@ -1906,12 +1905,6 @@ func GetCloudbrainByID(id string) (*Cloudbrain, error) {
 	return getRepoCloudBrain(cb)
 }
 
-func IsCloudbrainExistByJobName(jobName string)(bool,error){
-	return x.Unscoped().Exist(&Cloudbrain{
-		JobName: jobName,
-	})
-}
-
 func GetCloudbrainByIDWithDeleted(id string) (*Cloudbrain, error) {
 	idInt64, _ := strconv.ParseInt(id, 10, 64)
 	cb := &Cloudbrain{ID: idInt64}
@@ -2057,83 +2050,6 @@ func GetCloudBrainUnStoppedJob() ([]*Cloudbrain, error) {
 		Find(&cloudbrains)
 }
 
-func GetCloudBrainOneStoppedNotDebugJobDaysAgo(days int, limit int) ([]*Cloudbrain, error) {
-	cloudbrains := make([]*Cloudbrain, 0, 10)
-	endTimeBefore := time.Now().Unix() - int64(days)*24*3600
-	missEndTimeBefore := endTimeBefore - 24*3600
-	return cloudbrains, x.Unscoped().Cols("id,job_name,job_id").
-		In("status",
-			JobStopped, JobSucceeded, JobFailed, ModelArtsCreateFailed, ModelArtsStartFailed, ModelArtsUnavailable, ModelArtsResizFailed, ModelArtsDeleted,
-			ModelArtsStopped, ModelArtsTrainJobCanceled, ModelArtsTrainJobCheckFailed, ModelArtsTrainJobCompleted, ModelArtsTrainJobDeleteFailed, ModelArtsTrainJobDeployServiceFailed,
-			ModelArtsTrainJobFailed, ModelArtsTrainJobImageFailed, ModelArtsTrainJobKilled, ModelArtsTrainJobLost, ModelArtsTrainJobSubmitFailed, ModelArtsTrainJobSubmitModelFailed).
-		Where("(((end_time is null or end_time=0) and updated_unix<? and updated_unix != 0 ) or (end_time<? and end_time != 0)) and cleared=false and type=0 and job_type != 'DEBUG'", missEndTimeBefore, endTimeBefore).
-		Limit(limit).
-		Find(&cloudbrains)
-}
-/**
-  本方法考虑了再次调试的情况，多次调试取最后一次的任务的结束时间
- */
-func GetCloudBrainOneStoppedDebugJobDaysAgo(days int, limit int) ([]*Cloudbrain, error) {
-	cloudbrains := make([]*Cloudbrain, 0, 10)
-	endTimeBefore := time.Now().Unix() - int64(days)*24*3600
-	missEndTimeBefore := endTimeBefore - 24*3600
-    sql:=`SELECT id,job_name,job_id from (SELECT DISTINCT ON (job_name)
-        id, job_name, job_id,status,end_time,updated_unix,cleared
-        FROM   cloudbrain
-        where type=0 and job_type='DEBUG'
-        ORDER  BY job_name, updated_unix DESC) a
-        where status in ('STOPPED','SUCCEEDED','FAILED') and (((end_time is null or end_time=0) and updated_unix<? and updated_unix != 0 ) or (end_time<? and end_time != 0)) and cleared=false`
-
-	return cloudbrains, x.Unscoped().SQL(sql,missEndTimeBefore, endTimeBefore).Limit(limit).Find(&cloudbrains)
-
-}
-
-
-func UpdateCloudBrainRecordsCleared(ids []int64) error {
-	pageSize := 150
-	n := len(ids) / pageSize
-
-	var err error
-
-	for i := 1; i <= n+1; i++ {
-		tempIds := getPageIds(ids, i, pageSize)
-		if len(tempIds) > 0 {
-			idsIn := ""
-			for i, id := range tempIds {
-				if i == 0 {
-					idsIn += strconv.FormatInt(id, 10)
-				} else {
-					idsIn += "," + strconv.FormatInt(id, 10)
-				}
-			}
-
-			_, errTemp := x.Unscoped().Exec("update cloudbrain set cleared=true where id in (" + idsIn + ")")
-			if errTemp != nil {
-				err = errTemp
-			}
-
-		}
-
-	}
-	return err
-
-}
-
-func getPageIds(ids []int64, page int, pagesize int) []int64 {
-	begin := (page - 1) * pagesize
-	end := (page) * pagesize
-
-	if begin > len(ids)-1 {
-		return []int64{}
-	}
-	if end > len(ids)-1 {
-		return ids[begin:]
-	} else {
-		return ids[begin:end]
-	}
-
-}
-
 func GetStoppedJobWithNoDurationJob() ([]*Cloudbrain, error) {
 	cloudbrains := make([]*Cloudbrain, 0)
 	return cloudbrains, x.
@@ -2655,7 +2571,7 @@ func LoadSpecs4CloudbrainInfo(tasks []*CloudbrainInfo) error {
 		cloudbrainIds[i] = v.Cloudbrain.ID
 	}
 	specs := make([]*CloudbrainSpec, 0)
-	err := x.In("cloudbrain_id", cloudbrainIds).Find(&specs)
+	err := x.Select("`cloudbrain_spec`.*").Table("cloudbrain_spec").Find(&specs)
 	if err != nil {
 		return err
 	}

models/cloudbrain_static.go

@@ -92,6 +92,17 @@ type HourTimeStatistic struct {
 	HourTimeTotalDuration map[string]int     `json:"hourTimeTotalDuration"`
 	HourTimeUsageRate     map[string]float64 `json:"hourTimeUsageRate"`
 }
+type CloudbrainTypeDuration []struct {
+	Type            int `xorm:"type"`
+	DurationSum     int `xorm:"durationSum"`
+	CardDurationSum int `xorm:"cardDurationSum"`
+	Count           int `xorm:"count"`
+}
+type CloudbrainAllDuration struct {
+	DurationSum     int `xorm:"durationSum"`
+	CardDurationSum int `xorm:"cardDurationSum"`
+	Count           int `xorm:"count"`
+}
 
 func GetTodayCreatorCount(beginTime time.Time, endTime time.Time) (int64, error) {
 	countSql := "SELECT count(distinct user_id) FROM  " +
@@ -183,17 +194,6 @@ func GetWaittingTop() ([]*CloudbrainInfo, error) {
 		Find(&cloudbrains); err != nil {
 		log.Info("find error.")
 	}
-
-	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, nil
 }
 
@@ -210,16 +210,6 @@ func GetRunningTop() ([]*CloudbrainInfo, error) {
 		Find(&cloudbrains); err != nil {
 		log.Info("find error.")
 	}
-	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, nil
 }
 
@@ -303,7 +293,7 @@ func GetCloudbrainByTime(beginTime int64, endTime int64) ([]*CloudbrainInfo, err
 		builder.And(builder.Gte{"cloudbrain.start_time": beginTime}, builder.Lte{"cloudbrain.start_time": endTime}, builder.Gt{"cloudbrain.start_time": 0}),
 	)
 	cond = cond.Or(
-		builder.And(builder.Eq{"cloudbrain.status": string(JobRunning)}),
+		builder.And(builder.Eq{"cloudbrain.status": string(JobRunning)}, builder.Lte{"cloudbrain.start_time": beginTime}),
 	)
 	sess.OrderBy("cloudbrain.id ASC")
 	cloudbrains := make([]*CloudbrainInfo, 0, 10)
@@ -425,3 +415,55 @@ func DeleteCloudbrainDurationStatistic(beginTime timeutil.TimeStamp, endTime tim
 	}
 	return nil
 }
+
+func GetCloudbrainTypeCardDuration() (CloudbrainTypeDuration, error) {
+	query := `
+    SELECT
+		cloudbrain.type,
+		SUM(cloudbrain.duration) as durationSum,
+        SUM(
+            COALESCE(cloudbrain.duration *
+				CASE
+				WHEN cloudbrain.work_server_number = 0 THEN 1
+				ELSE COALESCE(cloudbrain.work_server_number, 1)
+				END *
+				COALESCE(cloudbrain_spec.acc_cards_num, 1), 0)
+   ) as cardDurationSum,
+        COUNT(*) as count
+    FROM cloudbrain
+    LEFT JOIN cloudbrain_spec
+        ON cloudbrain.id = cloudbrain_spec.cloudbrain_id
+	GROUP BY cloudbrain.type
+    `
+	// 执行查询
+	var results CloudbrainTypeDuration
+	if err := x.SQL(query).Find(&results); err != nil {
+		panic(err)
+	}
+	return results, nil
+}
+
+func GetCloudbrainAllCardDuration() (CloudbrainAllDuration, error) {
+	query := `
+    SELECT
+		SUM(cloudbrain.duration) as durationSum,
+        SUM(
+            COALESCE(cloudbrain.duration *
+				CASE
+				WHEN cloudbrain.work_server_number = 0 THEN 1
+				ELSE COALESCE(cloudbrain.work_server_number, 1)
+				END *
+				COALESCE(cloudbrain_spec.acc_cards_num, 1), 0)
+   ) as cardDurationSum,
+        COUNT(*) as count
+    FROM cloudbrain
+    LEFT JOIN cloudbrain_spec
+        ON cloudbrain.id = cloudbrain_spec.cloudbrain_id
+    `
+	// 执行查询
+	var result CloudbrainAllDuration
+	if _, err := x.SQL(query).Get(&result); err != nil {
+		panic(err)
+	}
+	return result, nil
+}

models/resource_specification.go

@@ -3,7 +3,6 @@ package models
 import (
 	"code.gitea.io/gitea/modules/timeutil"
 	"fmt"
-	"strings"
 	"xorm.io/builder"
 )
 
@@ -198,104 +197,12 @@ type Specification struct {
 	AiCenterName    string
 	IsExclusive     bool
 	ExclusiveOrg    string
-	//specs that have the same sourceSpecId, computeResource and cluster as current spec
-	RelatedSpecs []*Specification
 }
 
 func (Specification) TableName() string {
 	return "resource_specification"
 }
 
-func (s *Specification) loadRelatedSpecs() {
-	if s.RelatedSpecs != nil {
-		return
-	}
-	defaultSpecs := make([]*Specification, 0)
-	if s.SourceSpecId == "" {
-		s.RelatedSpecs = defaultSpecs
-		return
-	}
-	r, err := FindSpecs(FindSpecsOptions{
-		ComputeResource: s.ComputeResource,
-		Cluster:         s.Cluster,
-		SourceSpecId:    s.SourceSpecId,
-		RequestAll:      true,
-		SpecStatus:      SpecOnShelf,
-	})
-	if err != nil {
-		s.RelatedSpecs = defaultSpecs
-		return
-	}
-	s.RelatedSpecs = r
-}
-func (s *Specification) GetAvailableCenterIds(userIds ...int64) []string {
-	s.loadRelatedSpecs()
-
-	if len(s.RelatedSpecs) == 0 {
-		return make([]string, 0)
-	}
-
-	var uId int64
-	if len(userIds) > 0 {
-		uId = userIds[0]
-	}
-	//filter exclusive specs
-	specs := FilterExclusiveSpecs(s.RelatedSpecs, uId)
-
-	centerIds := make([]string, len(specs))
-	for i, v := range specs {
-		centerIds[i] = v.AiCenterCode
-	}
-	return centerIds
-}
-
-func FilterExclusiveSpecs(r []*Specification, userId int64) []*Specification {
-	if userId == 0 {
-		return r
-	}
-	specs := make([]*Specification, 0, len(r))
-	specMap := make(map[int64]string, 0)
-	for i := 0; i < len(r); i++ {
-		spec := r[i]
-		if _, has := specMap[spec.ID]; has {
-			continue
-		}
-		if !spec.IsExclusive {
-			specs = append(specs, spec)
-			specMap[spec.ID] = ""
-			continue
-		}
-		orgs := strings.Split(spec.ExclusiveOrg, ";")
-		for _, org := range orgs {
-			isMember, _ := IsOrganizationMemberByOrgName(org, userId)
-			if isMember {
-				specs = append(specs, spec)
-				specMap[spec.ID] = ""
-				break
-			}
-		}
-	}
-	return specs
-}
-
-func DistinctSpecs(r []*Specification) []*Specification {
-	specs := make([]*Specification, 0, len(r))
-	sourceSpecIdMap := make(map[string]string, 0)
-	for i := 0; i < len(r); i++ {
-		spec := r[i]
-		if spec.SourceSpecId == "" {
-			specs = append(specs, spec)
-			continue
-		}
-		if _, has := sourceSpecIdMap[spec.SourceSpecId]; has {
-			continue
-		}
-		specs = append(specs, spec)
-		sourceSpecIdMap[spec.SourceSpecId] = ""
-	}
-	return specs
-}
-
 func InsertResourceSpecification(r ResourceSpecification) (int64, error) {
 	return x.Insert(&r)
 }

models/user_analysis_for_activity.go

@@ -449,20 +449,3 @@ func QueryUserLoginInfo(userIds []int64) []*UserLoginLog {
 
 	return loginList
 }
-
-func QueryUserAnnualReport(userId int64) *UserSummaryCurrentYear {
-	statictisSess := xStatistic.NewSession()
-	defer statictisSess.Close()
-	log.Info("userId=" + fmt.Sprint(userId))
-
-	reList := make([]*UserSummaryCurrentYear, 0)
-	err := statictisSess.Select("*").Table(new(UserSummaryCurrentYear)).Where("id=" + fmt.Sprint(userId)).Find(&reList)
-	if err == nil {
-		if len(reList) > 0 {
-			return reList[0]
-		}
-	} else {
-		log.Info("error:=" + err.Error())
-	}
-	return nil
-}

models/user_business_analysis.go

@@ -132,17 +132,11 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics {
 	if count > 0 {
 		for _, userMetrics := range allUserInfo {
 			dateTime := time.Unix(userMetrics.CountDate, 0)
-			mInt := int(dateTime.Month())
-			mString := fmt.Sprint(mInt)
-			if mInt < 10 {
-				mString = "0" + mString
-			}
-			month := fmt.Sprint(dateTime.Year()) + "-" + mString
+			month := fmt.Sprint(dateTime.Year()) + "-" + fmt.Sprint(int(dateTime.Month()))
 			if _, ok := monthMap[month]; !ok {
 				monthUserMetrics := &UserMetrics{
 					DisplayDate:                month,
 					ActivateRegistUser:         userMetrics.ActivateRegistUser,
-					RegistActivityUser:         userMetrics.RegistActivityUser,
 					NotActivateRegistUser:      userMetrics.NotActivateRegistUser,
 					TotalUser:                  userMetrics.TotalUser,
 					TotalNotActivateRegistUser: userMetrics.TotalUser - userMetrics.TotalActivateRegistUser,
@@ -158,7 +152,6 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics {
 				value.ActivateRegistUser += userMetrics.ActivateRegistUser
 				value.NotActivateRegistUser += userMetrics.NotActivateRegistUser
 				value.HasActivityUser += userMetrics.HasActivityUser
-				value.RegistActivityUser += userMetrics.RegistActivityUser
 				value.TotalRegistUser += userMetrics.ActivateRegistUser + userMetrics.NotActivateRegistUser
 				value.ActivateIndex = float64(value.ActivateRegistUser) / float64(value.TotalRegistUser)
 				value.DaysForMonth += 1
@@ -617,7 +610,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 
 	DataDate := currentTimeNow.Format("2006-01-02") + " 00:01"
 	bonusMap := make(map[string]map[string]int)
-	if isUserYearData(tableName) {
+	if tableName == "user_business_analysis_current_year" {
 		bonusMap = getBonusMap()
 		log.Info("truncate all data from table:user_summary_current_year ")
 		statictisSess.Exec("TRUNCATE TABLE user_summary_current_year")
@@ -719,7 +712,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 					userMetrics["TotalHasActivityUser"] = getMapKeyStringValue("TotalHasActivityUser", userMetrics) + 1
 				}
 			}
-			if isUserYearData(tableName) {
+			if tableName == "user_business_analysis_current_year" {
 				//年度数据
 				subTime := time.Now().UTC().Sub(dateRecordAll.RegistDate.AsTime().UTC())
 				mostActiveDay := ""
@@ -779,16 +772,6 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	log.Info("refresh data finished.tableName=" + tableName + " total record:" + fmt.Sprint(insertCount))
 }
 
-func isUserYearData(tableName string) bool {
-	if tableName == "user_business_analysis_current_year" {
-		currentTimeNow := time.Now()
-		if currentTimeNow.Year() >= 2023 {
-			return false
-		}
-	}
-	return true
-}
-
 func getBonusMap() map[string]map[string]int {
 	bonusMap := make(map[string]map[string]int)
 	url := setting.RecommentRepoAddr + "bonus/record.txt"

models/user_invitation.go

@@ -13,7 +13,6 @@ type Invitation struct {
 	SrcUserID         int64              `xorm:"NOT NULL DEFAULT 0"`
 	UserID            int64              `xorm:"NOT NULL DEFAULT 0"`
 	Phone             string             `xorm:"INDEX"`
-	Email             string             `xorm:"-"`
 	Avatar            string             `xorm:"-"`
 	Name              string             `xorm:"-"`
 	InvitationUserNum int                `xorm:"-"`

modules/cron/tasks_basic.go

@@ -5,12 +5,10 @@
 package cron
 
 import (
-	"code.gitea.io/gitea/modules/setting"
 	"context"
 	"time"
 
 	"code.gitea.io/gitea/modules/urfs_client/urchin"
-	cloudbrainService "code.gitea.io/gitea/services/cloudbrain"
 
 	"code.gitea.io/gitea/modules/modelarts"
 	"code.gitea.io/gitea/services/cloudbrain/resource"
@@ -193,17 +191,6 @@ func registerHandleRepoAndUserStatistic() {
 	})
 }
 
-func registerHandleClearCloudbrainResult() {
-	RegisterTaskFatal("handle_cloudbrain_one_result_clear", &BaseConfig{
-		Enabled:    true,
-		RunAtStart: setting.ClearStrategy.RunAtStart,
-		Schedule:   setting.ClearStrategy.Cron,
-	}, func(ctx context.Context, _ *models.User, _ Config) error {
-		cloudbrainService.ClearCloudbrainResultSpace()
-		return nil
-	})
-}
-
 func registerHandleSummaryStatistic() {
 	RegisterTaskFatal("handle_summary_statistic", &BaseConfig{
 		Enabled:    true,
@@ -296,7 +283,7 @@ func registerHandleCloudbrainDurationStatistic() {
 	RegisterTaskFatal("handle_cloudbrain_duration_statistic", &BaseConfig{
 		Enabled:    true,
 		RunAtStart: false,
-		Schedule:   "1 0 * * * ?",
+		Schedule:   "1 1 * * * ?",
 	}, func(ctx context.Context, _ *models.User, _ Config) error {
 		repo.CloudbrainDurationStatisticHour()
 		return nil
@@ -320,7 +307,6 @@ func initBasicTasks() {
 
 	registerHandleRepoAndUserStatistic()
 	registerHandleSummaryStatistic()
-	registerHandleClearCloudbrainResult()
 
 	registerSyncCloudbrainStatus()
 	registerHandleOrgStatistic()

modules/grampus/grampus.go

@@ -105,6 +105,8 @@ func getDatasetGrampus(datasetInfos map[string]models.DatasetInfo) []models.Gram
 func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId string, err error) {
 	createTime := timeutil.TimeStampNow()
 
+	centerID, centerName := getCentersParamter(ctx, req)
+
 	var datasetGrampus, modelGrampus []models.GrampusDataset
 	var codeGrampus models.GrampusDataset
 	if ProcessorTypeNPU == req.ProcessType {
@@ -136,7 +138,8 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId str
 				ResourceSpecId: req.Spec.SourceSpecId,
 				ImageId:        req.ImageId,
 				ImageUrl:       req.ImageUrl,
-				CenterID:       req.Spec.GetAvailableCenterIds(ctx.User.ID),
+				CenterID:       centerID,
+				CenterName:     centerName,
 				ReplicaNum:     1,
 				Datasets:       datasetGrampus,
 				Models:         modelGrampus,

modules/setting/setting.go

@@ -519,7 +519,6 @@ var (
 	CullIdleTimeout        string
 	CullInterval           string
 
-
 	//benchmark config
 	IsBenchmarkEnabled     bool
 	BenchmarkOwner         string
@@ -614,16 +613,6 @@ var (
 		UsageRateBeginTime      string
 	}{}
 
-	ClearStrategy= struct {
-		Enabled bool
-		ResultSaveDays         int
-		BatchSize int
-		DebugJobSize int
-		TrashSaveDays int
-		Cron string
-		RunAtStart bool
-	}{}
-
 	C2NetInfos                 *C2NetSqInfos
 	CenterInfos                *AiCenterInfos
 	C2NetMapInfo               map[string]*C2NetSequenceInfo
@@ -1630,7 +1619,6 @@ func NewContext() {
 	getModelConvertConfig()
 	getModelSafetyConfig()
 	getModelAppConfig()
-	getClearStrategy()
 }
 
 func getModelSafetyConfig() {
@@ -1691,18 +1679,6 @@ func getModelartsCDConfig() {
 	getNotebookFlavorInfos()
 }
 
-func getClearStrategy(){
-
-	sec := Cfg.Section("clear_strategy")
-    ClearStrategy.Enabled=sec.Key("ENABLED").MustBool(false)
-	ClearStrategy.ResultSaveDays=sec.Key("RESULT_SAVE_DAYS").MustInt(30)
-	ClearStrategy.BatchSize=sec.Key("BATCH_SIZE").MustInt(500)
-	ClearStrategy.DebugJobSize=sec.Key("DEBUG_BATCH_SIZE").MustInt(100)
-	ClearStrategy.TrashSaveDays=sec.Key("TRASH_SAVE_DAYS").MustInt(90)
-	ClearStrategy.Cron=sec.Key("CRON").MustString("* 0,30 2-8 * * ?")
-	ClearStrategy.RunAtStart=sec.Key("RUN_AT_START").MustBool(false)
-}
-
 func getGrampusConfig() {
 	sec := Cfg.Section("grampus")
 

modules/structs/pipeline.go

@@ -1,23 +0,0 @@
-package structs
-
-type Pipeline struct {
-	ID     int64  `json:"id"`
-	Name   string `json:"name"`
-	Status string `json:"status"`
-}
-type NodeInfo struct {
-	Name    string `json:"name"`
-	Status  string `json:"status"`
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-type PipelineNotification struct {
-	Type          int      `json:"type"`
-	Username      string   `json:"username"`
-	Reponame      string   `json:"reponame"`
-	Pipeline      Pipeline `json:"pipeline"`
-	PipelineRunId string   `json:"pipeline_run_id"`
-	Node          NodeInfo `json:"node"`
-	OccurTime     int64    `json:"occur_time"`
-}

options/locale/locale_en-US.ini

@@ -1305,11 +1305,6 @@ model.manage.select.engine=Select model engine
 model.manage.modelfile=Model file
 model.manage.modellabel=Model label
 model.manage.modeldesc=Model description
-model.manage.modelaccess=Model Access
-model.manage.modelaccess.public=Public
-model.manage.modelaccess.private=Private
-model.manage.modelaccess.setpublic=Set Public
-model.manage.modelaccess.setprivate=Set Private
 model.manage.baseinfo=Base Information
 modelconvert.notcreate=No model conversion task has been created.
 modelconvert.importfirst1=Please import the
@@ -3251,7 +3246,6 @@ specification = specification
 select_specification = select specification
 description = description
 wrong_specification=You cannot use this specification, please choose another item.
-result_cleared=The files of the task have been cleared, can not restart any more, please create a new debug task instead.
 resource_use=Resource Occupancy
 
 job_name_rule = Please enter letters, numbers, _ and - up to 64 characters and cannot end with a dash (-).

options/locale/locale_zh-CN.ini

@@ -1318,11 +1318,6 @@ model.manage.select.engine=选择模型框架
 model.manage.modelfile=模型文件
 model.manage.modellabel=模型标签
 model.manage.modeldesc=模型描述
-model.manage.modelaccess=模型权限
-model.manage.modelaccess.public=公开
-model.manage.modelaccess.private=私有
-model.manage.modelaccess.setpublic=设为公开
-model.manage.modelaccess.setprivate=设为私有
 model.manage.baseinfo=基本信息
 modelconvert.notcreate=未创建过模型转换任务
 modelconvert.importfirst1=请您先导入
@@ -3271,8 +3266,6 @@ card_duration = 运行卡时
 card_type = 卡类型
 wrong_specification=您目前不能使用这个资源规格，请选择其他资源规格。
 
-result_cleared=本任务的文件已被清理，无法再次调试，请新建调试任务。
-
 job_name_rule = 请输入字母、数字、_和-，最长64个字符，且不能以中划线（-）结尾。
 train_dataset_path_rule = 数据集位置存储在运行参数 <strong style="color:#010101">data_url</strong> 中，预训练模型存放在运行参数 <strong style="color:#010101">ckpt_url</strong> 中，训练输出路径存储在运行参数 <strong style="color:#010101">train_url</strong> 中。
 infer_dataset_path_rule = 数据集位置存储在运行参数 <strong style="color:#010101">data_url</strong> 中，推理输出路径存储在运行参数 <strong style="color:#010101">result_url</strong> 中。

routers/api/v1/api.go

@@ -543,10 +543,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/get_multipart_url", repo.GetMultipartUploadUrl)
 			m.Post("/complete_multipart", repo.CompleteMultipart)
 
-		}, reqToken())
-		m.Group("/pipeline", func() {
-			m.Post("/notification", bind(api.PipelineNotification{}), notify.PipelineNotify)
-
 		}, reqToken())
 
 		// Notifications
@@ -614,7 +610,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/query_invitation_yesterday", operationReq, repo_ext.QueryInvitationYesterday)
 		m.Get("/query_invitation_all", operationReq, repo_ext.QueryInvitationAll)
 		m.Get("/query_invitation_userdefine", operationReq, repo_ext.QueryUserDefineInvitationPage)
-		m.Get("/query_user_annual_report", repo_ext.QueryUserAnnualReport)
 
 		m.Get("/download_invitation_detail", operationReq, repo_ext.DownloadInvitationDetail)
 
@@ -743,7 +738,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		}, reqToken(), repoAssignment())
 
 		m.Group("/file_notebook", func() {
-			m.Get("", repo.GetFileNoteBookInfo)
+			m.Get("", reqToken(), repo.GetFileNoteBookInfo)
 			m.Post("/create", reqToken(), reqWeChat(), bind(api.CreateFileNotebookJobOption{}), repo.CreateFileNoteBook)
 
 		})
@@ -999,7 +994,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 							m.Get("/detail", reqToken(), reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
 							m.Get("/model_list", repo.CloudBrainModelList)
 							m.Post("/stop_version", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo_ext.CloudBrainStop)
-							m.Put("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.GeneralCloudBrainJobStop)
 						})
 					})
 					m.Group("/inference-job", func() {
@@ -1024,7 +1018,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/query_modelfile_for_predict", repo.QueryModelFileForPredict)
 					m.Get("/query_train_model", repo.QueryTrainModelList)
 					m.Post("/create_model_convert", repo.CreateModelConvert)
-					m.Post("/convert_stop", repo.StopModelConvert)
 					m.Get("/show_model_convert_page", repo.ShowModelConvertPage)
 					m.Get("/query_model_convert_byId", repo.QueryModelConvertById)
 

routers/api/v1/notify/pipeline.go

@@ -1,15 +0,0 @@
-package notify
-
-import (
-	"net/http"
-
-	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/context"
-	api "code.gitea.io/gitea/modules/structs"
-)
-
-func PipelineNotify(ctx *context.APIContext, form api.PipelineNotification) {
-
-	ctx.JSON(http.StatusOK, models.BaseOKMessageApi)
-
-}

routers/api/v1/repo/cloudbrain.go

@@ -17,8 +17,6 @@ import (
 	"strings"
 	"time"
 
-	"code.gitea.io/gitea/modules/grampus"
-
 	cloudbrainService "code.gitea.io/gitea/services/cloudbrain"
 
 	"code.gitea.io/gitea/modules/convert"
@@ -82,30 +80,6 @@ func CloudBrainShow(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, models.BaseMessageWithDataApi{Code: 0, Message: "", Data: convert.ToCloudBrain(task)})
 
 }
-func GeneralCloudBrainJobStop(ctx *context.APIContext) {
-	task := ctx.Cloudbrain
-	if task.IsTerminal() {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("cloudbrain.Already_stopped"))
-		return
-	}
-	var err error
-
-	if ctx.Cloudbrain.Type == models.TypeCloudBrainOne {
-		err = cloudbrain.StopJob(task.JobID)
-	} else if ctx.Cloudbrain.Type == models.TypeCloudBrainTwo {
-		_, err = modelarts.StopTrainJob(task.JobID, strconv.FormatInt(task.VersionID, 10))
-	} else {
-		_, err = grampus.StopJob(task.JobID)
-	}
-
-	if err != nil {
-		log.Warn("cloud brain stopped failed.", err)
-		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("cloudbrain.Stopped_failed"))
-		return
-	}
-
-	ctx.JSON(http.StatusOK, models.BaseOKMessageApi)
-}
 func CreateFileNoteBook(ctx *context.APIContext, option api.CreateFileNotebookJobOption) {
 	cloudbrainTask.FileNotebookCreate(ctx.Context, option)
 }

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -103,86 +103,62 @@ func GetAllCloudbrainsOverview(ctx *context.Context) {
 	})
 }
 func GetOverviewDuration(ctx *context.Context) {
-	recordCloudbrain, err := models.GetRecordBeginTime()
-	if err != nil {
-		log.Error("Can not get recordCloudbrain", err)
-		ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
-		return
-	}
-	recordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix
-	now := time.Now()
-	endTime := now
-	var workServerNumber int64
-	var cardNum int64
-
-	durationAllSum := int64(0)
-	cardDuSum := int64(0)
+	durationSum := 0
+	cardDurationSum := 0
 
-	cloudBrainOneCardDuSum := int64(0)
-	cloudBrainTwoCardDuSum := int64(0)
-	c2NetCardDuSum := int64(0)
-	cDNetCardDuSum := int64(0)
+	cloudBrainOneCardDuSum := 0
+	cloudBrainTwoCardDuSum := 0
+	c2NetCardDuSum := 0
+	cDNetCardDuSum := 0
 
-	cloudBrainOneDuration := int64(0)
-	cloudBrainTwoDuration := int64(0)
-	c2NetDuration := int64(0)
-	cDCenterDuration := int64(0)
+	cloudBrainOneDuration := 0
+	cloudBrainTwoDuration := 0
+	c2NetDuration := 0
+	cDCenterDuration := 0
 
-	cloudbrains, _, err := models.CloudbrainAllKanBan(&models.CloudbrainsOptions{
-		Type:          models.TypeCloudBrainAll,
-		BeginTimeUnix: int64(recordBeginTime),
-		EndTimeUnix:   endTime.Unix(),
-	})
+	cloudbrainTypeDuration, err := models.GetCloudbrainTypeCardDuration()
 	if err != nil {
-		ctx.ServerError("Get cloudbrains failed:", err)
+		log.Error("GetCloudbrainTypeCardDuration err!", err)
 		return
 	}
-	models.LoadSpecs4CloudbrainInfo(cloudbrains)
-
-	for _, cloudbrain := range cloudbrains {
-		cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
-		if cloudbrain.Cloudbrain.Spec != nil {
-			cardNum = int64(cloudbrain.Cloudbrain.Spec.AccCardsNum)
-		} else {
-			cardNum = 1
+	for _, result := range cloudbrainTypeDuration {
+		if result.Type == models.TypeCloudBrainOne {
+			cloudBrainOneDuration = result.DurationSum
+			cloudBrainOneCardDuSum = result.CardDurationSum
 		}
-		if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
-			workServerNumber = int64(cloudbrain.Cloudbrain.WorkServerNumber)
-		} else {
-			workServerNumber = 1
+		if result.Type == models.TypeCloudBrainTwo {
+			cloudBrainTwoDuration = result.DurationSum
+			cloudBrainTwoCardDuSum = result.CardDurationSum
 		}
-		duration := models.ConvertStrToDuration(cloudbrain.TrainJobDuration)
-		CardDuration := workServerNumber * int64(cardNum) * duration
-
-		if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
-			cloudBrainOneDuration += duration
-			cloudBrainOneCardDuSum += CardDuration
-		} else if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo {
-			cloudBrainTwoDuration += duration
-			cloudBrainTwoCardDuSum += CardDuration
-		} else if cloudbrain.Cloudbrain.Type == models.TypeC2Net {
-			c2NetDuration += duration
-			c2NetCardDuSum += CardDuration
-		} else if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
-			cDCenterDuration += duration
-			cDNetCardDuSum += CardDuration
+		if result.Type == models.TypeC2Net {
+			c2NetDuration = result.DurationSum
+			c2NetCardDuSum = result.CardDurationSum
+		}
+		if result.Type == models.TypeCDCenter {
+			cDCenterDuration = result.DurationSum
+			cDNetCardDuSum = result.CardDurationSum
 		}
-
-		durationAllSum += duration
-		cardDuSum += CardDuration
 	}
+	cloudbrainAllDuration, err := models.GetCloudbrainAllCardDuration()
+	if err != nil {
+		log.Error("GetCloudbrainAllCardDuration err!", err)
+		return
+	}
+	durationSum = cloudbrainAllDuration.DurationSum
+	cardDurationSum = cloudbrainAllDuration.CardDurationSum
+
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"cloudBrainOneCardDuSum": cloudBrainOneCardDuSum,
 		"cloudBrainTwoCardDuSum": cloudBrainTwoCardDuSum,
 		"c2NetCardDuSum":         c2NetCardDuSum,
 		"cDNetCardDuSum":         cDNetCardDuSum,
-		"cardDuSum":              cardDuSum,
+		"cardDuSum":              cardDurationSum,
 
 		"cloudBrainOneDuration": cloudBrainOneDuration,
 		"cloudBrainTwoDuration": cloudBrainTwoDuration,
 		"c2NetDuration":         c2NetDuration,
 		"cDCenterDuration":      cDCenterDuration,
-		"durationSum":           durationAllSum,
+		"durationSum":           durationSum,
 	})
 }
 
@@ -968,8 +944,6 @@ func GetWaittingTop(ctx *context.Context) {
 		taskDetail.RepoID = ciTasks[i].RepoID
 		if ciTasks[i].Repo != nil {
 			taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name
-		} else {
-			taskDetail.RepoName = ""
 		}
 		WaitTimeInt := time.Now().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
 		taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
@@ -977,13 +951,6 @@ func GetWaittingTop(ctx *context.Context) {
 		if WaitTimeInt < 0 {
 			taskDetail.WaitTime = "00:00:00"
 		}
-
-		taskDetail.ID = ciTasks[i].Cloudbrain.ID
-		taskDetail.ComputeResource = ciTasks[i].Cloudbrain.ComputeResource
-		taskDetail.JobType = ciTasks[i].Cloudbrain.JobType
-		taskDetail.JobID = ciTasks[i].Cloudbrain.JobID
-		taskDetail.Type = ciTasks[i].Cloudbrain.Type
-
 		tasks = append(tasks, taskDetail)
 	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{
@@ -1010,12 +977,6 @@ func GetRunningTop(ctx *context.Context) {
 			taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name
 		}
 
-		taskDetail.ID = ciTasks[i].Cloudbrain.ID
-		taskDetail.ComputeResource = ciTasks[i].Cloudbrain.ComputeResource
-		taskDetail.JobType = ciTasks[i].Cloudbrain.JobType
-		taskDetail.JobID = ciTasks[i].Cloudbrain.JobID
-		taskDetail.Type = ciTasks[i].Cloudbrain.Type
-
 		tasks = append(tasks, taskDetail)
 	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{

routers/api/v1/repo/modelmanage.go

@@ -45,7 +45,6 @@ func QueryModelById(ctx *context.APIContext) {
 
 func QueryModelListForPredict(ctx *context.APIContext) {
 	log.Info("QueryModelListForPredict by api.")
-	ctx.Context.SetParams("isOnlyThisRepo", "true")
 	routerRepo.QueryModelListForPredict(ctx.Context)
 }
 
@@ -89,11 +88,6 @@ func CreateModelConvert(ctx *context.APIContext) {
 	routerRepo.SaveModelConvert(ctx.Context)
 }
 
-func StopModelConvert(ctx *context.APIContext) {
-	log.Info("StopModelConvert by api.")
-	routerRepo.StopModelConvertApi(ctx.Context)
-}
-
 func ShowModelConvertPage(ctx *context.APIContext) {
 	log.Info("ShowModelConvertPage by api.")
 	modelResult, count, err := routerRepo.GetModelConvertPageData(ctx.Context)

routers/repo/ai_model_convert.go

@@ -573,10 +573,13 @@ func deleteCloudBrainTask(task *models.AiModelConvert) {
 	}
 }
 
-func stopModelConvert(id string) error {
+func StopModelConvert(ctx *context.Context) {
+	id := ctx.Params(":id")
+	log.Info("stop model convert start.id=" + id)
 	job, err := models.QueryModelConvertById(id)
 	if err != nil {
-		return err
+		ctx.ServerError("Not found task.", err)
+		return
 	}
 	if job.IsGpuTrainTask() {
 		err = cloudbrain.StopJob(job.CloudBrainTaskId)
@@ -597,35 +600,6 @@ func stopModelConvert(id string) error {
 	err = models.UpdateModelConvert(job)
 	if err != nil {
 		log.Error("UpdateModelConvert failed:", err)
-		return err
-	}
-	return nil
-}
-
-func StopModelConvertApi(ctx *context.Context) {
-	id := ctx.Params(":id")
-	log.Info("stop model convert start.id=" + id)
-	err := stopModelConvert(id)
-	if err == nil {
-		ctx.JSON(200, map[string]string{
-			"code": "0",
-			"msg":  "succeed",
-		})
-	} else {
-		ctx.JSON(200, map[string]string{
-			"code": "1",
-			"msg":  err.Error(),
-		})
-	}
-}
-
-func StopModelConvert(ctx *context.Context) {
-	id := ctx.Params(":id")
-	log.Info("stop model convert start.id=" + id)
-	err := stopModelConvert(id)
-	if err != nil {
-		ctx.ServerError("Not found task.", err)
-		return
 	}
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelmanage/convert_model")
 }
@@ -646,7 +620,7 @@ func ShowModelConvertInfo(ctx *context.Context) {
 		return
 	}
 	ctx.Data["Name"] = job.Name
-	ctx.Data["canDownload"] = isOperModifyOrDelete(ctx, job.UserId)
+	ctx.Data["canDownload"] = isOper(ctx, job.UserId)
 	user, err := models.GetUserByID(job.UserId)
 	if err == nil {
 		job.UserName = user.Name
@@ -781,7 +755,7 @@ func GetModelConvertPageData(ctx *context.Context) ([]*models.AiModelConvert, in
 	}
 	userIds := make([]int64, len(modelResult))
 	for i, model := range modelResult {
-		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
+		model.IsCanOper = isOper(ctx, model.UserId)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
 		userIds[i] = model.UserId
 	}

routers/repo/ai_model_manage.go

@@ -93,7 +93,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 	log.Info("accuracyJson=" + string(accuracyJson))
 	aiTask.ContainerIp = ""
 	aiTaskJson, _ := json.Marshal(aiTask)
-	isPrivate := ctx.QueryBool("isPrivate")
+
 	model := &models.AiModelManage{
 		ID:            id,
 		Version:       version,
@@ -114,7 +114,6 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 		TrainTaskInfo: string(aiTaskJson),
 		Accuracy:      string(accuracyJson),
 		Status:        STATUS_COPY_MODEL,
-		IsPrivate:     isPrivate,
 	}
 
 	err = models.SaveModelToDb(model)
@@ -217,7 +216,6 @@ func SaveLocalModel(ctx *context.Context) {
 	description := ctx.Query("description")
 	engine := ctx.QueryInt("engine")
 	taskType := ctx.QueryInt("type")
-	isPrivate := ctx.QueryBool("isPrivate")
 	modelActualPath := ""
 	if taskType == models.TypeCloudBrainOne {
 		destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(id) + "/"
@@ -264,7 +262,6 @@ func SaveLocalModel(ctx *context.Context) {
 		TrainTaskInfo: "",
 		Accuracy:      "",
 		Status:        STATUS_FINISHED,
-		IsPrivate:     isPrivate,
 	}
 
 	err := models.SaveModelToDb(model)
@@ -557,6 +554,20 @@ func deleteModelByID(ctx *context.Context, id string) error {
 	return err
 }
 
+func QueryModelByParameters(repoId int64, page int) ([]*models.AiModelManage, int64, error) {
+
+	return models.QueryModel(&models.AiModelQueryOptions{
+		ListOptions: models.ListOptions{
+			Page:     page,
+			PageSize: setting.UI.IssuePagingNum,
+		},
+		RepoID: repoId,
+		Type:   -1,
+		New:    MODEL_LATEST,
+		Status: -1,
+	})
+}
+
 func DownloadMultiModelFile(ctx *context.Context) {
 	log.Info("DownloadMultiModelFile start.")
 	id := ctx.Query("id")
@@ -567,7 +578,7 @@ func DownloadMultiModelFile(ctx *context.Context) {
 		ctx.ServerError("no such model:", err)
 		return
 	}
-	if !isCanDownload(ctx, task) {
+	if !isOper(ctx, task.UserId) {
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
@@ -795,7 +806,7 @@ func DownloadSingleModelFile(ctx *context.Context) {
 		ctx.ServerError("no such model:", err)
 		return
 	}
-	if !isCanDownload(ctx, task) {
+	if !isOper(ctx, task.UserId) {
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
@@ -863,9 +874,8 @@ func QueryModelById(ctx *context.Context) {
 	id := ctx.Query("id")
 	model, err := models.QueryModelById(id)
 	if err == nil {
-		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
+		model.IsCanOper = isOper(ctx, model.UserId)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
-		model.IsCanDownload = isCanDownload(ctx, model)
 		removeIpInfo(model)
 		ctx.JSON(http.StatusOK, model)
 	} else {
@@ -881,8 +891,7 @@ func ShowSingleModel(ctx *context.Context) {
 
 	userIds := make([]int64, len(models))
 	for i, model := range models {
-		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
-		model.IsCanDownload = isCanDownload(ctx, model)
+		model.IsCanOper = isOper(ctx, model.UserId)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
 		userIds[i] = model.UserId
 	}
@@ -932,8 +941,7 @@ func ShowOneVersionOtherModel(ctx *context.Context) {
 
 	userIds := make([]int64, len(aimodels))
 	for i, model := range aimodels {
-		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
-		model.IsCanDownload = isCanDownload(ctx, model)
+		model.IsCanOper = isOper(ctx, model.UserId)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
 		userIds[i] = model.UserId
 	}
@@ -956,7 +964,6 @@ func ShowOneVersionOtherModel(ctx *context.Context) {
 }
 
 func SetModelCount(ctx *context.Context) {
-	isQueryPrivate := isQueryPrivateModel(ctx)
 	repoId := ctx.Repo.Repository.ID
 	Type := -1
 	_, count, _ := models.QueryModel(&models.AiModelQueryOptions{
@@ -964,12 +971,10 @@ func SetModelCount(ctx *context.Context) {
 			Page:     1,
 			PageSize: 2,
 		},
-		RepoID:         repoId,
-		Type:           Type,
-		New:            MODEL_LATEST,
-		IsOnlyThisRepo: true,
-		Status:         -1,
-		IsQueryPrivate: isQueryPrivate,
+		RepoID: repoId,
+		Type:   Type,
+		New:    MODEL_LATEST,
+		Status: -1,
 	})
 	ctx.Data["MODEL_COUNT"] = count
 }
@@ -996,87 +1001,27 @@ func isQueryRight(ctx *context.Context) bool {
 	}
 }
 
-func isCanDownload(ctx *context.Context, task *models.AiModelManage) bool {
-	if ctx.User == nil {
-		return false
-	}
-	isCollaborator, err := ctx.Repo.Repository.IsCollaborator(ctx.User.ID)
-	if err != nil {
-		log.Info("query error.")
-	}
-	isTeamMember, err := ctx.Repo.Repository.IsInRepoTeam(ctx.User.ID)
-	if err != nil {
-		log.Info("query IsInRepoTeam error." + err.Error())
-	}
-	if ctx.User.IsAdmin || ctx.User.ID == task.UserId || isCollaborator || isTeamMember {
-		return true
-	}
-	if ctx.Repo.IsOwner() {
-		return true
-	}
-	if !task.IsPrivate {
-		return true
-	}
-	return false
-}
-
-func isQueryPrivateModel(ctx *context.Context) bool {
-	if ctx.User == nil {
-		return false
-	}
-	isCollaborator, err := ctx.Repo.Repository.IsCollaborator(ctx.User.ID)
-	if err != nil {
-		log.Info("query IsCollaborator error." + err.Error())
-	}
-	isTeamMember, err := ctx.Repo.Repository.IsInRepoTeam(ctx.User.ID)
-	if err != nil {
-		log.Info("query IsInRepoTeam error." + err.Error())
-	}
-	if ctx.User.IsAdmin || isCollaborator || isTeamMember {
-		return true
-	}
-	if ctx.Repo.IsOwner() {
-		return true
-	}
-	return false
-}
-
 func isCanDelete(ctx *context.Context, modelUserId int64) bool {
 	if ctx.User == nil {
 		return false
 	}
-	if ctx.User.ID == modelUserId {
-		return true
-	}
-	return isAdminRight(ctx)
-}
-
-func isAdminRight(ctx *context.Context) bool {
-	if ctx.User.IsAdmin {
+	if ctx.User.IsAdmin || ctx.User.ID == modelUserId {
 		return true
 	}
 	if ctx.Repo.IsOwner() {
 		return true
 	}
-	permission, err := models.GetUserRepoPermission(ctx.Repo.Repository, ctx.User)
-	if err != nil {
-		log.Error("GetUserRepoPermission failed:%v", err.Error())
-		return false
-	}
-	if permission.AccessMode >= models.AccessModeAdmin {
-		return true
-	}
 	return false
 }
 
-func isOperModifyOrDelete(ctx *context.Context, modelUserId int64) bool {
+func isOper(ctx *context.Context, modelUserId int64) bool {
 	if ctx.User == nil {
 		return false
 	}
 	if ctx.User.IsAdmin || ctx.User.ID == modelUserId {
 		return true
 	}
-	return isAdminRight(ctx)
+	return false
 }
 
 func ShowModelPageInfo(ctx *context.Context) {
@@ -1093,7 +1038,6 @@ func ShowModelPageInfo(ctx *context.Context) {
 	if pageSize <= 0 {
 		pageSize = setting.UI.IssuePagingNum
 	}
-	isQueryPrivate := isQueryPrivateModel(ctx)
 	repoId := ctx.Repo.Repository.ID
 	Type := -1
 	modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{
@@ -1101,12 +1045,10 @@ func ShowModelPageInfo(ctx *context.Context) {
 			Page:     page,
 			PageSize: pageSize,
 		},
-		RepoID:         repoId,
-		Type:           Type,
-		New:            MODEL_LATEST,
-		IsOnlyThisRepo: true,
-		Status:         -1,
-		IsQueryPrivate: isQueryPrivate,
+		RepoID: repoId,
+		Type:   Type,
+		New:    MODEL_LATEST,
+		Status: -1,
 	})
 	if err != nil {
 		ctx.ServerError("Cloudbrain", err)
@@ -1115,9 +1057,8 @@ func ShowModelPageInfo(ctx *context.Context) {
 
 	userIds := make([]int64, len(modelResult))
 	for i, model := range modelResult {
-		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
+		model.IsCanOper = isOper(ctx, model.UserId)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
-		model.IsCanDownload = isCanDownload(ctx, model)
 		userIds[i] = model.UserId
 	}
 
@@ -1148,37 +1089,6 @@ func ModifyModel(id string, description string) error {
 	return err
 }
 
-func ModifyModelPrivate(ctx *context.Context) {
-	id := ctx.Query("id")
-	isPrivate := ctx.QueryBool("isPrivate")
-	re := map[string]string{
-		"code": "-1",
-	}
-	task, err := models.QueryModelById(id)
-	if err != nil || task == nil {
-		re["msg"] = err.Error()
-		log.Error("no such model!", err.Error())
-		ctx.JSON(200, re)
-		return
-	}
-	if !isOperModifyOrDelete(ctx, task.UserId) {
-		re["msg"] = "No right to operation."
-		ctx.JSON(200, re)
-		return
-	}
-	err = models.ModifyModelPrivate(id, isPrivate)
-	if err == nil {
-		re["code"] = "0"
-		ctx.JSON(200, re)
-		log.Info("modify success.")
-	} else {
-		re["msg"] = err.Error()
-		ctx.JSON(200, re)
-		log.Info("Failed to modify.id=" + id + "  isprivate=" + fmt.Sprint(isPrivate) + " error:" + err.Error())
-	}
-
-}
-
 func ModifyModelInfo(ctx *context.Context) {
 	log.Info("modify model start.")
 	id := ctx.Query("id")
@@ -1192,7 +1102,7 @@ func ModifyModelInfo(ctx *context.Context) {
 		ctx.JSON(200, re)
 		return
 	}
-	if !isOperModifyOrDelete(ctx, task.UserId) {
+	if !isOper(ctx, task.UserId) {
 		re["msg"] = "No right to operation."
 		ctx.JSON(200, re)
 		return
@@ -1202,7 +1112,6 @@ func ModifyModelInfo(ctx *context.Context) {
 		label := ctx.Query("label")
 		description := ctx.Query("description")
 		engine := ctx.QueryInt("engine")
-		isPrivate := ctx.QueryBool("isPrivate")
 		aimodels := models.QueryModelByName(name, task.RepoId)
 		if aimodels != nil && len(aimodels) > 0 {
 			if len(aimodels) == 1 {
@@ -1217,14 +1126,14 @@ func ModifyModelInfo(ctx *context.Context) {
 				return
 			}
 		}
-		err = models.ModifyLocalModel(id, name, label, description, engine, isPrivate)
+		err = models.ModifyLocalModel(id, name, label, description, engine)
 
 	} else {
 		label := ctx.Query("label")
 		description := ctx.Query("description")
 		engine := task.Engine
 		name := task.Name
-		err = models.ModifyLocalModel(id, name, label, description, int(engine), task.IsPrivate)
+		err = models.ModifyLocalModel(id, name, label, description, int(engine))
 	}
 
 	if err != nil {
@@ -1239,27 +1148,15 @@ func ModifyModelInfo(ctx *context.Context) {
 
 func QueryModelListForPredict(ctx *context.Context) {
 	repoId := ctx.Repo.Repository.ID
-	page := ctx.QueryInt("page")
-	if page <= 0 {
-		page = -1
-	}
-	pageSize := ctx.QueryInt("pageSize")
-	if pageSize <= 0 {
-		pageSize = -1
-	}
-	isQueryPrivate := isQueryPrivateModel(ctx)
-	//IsOnlyThisRepo := ctx.QueryBool("isOnlyThisRepo")
 	modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{
 		ListOptions: models.ListOptions{
-			Page:     page,
-			PageSize: pageSize,
+			Page:     -1,
+			PageSize: -1,
 		},
-		RepoID:         repoId,
-		Type:           ctx.QueryInt("type"),
-		New:            -1,
-		Status:         0,
-		IsOnlyThisRepo: true,
-		IsQueryPrivate: isQueryPrivate,
+		RepoID: repoId,
+		Type:   ctx.QueryInt("type"),
+		New:    -1,
+		Status: 0,
 	})
 	if err != nil {
 		ctx.ServerError("Cloudbrain", err)
@@ -1271,9 +1168,7 @@ func QueryModelListForPredict(ctx *context.Context) {
 
 	nameMap := make(map[string][]*models.AiModelManage)
 	for _, model := range modelResult {
-		model.TrainTaskInfo = ""
-		model.Accuracy = ""
-		//removeIpInfo(model)
+		removeIpInfo(model)
 		if _, value := nameMap[model.Name]; !value {
 			models := make([]*models.AiModelManage, 0)
 			models = append(models, model)

routers/repo/cloudbrain.go

@@ -670,13 +670,6 @@ func CloudBrainRestart(ctx *context.Context) {
 			break
 		}
 
-		if _, err := os.Stat(getOldJobPath(task)); err != nil {
-			log.Error("Can not find job minio path", err)
-			resultCode = "-1"
-			errorMsg = ctx.Tr("cloudbrain.result_cleared")
-			break
-		}
-
 		count, err := cloudbrainTask.GetNotFinalStatusTaskCount(ctx.User.ID, models.TypeCloudBrainOne, string(models.JobTypeDebug))
 		if err != nil {
 			log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
@@ -711,11 +704,6 @@ func CloudBrainRestart(ctx *context.Context) {
 	})
 }
 
-
-func getOldJobPath(task *models.Cloudbrain) string {
-	return setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + "/" + setting.CBCodePathPrefix + task.JobName
-}
-
 func CloudBrainBenchMarkShow(ctx *context.Context) {
 	cloudBrainShow(ctx, tplCloudBrainBenchmarkShow, models.JobTypeBenchmark)
 }

routers/repo/cloudbrain_statistic.go

@@ -29,17 +29,16 @@ func CloudbrainDurationStatisticHour() {
 			statisticTime = currentTime
 		}
 
-		err = models.DeleteCloudbrainDurationStatistic(timeutil.TimeStamp(statisticTime.Add(-1*time.Hour).Unix()), timeutil.TimeStamp(currentTime.Unix()))
+		err = models.DeleteCloudbrainDurationStatistic(timeutil.TimeStamp(statisticTime.Unix()), timeutil.TimeStamp(currentTime.Unix()))
 		if err != nil {
 			log.Error("DeleteCloudbrainDurationStatistic failed", err)
 		}
-
+		statisticTime = statisticTime.Add(+1 * time.Hour)
 		for statisticTime.Before(currentTime) || statisticTime.Equal(currentTime) {
 			countEach := summaryDurationStat(statisticTime)
 			count += countEach
 			statisticTime = statisticTime.Add(+1 * time.Hour)
 		}
-		log.Info("summaryDurationStat count: %v", count)
 	}
 }
 func UpdateDurationStatisticHistoryData(beginTime time.Time, endTime time.Time) int64 {
@@ -65,15 +64,18 @@ func summaryDurationStat(statisticTime time.Time) int64 {
 
 	ciTasks, err := models.GetCloudbrainByTime(beginTime, endTime)
 	if err != nil {
-		log.Info("GetCloudbrainByTime err: %v", err)
+		log.Error("GetCloudbrainByTime err: %v", err)
 		return 0
 	}
-	models.LoadSpecs4CloudbrainInfo(ciTasks)
-	cloudBrainCenterCodeAndCardTypeInfo, cloudbrainMap := getcloudBrainCenterCodeAndCardTypeInfo(ciTasks, beginTime, endTime)
+	err = models.LoadSpecs4CloudbrainInfo(ciTasks)
+	if err != nil {
+		log.Error("LoadSpecs4CloudbrainInfo err: %v", err)
+	}
+	cloudBrainCenterCodeAndCardTypeInfo := getcloudBrainCenterCodeAndCardTypeInfo(ciTasks, int(beginTime), int(endTime))
 
 	resourceQueues, err := models.GetCanUseCardInfo()
 	if err != nil {
-		log.Info("GetCanUseCardInfo err: %v", err)
+		log.Error("GetCanUseCardInfo err: %v", err)
 		return 0
 	}
 
@@ -85,56 +87,45 @@ func summaryDurationStat(statisticTime time.Time) int64 {
 			cardsTotalDurationMap[resourceQueue.Cluster+"/"+resourceQueue.AiCenterCode+"/"+resourceQueue.AccCardType] += resourceQueue.CardsTotalNum * 1 * 60 * 60
 		}
 	}
-
-	for centerCode, CardTypes := range cloudBrainCenterCodeAndCardTypeInfo {
-		for cardType, cardDuration := range CardTypes {
-			cloudbrainTable := cloudbrainMap[centerCode+"/"+cardType]
-			if cloudbrainTable != nil {
-				if _, ok := cardsTotalDurationMap[cloudbrainTable.Cluster+"/"+centerCode+"/"+cardType]; !ok {
-					cardsTotalDurationMap[cloudbrainTable.Cluster+"/"+centerCode+"/"+cardType] = 0
-				}
-				cloudbrainDurationStat := models.CloudbrainDurationStatistic{
-					DateTimeUnix:       dateTimeUnix,
-					DayTime:            dayTime,
-					HourTime:           hourTime,
-					Cluster:            cloudbrainTable.Cluster,
-					AiCenterName:       GetAiCenterNameByCode(centerCode, "zh-CN"),
-					AiCenterCode:       centerCode,
-					AccCardType:        cardType,
-					CardsUseDuration:   cardDuration,
-					CardsTotalDuration: cardsTotalDurationMap[cloudbrainTable.Cluster+"/"+centerCode+"/"+cardType],
-					CreatedUnix:        timeutil.TimeStampNow(),
-				}
-				if _, err = models.InsertCloudbrainDurationStatistic(&cloudbrainDurationStat); err != nil {
-					log.Error("Insert cloudbrainDurationStat failed: %v", err.Error())
-				}
-				count++
-				delete(cardsTotalDurationMap, cloudbrainTable.Cluster+"/"+centerCode+"/"+cardType)
-			}
-		}
-	}
-
 	for key, cardsTotalDuration := range cardsTotalDurationMap {
-		cloudbrainDurationStat := models.CloudbrainDurationStatistic{
-			DateTimeUnix:       dateTimeUnix,
-			DayTime:            dayTime,
-			HourTime:           hourTime,
-			Cluster:            strings.Split(key, "/")[0],
-			AiCenterName:       GetAiCenterNameByCode(strings.Split(key, "/")[1], "zh-CN"),
-			AiCenterCode:       strings.Split(key, "/")[1],
-			AccCardType:        strings.Split(key, "/")[2],
-			CardsUseDuration:   0,
-			CardsTotalDuration: cardsTotalDuration,
-			CardsTotalNum:      cardsTotalDuration / 1 / 60 / 60,
-			CreatedUnix:        timeutil.TimeStampNow(),
-		}
-		if _, err = models.InsertCloudbrainDurationStatistic(&cloudbrainDurationStat); err != nil {
-			log.Error("Insert cloudbrainDurationStat failed: %v", err.Error())
+		if _, ok := cloudBrainCenterCodeAndCardTypeInfo[strings.Split(key, "/")[0]+"/"+strings.Split(key, "/")[1]][strings.Split(key, "/")[2]]; ok {
+			cloudbrainDurationStat := models.CloudbrainDurationStatistic{
+				DateTimeUnix:       dateTimeUnix,
+				DayTime:            dayTime,
+				HourTime:           hourTime,
+				Cluster:            strings.Split(key, "/")[0],
+				AiCenterName:       GetAiCenterNameByCode(strings.Split(key, "/")[1], "zh-CN"),
+				AiCenterCode:       strings.Split(key, "/")[1],
+				AccCardType:        strings.Split(key, "/")[2],
+				CardsUseDuration:   cloudBrainCenterCodeAndCardTypeInfo[strings.Split(key, "/")[0]+"/"+strings.Split(key, "/")[1]][strings.Split(key, "/")[2]],
+				CardsTotalDuration: cardsTotalDuration,
+				CardsTotalNum:      cardsTotalDuration / 1 / 60 / 60,
+				CreatedUnix:        timeutil.TimeStampNow(),
+			}
+			if _, err = models.InsertCloudbrainDurationStatistic(&cloudbrainDurationStat); err != nil {
+				log.Error("Insert cloudbrainDurationStat failed: %v", err.Error())
+			}
+			count++
+		} else {
+			cloudbrainDurationStat := models.CloudbrainDurationStatistic{
+				DateTimeUnix:       dateTimeUnix,
+				DayTime:            dayTime,
+				HourTime:           hourTime,
+				Cluster:            strings.Split(key, "/")[0],
+				AiCenterName:       GetAiCenterNameByCode(strings.Split(key, "/")[1], "zh-CN"),
+				AiCenterCode:       strings.Split(key, "/")[1],
+				AccCardType:        strings.Split(key, "/")[2],
+				CardsUseDuration:   0,
+				CardsTotalDuration: cardsTotalDuration,
+				CardsTotalNum:      cardsTotalDuration / 1 / 60 / 60,
+				CreatedUnix:        timeutil.TimeStampNow(),
+			}
+			if _, err = models.InsertCloudbrainDurationStatistic(&cloudbrainDurationStat); err != nil {
+				log.Error("Insert cloudbrainDurationStat failed: %v", err.Error())
+			}
+			count++
 		}
-		count++
 	}
-
-	log.Info("finish summary cloudbrainDurationStat")
 	return count
 }
 
@@ -153,33 +144,21 @@ func GetAiCenterNameByCode(centerCode string, language string) string {
 	return aiCenterName
 }
 
-func getcloudBrainCenterCodeAndCardTypeInfo(ciTasks []*models.CloudbrainInfo, beginTime int64, endTime int64) (map[string]map[string]int, map[string]*models.Cloudbrain) {
+func getcloudBrainCenterCodeAndCardTypeInfo(ciTasks []*models.CloudbrainInfo, hourBeginTime int, hourEndTime int) map[string]map[string]int {
 	var WorkServerNumber int
 	var AccCardsNum int
-	cloudbrainMap := make(map[string]*models.Cloudbrain)
 	cloudBrainCenterCodeAndCardType := make(map[string]map[string]int)
 	for _, cloudbrain := range ciTasks {
-		if cloudbrain.Cloudbrain.StartTime == 0 {
-			cloudbrain.Cloudbrain.StartTime = cloudbrain.Cloudbrain.CreatedUnix
-		}
-		if cloudbrain.Cloudbrain.EndTime == 0 {
-			cloudbrain.Cloudbrain.EndTime = timeutil.TimeStamp(time.Now().Unix())
-		}
-		cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
-		if cloudbrain.Cloudbrain.Spec != nil {
-			if _, ok := cloudbrainMap[cloudbrain.Cloudbrain.AiCenter+"/"+cloudbrain.Cloudbrain.Spec.AccCardType]; !ok {
-				if cloudbrain.Cloudbrain.Spec != nil {
-					cloudbrainMap[cloudbrain.Cloudbrain.AiCenter+"/"+cloudbrain.Cloudbrain.Spec.AccCardType] = &cloudbrain.Cloudbrain
-				}
-			}
-		}
-
 		cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
 		if cloudbrain.Cloudbrain.StartTime == 0 {
 			cloudbrain.Cloudbrain.StartTime = cloudbrain.Cloudbrain.CreatedUnix
 		}
 		if cloudbrain.Cloudbrain.EndTime == 0 {
-			cloudbrain.Cloudbrain.EndTime = cloudbrain.Cloudbrain.UpdatedUnix
+			if cloudbrain.Cloudbrain.Status == string(models.JobRunning) {
+				cloudbrain.Cloudbrain.EndTime = timeutil.TimeStamp(time.Now().Unix())
+			} else {
+				cloudbrain.Cloudbrain.EndTime = cloudbrain.Cloudbrain.StartTime + timeutil.TimeStamp(cloudbrain.Cloudbrain.Duration)
+			}
 		}
 		if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
 			WorkServerNumber = cloudbrain.Cloudbrain.WorkServerNumber
@@ -191,55 +170,36 @@ func getcloudBrainCenterCodeAndCardTypeInfo(ciTasks []*models.CloudbrainInfo, be
 		} else {
 			AccCardsNum = cloudbrain.Cloudbrain.Spec.AccCardsNum
 		}
-		if _, ok := cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter]; !ok {
-			cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter] = make(map[string]int)
+		if _, ok := cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter]; !ok {
+			cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter] = make(map[string]int)
 		}
+		taskStartTime := int(cloudbrain.Cloudbrain.StartTime)
+		taskEndTime := int(cloudbrain.Cloudbrain.EndTime)
 		if cloudbrain.Cloudbrain.Spec != nil {
-			if cloudbrain.Cloudbrain.Status == string(models.ModelArtsRunning) && cloudbrain.Cloudbrain.DeletedAt.IsZero() {
-				if _, ok := cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType]; !ok {
-					if int64(cloudbrain.Cloudbrain.StartTime) < beginTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (int(endTime) - int(beginTime))
-					} else if beginTime <= int64(cloudbrain.Cloudbrain.StartTime) && int64(cloudbrain.Cloudbrain.StartTime) < endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (int(endTime) - int(cloudbrain.Cloudbrain.StartTime))
-					} else if int64(cloudbrain.Cloudbrain.StartTime) >= endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = 0
-					}
-				} else {
-					if int64(cloudbrain.Cloudbrain.StartTime) < beginTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (int(endTime) - int(beginTime))
-					} else if beginTime <= int64(cloudbrain.Cloudbrain.StartTime) && int64(cloudbrain.Cloudbrain.StartTime) < endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (int(endTime) - int(cloudbrain.Cloudbrain.StartTime))
-					} else if int64(cloudbrain.Cloudbrain.StartTime) >= endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += 0
-					}
+			if _, ok := cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType]; !ok {
+				if taskStartTime < hourBeginTime && taskEndTime >= hourBeginTime && taskEndTime <= hourEndTime {
+					cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (taskEndTime - hourBeginTime)
+				} else if taskStartTime < hourBeginTime && taskEndTime > hourEndTime {
+					cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (hourEndTime - hourBeginTime)
+				} else if taskStartTime >= hourBeginTime && taskStartTime <= hourEndTime && taskEndTime >= hourBeginTime && taskEndTime <= hourEndTime {
+					cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (taskEndTime - taskStartTime)
+				} else if taskStartTime >= hourBeginTime && taskStartTime <= hourEndTime && taskEndTime > hourEndTime {
+					cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (hourEndTime - taskStartTime)
 				}
 			} else {
-				if _, ok := cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType]; !ok {
-					if int64(cloudbrain.Cloudbrain.StartTime) <= beginTime && int64(cloudbrain.Cloudbrain.EndTime) <= endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (int(cloudbrain.Cloudbrain.EndTime) - int(beginTime))
-					} else if int64(cloudbrain.Cloudbrain.StartTime) <= beginTime && int64(cloudbrain.Cloudbrain.EndTime) > endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (int(endTime) - int(beginTime))
-					} else if beginTime <= int64(cloudbrain.Cloudbrain.StartTime) && int64(cloudbrain.Cloudbrain.StartTime) <= endTime && int64(cloudbrain.Cloudbrain.EndTime) <= endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (int(cloudbrain.Cloudbrain.EndTime) - int(cloudbrain.Cloudbrain.StartTime))
-					} else if beginTime <= int64(cloudbrain.Cloudbrain.StartTime) && int64(cloudbrain.Cloudbrain.StartTime) <= endTime && int64(cloudbrain.Cloudbrain.EndTime) > endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (int(endTime) - int(cloudbrain.Cloudbrain.StartTime))
-					}
-				} else {
-					if int64(cloudbrain.Cloudbrain.StartTime) <= beginTime && int64(cloudbrain.Cloudbrain.EndTime) <= endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (int(cloudbrain.Cloudbrain.EndTime) - int(beginTime))
-					} else if int64(cloudbrain.Cloudbrain.StartTime) <= beginTime && int64(cloudbrain.Cloudbrain.EndTime) > endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (int(endTime) - int(beginTime))
-					} else if beginTime <= int64(cloudbrain.Cloudbrain.StartTime) && int64(cloudbrain.Cloudbrain.StartTime) <= endTime && int64(cloudbrain.Cloudbrain.EndTime) <= endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (int(cloudbrain.Cloudbrain.EndTime) - int(cloudbrain.Cloudbrain.StartTime))
-					} else if beginTime <= int64(cloudbrain.Cloudbrain.StartTime) && int64(cloudbrain.Cloudbrain.StartTime) <= endTime && int64(cloudbrain.Cloudbrain.EndTime) > endTime {
-						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (int(endTime) - int(cloudbrain.Cloudbrain.StartTime))
-					}
+				if taskStartTime < hourBeginTime && taskEndTime >= hourBeginTime && taskEndTime <= hourEndTime {
+					cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (taskEndTime - hourBeginTime)
+				} else if taskStartTime < hourBeginTime && taskEndTime > hourEndTime {
+					cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (hourEndTime - hourBeginTime)
+				} else if taskStartTime >= hourBeginTime && taskStartTime <= hourEndTime && taskEndTime >= hourBeginTime && taskEndTime <= hourEndTime {
+					cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (taskEndTime - taskStartTime)
+				} else if taskStartTime >= hourBeginTime && taskStartTime <= hourEndTime && taskEndTime > hourEndTime {
+					cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.Cluster+"/"+cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] += AccCardsNum * WorkServerNumber * (hourEndTime - taskStartTime)
 				}
 			}
 		}
 	}
-
-	return cloudBrainCenterCodeAndCardType, cloudbrainMap
+	return cloudBrainCenterCodeAndCardType
 }
 
 func CloudbrainUpdateHistoryData(ctx *context.Context) {

routers/repo/modelarts.go

@@ -2337,7 +2337,7 @@ func InferenceJobIndex(ctx *context.Context) {
 			tasks[i].ComputeResource = models.NPUResource
 		}
 	}
-	isQueryPrivate := isQueryPrivateModel(ctx)
+
 	repoId := ctx.Repo.Repository.ID
 	Type := -1
 	_, model_count, _ := models.QueryModel(&models.AiModelQueryOptions{
@@ -2345,12 +2345,10 @@ func InferenceJobIndex(ctx *context.Context) {
 			Page:     1,
 			PageSize: 2,
 		},
-		RepoID:         repoId,
-		Type:           Type,
-		New:            MODEL_LATEST,
-		IsOnlyThisRepo: true,
-		Status:         0,
-		IsQueryPrivate: isQueryPrivate,
+		RepoID: repoId,
+		Type:   Type,
+		New:    MODEL_LATEST,
+		Status: 0,
 	})
 	ctx.Data["MODEL_COUNT"] = model_count
 
@@ -2419,7 +2417,7 @@ func inferenceJobNewDataPrepare(ctx *context.Context) error {
 		return err
 	}
 	ctx.Data["config_list"] = configList.ParaConfigs
-	isQueryPrivate := isQueryPrivateModel(ctx)
+
 	repoId := ctx.Repo.Repository.ID
 	Type := -1
 	_, model_count, _ := models.QueryModel(&models.AiModelQueryOptions{
@@ -2427,12 +2425,10 @@ func inferenceJobNewDataPrepare(ctx *context.Context) error {
 			Page:     1,
 			PageSize: 2,
 		},
-		RepoID:         repoId,
-		Type:           Type,
-		New:            MODEL_LATEST,
-		IsOnlyThisRepo: true,
-		Status:         0,
-		IsQueryPrivate: isQueryPrivate,
+		RepoID: repoId,
+		Type:   Type,
+		New:    MODEL_LATEST,
+		Status: 0,
 	})
 	ctx.Data["MODEL_COUNT"] = model_count
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo

routers/repo/user_data_analysis.go

@@ -907,9 +907,3 @@ func QueryUserLoginInfo(ctx *context.Context) {
 		log.Info("writer exel error." + err.Error())
 	}
 }
-
-func QueryUserAnnualReport(ctx *context.Context) {
-	log.Info("start to QueryUserAnnualReport ")
-	result := models.QueryUserAnnualReport(ctx.User.ID)
-	ctx.JSON(http.StatusOK, result)
-}

routers/repo/user_invitation.go

@@ -49,10 +49,9 @@ func getInvitationDetailExcelHeader(ctx *context.Context) map[string]string {
 	excelHeader := make([]string, 0)
 	excelHeader = append(excelHeader, ctx.Tr("user.static.id"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.name"))
-	excelHeader = append(excelHeader, ctx.Tr("user.static.email"))
+	excelHeader = append(excelHeader, ctx.Tr("user.static.srcUserId"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.phone"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.registdate"))
-	excelHeader = append(excelHeader, ctx.Tr("user.static.srcUserId"))
 
 	excelHeaderMap := make(map[string]string, 0)
 	var i byte
@@ -93,7 +92,8 @@ func writeInvitationDetailExcel(row int, xlsx *excelize.File, sheetName string,
 	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Name)
 	tmp = tmp + 1
-	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Email)
+
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.SrcUserID)
 	tmp = tmp + 1
 
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Phone)
@@ -101,9 +101,7 @@ func writeInvitationDetailExcel(row int, xlsx *excelize.File, sheetName string,
 
 	formatTime := userRecord.CreatedUnix.Format("2006-01-02 15:04:05")
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, formatTime[0:len(formatTime)-3])
-	tmp = tmp + 1
 
-	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.SrcUserID)
 }
 
 func DownloadInvitationDetail(ctx *context.Context) {
@@ -415,7 +413,6 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 					invi.Name = tmpUser.Name
 					invi.Phone = tmpUser.PhoneNumber
 					invi.CreatedUnix = tmpUser.CreatedUnix
-					invi.Email = tmpUser.Email
 				} else {
 					invi.Name = "已注销"
 				}

routers/routes/routes.go

@@ -1251,7 +1251,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Post("/delete_model_convert/:id", repo.DeleteModelConvert)
 			m.Post("/convert_stop/:id", repo.StopModelConvert)
 			m.Put("/modify_model", repo.ModifyModelInfo)
-			m.Put("/modify_model_status", repo.ModifyModelPrivate)
 			m.Get("/show_model", reqRepoModelManageReader, repo.ShowModelTemplate)
 			m.Get("/convert_model", reqRepoModelManageReader, repo.ConvertModelTemplate)
 			m.Get("/show_model_info", repo.ShowModelInfo)

routers/user/Invitation.go

@@ -63,7 +63,7 @@ func InviationTpl(ctx *context.Context) {
 	ctx.HTML(200, tplInvitation)
 }
 
-func RegisteUserByInvitaionCode(invitationcode string, newUserId int64, newPhoneNumber string, email string) error {
+func RegisteUserByInvitaionCode(invitationcode string, newUserId int64, newPhoneNumber string) error {
 	user := parseInvitaionCode(invitationcode)
 	if user == nil {
 		return errors.New("The invitated user not existed.")
@@ -85,7 +85,6 @@ func RegisteUserByInvitaionCode(invitationcode string, newUserId int64, newPhone
 		SrcUserID: user.ID,
 		UserID:    newUserId,
 		Phone:     newPhoneNumber,
-		Email:     email,
 	}
 
 	err := models.InsertInvitaion(invitation)

routers/user/auth.go

@@ -1368,7 +1368,7 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo
 
 	log.Info("enter here, and form.InvitaionCode =" + invitationCode)
 	if invitationCode != "" {
-		RegisteUserByInvitaionCode(invitationCode, u.ID, u.PhoneNumber, u.Email)
+		RegisteUserByInvitaionCode(invitationCode, u.ID, u.PhoneNumber)
 	}
 
 	err := models.AddEmailAddress(&models.EmailAddress{

services/cloudbrain/clear.go

@@ -1,151 +0,0 @@
-package cloudbrain
-
-import (
-	"io/ioutil"
-	"os"
-	"sort"
-	"time"
-
-	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/storage"
-)
-
-func ClearCloudbrainResultSpace() {
-	log.Info("clear cloudbrain one result space begin.")
-	if !setting.ClearStrategy.Enabled{
-		return
-	}
-
-	tasks, err := models.GetCloudBrainOneStoppedNotDebugJobDaysAgo(setting.ClearStrategy.ResultSaveDays, setting.ClearStrategy.BatchSize)
-	if err != nil {
-		log.Warn("Failed to get cloudbrain, clear result failed.", err)
-		return
-	}
-	debugTasks, err := models.GetCloudBrainOneStoppedDebugJobDaysAgo(setting.ClearStrategy.ResultSaveDays, setting.ClearStrategy.DebugJobSize)
-	if err != nil {
-		log.Warn("Failed to get debug cloudbrain.", err)
-
-	}
-	tasks=append(tasks,debugTasks...)
-
-	if err != nil {
-		log.Warn("Failed to get cloudbrain, clear result failed.", err)
-		return
-	}
-	var ids []int64
-	for _, task := range tasks {
-		err := DeleteCloudbrainOneJobStorage(task.JobName)
-		if err == nil {
-			log.Info("clear job in cloudbrain table:"+task.JobName)
-			ids = append(ids, task.ID)
-		}
-	}
-
-	err = models.UpdateCloudBrainRecordsCleared(ids)
-	if err != nil {
-		log.Warn("Failed to set cloudbrain cleared status", err)
-	}
-	//如果云脑表处理完了，通过遍历minio对象处理历史垃圾数据，如果存在的话
-	if len(tasks) < setting.ClearStrategy.BatchSize+setting.ClearStrategy.DebugJobSize {
-		clearLocalHistoryTrashFile()
-		clearMinioHistoryTrashFile()
-
-	}
-	log.Info("clear cloudbrain one result space end.")
-
-}
-
-func clearMinioHistoryTrashFile() {
-	JobRealPrefix := setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + "/" + setting.CBCodePathPrefix
-
-	miniofiles, err := ioutil.ReadDir(JobRealPrefix)
-
-	processCount := 0
-	if err != nil {
-		log.Warn("Can not browser minio job path.")
-	} else {
-		SortModTimeAscend(miniofiles)
-		for _, file := range miniofiles {
-
-			if file.Name()!="" && file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
-
-				has,err:=models.IsCloudbrainExistByJobName(file.Name())
-				if err==nil && !has {
-					dirPath := setting.CBCodePathPrefix + file.Name() + "/"
-					log.Info("clear job in minio trash:" + file.Name())
-					storage.Attachments.DeleteDir(dirPath)
-					processCount++
-				}
-				if processCount == setting.ClearStrategy.BatchSize {
-					break
-				}
-			} else {
-				break
-			}
-
-		}
-
-	}
-}
-
-func clearLocalHistoryTrashFile()  {
-	files, err := ioutil.ReadDir(setting.JobPath)
-	processCount := 0
-	if err != nil {
-		log.Warn("Can not browser local job path.")
-	} else {
-		SortModTimeAscend(files)
-		for _, file := range files {
-			//清理n天前的历史垃圾数据，清理job目录
-			if file.Name()!="" && file.ModTime().Before(time.Now().AddDate(0, 0, -setting.ClearStrategy.TrashSaveDays)) {
-				has,err:=models.IsCloudbrainExistByJobName(file.Name())
-				if err==nil && !has{
-					os.RemoveAll(setting.JobPath + file.Name())
-					log.Info("clear job in local trash:"+file.Name())
-					processCount++
-				}
-				if processCount == setting.ClearStrategy.BatchSize {
-					break
-				}
-			} else {
-				break
-			}
-
-		}
-
-	}
-
-}
-
-func SortModTimeAscend(files []os.FileInfo) {
-	sort.Slice(files, func(i, j int) bool {
-		return files[i].ModTime().Before(files[j].ModTime())
-	})
-}
-
-func DeleteCloudbrainOneJobStorage(jobName string) error {
-
-	if jobName==""{
-		return nil
-	}
-	//delete local
-	localJobPath := setting.JobPath + jobName
-	err := os.RemoveAll(localJobPath)
-	if err != nil {
-		log.Error("RemoveAll(%s) failed:%v", localJobPath, err)
-	}
-
-	dirPath := setting.CBCodePathPrefix + jobName + "/"
-	err1 := storage.Attachments.DeleteDir(dirPath)
-
-	if err1 != nil {
-		log.Error("DeleteDir(%s) failed:%v", localJobPath, err)
-	}
-	if err == nil {
-		err = err1
-	}
-
-	return err
-}

services/cloudbrain/resource/resource_specification.go

@@ -246,10 +246,10 @@ func FindAvailableSpecs(userId int64, opts models.FindSpecsOptions) ([]*models.S
 		return nil, err
 	}
 	//filter exclusive specs
-	specs := models.FilterExclusiveSpecs(r, userId)
+	specs := filterExclusiveSpecs(r, userId)
 
 	//distinct by sourceSpecId
-	specs = models.DistinctSpecs(specs)
+	specs = distinctSpecs(specs)
 	return specs, err
 }
 
@@ -265,6 +265,50 @@ func FindAvailableSpecs4Show(userId int64, opts models.FindSpecsOptions) ([]*api
 	return result, nil
 }
 
+func filterExclusiveSpecs(r []*models.Specification, userId int64) []*models.Specification {
+	specs := make([]*models.Specification, 0, len(r))
+	specMap := make(map[int64]string, 0)
+	for i := 0; i < len(r); i++ {
+		spec := r[i]
+		if _, has := specMap[spec.ID]; has {
+			continue
+		}
+		if !spec.IsExclusive {
+			specs = append(specs, spec)
+			specMap[spec.ID] = ""
+			continue
+		}
+		orgs := strings.Split(spec.ExclusiveOrg, ";")
+		for _, org := range orgs {
+			isMember, _ := models.IsOrganizationMemberByOrgName(org, userId)
+			if isMember {
+				specs = append(specs, spec)
+				specMap[spec.ID] = ""
+				break
+			}
+		}
+	}
+	return specs
+}
+
+func distinctSpecs(r []*models.Specification) []*models.Specification {
+	specs := make([]*models.Specification, 0, len(r))
+	sourceSpecIdMap := make(map[string]string, 0)
+	for i := 0; i < len(r); i++ {
+		spec := r[i]
+		if spec.SourceSpecId == "" {
+			specs = append(specs, spec)
+			continue
+		}
+		if _, has := sourceSpecIdMap[spec.SourceSpecId]; has {
+			continue
+		}
+		specs = append(specs, spec)
+		sourceSpecIdMap[spec.SourceSpecId] = ""
+	}
+	return specs
+}
+
 func GetAndCheckSpec(userId int64, specId int64, opts models.FindSpecsOptions) (*models.Specification, error) {
 	if specId == 0 {
 		return nil, nil

templates/repo/cloudbrain/trainjob/show.tmpl

@@ -647,23 +647,6 @@
                         <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
-                    <div class="inline fields">
-                            
-                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
-                            
-                            <div class="field">
-                                <div class="ui radio checkbox">
-                                    <input type="radio" name="isPrivate" checked="checked" value="false">
-                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
-                                </div>
-                            </div>
-                            <div class="field">
-                                <div class="ui radio checkbox">
-                                    <input type="radio" name="isPrivate" value="true">
-                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
-                                </div>
-                            </div>
-                    </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
                         <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
@@ -866,10 +849,6 @@
         }
         let url_href = `/${userName}/${repoPath}/modelmanage/create_new_model`
         let data = $("#formId").serialize()
-        var radio = document.getElementsByName("isPrivate");
-        if(radio == null || radio.length == 0){
-            data +="&isPrivate=true";
-        }
         $("#mask").css({ "display": "block", "z-index": "9999" })
         $.ajax({
             url: url_href,

templates/repo/grampus/trainjob/show.tmpl

@@ -679,23 +679,6 @@
                         <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
-                    <div class="inline fields">
-                            
-                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
-                            
-                            <div class="field">
-                                <div class="ui radio checkbox">
-                                    <input type="radio" name="isPrivate" checked="checked" value="false">
-                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
-                                </div>
-                            </div>
-                            <div class="field">
-                                <div class="ui radio checkbox">
-                                    <input type="radio" name="isPrivate" value="true">
-                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
-                                </div>
-                            </div>
-                    </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
                         <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
@@ -927,10 +910,6 @@
         }
         let url_href = `/${userName}/${repoPath}/modelmanage/create_new_model`
         let data = $("#formId").serialize()
-        var radio = document.getElementsByName("isPrivate");
-        if(radio == null || radio.length == 0){
-            data +="&isPrivate=true";
-        }
         $("#mask").css({ "display": "block", "z-index": "9999" })
         $.ajax({
             url: url_href,

templates/repo/modelarts/trainjob/show.tmpl

@@ -703,25 +703,6 @@
                         <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
-                    {{if eq $.Repository.IsPrivate false}}
-                        <div class="inline fields">
-                                
-                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
-                                
-                                <div class="field">
-                                    <div class="ui radio checkbox">
-                                        <input type="radio" name="isPrivate" checked="checked" value="false">
-                                        <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
-                                    </div>
-                                </div>
-                                <div class="field">
-                                    <div class="ui radio checkbox">
-                                        <input type="radio" name="isPrivate" value="true">
-                                        <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
-                                    </div>
-                                </div>
-                        </div>
-                    {{end}}
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
                         <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
@@ -949,10 +930,6 @@
         }
         let url_href = `/${userName}/${repoPath}/modelmanage/create_new_model`
         let data = $("#formId").serialize()
-        var radio = document.getElementsByName("isPrivate");
-        if(radio == null || radio.length == 0){
-            data +="&isPrivate=true";
-        }
         $("#mask").css({ "display": "block", "z-index": "9999" })
         $.ajax({
             url: url_href,

templates/repo/modelmanage/convertIndex.tmpl

@@ -487,7 +487,7 @@
     }
    
     function loadModelList(){
-        $.get(`${repolink}/modelmanage/query_model_for_predict?repoId=${repoId}&type=-1&isOnlyThisRepo=true`, (data) => {
+        $.get(`${repolink}/modelmanage/query_model_for_predict?repoId=${repoId}&type=-1`, (data) => {
             modelData = data
             let nameList =  data.nameList
             const n_length = nameList.length

templates/repo/modelmanage/create_local_1.tmpl

@@ -2,7 +2,6 @@
 <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-local-create-1.css?v={{MD5 AppVer}}" />
 <div class="repository release dataset-list view">
     {{template "repo/header" .}}
-    <script>var REPO_IS_PRIVATE = {{$.Repository.IsPrivate}};</script>
     <div class="ui container">
         <div id="__vue-root"></div>
     </div>    

templates/repo/modelmanage/create_online.tmpl

@@ -135,25 +135,6 @@
                                 <input class="ays-ignore" id="label" name="label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                             </div>    
                         </div>
-                        {{if eq $.Repository.IsPrivate false}}
-                            <div class="inline fields">
-                                <div class="two wide field right aligned">
-                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}  &nbsp</label>
-                                </div>
-                                <div class="field">
-                                    <div class="ui radio checkbox">
-                                        <input type="radio" name="isPrivate" checked="checked" value="false">
-                                        <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
-                                    </div>
-                                </div>
-                                <div class="field">
-                                    <div class="ui radio checkbox">
-                                        <input type="radio" name="isPrivate" value="true">
-                                        <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
-                                    </div>
-                                </div>
-                            </div>
-                        {{end}}
                         <div class="inline fields">
                             <div class="two wide field right aligned">                    
                                 <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}} &nbsp</label>
@@ -568,10 +549,6 @@
             let cName = $("input[name='name']").val();
             let version = $("input[name='version']").val();
             let data = $("#formId").serialize();
-            var radio = document.getElementsByName("isPrivate");
-            if(radio == null || radio.length == 0){
-                data +="&isPrivate=true";
-            }
             const initModel = $("input[name='initModel']").val();
             let url_href = location.href.split("create_online_model")[0] + 'create_new_model';
             $("#mask").css({ display: "block", "z-index": "9999" });

templates/repo/modelmanage/index.tmpl

@@ -44,7 +44,7 @@
     }
 </style>
 <link rel="stylesheet" href="/self/ztree/css/zTreeStyle/zTreeStyle.css" type="text/css">
-<script>var REPO_IS_PRIVATE = {{.Repository.IsPrivate}};</script>
+
 
 <!-- 弹窗 -->
 <div id="mask">
@@ -57,7 +57,6 @@
     </div>
 </div>
 {{$repository := .Repository.ID}}
-
 <!-- 提示框 -->
 <div class="alert"></div>
 
@@ -235,7 +234,6 @@
                         <input id="label" name="label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>    
                 </div>
-                
                 <div class="inline fields">
                     <div class="two wide field right aligned">                    
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}} &nbsp</label>

web_src/js/components/Model.vue

@@ -32,7 +32,18 @@
               >
             </template>
           </el-table-column>
-          
+          <el-table-column
+            prop="status"
+            :label="i18n.model_status"
+            align="center"
+            min-width="6.5%"
+          >
+            <template slot-scope="scope">
+              <span class="text-over" :title="scope.row.status_title">
+                <i style="vertical-align: middle" :class="scope.row.status"></i
+              ></span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="version"
             :label="i18n.model_version"
@@ -90,22 +101,6 @@
               <span class="text-over">{{ scope.row.computeResource }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="isPrivate"
-            :label="i18n.model_status"
-            align="center"
-            min-width="6.75%"
-          >
-            <template slot-scope="scope">
-             <span class="text-over" :title="scope.row.status_title">
-                <i style="vertical-align: middle" :class="scope.row.status"></i
-              ></span>
-            <span style="color: #fa8c16;" v-if="scope.row.isPrivate">{{ i18n.modelaccess_private }}</span>
-            <span style="color: #13c28d;" v-else="!scope.row.isPrivate">{{ i18n.modelaccess_public }}</span>
-          
-            </template>
-          </el-table-column>
-
           <el-table-column
             prop="createdUnix"
             :label="i18n.model_create_time"
@@ -142,23 +137,29 @@
           >
             <template slot-scope="scope">
               <div class="space-around" >
-               
+                <!--<a
+                  :style="{
+                    visibility: !scope.row.Children ? 'visible' : 'hidden',
+                  }"
+                  :class="{ disabled: !scope.row.isCanOper }"
+                  @click="
+                    showcreateVue(
+                      scope.row.name,
+                      scope.row.version,
+                      scope.row.label
+                    )
+                  "
+                  >{{ i18n.model_create_new_ver }}</a
+                >-->
                 <a class="op-btn"
                   v-show="scope.row.modelType == 1"
                   :href="url + 'create_local_model_1?type=1&name=' + encodeURIComponent(scope.row.name) + '&id=' + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
-                <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>              
-                <a class="op-btn" style="color: #13c28d;" v-show="repoIsPrivate == false && scope.row.isPrivate==true && scope.row.isCanOper"  @click="
-                    modifyModelStatus(scope.row.id, scope.row.cName, scope.row.rowKey,false)
-                  ">{{ i18n.modelaccess_setpublic }}</a>
-                <a class="op-btn" style="color: #fa8c16;" v-show="repoIsPrivate == false && scope.row.isPrivate==false && scope.row.isCanOper"  @click="
-                    modifyModelStatus(scope.row.id, scope.row.cName, scope.row.rowKey,true)
-                  ">{{ i18n.modelaccess_setprivate }}</a>
-                
+                <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>
                 <a class="op-btn"
                   :href="loadhref + scope.row.id"
-                  :class="{ disabled: !scope.row.isCanDownload }"
+                  :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.model_download }}</a>
                 <a class="op-btn"
                   :class="{ disabled: !scope.row.isCanDelete }"
@@ -189,9 +190,8 @@
 </template>
 
 <script>
-import { modifyModelStatus } from '~/apis/modules/modelmanage';
 const { _AppSubUrl, _StaticUrlPrefix, csrf } = window.config;
-const REPOISPRIVATE = window.REPO_IS_PRIVATE;
+
 export default {
   components: {},
   data() {
@@ -206,13 +206,11 @@ export default {
       isLoading: true,
       loadNodeMap: new Map(),
       submitId: {},
-      repo: location.pathname.split('/').slice(0, 3).join('/'),
       defaultAvatar: "/user/avatar/Ghost/-1",
       defaultAvatarName: "Ghost",
       data: "",
       timer: null,
       timerFlag: false,
-      repoIsPrivate:  REPOISPRIVATE,
     };
   },
   methods: {
@@ -405,26 +403,6 @@ export default {
         }
       }
     },
-    modifyModelStatus(id, name, rowKey,isPrivate) {
-      let data = {'id':id,'isPrivate':isPrivate,'repo':this.repo};
-      modifyModelStatus(data).then(res => {
-        res = res.data;
-        if (res && res.code == '0') {
-          this.getModelList();
-        } else {
-          this.$message({
-            type: 'error',
-            message: this.$t('modelManage.infoModificationFailed'),
-          });
-        }
-      }).catch(err => {
-        console.log(err);
-        this.$message({
-          type: 'error',
-          message: this.$t('modelManage.infoModificationFailed'),
-        });
-      });
-    },
     deleteModel(id, name, rowKey) {
       let row = { cName: name, id: id, rowKey: rowKey };
       let _this = this;
@@ -564,14 +542,6 @@ export default {
     showinfoHref() {
       return this.url + "show_model_info?name=";
     },
-    transStatus(){
-      return function (state) {
-          if(state){
-             return this.i18n.modelaccess_private;
-          }
-          return this.i18n.modelaccess_public;
-      }
-    },
     transTime() {
       return function (time) {
         let date = new Date(time * 1000); //时间戳为10位需*1000，时间戳为13位的话不需乘1000

web_src/js/features/i18nVue.js

@@ -92,11 +92,6 @@ export const i18nVue = {
     model_create_time: "创建时间",
     model_creator: "创建者",
     model_operation: "操作",
-    model_access: "权限",
-    modelaccess_public:"公开",
-    modelaccess_private:"私有",
-    modelaccess_setpublic:"设为公开",
-    modelaccess_setprivate:"设为私有",
     model_create_new_ver: "创建新版本",
     model_download: "下载",
     model_delete: "删除",
@@ -213,11 +208,6 @@ export const i18nVue = {
     model_create_time: "Created Time",
     model_creator: "Creator",
     model_operation: "Operation",
-    model_access: "Access",
-    modelaccess_public:"Public",
-    modelaccess_private:"Private",
-    modelaccess_setpublic:"Set Public",
-    modelaccess_setprivate:"Set Private",
     model_create_new_ver: "New Version",
     model_download: "Download",
     model_delete: "Delete",

web_src/vuepages/apis/modules/modelmanage.js

@@ -24,16 +24,6 @@ export const modifyModel = (data) => {
   });
 };
 
-export const modifyModelStatus = (data) => {
-  return service({
-    url: `${data.repo}/modelmanage/modify_model_status`,
-    method: 'put',
-    headers: { 'Content-type': 'application/x-www-form-urlencoded' },
-    params: {},
-    data: Qs.stringify(data),
-  });
-};
-
 // 求模型信息
 export const getModelInfoByName = (params) => {
   return service({

web_src/vuepages/langs/config/en-US.js

@@ -281,9 +281,6 @@ const en = {
     infoModificationFailed: 'Information modify failed',
     deleteModelFileConfirmTips: 'Are you sure you want to delete the current model file?',
     modelFileDeleteFailed: 'Model file delete failed',
-    modelAccess:'Model Access',
-    modelAccessPublic:'Public',
-    modelAccessPrivate:'Private',
   },
 }
 

web_src/vuepages/langs/config/zh-CN.js

@@ -282,9 +282,6 @@ const zh = {
     infoModificationFailed: '信息修改失败',
     deleteModelFileConfirmTips: '请确认是否删除当前模型文件？',
     modelFileDeleteFailed: '模型文件删除失败',
-    modelAccess:'模型权限',
-    modelAccessPublic:'公开',
-    modelAccessPrivate:'私有',
   },
 };
 

web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue

@@ -51,12 +51,6 @@
                 </div>
               </div>
             </div>
-            <div class="row">
-              <div class="tit">{{ $t('modelManage.modelAccess') }}：</div>
-              <div class="val">
-                <div class="txt-wrap">{{ state.isPrivate }}</div>
-              </div>
-            </div>
           </div>
           <div class="area">
             <div class="row">
@@ -182,8 +176,8 @@
                       <span>{{ scope.row.FileName }}</span>
                     </div>
                   </a>
-                  <a v-else :class="!canDownload ? 'disabled-download' : ''"
-                    :href="canDownload ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=${filePath.length > 1 ? encodeURIComponent(filePath.map(item => item.path).join('/').slice(1) + '/') : ''}&fileName=${scope.row.FileName}` : 'javascript:;'">
+                  <a v-else :class="!canOperate ? 'disabled-download' : ''"
+                    :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=${filePath.length > 1 ? encodeURIComponent(filePath.map(item => item.path).join('/').slice(1) + '/') : ''}&fileName=${scope.row.FileName}` : 'javascript:;'">
                     <div class="fitted" :title="scope.row.FileName">
                       <i class="icon file" width="16" height="16" aria-hidden="true"></i>
                       <span>{{ scope.row.FileName }}</span>
@@ -228,7 +222,6 @@ export default {
     return {
       modelType: '0', // 1-本地, 0-线上
       canOperate: false,
-      canDownload:false,
       canDelete: false,
       isExpanded: false,
       loading: false,
@@ -292,7 +285,6 @@ export default {
       const data = this.modelList.filter((model) => model.version == version)[0];
       this.modelType = data.modelType;
       this.canOperate = data.isCanOper;
-      this.canDownload = data.isCanDownload;
       this.canDelete = data.isCanDelete;
       this.state.type = data.type;
       this.state.typeStr = data.type == 0 ? 'CPU/GPU' : data.type == 1 ? 'NPU' : '';
@@ -306,7 +298,6 @@ export default {
       this.state._label = data.label;
       this.state.description = data.description || '--';
       this.state._description = data.description;
-      this.state.isPrivate= (data.isPrivate == true ? this.$t('modelManage.modelAccessPrivate'):this.$t('modelManage.modelAccessPublic'));
       this.state.createTime = formatDate(new Date(data.createdUnix * 1000), 'yyyy-MM-dd HH:mm:ss');
 
       const trainTaskInfo = data.trainTaskInfo ? JSON.parse(data.trainTaskInfo) : '';

web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue

@@ -85,28 +85,6 @@
               :placeholder="$t('modelManage.modelLabelInputTips')" @input="labelInput"></el-input>
           </div>
         </div>
-
-        <div class="row" v-if="repoIsPrivate==false">
-          <div class="r-title"><label>{{ $t('modelManage.modelAccess') }}</label></div>
-          <div class="field">
-            <div class="ui radio checkbox">
-              <input id="isPrivate_false" type="radio" name="isPrivate" checked="checked" value="false">
-              <label>{{ $t('modelManage.modelAccessPublic') }}</label>
-            </div>
-          </div>
-          <div class="field">
-              <label>&nbsp;&nbsp;</label>
-          </div>
-          <div class="field">
-              <div class="ui radio checkbox">
-                <input id="isPrivate_true" type="radio" name="isPrivate" value="true">
-                <label>{{ $t('modelManage.modelAccessPrivate') }}</label>
-              </div>
-          </div>
-          
-         
-        </div>
-
         <div class="row" style="align-items:flex-start;">
           <div class="r-title"><label>{{ $t('modelManage.modelDescr') }}</label></div>
           <div class="r-content">
@@ -115,7 +93,6 @@
             </el-input>
           </div>
         </div>
-
         <div class="row" style="margin-top:20px">
           <div class="r-title"><label></label></div>
           <div class="r-content">
@@ -139,7 +116,7 @@ import { MODEL_ENGINES } from '~/const'
 
 const REPO_NAME = location.pathname.split('/')[2];
 const MAX_LABEL_COUNT = 5;
-const REPOISPRIVATE = window.REPO_IS_PRIVATE;
+
 export default {
   data() {
     return {
@@ -152,12 +129,10 @@ export default {
         engine: '0',
         label: '',
         description: '',
-        isPrivate : false,
       },
       nameErr: false,
       isShowVersion: false,
       engineList: MODEL_ENGINES,
-      repoIsPrivate:  REPOISPRIVATE,
     };
   },
   components: {},
@@ -170,7 +145,6 @@ export default {
       const hasEndSpace = this.state.label[this.state.label.length - 1] == ' ';
       const list = this.state.label.trim().split(' ').filter(label => label != '');
       this.state.label = list.slice(0, MAX_LABEL_COUNT).join(' ') + (hasEndSpace && list.length < MAX_LABEL_COUNT ? ' ' : '');
-      
     },
     submit() {
       if (!this.checkName()) {
@@ -180,16 +154,6 @@ export default {
         // });       
         return;
       }
-      var radio = document.getElementsByName("isPrivate");
-      if(radio != null && radio.length > 0){
-        for (var i=0; i<radio.length; i++) {
-          if (radio[i].checked) {
-            this.state.isPrivate=radio[i].value;
-          }
-        }
-      }else{
-        this.state.isPrivate = true;
-      }
       const submintApi = this.type == '1' ? modifyModel : saveLocalModel;
       submintApi({
         repo: location.pathname.split('/').slice(0, 3).join('/'),
@@ -256,14 +220,6 @@ export default {
           this.state.engine = data.engine.toString();
           this.state.label = data.label;
           this.state.description = data.description;
-          this.state.isPrivate = data.isPrivate;
-          if(data.isPrivate){
-              $('#isPrivate_true').attr("checked",true);
-              $('#isPrivate_false').attr("checked",false);
-          }else{
-              $('#isPrivate_true').attr("checked",false);
-              $('#isPrivate_false').attr("checked",true);
-          }
         }
       }).catch(err => {
         this.loading = false;