From 90099d1dbb3c67ccb340d9759a7d7b34fce02fd9 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Wed, 17 May 2023 17:30:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 240f0fcfac32eae5889a06e8c4baffbbf5d10a10 --- .../rpc/internal/logic/createdatasetlogic.go | 69 +++++++++++++++---- 1 file changed, 55 insertions(+), 14 deletions(-) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createdatasetlogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createdatasetlogic.go index 8d9b924d..b1f3eeac 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createdatasetlogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createdatasetlogic.go @@ -1,10 +1,15 @@ package logic import ( + "APIGW-go-sdk/core" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common" "PCM/common/tool" + "bytes" "context" + "fmt" + "io/ioutil" "k8s.io/apimachinery/pkg/util/json" + "net/http" "strings" "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) { // todo: add your logic here and delete this line var resp modelarts.CreateDataSetResq - url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/datasets" - reqByte, err := json.Marshal(in) - if err != nil { - return nil, err - } - payload := strings.NewReader(string(reqByte)) - token := common.GetToken() - body, err := tool.HttpClient(tool.POST, url, payload, token) - if err != nil { - return nil, err - } - json.Unmarshal(body, &resp) - if &resp == nil { - return nil, err + //根据智算类型判断走华为智算还是南京智算 + modelArtsType := in.ModelArtsType + if modelArtsType == l.svcCtx.Config.HaweiModelArtsType { + modelArtsUrl := l.svcCtx.Config.ModelArtsUrl + url := modelArtsUrl + "v2/" + in.ProjectId + "/datasets" + reqByte, err := json.Marshal(in) + if err != nil { + return nil, err + } + payload := strings.NewReader(string(reqByte)) + token := common.GetToken() + body, err := tool.HttpClient(tool.POST, url, payload, token) + if err != nil { + 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 }