Browse Source

fix-isuue

tags/v1.22.6.2^2
liuzx 3 years ago
parent
commit
f2087b7c75
2 changed files with 11 additions and 0 deletions
  1. +5
    -0
      models/cloudbrain.go
  2. +6
    -0
      routers/repo/modelarts.go

+ 5
- 0
models/cloudbrain.go View File

@@ -1005,6 +1005,11 @@ type Datasurl struct {
DatasetName string `json:"dataset_name"` DatasetName string `json:"dataset_name"`
} }


type DatasetDownload struct {
DatasetName string `json:"dataset_name"`
DatasetDownloadLink string `json:"dataset_download_link"`
}

type DataSource struct { type DataSource struct {
DatasetID string `json:"dataset_id"` DatasetID string `json:"dataset_id"`
DatasetVersion string `json:"dataset_version"` DatasetVersion string `json:"dataset_version"`


+ 6
- 0
routers/repo/modelarts.go View File

@@ -286,6 +286,7 @@ func NotebookShow(ctx *context.Context) {
} }


datasetDownloadLink := "" datasetDownloadLink := ""
datasetDownload := make([]models.DatasetDownload, 0)
if ctx.IsSigned { if ctx.IsSigned {
if task.Uuid != "" && task.UserID == ctx.User.ID { if task.Uuid != "" && task.UserID == ctx.User.ID {
uuidList := strings.Split(task.Uuid, ";") uuidList := strings.Split(task.Uuid, ";")
@@ -293,6 +294,10 @@ func NotebookShow(ctx *context.Context) {
attachment, err := models.GetAttachmentByUUID(uuidStr) attachment, err := models.GetAttachmentByUUID(uuidStr)
if err == nil { if err == nil {
datasetDownloadLink = datasetDownloadLink + attachment.S3DownloadURL() + ";" datasetDownloadLink = datasetDownloadLink + attachment.S3DownloadURL() + ";"
datasetDownload = append(datasetDownload, models.DatasetDownload{
DatasetName: attachment.Name,
DatasetDownloadLink: datasetDownloadLink,
})
} }
} }
datasetName, err := GetDatasetNameByUUID(task.Uuid) datasetName, err := GetDatasetNameByUUID(task.Uuid)
@@ -331,6 +336,7 @@ func NotebookShow(ctx *context.Context) {
} }
ctx.Data["duration"] = task.TrainJobDuration ctx.Data["duration"] = task.TrainJobDuration
ctx.Data["datasetDownloadLink"] = datasetDownloadLink ctx.Data["datasetDownloadLink"] = datasetDownloadLink
ctx.Data["datasetDownload"] = datasetDownload
ctx.Data["task"] = task ctx.Data["task"] = task
ctx.Data["ID"] = ID ctx.Data["ID"] = ID
ctx.Data["jobName"] = task.JobName ctx.Data["jobName"] = task.JobName


Loading…
Cancel
Save