| @@ -2066,13 +2066,6 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference | |||||
| gitRepo, _ := git.OpenRepository(repo.RepoPath()) | gitRepo, _ := git.OpenRepository(repo.RepoPath()) | ||||
| commitID, _ := gitRepo.GetBranchCommitID(branchName) | commitID, _ := gitRepo.GetBranchCommitID(branchName) | ||||
| _, dataUrl, datasetNames, _, err := getDatasUrlListByUUIDS(uuid) | |||||
| if err != nil { | |||||
| inferenceJobErrorNewDataPrepare(ctx, form) | |||||
| ctx.RenderWithErr(ctx.Tr(errStr), tplModelArtsInferenceJobNew, &form) | |||||
| return | |||||
| } | |||||
| if err := downloadCode(repo, codeLocalPath, branchName); err != nil { | if err := downloadCode(repo, codeLocalPath, branchName); err != nil { | ||||
| log.Error("Create task failed, server timed out: %s (%v)", repo.FullName(), err) | log.Error("Create task failed, server timed out: %s (%v)", repo.FullName(), err) | ||||
| inferenceJobErrorNewDataPrepare(ctx, form) | inferenceJobErrorNewDataPrepare(ctx, form) | ||||
| @@ -2111,6 +2104,28 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference | |||||
| Label: modelarts.CkptUrl, | Label: modelarts.CkptUrl, | ||||
| Value: "s3:/" + ckptUrl, | Value: "s3:/" + ckptUrl, | ||||
| }) | }) | ||||
| datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid) | |||||
| if err != nil { | |||||
| inferenceJobErrorNewDataPrepare(ctx, form) | |||||
| ctx.RenderWithErr(ctx.Tr(errStr), tplModelArtsInferenceJobNew, &form) | |||||
| return | |||||
| } | |||||
| dataPath := dataUrl | |||||
| jsondatas, err := json.Marshal(datasUrlList) | |||||
| if err != nil { | |||||
| log.Error("Failed to Marshal: %v", err) | |||||
| inferenceJobErrorNewDataPrepare(ctx, form) | |||||
| ctx.RenderWithErr("json error:"+err.Error(), tplModelArtsInferenceJobNew, &form) | |||||
| return | |||||
| } | |||||
| if isMultiDataset { | |||||
| param = append(param, models.Parameter{ | |||||
| Label: modelarts.MultiDataUrl, | |||||
| Value: string(jsondatas), | |||||
| }) | |||||
| } | |||||
| existDeviceTarget := false | existDeviceTarget := false | ||||
| if len(params) != 0 { | if len(params) != 0 { | ||||
| err := json.Unmarshal([]byte(params), ¶meters) | err := json.Unmarshal([]byte(params), ¶meters) | ||||
| @@ -2143,7 +2158,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference | |||||
| req := &modelarts.GenerateInferenceJobReq{ | req := &modelarts.GenerateInferenceJobReq{ | ||||
| JobName: jobName, | JobName: jobName, | ||||
| DisplayJobName: displayJobName, | DisplayJobName: displayJobName, | ||||
| DataUrl: dataUrl, | |||||
| DataUrl: dataPath, | |||||
| Description: description, | Description: description, | ||||
| CodeObsPath: codeObsPath, | CodeObsPath: codeObsPath, | ||||
| BootFileUrl: codeObsPath + bootFile, | BootFileUrl: codeObsPath + bootFile, | ||||