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

Merge branch '2.0_wangqi_20230315' into 2.0 

# Conflicts:
#	adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go
This commit is contained in:
devad 2023-03-23 16:19:04 +08:00
parent 29191bfaaf b04ab84142
commit afccebdca1
10 changed files with 2416 additions and 3265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ import (
func listDataSetHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.DatasetReq
var req types.DataSetReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
return

19
adaptor/PCM-AI/PCM-AI-CORE/api/internal/logic/listdatasetlogic.go
View File

@ -28,22 +28,19 @@ func NewListDataSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListD
}
}
func (l *ListDataSetLogic) ListDataSet(req *types.DatasetReq) (resp *types.DatasetResp, err error) {
func (l *ListDataSetLogic) ListDataSet(req *types.DataSetReq) (resp *types.DataSetResp, err error) {
// todo: add your logic here and delete this line
modelartsReq := &modelarts.DatasetReq{}
//err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
modelartsReq := &modelarts.DataSetReq{}
err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters})
//err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters})
DataSetResp, err := l.svcCtx.ModelArtsRpc.GetDatasetList(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)
}
resp = &types.DatasetResp{}
for i := 0; i < len(DataSetResp.Datasets); i++ {
dataset := types.Datasets{}
resp.DataSets = append(resp.DataSets, dataset)
}
resp = &types.DataSetResp{}
err = copier.CopyWithOption(&resp, &DataSetResp, copier.Option{Converters: tool.Converters})
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)
}
return resp, nil
}

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

