Merge pull request 'fix-1956 1640 1597 2370' (#2540) from fix-1956 into V20220801

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2540
Reviewed-by: lewis <747342561@qq.com>

routers/repo/cloudbrain.go

@@ -636,6 +636,7 @@ func CloudBrainTrainJobShow(ctx *context.Context) {
 func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.JobType) {
 	ctx.Data["PageIsCloudBrain"] = true
 	debugListType := ctx.Query("debugListType")
+	cloudbrain.InitSpecialPool()
 
 	var task *models.Cloudbrain
 	var err error
@@ -647,22 +648,22 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 
 	if err != nil {
 		log.Info("error:" + err.Error())
-		ctx.Data["error"] = err.Error()
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
 
 	result, err := cloudbrain.GetJob(task.JobID)
 	if err != nil {
 		log.Info("error:" + err.Error())
-		ctx.Data["error"] = err.Error()
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
-
+	hasSpec := false
 	if task.JobType == string(models.JobTypeTrain) {
 		if cloudbrain.TrainResourceSpecs == nil {
 			json.Unmarshal([]byte(setting.TrainResourceSpecs), &cloudbrain.TrainResourceSpecs)
 		}
-		hasSpec := false
+
 		for _, tmp := range cloudbrain.TrainResourceSpecs.ResourceSpec {
 			if tmp.Id == task.ResourceSpecId {
 				hasSpec = true
@@ -670,24 +671,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 				ctx.Data["CpuNum"] = tmp.CpuNum
 				ctx.Data["MemMiB"] = tmp.MemMiB
 				ctx.Data["ShareMemMiB"] = tmp.ShareMemMiB
-			}
-		}
-
-		if !hasSpec && cloudbrain.SpecialPools != nil {
-			for _, specialPool := range cloudbrain.SpecialPools.Pools {
-
-				if specialPool.ResourceSpec != nil {
-
-					for _, spec := range specialPool.ResourceSpec {
-						if task.ResourceSpecId == spec.Id {
-							ctx.Data["GpuNum"] = spec.GpuNum
-							ctx.Data["CpuNum"] = spec.CpuNum
-							ctx.Data["MemMiB"] = spec.MemMiB
-							ctx.Data["ShareMemMiB"] = spec.ShareMemMiB
-							break
-						}
-					}
-				}
+				break
 			}
 		}
 
@@ -697,10 +681,12 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 		}
 		for _, tmp := range cloudbrain.InferenceResourceSpecs.ResourceSpec {
 			if tmp.Id == task.ResourceSpecId {
+				hasSpec = true
 				ctx.Data["GpuNum"] = tmp.GpuNum
 				ctx.Data["CpuNum"] = tmp.CpuNum
 				ctx.Data["MemMiB"] = tmp.MemMiB
 				ctx.Data["ShareMemMiB"] = tmp.ShareMemMiB
+				break
 			}
 		}
 	} else {
@@ -709,10 +695,32 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 		}
 		for _, tmp := range cloudbrain.ResourceSpecs.ResourceSpec {
 			if tmp.Id == task.ResourceSpecId {
+				hasSpec = true
 				ctx.Data["GpuNum"] = tmp.GpuNum
 				ctx.Data["CpuNum"] = tmp.CpuNum
 				ctx.Data["MemMiB"] = tmp.MemMiB
 				ctx.Data["ShareMemMiB"] = tmp.ShareMemMiB
+				break
+
+			}
+		}
+	}
+
+	if !hasSpec && cloudbrain.SpecialPools != nil {
+
+		for _, specialPool := range cloudbrain.SpecialPools.Pools {
+
+			if specialPool.ResourceSpec != nil {
+
+				for _, spec := range specialPool.ResourceSpec {
+					if task.ResourceSpecId == spec.Id {
+						ctx.Data["GpuNum"] = spec.GpuNum
+						ctx.Data["CpuNum"] = spec.CpuNum
+						ctx.Data["MemMiB"] = spec.MemMiB
+						ctx.Data["ShareMemMiB"] = spec.ShareMemMiB
+						break
+					}
+				}
 			}
 		}
 	}
@@ -731,14 +739,6 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 					ctx.Data["resource_type"] = resourceType.Value
 				}
 			}
-			for _, specialPool := range cloudbrain.SpecialPools.Pools {
-
-				for _, resourceType := range specialPool.Pool {
-					if resourceType.Queue == jobRes.Config.GpuType {
-						ctx.Data["resource_type"] = resourceType.Value
-					}
-				}
-			}
 
 		} else if task.JobType == string(models.JobTypeInference) {
 			if inferenceGpuInfos == nil {
@@ -770,6 +770,16 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 				}
 			}
 		}
+
+		if cloudbrain.SpecialPools != nil {
+			for _, specialPool := range cloudbrain.SpecialPools.Pools {
+				for _, resourceType := range specialPool.Pool {
+					if resourceType.Queue == jobRes.Config.GpuType {
+						ctx.Data["resource_type"] = resourceType.Value
+					}
+				}
+			}
+		}
 		taskRoles := jobRes.TaskRoles
 		taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
 		ctx.Data["taskRes"] = taskRes
