From a55cc27689bdd0d4980bf530452f7f681eaaf978 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Thu, 18 May 2023 16:42:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=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: 58bba95d9f7ed7e299b06841e198150ccf361880 --- .../rpc/internal/logic/createmodellogic.go | 72 ++++++++++++++----- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createmodellogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createmodellogic.go index a4159722..0720af58 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createmodellogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createmodellogic.go @@ -6,14 +6,18 @@ package logic */ import ( + "APIGW-go-sdk/core" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common" - "PCM/common/tool" - "context" - "k8s.io/apimachinery/pkg/util/json" - "strings" - "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts" + "PCM/common/tool" + "bytes" + "context" + "fmt" + "io/ioutil" + "k8s.io/apimachinery/pkg/util/json" + "net/http" + "strings" "github.com/zeromicro/go-zero/core/logx" ) @@ -36,17 +40,53 @@ func NewCreateModelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Creat func (l *CreateModelLogic) CreateModel(in *modelarts.CreateModelReq) (*modelarts.CreateModelResp, error) { // todo: add your logic here and delete this line var resp modelarts.CreateModelResp - url := "https://modelarts.cn-north-4.myhuaweicloud.com/v1/" + in.ProjectId + "/models" - reqByte, err := json.Marshal(in) - if err != nil { - return nil, err + //根据智算类型判断走华为智算还是南京智算 + modelArtsType := in.ModelArtsType + if modelArtsType == l.svcCtx.Config.HaweiModelArtsType { + modelArtsUrl := l.svcCtx.Config.ModelArtsUrl + url := modelArtsUrl + "v1/" + in.ProjectId + "/models" + 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) + } 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+"v1/"+in.ProjectId+"/models", + bytes.NewBuffer(reqByte)) + if err != nil { + fmt.Println(err) + } + 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) } - 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) + return &resp, nil }