From 24f7aa6d4a2b26edbced6a2ec0d786dc540d2f59 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 23 Aug 2022 17:13:12 +0800
Subject: [PATCH] #2701 update

---
 routers/repo/modelarts.go | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index cbe2589b2..f764a2dae 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -5,7 +5,6 @@ import (
 	"code.gitea.io/gitea/services/cloudbrain/resource"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -320,24 +319,7 @@ func NotebookShow(ctx *context.Context) {
 	if err == nil {
 		task.User = user
 	}
-	if modelarts.FlavorInfos == nil {
-		json.Unmarshal([]byte(setting.FlavorInfos), &modelarts.FlavorInfos)
-	}
-
-	findSpec := false
-	if modelarts.FlavorInfos != nil {
-		ctx.Data["resource_spec"] = modelarts.FlavorInfos.FlavorInfo[0].Desc
-		for _, f := range modelarts.FlavorInfos.FlavorInfo {
-			if fmt.Sprint(f.Value) == task.FlavorCode {
-				ctx.Data["resource_spec"] = f.Desc
-				findSpec = true
-				break
-			}
-		}
-	}
-
-	setShowSpecBySpecialPoolConfig(ctx, findSpec, task)
-
+	prepareSpec4Show(ctx, task)
 	if task.TrainJobDuration == "" {
 		if task.Duration == 0 {
 			var duration int64
@@ -1781,7 +1763,6 @@ func TrainJobShow(ctx *context.Context) {
 	for i, task := range VersionListTasks {
 
 		var parameters models.Parameters
-
 		err := json.Unmarshal([]byte(VersionListTasks[i].Parameters), &parameters)
 		if err != nil {
 			log.Error("Failed to Unmarshal Parameters: %s (%v)", VersionListTasks[i].Parameters, err)
@@ -1802,6 +1783,14 @@ func TrainJobShow(ctx *context.Context) {
 		datasetList = append(datasetList, GetCloudBrainDataSetInfo(task.Uuid, false))
 		VersionListTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain)
 		VersionListTasks[i].CanModify = cloudbrain.CanModifyJob(ctx, &task.Cloudbrain)
+
+		//add spec
+		s, err := resource.GetCloudbrainSpec(task.Cloudbrain.ID)
+		if err != nil {
+			log.Error("TrainJobShow GetCloudbrainSpec error:" + err.Error())
+			continue
+		}
+		VersionListTasks[i].Cloudbrain.Spec = s
 	}
 
 	pager := context.NewPagination(VersionListCount, setting.UI.IssuePagingNum, page, 5)
@@ -2533,7 +2522,7 @@ func InferenceJobShow(ctx *context.Context) {
 	} else {
 		task.Parameters = ""
 	}
-
+	prepareSpec4Show(ctx, task)
 	LabelName := strings.Fields(task.LabelName)
 	ctx.Data["labelName"] = LabelName
 	ctx.Data["jobID"] = jobID