@@ -895,6 +905,20 @@ func CloudBrainCommitImageShow(ctx *context.Context) {
 	ctx.HTML(200, tplCloudBrainImageSubmit)
 }
 
+func GetImage(ctx *context.Context) {
+
+	var ID = ctx.Params(":id")
+	id, _ := strconv.ParseInt(ID, 10, 64)
+
+	image, err := models.GetImageByID(id)
+	if err != nil {
+		log.Error("GetImageByID failed:%v", err.Error())
+		ctx.JSON(http.StatusNotFound, nil)
+	}
+	ctx.JSON(http.StatusOK, image)
+
+}
+
 func CloudBrainImageEdit(ctx *context.Context) {
 	ctx.Data["PageIsImageEdit"] = true
 	ctx.Data["PageFrom"] = ctx.Params(":from")

routers/repo/grampus.go

@@ -626,7 +626,7 @@ func GrampusTrainJobShow(ctx *context.Context) {
 	task, err := models.GetCloudbrainByJobIDWithDeleted(ctx.Params(":jobid"))
 	if err != nil {
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
-		ctx.ServerError("system error", err)
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
 
@@ -634,8 +634,8 @@ func GrampusTrainJobShow(ctx *context.Context) {
 		result, err := grampus.GetJob(task.JobID)
 		if err != nil {
 			log.Error("GetJob failed:" + err.Error())
-			//ctx.ServerError("GetJob failed", err)
-			//return
+			ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
+			return
 		}
 
 		if result != nil {

routers/repo/modelarts.go

@@ -257,15 +257,15 @@ func NotebookShow(ctx *context.Context) {
 	var ID = ctx.Params(":id")
 	task, err := models.GetCloudbrainByIDWithDeleted(ID)
 	if err != nil {
-		ctx.Data["error"] = err.Error()
-		ctx.RenderWithErr(err.Error(), tplModelArtsNotebookShow, nil)
+		log.Error("GET job error", err.Error())
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
 
 	result, err := modelarts.GetNotebook2(task.JobID)
 	if err != nil {
-		ctx.Data["error"] = err.Error()
-		ctx.RenderWithErr(err.Error(), tplModelArtsNotebookShow, nil)
+		log.Error("GET job error", err.Error())
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
 
@@ -276,8 +276,8 @@ func NotebookShow(ctx *context.Context) {
 				models.ParseAndSetDurationFromModelArtsNotebook(result, task)
 				err = models.UpdateJob(task)
 				if err != nil {
-					ctx.Data["error"] = err.Error()
-					ctx.RenderWithErr(err.Error(), tplModelArtsNotebookShow, nil)
+					log.Error("GET job error", err.Error())
+					ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 					return
 				}
 			}
@@ -1643,7 +1643,11 @@ func TrainJobShow(ctx *context.Context) {
 
 	if err != nil {
 		log.Error("GetVersionListTasks(%s) failed:%v", jobID, err.Error())
-		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobShow, nil)
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
+		return
+	}
+	if len(VersionListTasks) == 0 {
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
 	//设置权限
@@ -2297,7 +2301,7 @@ func InferenceJobShow(ctx *context.Context) {
 
 	if err != nil {
 		log.Error("GetInferenceTask(%s) failed:%v", jobID, err.Error())
-		ctx.RenderWithErr(err.Error(), tplModelArtsInferenceJobShow, nil)
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
 	//设置权限

routers/routes/routes.go

@@ -1016,6 +1016,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 	}, context.RepoAssignment(), context.RepoMustNotBeArchived(), reqRepoAdmin)
 
 	m.Group("/image/:id", func() {
+		m.Get("", repo.GetImage)
 		m.Get("/:from", cloudbrain.AdminOrImageCreaterRight, repo.CloudBrainImageEdit)
 		m.Post("", cloudbrain.AdminOrImageCreaterRight, bindIgnErr(auth.EditImageCloudBrainForm{}), repo.CloudBrainImageEditPost)
 		m.Delete("", cloudbrain.AdminOrImageCreaterRight, repo.CloudBrainImageDelete)

templates/org/create.tmpl

@@ -48,7 +48,7 @@
 						<button class="ui green button">
 							{{.i18n.Tr "org.create_org"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.i18n.Tr "cancel"}}</a>
+						<a class="ui button" href="javascript:history.go(-1)">{{.i18n.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

templates/repo/create.tmpl

@@ -176,7 +176,7 @@
 						<button class="ui green button" id="submit_reponame">
 							{{.i18n.Tr "repo.create_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.i18n.Tr "cancel"}}</a>
+						<a class="ui button" href="javascript:history.go(-1)">{{.i18n.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

templates/repo/migrate.tmpl

@@ -102,7 +102,7 @@
 						<button class="ui green button" id="submit_reponame">
 							{{.i18n.Tr "repo.migrate_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.i18n.Tr "cancel"}}</a>
+						<a class="ui button" href="javascript:history.go(-1)">{{.i18n.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>