fix-bug

models/cloudbrain_static.go

@@ -34,6 +34,7 @@ type TaskDetail struct {
 	CardDuration    string             `json:"CardDuration"`
 	AiCenter        string             `json:"AiCenter"`
 	FlavorName      string             `json:"FlavorName"`
+	WorkServerNum   int64              `json:"WorkServerNum"`
 	Spec            *Specification     `json:"Spec"`
 }
 

routers/admin/cloudbrains.go

@@ -98,8 +98,8 @@ func CloudBrains(ctx *context.Context) {
 		ciTasks[i].CanDebug = true
 		ciTasks[i].CanDel = true
 		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
-		ciTasks[i].Cloudbrain.AiCenter = repo.GetCloudbrainAiCenter(task.Cloudbrain, ctx)
-		ciTasks[i].Cloudbrain.Cluster = repo.GetCloudbrainCluster(task.Cloudbrain, ctx)
+		// ciTasks[i].Cloudbrain.AiCenter = repo.GetCloudbrainAiCenter(task.Cloudbrain, ctx)
+		// ciTasks[i].Cloudbrain.Cluster = repo.GetCloudbrainCluster(task.Cloudbrain, ctx)
 	}
 
 	pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, getTotalPage(count, setting.UI.IssuePagingNum))

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -738,7 +738,6 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 	tasks := []models.TaskDetail{}
 	for i, task := range ciTasks {
 		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
-
 		var taskDetail models.TaskDetail
 		taskDetail.ID = ciTasks[i].Cloudbrain.ID
 		taskDetail.JobID = ciTasks[i].Cloudbrain.JobID
@@ -758,11 +757,20 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 			taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name
 			taskDetail.RepoAlias = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Alias
 		}
-		taskDetail.CardNum, taskDetail.CardType, _ = repo.GetCloudbrainCardNumAndType(ciTasks[i].Cloudbrain)
+		if ciTasks[i].Cloudbrain.WorkServerNumber >= 1 {
+			taskDetail.WorkServerNum = int64(ciTasks[i].Cloudbrain.WorkServerNumber)
+		} else {
+			taskDetail.WorkServerNum = 1
+		}
+		// taskDetail.CardNum, taskDetail.CardType, _ = repo.GetCloudbrainCardNumAndType(ciTasks[i].Cloudbrain)
+		// if ciTasks[i].Cloudbrain.Spec != nil {
+		// 	taskDetail.CardNum = ciTasks[i].Cloudbrain.Spec.AccCardsNum
+		// 	taskDetail.CardType = ciTasks[i].Cloudbrain.Spec.AccCardType
+		// 	taskDetail.AiCenter = ciTasks[i].Cloudbrain.Spec.AiCenterName
+		// }
+		// taskDetail.AiCenter = repo.GetCloudbrainAiCenter(ciTasks[i].Cloudbrain, ctx)
+		// taskDetail.FlavorName, _ = repo.GetCloudbrainFlavorName(ciTasks[i].Cloudbrain)
 		taskDetail.CardDuration = repo.GetCloudbrainCardDuration(ciTasks[i].Cloudbrain)
-		taskDetail.AiCenter = repo.GetCloudbrainAiCenter(ciTasks[i].Cloudbrain, ctx)
-		taskDetail.FlavorName, _ = repo.GetCloudbrainFlavorName(ciTasks[i].Cloudbrain)
-
 		taskDetail.WaitTime = repo.GetCloudbrainWaitTime(ciTasks[i].Cloudbrain)
 
 		if ciTasks[i].Cloudbrain.DeletedAt != nilTime || ciTasks[i].Repo == nil {

routers/repo/cloudbrain.go

@@ -2841,8 +2841,19 @@ func GetCloudbrainCluster(task models.Cloudbrain, ctx *context.Context) string {
 	return ""
 }
 func GetCloudbrainCardDuration(task models.Cloudbrain) string {
-	cardNum, _, _ := GetCloudbrainCardNumAndType(task)
-	cardDuration := models.ConvertDurationToStr(int64(cardNum) * task.Duration)
+	spec, err := resource.GetCloudbrainSpec(task.ID)
+	if err != nil {
+		log.Info("error:" + err.Error())
+		return ""
+	}
+	cardNum := spec.AccCardsNum
+	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 GetCloudbrainWaitTime(task models.Cloudbrain) string {

routers/user/home.go

@@ -23,7 +23,6 @@ import (
 	"code.gitea.io/gitea/modules/modelarts"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
-	"code.gitea.io/gitea/routers/repo"
 	issue_service "code.gitea.io/gitea/services/issue"
 	pull_service "code.gitea.io/gitea/services/pull"
 
@@ -841,8 +840,8 @@ func Cloudbrains(ctx *context.Context) {
 		ciTasks[i].CanDebug = true
 		ciTasks[i].CanDel = true
 		ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
-		ciTasks[i].Cloudbrain.AiCenter = repo.GetCloudbrainAiCenter(task.Cloudbrain, ctx)
-		ciTasks[i].Cloudbrain.Cluster = repo.GetCloudbrainCluster(task.Cloudbrain, ctx)
+		// ciTasks[i].Cloudbrain.AiCenter = repo.GetCloudbrainAiCenter(task.Cloudbrain, ctx)
+		// ciTasks[i].Cloudbrain.Cluster = repo.GetCloudbrainCluster(task.Cloudbrain, ctx)
 
 	}