From 7c6389d3d85ec808cce53d956c012a904f269e24 Mon Sep 17 00:00:00 2001 From: tzwang Date: Thu, 29 Aug 2024 11:10:28 +0800 Subject: [PATCH] updated createDeployTask apis Former-commit-id: c45af4d03769819fa0ff4c2a8d6e83e7fd3b93dd --- desc/inference/inference.api | 4 ++-- .../handler/inference/createdeploytaskhandler.go | 9 +++------ .../handler/inference/getadaptersbymodelhandler.go | 9 +++------ internal/logic/inference/getadaptersbymodellogic.go | 12 +++++++++++- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/desc/inference/inference.api b/desc/inference/inference.api index ec793a70..962b9700 100644 --- a/desc/inference/inference.api +++ b/desc/inference/inference.api @@ -195,13 +195,13 @@ type ( } GetAdaptersByModelResp { - Adapters []AdapterAvail `json:"adapters"` + Adapters []*AdapterAvail `json:"adapters"` } AdapterAvail { AdapterId string `json:"adapterId"` AdapterName string `json:"taskName"` - Clusters []ClusterAvail `json:"clusters"` + Clusters []*ClusterAvail `json:"clusters"` } ClusterAvail { diff --git a/internal/handler/inference/createdeploytaskhandler.go b/internal/handler/inference/createdeploytaskhandler.go index 3ed4e9d3..7fffde9d 100644 --- a/internal/handler/inference/createdeploytaskhandler.go +++ b/internal/handler/inference/createdeploytaskhandler.go @@ -1,6 +1,7 @@ package inference import ( + "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "net/http" "github.com/zeromicro/go-zero/rest/httpx" @@ -13,16 +14,12 @@ func CreateDeployTaskHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req types.CreateDeployTaskReq if err := httpx.Parse(r, &req); err != nil { - httpx.ErrorCtx(r.Context(), w, err) + result.ParamErrorResult(r, w, err) return } l := inference.NewCreateDeployTaskLogic(r.Context(), svcCtx) resp, err := l.CreateDeployTask(&req) - if err != nil { - httpx.ErrorCtx(r.Context(), w, err) - } else { - httpx.OkJsonCtx(r.Context(), w, resp) - } + result.HttpResult(r, w, resp, err) } } diff --git a/internal/handler/inference/getadaptersbymodelhandler.go b/internal/handler/inference/getadaptersbymodelhandler.go index 7aeabfad..d199313f 100644 --- a/internal/handler/inference/getadaptersbymodelhandler.go +++ b/internal/handler/inference/getadaptersbymodelhandler.go @@ -1,6 +1,7 @@ package inference import ( + "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "net/http" "github.com/zeromicro/go-zero/rest/httpx" @@ -13,16 +14,12 @@ func GetAdaptersByModelHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req types.GetAdaptersByModelReq if err := httpx.Parse(r, &req); err != nil { - httpx.ErrorCtx(r.Context(), w, err) + result.ParamErrorResult(r, w, err) return } l := inference.NewGetAdaptersByModelLogic(r.Context(), svcCtx) resp, err := l.GetAdaptersByModel(&req) - if err != nil { - httpx.ErrorCtx(r.Context(), w, err) - } else { - httpx.OkJsonCtx(r.Context(), w, resp) - } + result.HttpResult(r, w, resp, err) } } diff --git a/internal/logic/inference/getadaptersbymodellogic.go b/internal/logic/inference/getadaptersbymodellogic.go index f0450fd5..d4ce296a 100644 --- a/internal/logic/inference/getadaptersbymodellogic.go +++ b/internal/logic/inference/getadaptersbymodellogic.go @@ -2,6 +2,7 @@ package inference import ( "context" + "errors" "gitlink.org.cn/JointCloud/pcm-coordinator/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/internal/types" @@ -24,7 +25,16 @@ func NewGetAdaptersByModelLogic(ctx context.Context, svcCtx *svc.ServiceContext) } func (l *GetAdaptersByModelLogic) GetAdaptersByModel(req *types.GetAdaptersByModelReq) (resp *types.GetAdaptersByModelResp, err error) { - // todo: add your logic here and delete this line + resp = &types.GetAdaptersByModelResp{} + + adapterList, err := l.svcCtx.Scheduler.AiStorages.GetAdaptersByType("1") + if err != nil { + return nil, err + } + + if len(adapterList) == 0 { + return nil, errors.New("适配器不存在") + } return }