fix-3144

models/cloudbrain.go

@@ -304,6 +304,17 @@ func ConvertDurationToStr(duration int64) string {
 	}
 	return util.AddZero(duration/3600) + ":" + util.AddZero(duration%3600/60) + ":" + util.AddZero(duration%60)
 }
+func ConvertStrToDuration(trainJobDuration string) int64 {
+	trainJobDurationList := strings.Split(trainJobDuration, ":")
+	if len(trainJobDurationList) == 3 {
+		i, _ := strconv.ParseInt(trainJobDurationList[0], 10, 64)
+		j, _ := strconv.ParseInt(trainJobDurationList[1], 10, 64)
+		k, _ := strconv.ParseInt(trainJobDurationList[2], 10, 64)
+		return i*3600 + j*60 + k
+	} else {
+		return 0
+	}
+}
 
 func IsTrainJobTerminal(status string) bool {
 	return status == string(ModelArtsTrainJobCompleted) || status == string(ModelArtsTrainJobFailed) || status == string(ModelArtsTrainJobKilled) || status == GrampusStatusFailed || status == GrampusStatusStopped || status == GrampusStatusSucceeded
@@ -2317,6 +2328,19 @@ func CloudbrainAllStatic(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, er
 		Find(&cloudbrains); err != nil {
 		return nil, 0, fmt.Errorf("Find: %v", err)
 	}
+	if opts.NeedRepoInfo {
+		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, count, nil
 }
 

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -13,6 +13,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/routers/repo"
 	cloudbrainService "code.gitea.io/gitea/services/cloudbrain"
+	"code.gitea.io/gitea/services/cloudbrain/resource"
 	"github.com/360EntSecGroup-Skylar/excelize/v2"
 )
 
@@ -122,8 +123,8 @@ func GetOverviewDuration(ctx *context.Context) {
 	recordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix
 	now := time.Now()
 	endTime := now
-	worker_server_num := 1
-	cardNum := 1
+	// worker_server_num := 1
+	// cardNum := 1
 	durationAllSum := int64(0)
 	cardDuSum := int64(0)
 
@@ -149,34 +150,40 @@ func GetOverviewDuration(ctx *context.Context) {
 	models.LoadSpecs4CloudbrainInfo(cloudbrains)
 
 	for _, cloudbrain := range cloudbrains {
-		if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
-			worker_server_num = cloudbrain.Cloudbrain.WorkServerNumber
-		} else {
-			worker_server_num = 1
-		}
-		if cloudbrain.Cloudbrain.Spec == nil {
-			cardNum = 1
-		} else {
-			cardNum = cloudbrain.Cloudbrain.Spec.AccCardsNum
-		}
-		duration := cloudbrain.Duration
-		durationSum := cloudbrain.Duration * int64(worker_server_num) * int64(cardNum)
+		cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
+		CardDurationString := repo.GetCloudbrainCardDuration(cloudbrain.Cloudbrain)
+		CardDuration := models.ConvertStrToDuration(CardDurationString)
+		// if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
+		// 	worker_server_num = cloudbrain.Cloudbrain.WorkServerNumber
+		// } else {
+		// 	worker_server_num = 1
+		// }
+		// if cloudbrain.Cloudbrain.Spec == nil {
+		// 	cardNum = 1
+		// } else {
+		// 	cardNum = cloudbrain.Cloudbrain.Spec.AccCardsNum
+		// }
+		// duration := cloudbrain.Duration
+		// duration := cloudbrain.Duration
+		duration := models.ConvertStrToDuration(cloudbrain.TrainJobDuration)
+		// CardDuration := cloudbrain.Duration * int64(worker_server_num) * int64(cardNum)
+
 		if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
 			cloudBrainOneDuration += duration
-			cloudBrainOneCardDuSum += durationSum
+			cloudBrainOneCardDuSum += CardDuration
 		} else if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo {
 			cloudBrainTwoDuration += duration
-			cloudBrainTwoCardDuSum += durationSum
+			cloudBrainTwoCardDuSum += CardDuration
 		} else if cloudbrain.Cloudbrain.Type == models.TypeC2Net {
 			c2NetDuration += duration
-			c2NetCardDuSum += durationSum
+			c2NetCardDuSum += CardDuration
 		} else if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
 			cDCenterDuration += duration
-			cDNetCardDuSum += durationSum
+			cDNetCardDuSum += CardDuration
 		}
 
 		durationAllSum += duration
-		cardDuSum += durationSum
+		cardDuSum += CardDuration
 	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"cloudBrainOneCardDuSum": cloudBrainOneCardDuSum,
@@ -193,6 +200,28 @@ func GetOverviewDuration(ctx *context.Context) {
 	})
 }
 
+func GetCloudbrainCardDuration(task models.Cloudbrain) string {
+	cardNum := int(0)
+	spec, err := resource.GetCloudbrainSpec(task.ID)
+	if err != nil {
+		log.Info("error:" + err.Error())
+		return ""
+	}
+	if spec != nil {
+		cardNum = spec.AccCardsNum
+	} else {
+		cardNum = 1
+	}
+	var workServerNumber int64
+	if task.WorkServerNumber >= 1 {
+		workServerNumber = int64(task.WorkServerNumber)
+	} else {
+		workServerNumber = 1
+	}
+	cardDuration := models.ConvertDurationToStr(workServerNumber * int64(cardNum) * task.Duration)
+	return cardDuration
+}
+
 func GetAllCloudbrainsTrend(ctx *context.Context) {
 
 	queryType := ctx.QueryTrim("type")
@@ -1199,6 +1228,12 @@ func getMonthCloudbrainInfo(beginTime time.Time, endTime time.Time) ([]DateCloud
 }
 
 func DownloadCloudBrainBoard(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
+	}
 
 	page := 1
 
@@ -1207,14 +1242,20 @@ func DownloadCloudBrainBoard(ctx *context.Context) {
 	var cloudBrain = ctx.Tr("repo.cloudbrain")
 	fileName := getCloudbrainFileName(cloudBrain)
 
+	recordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix
+	now := time.Now()
+	endTime := now
+
 	_, total, err := models.CloudbrainAll(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
 			PageSize: pageSize,
 		},
-		Type:         models.TypeCloudBrainAll,
-		NeedRepoInfo: false,
+		Type:          models.TypeCloudBrainAll,
+		BeginTimeUnix: int64(recordBeginTime),
+		EndTimeUnix:   endTime.Unix(),
 	})
+	log.Info("totalcountisis:", total)
 
 	if err != nil {
 		log.Warn("Can not get cloud brain info", err)
@@ -1239,8 +1280,10 @@ func DownloadCloudBrainBoard(ctx *context.Context) {
 				Page:     page,
 				PageSize: pageSize,
 			},
-			Type:         models.TypeCloudBrainAll,
-			NeedRepoInfo: true,
+			Type:          models.TypeCloudBrainAll,
+			BeginTimeUnix: int64(recordBeginTime),
+			EndTimeUnix:   endTime.Unix(),
+			NeedRepoInfo:  true,
 		})
 		if err != nil {
 			log.Warn("Can not get cloud brain info", err)