floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:查询数据集列表接口修改 

Former-commit-id: 876fc522810473bd4ff8deacb06a665f367aec71
This commit is contained in:
qiwang 2023-05-17 17:17:58 +08:00
parent 763df099e8
commit 6c6a4ad6a8
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go
View File

@ -6,7 +6,6 @@ import (
"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
"PCM/common/tool" "PCM/common/tool"
"bytes"
"context" "context"
"fmt" "fmt"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
@ -45,7 +44,7 @@ func (l *GetDatasetListLogic) GetDatasetList(in *modelarts.DataSetReq) (*modelar
} }
//根据智算类型判断走华为智算还是南京智算 //根据智算类型判断走华为智算还是南京智算
modelArtsType := in.ModelArtsType modelArtsType := in.ModelArtsType
if modelArtsType == "huawei" { if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
modelArtsUrl := l.svcCtx.Config.ModelArtsUrl modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
token := common.GetToken() token := common.GetToken()
statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, modelArtsUrl+"v2/"+projectId+"/datasets?offset="+offset+"&"+"limit="+limit, strings.NewReader(``), token) statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, modelArtsUrl+"v2/"+projectId+"/datasets?offset="+offset+"&"+"limit="+limit, strings.NewReader(``), token)
@ -61,25 +60,23 @@ func (l *GetDatasetListLogic) GetDatasetList(in *modelarts.DataSetReq) (*modelar
resp.Code = 400 resp.Code = 400
resp.Msg = "Failure" resp.Msg = "Failure"
} }
} else if modelArtsType == "nanjing" { } else if modelArtsType == l.svcCtx.Config.NanjingModelArtsType {
AK := l.svcCtx.Config.AK AK := l.svcCtx.Config.AK
SK := l.svcCtx.Config.SK SK := l.svcCtx.Config.SK
NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl
XProjectId := l.svcCtx.Config.XProjectId XProjectId := l.svcCtx.Config.XProjectId
XDomainId := l.svcCtx.Config.XDomainId
s := core.Signer{ s := core.Signer{
Key: AK, Key: AK,
Secret: SK, Secret: SK,
} }
r, err := http.NewRequest("GET", NanjingModelArtsUrl+in.ProjectId+"/datasets?offset="+offset+"&"+"limit="+limit, r, err := http.NewRequest("GET", NanjingModelArtsUrl+"v2/"+in.ProjectId+"/datasets?offset="+offset+"&"+"limit="+limit,
bytes.NewBuffer([]byte("foo=bar"))) nil)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
//return //return
} }
r.Header.Add("content-type", "application/json;charset=UTF-8") r.Header.Add("content-type", "application/json;charset=UTF-8")
r.Header.Add("X-Project-Id", XProjectId) r.Header.Add("X-Project-Id", XProjectId)
r.Header.Add("X-Domain-Id", XDomainId)
r.Header.Add("x-stage", "RELEASE") r.Header.Add("x-stage", "RELEASE")
s.Sign(r) s.Sign(r)
client := http.DefaultClient client := http.DefaultClient