diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 00c9a5c88..d1d00d095 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -1101,15 +1101,15 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) Value: modelarts.Ascend, }) } - DatasUrlList, dataUrl, datasetNames, isMultiDataset, err := GetDatasUrlListByUUIDS(uuid) + datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid) if err != nil { - log.Error("Failed to GetDatasUrlListByUUIDS: %v", err) + log.Error("Failed to getDatasUrlListByUUIDS: %v", err) trainJobErrorNewDataPrepare(ctx, form) - ctx.RenderWithErr("Failed to GetDatasUrlListByUUIDS:"+err.Error(), tplModelArtsTrainJobNew, &form) + ctx.RenderWithErr("Failed to getDatasUrlListByUUIDS:"+err.Error(), tplModelArtsTrainJobNew, &form) return } dataPath := dataUrl - jsondatas, err := json.Marshal(DatasUrlList) + jsondatas, err := json.Marshal(datasUrlList) if err != nil { log.Error("Failed to Marshal: %v", err) trainJobErrorNewDataPrepare(ctx, form) @@ -1342,15 +1342,15 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ }) } - DatasUrlList, dataUrl, datasetNames, isMultiDataset, err := GetDatasUrlListByUUIDS(uuid) + datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid) if err != nil { - log.Error("Failed to GetDatasUrlListByUUIDS: %v", err) + log.Error("Failed to getDatasUrlListByUUIDS: %v", err) versionErrorDataPrepare(ctx, form) - ctx.RenderWithErr("Failed to GetDatasUrlListByUUIDS:"+err.Error(), tplModelArtsTrainJobVersionNew, &form) + ctx.RenderWithErr("Failed to getDatasUrlListByUUIDS:"+err.Error(), tplModelArtsTrainJobVersionNew, &form) return } dataPath := dataUrl - jsondatas, err := json.Marshal(DatasUrlList) + jsondatas, err := json.Marshal(datasUrlList) if err != nil { log.Error("Failed to Marshal: %v", err) versionErrorDataPrepare(ctx, form) @@ -2482,7 +2482,7 @@ func TrainJobDownloadLogFile(ctx *context.Context) { ctx.Resp.Header().Set("Cache-Control", "max-age=0") http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently) } -func GetDatasUrlListByUUIDS(uuidStr string) ([]models.Datasurl, string, string, bool, error) { +func getDatasUrlListByUUIDS(uuidStr string) ([]models.Datasurl, string, string, bool, error) { var isMultiDataset bool var dataUrl string var datasetNames string @@ -2528,43 +2528,4 @@ func GetDatasUrlListByUUIDS(uuidStr string) ([]models.Datasurl, string, string, } return datasUrlList, dataUrl, datasetNames, isMultiDataset, nil - - // var dataUrl string - // var DatasUrlList []models.Datasurl - // uuidList := strings.Split(uuidStr, ";") - // isMultiDataset := false - - // if len(uuidList) >= 1 { - // for _, uuid := range uuidList { - // attach, err := models.GetAttachmentByUUID(uuid) - // if err != nil { - // log.Error("GetAttachmentByUUID failed: %v", err) - // return nil, "", isMultiDataset, err - // } - // datasetName := attach.Name - // index := strings.LastIndex(datasetName, ".") - // if index <= 0 { - // index = 0 - // } - // datasetNameHead := datasetName[:index] - // datasetUrl := "s3://" + setting.Bucket + "/" + setting.BasePath + path.Join(uuid[0:1], uuid[1:2]) + "/" + uuid + uuid + "/" - // DatasUrlList = append(DatasUrlList, models.Datasurl{ - // DatasetUrl: datasetUrl, - // DatasetName: datasetNameHead, - // }) - // } - // firstDataset := uuidList[0] - // dataUrl = "/" + setting.Bucket + "/" + setting.BasePath + path.Join(firstDataset[0:1], firstDataset[1:2]) + "/" + firstDataset + firstDataset + "/" - // isMultiDataset = true - // return DatasUrlList, dataUrl, isMultiDataset, nil - // } - // return nil, "", isMultiDataset, nil -} -func IsDatasetUseCountExceed(uuid string) bool { - uuidList := strings.Split(uuid, ";") - if len(uuidList) > setting.MaxDatasetNum { - return true - } else { - return false - } }