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

fix:PCM-CORE代码修改 

Former-commit-id: 9596570500f3b378cf88cdbfa63a2769790ed2a9
This commit is contained in:
qiwang 2023-06-12 19:09:20 +08:00
parent 69e400259a
commit 41bb1732e0
6 changed files with 856 additions and 856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1688
adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go
View File

File diff suppressed because it is too large Load Diff

2
adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto
View File

@ -484,7 +484,7 @@ message CreateTrainingJobReq {
Algorithms algorithm = 3; // @gotags: copier:"AlgorithmsCtRq" Algorithms algorithm = 3; // @gotags: copier:"AlgorithmsCtRq"
SpecsC spec = 4; // @gotags: copier:"SpecsCtRq" SpecsC spec = 4; // @gotags: copier:"SpecsCtRq"
string project_id =5; // @gotags: copier:"ProjectId" string project_id =5; // @gotags: copier:"ProjectId"
string modelArtsType =6; // @gotags: copier:"modelArtsType" string modelArtsType =6; // @gotags: copier:"ModelArtsType"
} }
//创建训练任务出参 //创建训练任务出参
message CreateTrainingJobResp{ message CreateTrainingJobResp{

10
adaptor/PCM-CORE/api/desc/ai/pcm-ai.api
View File

@ -1109,9 +1109,9 @@ type (
JobConfigCARq *JobConfigAl `json:"jobConfig,optional"` JobConfigCARq *JobConfigAl `json:"jobConfig,optional"`
ResourceRequirementsCARq []*ResourceRequirements `json:"resourceRequirements,optional"` ResourceRequirementsCARq []*ResourceRequirements `json:"resourceRequirements,optional"`
AdvancedConfigCARq *AdvancedConfigAl `json:"advancedConfig,optional"` AdvancedConfigCARq *AdvancedConfigAl `json:"advancedConfig,optional"`
ProjectIdCARq string `path:"projectId"` ProjectIdCARq string `path:"projectId"`
/****************parmas from modelArtsType ********************/ /****************parmas from modelArtsType ********************/
modelArtsType string `form:"modelArtsType,optional"` modelArtsType string `json:"modelArtsType,optional"`
} }
CreateAlgorithmResp { CreateAlgorithmResp {
MetadataCARp *MetadataAlRp `json:"metadata,omitempty"` MetadataCARp *MetadataAlRp `json:"metadata,omitempty"`
@ -1129,8 +1129,8 @@ type (
/******************Delete dataset start*************************/ /******************Delete dataset start*************************/
type DeleteDataSetReq { type DeleteDataSetReq {
DatasetId string `json:"datasetId"` DatasetId string `path:"datasetId"`
ProjectId string `json:"projectId"` ProjectId string `path:"projectId"`
/****************parmas from modelArtsType ********************/ /****************parmas from modelArtsType ********************/
modelArtsType string `form:"modelArtsType,optional"` modelArtsType string `form:"modelArtsType,optional"`
} }
@ -1509,7 +1509,7 @@ type (
SpecsCtRq SpecsCtRq `json:"spec,optional"` SpecsCtRq SpecsCtRq `json:"spec,optional"`
ProjectId string `path:"projectId""` ProjectId string `path:"projectId""`
/****************智算类型 ModelartsType parmas ********************/ /****************智算类型 ModelartsType parmas ********************/
ModelartsType string `json:"modelartsType,optional"` ModelArtsType string `json:"modelArtsType,optional"`
/****************parmas from octpus /****************parmas from octpus
platform string `json:"platform,optional"` platform string `json:"platform,optional"`
params CreateTrainJobParam `json:"params,optional"` params CreateTrainJobParam `json:"params,optional"`

2
adaptor/PCM-CORE/api/desc/pcm.api
View File

@ -84,7 +84,7 @@ service pcm {
post /ai/createDataSet/:projectId (CreateDataSetReq) returns (CreateDataSetResp) post /ai/createDataSet/:projectId (CreateDataSetReq) returns (CreateDataSetResp)
@handler DeleteDataSetHandler @handler DeleteDataSetHandler
delete /ai/deleteDataSet (DeleteDataSetReq) returns (DeleteDataSetResp) delete /ai/deleteDataSet/:projectId/:datasetId (DeleteDataSetReq) returns (DeleteDataSetResp)
// creat task 创建导入任务 // creat task 创建导入任务
@handler CreateTaskHandler @handler CreateTaskHandler
post /ai/CreateTask/:projectId/:datasetId (ImportTaskDataReq) returns (ImportTaskDataResp) post /ai/CreateTask/:projectId/:datasetId (ImportTaskDataReq) returns (ImportTaskDataResp)

2
adaptor/PCM-CORE/api/internal/handler/routes.go
View File

@ -111,7 +111,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
}, },
{ {
Method: http.MethodDelete, Method: http.MethodDelete,
Path: "/ai/deleteDataSet", Path: "/ai/deleteDataSet/:projectId/:datasetId",
Handler: ai.DeleteDataSetHandler(serverCtx), Handler: ai.DeleteDataSetHandler(serverCtx),
}, },
{ {

8
adaptor/PCM-CORE/api/internal/types/types.go
View File

@ -1353,7 +1353,7 @@ type CreateAlgorithmReq struct {
ResourceRequirementsCARq []*ResourceRequirements `json:"resourceRequirements,optional"` ResourceRequirementsCARq []*ResourceRequirements `json:"resourceRequirements,optional"`
AdvancedConfigCARq *AdvancedConfigAl `json:"advancedConfig,optional"` AdvancedConfigCARq *AdvancedConfigAl `json:"advancedConfig,optional"`
ProjectIdCARq string `path:"projectId"` ProjectIdCARq string `path:"projectId"`
ModelArtsType string `form:"modelArtsType,optional"` ModelArtsType string `json:"modelArtsType,optional"`
} }
type CreateAlgorithmResp struct { type CreateAlgorithmResp struct {
@ -1368,8 +1368,8 @@ type CreateAlgorithmResp struct {
} }
type DeleteDataSetReq struct { type DeleteDataSetReq struct {
DatasetId string `json:"datasetId"` DatasetId string `path:"datasetId"`
ProjectId string `json:"projectId"` ProjectId string `path:"projectId"`
ModelArtsType string `form:"modelArtsType,optional"` ModelArtsType string `form:"modelArtsType,optional"`
} }
@ -1741,7 +1741,7 @@ type CreateTrainingJobReq struct {
AlgorithmsCtRq AlgorithmsCtRq `json:"algorithm,optional"` AlgorithmsCtRq AlgorithmsCtRq `json:"algorithm,optional"`
SpecsCtRq SpecsCtRq `json:"spec,optional"` SpecsCtRq SpecsCtRq `json:"spec,optional"`
ProjectId string `path:"projectId""` ProjectId string `path:"projectId""`
ModelartsType string `json:"modelartsType,optional"` ModelArtsType string `json:"modelArtsType,optional"`
} }
type CreateTrainingJobResp struct { type CreateTrainingJobResp struct {