diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createalgorithmlogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createalgorithmlogic.go index 51057528..74f4d4e4 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createalgorithmlogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createalgorithmlogic.go @@ -1,13 +1,18 @@ package logic import ( + "APIGW-go-sdk/core" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts" "PCM/common/tool" + "bytes" "context" "encoding/json" + "fmt" "github.com/zeromicro/go-zero/core/logx" + "io/ioutil" + "net/http" "strings" ) @@ -28,25 +33,63 @@ func NewCreateAlgorithmLogic(ctx context.Context, svcCtx *svc.ServiceContext) *C // CreateAlgorithm 创建算法 func (l *CreateAlgorithmLogic) CreateAlgorithm(in *modelarts.CreateAlgorithmReq) (*modelarts.CreateAlgorithmResp, error) { var resp modelarts.CreateAlgorithmResp - url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/algorithms" - 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 == l.svcCtx.Config.HaweiModelArtsType { + modelArtsUrl := l.svcCtx.Config.ModelArtsUrl + url := modelArtsUrl + "v2/" + in.ProjectId + "/algorithms" + 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 == 400 { + json.Unmarshal(body, &resp) + resp.Code = 400 + resp.Msg = "Failure" + } + } 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 + 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+"/algorithms", + 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 == 400 { - json.Unmarshal(body, &resp) - resp.Code = 400 - resp.Msg = "Failure" } return &resp, nil } 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 acdf31dd..5e2986e0 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createtrainingjoblogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createtrainingjoblogic.go @@ -36,7 +36,7 @@ func (l *CreateTrainingJobLogic) CreateTrainingJob(in *modelarts.CreateTrainingJ var resp modelarts.CreateTrainingJobResp //根据智算类型判断走华为智算还是南京智算 modelArtsType := in.ModelArtsType - if modelArtsType == "huawei" { + if modelArtsType == l.svcCtx.Config.HaweiModelArtsType { modelArtsUrl := l.svcCtx.Config.ModelArtsUrl url := modelArtsUrl + "v2/" + in.ProjectId + "/training-jobs" reqByte, err := json.Marshal(in) @@ -58,7 +58,7 @@ func (l *CreateTrainingJobLogic) CreateTrainingJob(in *modelarts.CreateTrainingJ resp.Code = 400 resp.Msg = "Failure" } - } else if modelArtsType == "nanjing" { + } else if modelArtsType == l.svcCtx.Config.NanjingModelArtsType { AK := l.svcCtx.Config.AK SK := l.svcCtx.Config.SK NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl