Merge pull request 'fix issue' (#3014) from temp-0926-patch into V20220926.patch

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/3014

models/cloudbrain.go

@@ -1707,6 +1707,7 @@ func QueryModelTrainJobList(repoId int64) ([]*CloudbrainInfo, int, error) {
 	keys := make(map[string]string)
 	uniqueElements := make([]*CloudbrainInfo, 0)
 	for _, entry := range cloudbrains {
+		entry.Cloudbrain.ContainerIp = ""
 		if _, value := keys[entry.JobID]; !value {
 			keys[entry.JobID] = entry.DisplayJobName
 			uniqueElements = append(uniqueElements, entry)

routers/api/v1/repo/cloudbrain.go

@@ -485,7 +485,7 @@ func getAllLineFromFile(path string) int {
 }
 
 func getLastLogFromModelDir(jobName string, lines int, resultPath string) map[string]interface{} {
-	prefix := "/" + setting.CBCodePathPrefix + jobName + resultPath
+	prefix := setting.CBCodePathPrefix + jobName + resultPath
 	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
 	if err != nil {
 		log.Error("query cloudbrain model failed: %v", err)
@@ -546,7 +546,7 @@ func getLastLogFromModelDir(jobName string, lines int, resultPath string) map[st
 }
 
 func getLogFromModelDir(jobName string, startLine int, endLine int, resultPath string) map[string]interface{} {
-	prefix := "/" + setting.CBCodePathPrefix + jobName + resultPath
+	prefix := setting.CBCodePathPrefix + jobName + resultPath
 	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
 	if err != nil {
 		log.Error("query cloudbrain model failed: %v", err)

routers/repo/ai_model_manage.go

@@ -498,6 +498,9 @@ func QueryTrainJobVersionList(ctx *context.Context) {
 	if err != nil {
 		ctx.ServerError("QueryTrainJobList:", err)
 	} else {
+		for _, tmp := range VersionListTasks {
+			tmp.ContainerIp = ""
+		}
 		ctx.JSON(200, VersionListTasks)
 	}
 }

templates/repo/cloudbrain/trainjob/show.tmpl

@@ -253,7 +253,7 @@
                                  <div style="float: right;">
                                     {{if and ($.canDownload) (ne .Status "WAITING") ($.Permission.CanWrite $.UnitTypeModelManage) }}
                                     <a class="ti-action-menu-item" id="{{.VersionName}}-create-model"
-                                        onclick="showcreate({DisplayJobName:{{.DisplayJobName}},JobName:{{.JobName}},JobID:{{.JobID}},VersionName:{{.VersionName}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
+                                        onclick="showcreate({DisplayJobName:{{.DisplayJobName}},JobName:{{.JobName}},JobID:{{.JobID}},VersionName:{{.VersionName}}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{else}}
                                     <a class="ti-action-menu-item disabled" id="{{.VersionName}}-create-model">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{end}}