update

routers/repo/modelarts.go

@@ -1601,13 +1601,13 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 	_, err = ioutil.ReadDir(codeLocalPath)
 	if err == nil {
 		os.RemoveAll(codeLocalPath)
+		// }
+	} else {
+		log.Error("创建任务失败，原代码还未删除，请稍后重试！: %s (%v)", repo.FullName(), err)
+		inferenceJobErrorNewDataPrepare(ctx, form)
+		ctx.RenderWithErr("创建任务失败，原代码还未删除，请稍后重试！", tplModelArtsInferenceJobNew, &form)
+		return
 	}
-	// } else {
-	// 	log.Error("创建任务失败，原代码还未删除，请重试！: %s (%v)", repo.FullName(), err)
-	// 	inferenceJobErrorNewDataPrepare(ctx, form)
-	// 	ctx.RenderWithErr("创建任务失败，原代码还未删除，请重试！", tplModelArtsInferenceJobNew, &form)
-	// 	return
-	// }
 	// os.RemoveAll(codeLocalPath)
 
 	gitRepo, _ := git.OpenRepository(repo.RepoPath())
@@ -1655,7 +1655,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 		Value: "s3:/" + resultObsPath,
 	}, models.Parameter{
 		Label: modelarts.CkptName,
-		Value: ckptName,
+		Value: form.CkptName,
 	})
 	if len(params) != 0 {
 		err := json.Unmarshal([]byte(params), &parameters)
@@ -1699,11 +1699,11 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 	}
 
 	//将params转换Parameters.Parameter，出错时返回给前端
-	var Parameters modelarts.Parameters
-	if err := json.Unmarshal([]byte(params), &Parameters); err != nil {
-		ctx.ServerError("json.Unmarshal failed:", err)
-		return
-	}
+	// var Parameters modelarts.Parameters
+	// if err := json.Unmarshal([]byte(params), &Parameters); err != nil {
+	// 	ctx.ServerError("json.Unmarshal failed:", err)
+	// 	return
+	// }
 
 	err = modelarts.GenerateInferenceJob(ctx, req)
 	if err != nil {
@@ -1819,7 +1819,7 @@ func inferenceJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModel
 	ctx.Data["PageIsCloudBrain"] = true
 
 	t := time.Now()
-	var jobName = cutString(ctx.User.Name, 5) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
+	var jobName = "inference" + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
 	ctx.Data["job_name"] = jobName
 
 	attachs, err := models.GetModelArtsUserAttachments(ctx.User.ID)
@@ -1857,9 +1857,6 @@ func inferenceJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModel
 	}
 	ctx.Data["flavor_infos"] = flavorInfos.Info
 
-	outputObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.OutputPath
-	ctx.Data["train_url"] = outputObsPath
-
 	configList, err := getConfigList(modelarts.PerPage, 1, modelarts.SortByCreateTime, "desc", "", modelarts.ConfigTypeCustom)
 	if err != nil {
 		ctx.ServerError("getConfigList failed:", err)