Browse Source

Merge branch 'npu-model-upload' of git.openi.org.cn:OpenI/aiforge into npu-model-upload

pull/3134/head
lewis 2 years ago
parent
commit
69e8f012a7
2 changed files with 9 additions and 1 deletions
  1. +3
    -0
      routers/api/v1/repo/cloudbrain.go
  2. +6
    -1
      routers/api/v1/repo/modelarts.go

+ 3
- 0
routers/api/v1/repo/cloudbrain.go View File

@@ -172,6 +172,7 @@ func GetCloudBrainInferenceJob(ctx *context.APIContext) {
"JobID": jobID, "JobID": jobID,
"JobStatus": job.Status, "JobStatus": job.Status,
"JobDuration": job.TrainJobDuration, "JobDuration": job.TrainJobDuration,
"StartTime": job.StartTime,
}) })


} }
@@ -441,6 +442,7 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
"Content": result.Content, "Content": result.Content,
"Lines": result.Lines, "Lines": result.Lines,
"CanLogDownload": isCanDownloadLog(ctx, job), "CanLogDownload": isCanDownloadLog(ctx, job),
"StartTime": job.StartTime,
}) })
} }
} }
@@ -595,6 +597,7 @@ func CloudbrainGetLog(ctx *context.APIContext) {
"Content": content, "Content": content,
"Lines": result["Lines"], "Lines": result["Lines"],
"CanLogDownload": result["FileName"] != "", "CanLogDownload": result["FileName"] != "",
"StartTime": job.StartTime,
} }
//result := CloudbrainGetLogByJobId(job.JobID, job.JobName) //result := CloudbrainGetLogByJobId(job.JobID, job.JobName)
ctx.JSON(http.StatusOK, re) ctx.JSON(http.StatusOK, re)


+ 6
- 1
routers/api/v1/repo/modelarts.go View File

@@ -6,13 +6,14 @@
package repo package repo


import ( import (
"code.gitea.io/gitea/modules/urfs_client/urchin"
"encoding/json" "encoding/json"
"net/http" "net/http"
"path" "path"
"strconv" "strconv"
"strings" "strings"


"code.gitea.io/gitea/modules/urfs_client/urchin"

"code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/notification"


"code.gitea.io/gitea/modules/grampus" "code.gitea.io/gitea/modules/grampus"
@@ -50,6 +51,7 @@ func GetModelArtsNotebook2(ctx *context.APIContext) {
"JobName": job.JobName, "JobName": job.JobName,
"JobStatus": job.Status, "JobStatus": job.Status,
"JobDuration": job.TrainJobDuration, "JobDuration": job.TrainJobDuration,
"StartTime": job.StartTime,
}) })


} }
@@ -198,6 +200,7 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) {
"JobStatus": job.Status, "JobStatus": job.Status,
"JobDuration": job.TrainJobDuration, "JobDuration": job.TrainJobDuration,
"AiCenter": aiCenterName, "AiCenter": aiCenterName,
"StartTime": job.StartTime,
}) })


} }
@@ -325,6 +328,7 @@ func TrainJobGetLog(ctx *context.APIContext) {
"Content": result.Content, "Content": result.Content,
"Lines": result.Lines, "Lines": result.Lines,
"CanLogDownload": canLogDownload, "CanLogDownload": canLogDownload,
"StartTime": task.StartTime,
}) })
} }


@@ -541,6 +545,7 @@ func GetModelArtsInferenceJob(ctx *context.APIContext) {
"JobID": jobID, "JobID": jobID,
"JobStatus": job.Status, "JobStatus": job.Status,
"JobDuration": job.TrainJobDuration, "JobDuration": job.TrainJobDuration,
"StartTime": job.StartTime,
}) })


} }


Loading…
Cancel
Save