diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listmodelslogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listmodelslogic.go index 3af3b4f2..6a3144c4 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listmodelslogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listmodelslogic.go @@ -6,10 +6,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" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts" @@ -34,12 +39,50 @@ func NewListModelsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListMo func (l *ListModelsLogic) ListModels(in *modelarts.ListModelReq) (*modelarts.ListModelResp, error) { // todo: add your logic here and delete this line var resp modelarts.ListModelResp - url := "https://modelarts.cn-north-4.myhuaweicloud.com/v1/" + in.ProjectId + "/models" - token := common.GetToken() - body, err := tool.HttpClient(tool.GET, url, nil, token) - 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" + token := common.GetToken() + body, err := tool.HttpClient(tool.GET, url, nil, 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 + XDomainId := l.svcCtx.Config.XDomainId + s := core.Signer{ + Key: AK, + Secret: SK, + } + r, err := http.NewRequest("GET", NanjingModelArtsUrl+"v1/"+in.ProjectId+"/models", + bytes.NewBuffer([]byte("foo=bar"))) + 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) } - json.Unmarshal(body, &resp) + return &resp, nil }