@ -1,36 +1,28 @@
// Code generated by goctl. DO NOT EDIT.
package types
type Datasets struct {
DatasetId string `json:"dataset_id"`
DataFormat string `json:"data_format"`
DatasetFormat int32 `json:"dataset_format"`
DatasetName string `json:"dataset_name"`
DatasetType string `json:"dataset_type"`
ImportData bool `json:"import_data"`
DataSources []DataSources `json:"data_sources"`
type DataSets struct {
DatasetId string `json:"dataset_id" copier:"DatasetId"`
DataFormat string `json:"data_format" copier:"DataFormat"`
DataSources []DataSources `json:"data_sources" copier:"DataSources"`
DatasetFormat int32 `json:"dataset_format" copier:"DatasetFormat"`
DatasetName string `json:"dataset_name" copier:"DatasetName"`
DatasetType int32 `json:"dataset_type" copier:"DatasetType"`
ImportData bool `json:"import_data" copier:"ImportData"`
}
type DataSources struct {
DataPath string `json:"data_path"`
DataType string `json:"data_type"`
DataPath string `json:"data_path" copier:"DataPath"`
DataType int32 `json:"data_type" copier:"DataType"`
}
type DatasetReq struct {
type DataSetReq struct {
ProjectId string `json:"projectId" copier:"ProjectId"`
}
type DatasetResp struct {
Total int32 `json:"total"`
Count int32 `json:"count"`
Limit int32 `json:"limit"`
Offset int32 `json:"offset"`
SortBy string `json:"sort_by"`
Order string `json:"order"`
GroupBy string `json:"group_by"`
WorkspaceID string `json:"workspace_id"`
AiProject string `json:"ai_project"`
DataSets []Datasets `json:"dataSets" copier:"DataSets"`
type DataSetResp struct {
TotalNumber uint32 `json:"total_number" copier:"TotalNumber"`
DataSets []DataSets `json:"data_sets" copier:"DataSets"`
}
type CreateDataSetReq struct {

42
adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api
View File

@ -8,40 +8,28 @@ info(
)
/******************find datasetList start*************************/
type Datasets {
DatasetId string `json:"dataset_id"`
DataFormat string `json:"data_format"`
DatasetFormat int32 `json:"dataset_format"`
DatasetName string `json:"dataset_name"`
DatasetType string `json:"dataset_type"`
ImportData bool `json:"import_data"`
DataSources []DataSources `json:"data_sources"`
type DataSets {
DatasetId string `json:"dataset_id" copier:"DatasetId"`
DataFormat string `json:"data_format" copier:"DataFormat"`
DataSources []DataSources `json:"data_sources" copier:"DataSources"`
DatasetFormat int32 `json:"dataset_format" copier:"DatasetFormat"`
DatasetName string `json:"dataset_name" copier:"DatasetName"`
DatasetType int32 `json:"dataset_type" copier:"DatasetType"`
ImportData bool `json:"import_data" copier:"ImportData"`
}
type DataSources {
DataPath string `json:"data_path"`
DataType string `json:"data_type"`
DataPath string `json:"data_path" copier:"DataPath"`
DataType int32 `json:"data_type" copier:"DataType"`
}
type (
DatasetReq {
DataSetReq {
ProjectId string `json:"projectId" copier:"ProjectId"`
}
DatasetResp {
//Code int32 `json:"code" copier:"Code"`
//Msg string `json:"msg" copier:"Msg"`
//RecordCount int32 `json:"recordCount" copier:"RecordCount"`
Total int32 `json:"total"`
Count int32 `json:"count"`
Limit int32 `json:"limit"`
Offset int32 `json:"offset"`
SortBy string `json:"sort_by"`
Order string `json:"order"`
GroupBy string `json:"group_by"`
WorkspaceID string `json:"workspace_id"`
AiProject string `json:"ai_project"`
//Items []Items `json:"items"`
DataSets []Datasets `json:"dataSets" copier:"DataSets"`
DataSetResp {
TotalNumber uint32 `json:"total_number" copier:"TotalNumber"`
DataSets []DataSets `json:"data_sets" copier:"DataSets"`
}
)
@ -1446,7 +1434,7 @@ type (
service AICore-api {
@handler listDataSetHandler
get /listDataSet (DatasetReq) returns (DatasetResp)
get /listDataSet (DataSetReq) returns (DataSetResp)
@handler CreateDataSetHandler
post /createDataSet (CreateDataSetReq) returns (CreateDataSetResp)
@handler DeleteDataSetHandler

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

@ -27,9 +27,9 @@ func NewGetDatasetListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ge
}
// find datasetList
func (l *GetDatasetListLogic) GetDatasetList(in *modelarts.DatasetReq) (*modelarts.DatasetResp, error) {
func (l *GetDatasetListLogic) GetDatasetList(in *modelarts.DataSetReq) (*modelarts.DataSetResp, error) {
projectId := in.ProjectId
var resp modelarts.DatasetResp
var resp modelarts.DataSetResp
token := common.GetToken()
reqUrl, err := tool.HttpClient(tool.GET, "https://modelarts.cn-north-4.myhuaweicloud.com/v2/"+projectId+"/datasets", strings.NewReader(``), token)
json.Unmarshal(reqUrl, &resp)

2
adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/server/modelartsserver.go
View File

@ -29,7 +29,7 @@ func (s *ModelArtsServer) GetToken(ctx context.Context, in *modelarts.TokenReq)
}
// get modelarts Token
func (s *ModelArtsServer) GetDatasetList(ctx context.Context, in *modelarts.DatasetReq) (*modelarts.DatasetResp, error) {
func (s *ModelArtsServer) GetDatasetList(ctx context.Context, in *modelarts.DataSetReq) (*modelarts.DataSetResp, error) {
l := logic.NewGetDatasetListLogic(ctx, s.svcCtx)
return l.GetDatasetList(in)
}

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

File diff suppressed because it is too large Load Diff

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

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.19.4
// - protoc v3.21.12
// source: pcm-modelarts.proto
package modelarts
@ -22,64 +22,64 @@ const _ = grpc.SupportPackageIsVersion7
//
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
type ModelArtsClient interface {
//get modelarts Token
// get modelarts Token
GetToken(ctx context.Context, in *TokenReq, opts ...grpc.CallOption) (*TokenResp, error)
//get modelarts Token
GetDatasetList(ctx context.Context, in *DatasetReq, opts ...grpc.CallOption) (*DatasetResp, error)
//create DateSet
// get modelarts Token
GetDatasetList(ctx context.Context, in *DataSetReq, opts ...grpc.CallOption) (*DataSetResp, error)
// create DateSet
CreateDataSet(ctx context.Context, in *CreateDataSetReq, opts ...grpc.CallOption) (*CreateDataSetResq, error)
//create DateSet
// create DateSet
DeleteDataSet(ctx context.Context, in *DeleteDataSetReq, opts ...grpc.CallOption) (*DeleteDataSetResq, error)
//creat task 创建导入任务
// creat task 创建导入任务
CreateTask(ctx context.Context, in *ImportTaskDataReq, opts ...grpc.CallOption) (*ImportTaskDataResp, error)
//get taskList 查询数据集导入任务列表
// get taskList 查询数据集导入任务列表
GetImportTaskList(ctx context.Context, in *ListImportTasksReq, opts ...grpc.CallOption) (*ListImportTasksResp, error)
// ListTrainingJobs 查询训练作业列表
// ListTrainingJobs 查询训练作业列表
GetListTrainingJobs(ctx context.Context, in *ListTrainingJobsreq, opts ...grpc.CallOption) (*ListTrainingJobsresp, error)
// CreateTrainingJob 创建训练作业
// CreateTrainingJob 创建训练作业
CreateTrainingJob(ctx context.Context, in *CreateTrainingJobReq, opts ...grpc.CallOption) (*CreateTrainingJobResp, error)
// DeleteTrainingJobConfig 删除训练作业
// DeleteTrainingJobConfig 删除训练作业
DeleteTrainingJob(ctx context.Context, in *DeleteTrainingJobReq, opts ...grpc.CallOption) (*DeleteTrainingJobResp, error)
// CreateTrainingJobConfig 创建训练作业参数
// CreateTrainingJobConfig 创建训练作业参数
CreateTrainingJobConfig(ctx context.Context, in *CreateTrainingJobConfigReq, opts ...grpc.CallOption) (*CreateTrainingJobConfigResp, error)
// DeleteTrainingJobConfig 删除训练作业参数
// DeleteTrainingJobConfig 删除训练作业参数
DeleteTrainingJobConfig(ctx context.Context, in *DeleteTrainingJobConfigReq, opts ...grpc.CallOption) (*DeleteTrainingJobConfigResp, error)
// ListTrainingJobConfig 查询训练作业参数
// ListTrainingJobConfig 查询训练作业参数
ListTrainingJobConfig(ctx context.Context, in *ListTrainingJobConfigReq, opts ...grpc.CallOption) (*ListTrainingJobConfigResp, error)
// CreateAlgorithm 创建算法
// CreateAlgorithm 创建算法
CreateAlgorithm(ctx context.Context, in *CreateAlgorithmReq, opts ...grpc.CallOption) (*CreateAlgorithmResp, error)
// ListAlgorithms 查询算法
// ListAlgorithms 查询算法
ListAlgorithms(ctx context.Context, in *ListAlgorithmsReq, opts ...grpc.CallOption) (*ListAlgorithmsResp, error)
// DeleteAlgorithms 删除算法
// DeleteAlgorithms 删除算法
DeleteAlgorithms(ctx context.Context, in *DeleteAlgorithmsReq, opts ...grpc.CallOption) (*DeleteAlgorithmsResp, error)
// ShowAlgorithmByUuid 展示算法详情
// ShowAlgorithmByUuid 展示算法详情
ShowAlgorithmByUuid(ctx context.Context, in *ShowAlgorithmByUuidReq, opts ...grpc.CallOption) (*ShowAlgorithmByUuidResp, error)
//export task
ExportTask(ctx context.Context, in *ExportTaskReq, opts ...grpc.CallOption) (*ExportTaskResp, error)
GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error)
GetExportTaskStatusOfDataset(ctx context.Context, in *GetExportTaskStatusOfDatasetReq, opts ...grpc.CallOption) (*GetExportTaskStatusOfDatasetResp, error)
//processor task
// processor task
CreateProcessorTask(ctx context.Context, in *CreateProcessorTaskReq, opts ...grpc.CallOption) (*CreateProcessorTaskResp, error)
DescribeProcessorTask(ctx context.Context, in *DescribeProcessorTaskReq, opts ...grpc.CallOption) (*DescribeProcessorTaskResp, error)
//model management
// model management
CreateModel(ctx context.Context, in *CreateModelReq, opts ...grpc.CallOption) (*CreateModelResp, error)
DeleteModel(ctx context.Context, in *DeleteModelReq, opts ...grpc.CallOption) (*DeleteModelResp, error)
ListModels(ctx context.Context, in *ListModelReq, opts ...grpc.CallOption) (*ListModelResp, error)
ShowModels(ctx context.Context, in *ShowModelReq, opts ...grpc.CallOption) (*ShowModelResp, error)
//service management
// service management
CreateService(ctx context.Context, in *CreateServiceReq, opts ...grpc.CallOption) (*CreateServiceResp, error)
ListServices(ctx context.Context, in *ListServicesReq, opts ...grpc.CallOption) (*ListServicesResp, error)
ShowService(ctx context.Context, in *ShowServiceReq, opts ...grpc.CallOption) (*ShowServiceResp, error)
DeleteService(ctx context.Context, in *DeleteServiceReq, opts ...grpc.CallOption) (*DeleteServiceResp, error)
ListClusters(ctx context.Context, in *ListClustersReq, opts ...grpc.CallOption) (*ListClustersResp, error)
//notebook task
// notebook task
ListNotebook(ctx context.Context, in *ListNotebookReq, opts ...grpc.CallOption) (*ListNotebookResp, error)
CreateNotebook(ctx context.Context, in *CreateNotebookReq, opts ...grpc.CallOption) (*CreateNotebookResp, error)
StartNotebook(ctx context.Context, in *StartNotebookReq, opts ...grpc.CallOption) (*StartNotebookResp, error)
StopNotebook(ctx context.Context, in *StopNotebookReq, opts ...grpc.CallOption) (*StopNotebookResp, error)
GetNotebookStorage(ctx context.Context, in *GetNotebookStorageReq, opts ...grpc.CallOption) (*GetNotebookStorageResp, error)
MountNotebookStorage(ctx context.Context, in *MountNotebookStorageReq, opts ...grpc.CallOption) (*MountNotebookStorageResp, error)
//visualization-jobs
// visualization-jobs
GetVisualizationJob(ctx context.Context, in *GetVisualizationJobReq, opts ...grpc.CallOption) (*GetVisualizationJobResp, error)
CreateVisualizationJob(ctx context.Context, in *CreateVisualizationJobReq, opts ...grpc.CallOption) (*CreateVisualizationJobResp, error)
}
@ -101,8 +101,8 @@ func (c *modelArtsClient) GetToken(ctx context.Context, in *TokenReq, opts ...gr
return out, nil
}
func (c *modelArtsClient) GetDatasetList(ctx context.Context, in *DatasetReq, opts ...grpc.CallOption) (*DatasetResp, error) {
out := new(DatasetResp)
func (c *modelArtsClient) GetDatasetList(ctx context.Context, in *DataSetReq, opts ...grpc.CallOption) (*DataSetResp, error) {
out := new(DataSetResp)
err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetDatasetList", in, out, opts...)
if err != nil {
return nil, err
@ -438,64 +438,64 @@ func (c *modelArtsClient) CreateVisualizationJob(ctx context.Context, in *Create
// All implementations must embed UnimplementedModelArtsServer
// for forward compatibility
type ModelArtsServer interface {
//get modelarts Token
// get modelarts Token
GetToken(context.Context, *TokenReq) (*TokenResp, error)
//get modelarts Token
GetDatasetList(context.Context, *DatasetReq) (*DatasetResp, error)
//create DateSet
// get modelarts Token
GetDatasetList(context.Context, *DataSetReq) (*DataSetResp, error)
// create DateSet
CreateDataSet(context.Context, *CreateDataSetReq) (*CreateDataSetResq, error)
//create DateSet
// create DateSet
DeleteDataSet(context.Context, *DeleteDataSetReq) (*DeleteDataSetResq, error)
//creat task 创建导入任务
// creat task 创建导入任务
CreateTask(context.Context, *ImportTaskDataReq) (*ImportTaskDataResp, error)
//get taskList 查询数据集导入任务列表
// get taskList 查询数据集导入任务列表
GetImportTaskList(context.Context, *ListImportTasksReq) (*ListImportTasksResp, error)
// ListTrainingJobs 查询训练作业列表
// ListTrainingJobs 查询训练作业列表
GetListTrainingJobs(context.Context, *ListTrainingJobsreq) (*ListTrainingJobsresp, error)
// CreateTrainingJob 创建训练作业
// CreateTrainingJob 创建训练作业
CreateTrainingJob(context.Context, *CreateTrainingJobReq) (*CreateTrainingJobResp, error)
// DeleteTrainingJobConfig 删除训练作业
// DeleteTrainingJobConfig 删除训练作业
DeleteTrainingJob(context.Context, *DeleteTrainingJobReq) (*DeleteTrainingJobResp, error)
// CreateTrainingJobConfig 创建训练作业参数
// CreateTrainingJobConfig 创建训练作业参数
CreateTrainingJobConfig(context.Context, *CreateTrainingJobConfigReq) (*CreateTrainingJobConfigResp, error)
// DeleteTrainingJobConfig 删除训练作业参数
// DeleteTrainingJobConfig 删除训练作业参数
DeleteTrainingJobConfig(context.Context, *DeleteTrainingJobConfigReq) (*DeleteTrainingJobConfigResp, error)
// ListTrainingJobConfig 查询训练作业参数
// ListTrainingJobConfig 查询训练作业参数
ListTrainingJobConfig(context.Context, *ListTrainingJobConfigReq) (*ListTrainingJobConfigResp, error)
// CreateAlgorithm 创建算法
// CreateAlgorithm 创建算法
CreateAlgorithm(context.Context, *CreateAlgorithmReq) (*CreateAlgorithmResp, error)
// ListAlgorithms 查询算法
// ListAlgorithms 查询算法
ListAlgorithms(context.Context, *ListAlgorithmsReq) (*ListAlgorithmsResp, error)
// DeleteAlgorithms 删除算法
// DeleteAlgorithms 删除算法
DeleteAlgorithms(context.Context, *DeleteAlgorithmsReq) (*DeleteAlgorithmsResp, error)
// ShowAlgorithmByUuid 展示算法详情
// ShowAlgorithmByUuid 展示算法详情
ShowAlgorithmByUuid(context.Context, *ShowAlgorithmByUuidReq) (*ShowAlgorithmByUuidResp, error)
//export task
ExportTask(context.Context, *ExportTaskReq) (*ExportTaskResp, error)
GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDatasetResp, error)
GetExportTaskStatusOfDataset(context.Context, *GetExportTaskStatusOfDatasetReq) (*GetExportTaskStatusOfDatasetResp, error)
//processor task
// processor task
CreateProcessorTask(context.Context, *CreateProcessorTaskReq) (*CreateProcessorTaskResp, error)
DescribeProcessorTask(context.Context, *DescribeProcessorTaskReq) (*DescribeProcessorTaskResp, error)
//model management
// model management
CreateModel(context.Context, *CreateModelReq) (*CreateModelResp, error)
DeleteModel(context.Context, *DeleteModelReq) (*DeleteModelResp, error)
ListModels(context.Context, *ListModelReq) (*ListModelResp, error)
ShowModels(context.Context, *ShowModelReq) (*ShowModelResp, error)
//service management
// service management
CreateService(context.Context, *CreateServiceReq) (*CreateServiceResp, error)
ListServices(context.Context, *ListServicesReq) (*ListServicesResp, error)
ShowService(context.Context, *ShowServiceReq) (*ShowServiceResp, error)
DeleteService(context.Context, *DeleteServiceReq) (*DeleteServiceResp, error)
ListClusters(context.Context, *ListClustersReq) (*ListClustersResp, error)
//notebook task
// notebook task
ListNotebook(context.Context, *ListNotebookReq) (*ListNotebookResp, error)
CreateNotebook(context.Context, *CreateNotebookReq) (*CreateNotebookResp, error)
StartNotebook(context.Context, *StartNotebookReq) (*StartNotebookResp, error)
StopNotebook(context.Context, *StopNotebookReq) (*StopNotebookResp, error)
GetNotebookStorage(context.Context, *GetNotebookStorageReq) (*GetNotebookStorageResp, error)
MountNotebookStorage(context.Context, *MountNotebookStorageReq) (*MountNotebookStorageResp, error)
//visualization-jobs
// visualization-jobs
GetVisualizationJob(context.Context, *GetVisualizationJobReq) (*GetVisualizationJobResp, error)
CreateVisualizationJob(context.Context, *CreateVisualizationJobReq) (*CreateVisualizationJobResp, error)
mustEmbedUnimplementedModelArtsServer()
@ -508,7 +508,7 @@ type UnimplementedModelArtsServer struct {
func (UnimplementedModelArtsServer) GetToken(context.Context, *TokenReq) (*TokenResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method GetToken not implemented")
}
func (UnimplementedModelArtsServer) GetDatasetList(context.Context, *DatasetReq) (*DatasetResp, error) {
func (UnimplementedModelArtsServer) GetDatasetList(context.Context, *DataSetReq) (*DataSetResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method GetDatasetList not implemented")
}
func (UnimplementedModelArtsServer) CreateDataSet(context.Context, *CreateDataSetReq) (*CreateDataSetResq, error) {
@ -651,7 +651,7 @@ func _ModelArts_GetToken_Handler(srv interface{}, ctx context.Context, dec func(
}
func _ModelArts_GetDatasetList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(DatasetReq)
in := new(DataSetReq)
if err := dec(in); err != nil {
return nil, err
}
@ -663,7 +663,7 @@ func _ModelArts_GetDatasetList_Handler(srv interface{}, ctx context.Context, dec
FullMethod: "/modelarts.ModelArts/GetDatasetList",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ModelArtsServer).GetDatasetList(ctx, req.(*DatasetReq))
return srv.(ModelArtsServer).GetDatasetList(ctx, req.(*DataSetReq))
}
return interceptor(ctx, in, info, handler)
}

10
adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go
View File

@ -67,13 +67,13 @@ type (
CreateVisualizationJobResp = modelarts.CreateVisualizationJobResp
CustomHooks = modelarts.CustomHooks
CustomSpec = modelarts.CustomSpec
DataSetReq = modelarts.DataSetReq
DataSetResp = modelarts.DataSetResp
DataSets = modelarts.DataSets
DataSource = modelarts.DataSource
DataSources = modelarts.DataSources
DataVolumesRes = modelarts.DataVolumesRes
Dataset = modelarts.Dataset
DatasetReq = modelarts.DatasetReq
DatasetResp = modelarts.DatasetResp
Datasets = modelarts.Datasets
DeleteAlgorithmsReq = modelarts.DeleteAlgorithmsReq
DeleteAlgorithmsResp = modelarts.DeleteAlgorithmsResp
DeleteDataSetReq = modelarts.DeleteDataSetReq
@ -264,7 +264,7 @@ type (
// get modelarts Token
GetToken(ctx context.Context, in *TokenReq, opts ...grpc.CallOption) (*TokenResp, error)
// get modelarts Token
GetDatasetList(ctx context.Context, in *DatasetReq, opts ...grpc.CallOption) (*DatasetResp, error)
GetDatasetList(ctx context.Context, in *DataSetReq, opts ...grpc.CallOption) (*DataSetResp, error)
// create DateSet
CreateDataSet(ctx context.Context, in *CreateDataSetReq, opts ...grpc.CallOption) (*CreateDataSetResq, error)
// create DateSet
@ -341,7 +341,7 @@ func (m *defaultModelArts) GetToken(ctx context.Context, in *TokenReq, opts ...g
}
// get modelarts Token
func (m *defaultModelArts) GetDatasetList(ctx context.Context, in *DatasetReq, opts ...grpc.CallOption) (*DatasetResp, error) {
func (m *defaultModelArts) GetDatasetList(ctx context.Context, in *DataSetReq, opts ...grpc.CallOption) (*DataSetResp, error) {
client := modelarts.NewModelArtsClient(m.cli.Conn())
return client.GetDatasetList(ctx, in, opts...)
}

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

@ -49,19 +49,19 @@ message TokenResp{
/******************auth end*************************/
/******************find datasetList start*************************/
message DatasetReq{
message DataSetReq{
string project_id = 1; // @gotags: copier:"ProjectId"
}
message DatasetResp{
message DataSetResp{
uint32 total_number = 1; // @gotags: copier:"TotalNumber"
repeated Datasets datasets =2; // @gotags: copier:"Datasets"
repeated DataSets dataSets =2; // @gotags: copier:"DataSets"
}
message Datasets{
message DataSets{
string dataset_id =1; // @gotags: copier:"DatasetId"
string data_format =2; // @gotags: copier:"DataFormat"
DataSources data_sources =3; // @gotags: copier:"DataSources"
repeated DataSources data_sources =3; // @gotags: copier:"DataSources"
int32 dataset_format =4; // @gotags: copier:"DatasetFormat"
string dataset_name =5; // @gotags: copier:"DatasetName"
int32 dataset_type =6; // @gotags: copier:"DatasetType"
@ -1980,7 +1980,7 @@ service ModelArts {
//get modelarts Token
rpc GetToken(TokenReq) returns (TokenResp);
//get modelarts Token
rpc GetDatasetList(DatasetReq) returns (DatasetResp);
rpc GetDatasetList(DataSetReq) returns (DataSetResp);
//create DateSet
rpc CreateDataSet(CreateDataSetReq) returns (CreateDataSetResq);
//create DateSet