Browse Source

updated createDeployTask apis

Former-commit-id: c45af4d037
pull/291/head
tzwang 1 year ago
parent
commit
7c6389d3d8
4 changed files with 19 additions and 15 deletions
  1. +2
    -2
      desc/inference/inference.api
  2. +3
    -6
      internal/handler/inference/createdeploytaskhandler.go
  3. +3
    -6
      internal/handler/inference/getadaptersbymodelhandler.go
  4. +11
    -1
      internal/logic/inference/getadaptersbymodellogic.go

+ 2
- 2
desc/inference/inference.api View File

@@ -195,13 +195,13 @@ type (
} }


GetAdaptersByModelResp { GetAdaptersByModelResp {
Adapters []AdapterAvail `json:"adapters"`
Adapters []*AdapterAvail `json:"adapters"`
} }


AdapterAvail { AdapterAvail {
AdapterId string `json:"adapterId"` AdapterId string `json:"adapterId"`
AdapterName string `json:"taskName"` AdapterName string `json:"taskName"`
Clusters []ClusterAvail `json:"clusters"`
Clusters []*ClusterAvail `json:"clusters"`
} }


ClusterAvail { ClusterAvail {


+ 3
- 6
internal/handler/inference/createdeploytaskhandler.go View File

@@ -1,6 +1,7 @@
package inference package inference


import ( import (
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
"net/http" "net/http"


"github.com/zeromicro/go-zero/rest/httpx" "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) { return func(w http.ResponseWriter, r *http.Request) {
var req types.CreateDeployTaskReq var req types.CreateDeployTaskReq
if err := httpx.Parse(r, &req); err != nil { if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
result.ParamErrorResult(r, w, err)
return return
} }


l := inference.NewCreateDeployTaskLogic(r.Context(), svcCtx) l := inference.NewCreateDeployTaskLogic(r.Context(), svcCtx)
resp, err := l.CreateDeployTask(&req) 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)
} }
} }

+ 3
- 6
internal/handler/inference/getadaptersbymodelhandler.go View File

@@ -1,6 +1,7 @@
package inference package inference


import ( import (
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
"net/http" "net/http"


"github.com/zeromicro/go-zero/rest/httpx" "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) { return func(w http.ResponseWriter, r *http.Request) {
var req types.GetAdaptersByModelReq var req types.GetAdaptersByModelReq
if err := httpx.Parse(r, &req); err != nil { if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
result.ParamErrorResult(r, w, err)
return return
} }


l := inference.NewGetAdaptersByModelLogic(r.Context(), svcCtx) l := inference.NewGetAdaptersByModelLogic(r.Context(), svcCtx)
resp, err := l.GetAdaptersByModel(&req) 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)
} }
} }

+ 11
- 1
internal/logic/inference/getadaptersbymodellogic.go View File

@@ -2,6 +2,7 @@ package inference


import ( import (
"context" "context"
"errors"


"gitlink.org.cn/JointCloud/pcm-coordinator/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/internal/svc"
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/types" "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) { 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 return
} }

Loading…
Cancel
Save