Browse Source

update

tags/v1.21.12.1
Gitea 4 years ago
parent
commit
87fa475369
3 changed files with 26 additions and 1 deletions
  1. BIN
      main
  2. +25
    -0
      modules/storage/obs.go
  3. +1
    -1
      templates/repo/modelarts/trainjob/list_model.tmpl

BIN
main View File


+ 25
- 0
modules/storage/obs.go View File

@@ -175,6 +175,7 @@ func GetObsListObject(jobName string) ([]string, error) {
input.Prefix = strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath), "/")
log.Info("input.Prefix:", input.Prefix)
output, err := ObsCli.ListObjects(input)
log.Info("output.Prefix:", output)
ModelListArr := make([]string, 0)
if err == nil {
fmt.Printf("RequestId:%s\n", output.RequestId)
@@ -184,6 +185,7 @@ func GetObsListObject(jobName string) ([]string, error) {
str1 := strings.Split(val.Key, "/")
ModelList := str1[len(str1)-1]
ModelListArr = append(ModelListArr, ModelList)
log.Info("ModelListArr.Prefix:", ModelListArr)
}
return ModelListArr, err
} else {
@@ -220,6 +222,29 @@ func ObsGenMultiPartSignedUrl(uuid string, uploadId string, partNumber int, file
return output.SignedUrl, nil
}

func GetObsCreateSignedUrl(uuid string, uploadId string, partNumber int, fileName string) (string, error) {

input := &obs.CreateSignedUrlInput{}
input.Bucket = setting.Bucket
input.Key = strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
input.Expires = 60 * 60
input.Method = obs.HttpMethodPut

input.QueryParams = map[string]string{
"partNumber": com.ToStr(partNumber, 10),
"uploadId": uploadId,
//"partSize": com.ToStr(partSize,10),
}

output, err := ObsCli.CreateSignedUrl(input)
if err != nil {
log.Error("CreateSignedUrl failed:", err.Error())
return "", err
}

return output.SignedUrl, nil
}

func ObsGetPreSignedUrl(uuid, fileName string) (string, error) {
input := &obs.CreateSignedUrlInput{}
input.Method = obs.HttpMethodGet


+ 1
- 1
templates/repo/modelarts/trainjob/list_model.tmpl View File

@@ -22,7 +22,7 @@
</div>
<div class="content active">
<div class="ui list">
{{.TrainJobListModel}}
{{.ListModel}}
{{range .Tasks}}
<div class="item">
<i class="file icon"></i>


Loading…
Cancel
Save