fix:创建数据集接口修改
Former-commit-id: 240f0fcfac32eae5889a06e8c4baffbbf5d10a10
This commit is contained in:
parent
6c6a4ad6a8
commit
90099d1dbb
|
@ -1,10 +1,15 @@
|
||||||
package logic
|
package logic
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"APIGW-go-sdk/core"
|
||||||
"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
|
"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
|
||||||
"PCM/common/tool"
|
"PCM/common/tool"
|
||||||
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
"k8s.io/apimachinery/pkg/util/json"
|
"k8s.io/apimachinery/pkg/util/json"
|
||||||
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
|
"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
|
||||||
|
@ -31,20 +36,56 @@ func NewCreateDataSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cre
|
||||||
func (l *CreateDataSetLogic) CreateDataSet(in *modelarts.CreateDataSetReq) (*modelarts.CreateDataSetResq, error) {
|
func (l *CreateDataSetLogic) CreateDataSet(in *modelarts.CreateDataSetReq) (*modelarts.CreateDataSetResq, error) {
|
||||||
// todo: add your logic here and delete this line
|
// todo: add your logic here and delete this line
|
||||||
var resp modelarts.CreateDataSetResq
|
var resp modelarts.CreateDataSetResq
|
||||||
url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/datasets"
|
//根据智算类型判断走华为智算还是南京智算
|
||||||
reqByte, err := json.Marshal(in)
|
modelArtsType := in.ModelArtsType
|
||||||
if err != nil {
|
if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
|
||||||
return nil, err
|
modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
|
||||||
}
|
url := modelArtsUrl + "v2/" + in.ProjectId + "/datasets"
|
||||||
payload := strings.NewReader(string(reqByte))
|
reqByte, err := json.Marshal(in)
|
||||||
token := common.GetToken()
|
if err != nil {
|
||||||
body, err := tool.HttpClient(tool.POST, url, payload, token)
|
return nil, err
|
||||||
if err != nil {
|
}
|
||||||
return nil, err
|
payload := strings.NewReader(string(reqByte))
|
||||||
}
|
token := common.GetToken()
|
||||||
json.Unmarshal(body, &resp)
|
body, err := tool.HttpClient(tool.POST, url, payload, token)
|
||||||
if &resp == nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
}
|
||||||
|
json.Unmarshal(body, &resp)
|
||||||
|
if &resp == nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
} else if modelArtsType == l.svcCtx.Config.NanjingModelArtsType {
|
||||||
|
AK := l.svcCtx.Config.AK
|
||||||
|
SK := l.svcCtx.Config.SK
|
||||||
|
NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl
|
||||||
|
XProjectId := l.svcCtx.Config.XProjectId
|
||||||
|
s := core.Signer{
|
||||||
|
Key: AK,
|
||||||
|
Secret: SK,
|
||||||
|
}
|
||||||
|
reqByte, err := json.Marshal(in)
|
||||||
|
r, err := http.NewRequest("POST", NanjingModelArtsUrl+"v2/"+in.ProjectId+"/datasets",
|
||||||
|
bytes.NewBuffer(reqByte))
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
//return
|
||||||
|
}
|
||||||
|
r.Header.Add("content-type", "application/json;charset=UTF-8")
|
||||||
|
r.Header.Add("X-Project-Id", XProjectId)
|
||||||
|
r.Header.Add("x-stage", "RELEASE")
|
||||||
|
s.Sign(r)
|
||||||
|
client := http.DefaultClient
|
||||||
|
res, err := client.Do(r)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
}
|
||||||
|
defer res.Body.Close()
|
||||||
|
body, err := ioutil.ReadAll(res.Body)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
}
|
||||||
|
json.Unmarshal(body, &resp)
|
||||||
}
|
}
|
||||||
return &resp, nil
|
return &resp, nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue