From 256a87f54c7220693634291844a23729d69941a0 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Tue, 16 May 2023 10:31:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=88=E8=9E=8D=E5=90=88=E5=8D=97=E4=BA=AC?= =?UTF-8?q?=E5=92=8C=E5=8D=8E=E4=B8=BA=E6=8E=A5=E5=8F=A3=EF=BC=89=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: a6f7ec5a54bf657807005ae87f13fbd958c9460a --- .../internal/logic/createtrainingjoblogic.go | 88 ++++++++++++++----- 1 file changed, 65 insertions(+), 23 deletions(-) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createtrainingjoblogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createtrainingjoblogic.go index a544fbb2..acdf31dd 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createtrainingjoblogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createtrainingjoblogic.go @@ -1,14 +1,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" ) @@ -30,25 +34,63 @@ func NewCreateTrainingJobLogic(ctx context.Context, svcCtx *svc.ServiceContext) // CreateTrainingJob 创建训练作业 func (l *CreateTrainingJobLogic) CreateTrainingJob(in *modelarts.CreateTrainingJobReq) (*modelarts.CreateTrainingJobResp, error) { var resp modelarts.CreateTrainingJobResp - url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/training-jobs" - reqByte, err := json.Marshal(in) - if err != nil { - return nil, err - } - payload := strings.NewReader(string(reqByte)) - token := common.GetToken() - statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.POST, url, payload, token) - if err != nil { - return nil, err - } - if statusCode == 201 { + //根据智算类型判断走华为智算还是南京智算 + modelArtsType := in.ModelArtsType + if modelArtsType == "huawei" { + modelArtsUrl := l.svcCtx.Config.ModelArtsUrl + url := modelArtsUrl + "v2/" + in.ProjectId + "/training-jobs" + reqByte, err := json.Marshal(in) + if err != nil { + return nil, err + } + payload := strings.NewReader(string(reqByte)) + token := common.GetToken() + statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.POST, url, payload, token) + if err != nil { + return nil, err + } + if statusCode == 201 { + json.Unmarshal(body, &resp) + resp.Code = 200 + resp.Msg = "Success" + } else if statusCode != 201 { + json.Unmarshal(body, &resp) + resp.Code = 400 + resp.Msg = "Failure" + } + } else if modelArtsType == "nanjing" { + AK := l.svcCtx.Config.AK + SK := l.svcCtx.Config.SK + NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl + XProjectId := l.svcCtx.Config.XProjectId + XDomainId := l.svcCtx.Config.XDomainId + s := core.Signer{ + Key: AK, + Secret: SK, + } + reqByte, err := json.Marshal(in) + r, err := http.NewRequest("POST", NanjingModelArtsUrl+"v2/"+in.ProjectId+"/training-jobs", + 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-Domain-Id", XDomainId) + 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) - resp.Code = 200 - resp.Msg = "Success" - } else if statusCode != 201 { - json.Unmarshal(body, &resp) - resp.Code = 400 - resp.Msg = "Failure" } return &resp, nil }