From ebfca654cefe111d360fc3d6d6883dd25cc0adcb Mon Sep 17 00:00:00 2001 From: lee <320844511@qq.com> Date: Tue, 28 Mar 2023 17:13:33 +0800 Subject: [PATCH] =?UTF-8?q?modelarts=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/logic/getimporttasklistlogic.go | 10 +++++--- .../logic/getlisttrainingjobslogic.go | 10 +++++--- .../PCM-MODELARTS/rpc/pb/pcm-modelarts.proto | 24 +++++-------------- adaptor/PCM-CORE/api/desc/ai/pcm-ai.api | 17 ++++--------- .../logic/ai/getlisttrainingjobslogic.go | 8 ++++--- .../api/internal/logic/ai/listimportlogic.go | 2 +- adaptor/PCM-CORE/api/pcm.go | 2 +- 7 files changed, 31 insertions(+), 42 deletions(-) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getimporttasklistlogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getimporttasklistlogic.go index a1af375e..efd4625e 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getimporttasklistlogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getimporttasklistlogic.go @@ -43,9 +43,13 @@ func (l *GetImportTaskListLogic) GetImportTaskList(in *modelarts.ListImportTasks log.Fatal(err) } if statusCode == 200 { - json.Unmarshal(body, &resp.Resp200) - } else if statusCode == 400 { - json.Unmarshal(body, &resp.Resp400) + json.Unmarshal(body, &resp) + resp.Code = 200 + resp.Msg = "Success" + } else if statusCode != 200 { + json.Unmarshal(body, &resp) + resp.Code = 400 + resp.Msg = "Failure" } return &resp, nil } diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getlisttrainingjobslogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getlisttrainingjobslogic.go index ac93a3d8..925f5b56 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getlisttrainingjobslogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getlisttrainingjobslogic.go @@ -39,9 +39,13 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(in *modelarts.ListTrainin return nil, err } if statusCode == 200 { - json.Unmarshal(body, &resp.Resp200) - } else if statusCode == 400 { - json.Unmarshal(body, &resp.Resp400) + json.Unmarshal(body, &resp) + resp.Code = 200 + resp.Msg = "Success" + } else if statusCode != 200 { + json.Unmarshal(body, &resp) + resp.Code = 400 + resp.Msg = "Failure" } return &resp, nil } diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto b/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto index 625552d3..d59c93a2 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto @@ -102,19 +102,14 @@ message ListImportTasksReq{ } + message ListImportTasksResp{ - ListImportTasksResp200 resp200 = 1; //@gotags: copier:"Resp200" - ListImportTasksResp400 resp400 =2; //@gotags: copier:"Resp400" -} -message ListImportTasksResp200{ uint32 total_count = 1; //@gotags: copier:"TotalCount" repeated Import_tasks import_tasks = 2; //@gotags: copier:"ImportTasks" + int32 code =3; //@gotags: copier:"Code" + string msg =4; //@gotags: copier:"Msg" } -message ListImportTasksResp400{ - string error_msg = 1; //@gotags: copier:"ErrorMsg" - string error_code = 2; //@gotags: copier:"ErrorCode" - string error_solution = 3; //@gotags: copier:"ErrorSolution" -} + message Import_tasks{ uint32 annotated_sample_count = 1; //@gotags: copier:"AnnotatedSampleCount" @@ -189,15 +184,6 @@ message ListTrainingJobsreq{ } message ListTrainingJobsresp{ - ListTrainingJobsresp200 resp200 =1; - ListTrainingJobsresp400 resp400 =2; -} -message ListTrainingJobsresp400{ - string error_msg = 1; - string error_code = 2; - string error_solution = 3; -} -message ListTrainingJobsresp200{ int32 total = 1; //@gotags: copier:"Total" int32 count = 2; //@gotags: copier:"Count" int32 limit = 3; //@gotags: copier:"Limit" @@ -208,6 +194,8 @@ message ListTrainingJobsresp200{ string workspace_id = 8; //@gotags: copier:"WorkspaceID" string ai_project = 9; //@gotags: copier:"AiProject" repeated JobResponse items =10; //@gotags: copier:"Items" + int32 code =11; //@gotags: copier:"Code" + string msg =12; //@gotags: copier:"Msg" } message JobResponse{ diff --git a/adaptor/PCM-CORE/api/desc/ai/pcm-ai.api b/adaptor/PCM-CORE/api/desc/ai/pcm-ai.api index ad52847a..0cec4951 100644 --- a/adaptor/PCM-CORE/api/desc/ai/pcm-ai.api +++ b/adaptor/PCM-CORE/api/desc/ai/pcm-ai.api @@ -303,12 +303,10 @@ type ( Offset int32 `json:"offset,optional"` } ListImportTasksResp { - Resp200 *ListImportTasksResp200 `json:"resp200,omitempty"` - Resp400 *ListImportTasksResp400 `json:"resp400,omitempty"` - } - ListImportTasksResp200 { TotalCount uint32 `json:"totalCount,omitempty"` ImportTasks []ImportTasks `json:"importTasks,omitempty"` + Code int32 `json:"code,omitempty"` + Msg string `json:"msg,omitempty"` } ListImportTasksResp400 { ErrorMsg string `json:"errorMsg,omitempty"` @@ -519,10 +517,6 @@ type ( ProjectId string `json:"projectId"` } ListTrainingJobsresp { - Resp200 *ListTrainingJobsresp200 `json:"resp200,omitempty"` - Resp400 *ListTrainingJobsresp400 `json:"resp400,omitempty"` - } - ListTrainingJobsresp200 { Total int32 `json:"total"` Count int32 `json:"count"` Limit int32 `json:"limit"` @@ -533,11 +527,8 @@ type ( WorkspaceID string `json:"workspace_id"` AiProject string `json:"ai_project"` Items []Items `json:"items"` - } - ListTrainingJobsresp400 { - ErrorMsg string `json:"errorMsg,omitempty"` - ErrorCode string `json:"errorCode,omitempty"` - ErrorSolution string `json:"errorSolution,omitempty"` + Code int32 `json:"code,omitempty"` + Msg string `json:"msg,omitempty"` } ) /******************ListTrainingJobs end*************************/ diff --git a/adaptor/PCM-CORE/api/internal/logic/ai/getlisttrainingjobslogic.go b/adaptor/PCM-CORE/api/internal/logic/ai/getlisttrainingjobslogic.go index 5d6619a6..5b535be4 100644 --- a/adaptor/PCM-CORE/api/internal/logic/ai/getlisttrainingjobslogic.go +++ b/adaptor/PCM-CORE/api/internal/logic/ai/getlisttrainingjobslogic.go @@ -3,8 +3,10 @@ package ai import ( "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts" "PCM/common/tool" + "PCM/common/xerr" "context" "github.com/jinzhu/copier" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/json" "PCM/adaptor/PCM-CORE/api/internal/svc" @@ -31,9 +33,9 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJo modelartsReq := &modelarts.ListTrainingJobsreq{} err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) listDataSetResp, err := l.svcCtx.ModelArtsRpc.GetListTrainingJobs(l.ctx, modelartsReq) - //if err != nil { - // return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) - //} + if err != nil { + return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) + } marshal, err := json.Marshal(&listDataSetResp) if err != nil { return nil, err diff --git a/adaptor/PCM-CORE/api/internal/logic/ai/listimportlogic.go b/adaptor/PCM-CORE/api/internal/logic/ai/listimportlogic.go index f79c9fa2..442da110 100644 --- a/adaptor/PCM-CORE/api/internal/logic/ai/listimportlogic.go +++ b/adaptor/PCM-CORE/api/internal/logic/ai/listimportlogic.go @@ -36,6 +36,6 @@ func (l *ListImportLogic) ListImport(req *types.ListImportTasksReq) (resp *types return nil, err } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) return resp, nil } diff --git a/adaptor/PCM-CORE/api/pcm.go b/adaptor/PCM-CORE/api/pcm.go index c9d2da9a..5f667ebd 100644 --- a/adaptor/PCM-CORE/api/pcm.go +++ b/adaptor/PCM-CORE/api/pcm.go @@ -211,7 +211,7 @@ func initTaskCron(svc *svc.ServiceContext) { if err != nil { return } - for _, trainingJob := range trainingJobs.Resp200.Items { + for _, trainingJob := range trainingJobs.Items { _, err := svc.Db.Exec("update ai set status = ?,running_time = ?,start_time = ? where project_id = ? and name = ?", trainingJob.Status.Phase, trainingJob.Status.Duration/1000, tool.DurationToDateTime(trainingJob.Status.StartTime/1000), projectId, trainingJob.Metadata.Name) if err != nil { return