From f823365d16a5266f7ba3fb70ce90f123c9c1f0ef Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Wed, 22 Mar 2023 11:18:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api b/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api index a0fe3712..04d68f9a 100644 --- a/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api +++ b/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api @@ -9,18 +9,18 @@ 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"` + DatasetId string `json:"dataset_id,omitempty" copier:"DatasetId"` + DataFormat string `json:"data_format,omitempty" copier:"DataFormat"` + DataSources DataSources `json:"data_sources,omitempty" copier:"DataSources"` + DatasetFormat int32 `json:"dataset_format,omitempty" copier:"DatasetFormat"` + DatasetName string `json:"dataset_name,omitempty" copier:"DatasetName"` + DatasetType int32 `json:"dataset_type,omitempty" copier:"DatasetType"` + ImportData bool `json:"import_data,omitempty" copier:"ImportData"` } type DataSources { - DataPath string `json:"data_path"` - DataType string `json:"data_type"` + DataPath string `json:"data_path,omitempty" copier:"DataPath"` + DataType int32 `json:"data_type,omitempty" copier:"DataType"` } type ( @@ -28,19 +28,18 @@ type ( 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"` + 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"` DataSets []Datasets `json:"dataSets" copier:"DataSets"` } ) From 253b4f72185de54b1dbc9429b555599d0badd501 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Wed, 22 Mar 2023 17:18:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api | 33 +++++++------------ .../PCM-MODELARTS/rpc/pb/pcm-modelarts.proto | 2 +- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api b/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api index 04d68f9a..95559b08 100644 --- a/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api +++ b/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api @@ -9,18 +9,18 @@ info( /******************find datasetList start*************************/ type Datasets { - DatasetId string `json:"dataset_id,omitempty" copier:"DatasetId"` - DataFormat string `json:"data_format,omitempty" copier:"DataFormat"` - DataSources DataSources `json:"data_sources,omitempty" copier:"DataSources"` - DatasetFormat int32 `json:"dataset_format,omitempty" copier:"DatasetFormat"` - DatasetName string `json:"dataset_name,omitempty" copier:"DatasetName"` - DatasetType int32 `json:"dataset_type,omitempty" copier:"DatasetType"` - ImportData bool `json:"import_data,omitempty" copier:"ImportData"` + 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,omitempty" copier:"DataPath"` - DataType int32 `json:"data_type,omitempty" copier:"DataType"` + DataPath string `json:"data_path" copier:"DataPath"` + DataType int32 `json:"data_type" copier:"DataType"` } type ( @@ -28,19 +28,8 @@ type ( 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"` - DataSets []Datasets `json:"dataSets" copier:"DataSets"` + TotalNumber uint32 `json:"total_number" copier:"TotalNumber"` + DataSets []Datasets `json:"dataSets" copier:"DataSets"` } ) 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 e97a5037..dfbb78df 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto @@ -61,7 +61,7 @@ message DatasetResp{ 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" From 039c50e2d4e8048c9d38118abdbb1280f28f5b3b Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Thu, 23 Mar 2023 15:03:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/handler/listdatasethandler.go | 2 +- .../api/internal/logic/listdatasetlogic.go | 19 +- .../PCM-AI-CORE/api/internal/types/types.go | 36 ++-- .../PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api | 10 +- .../rpc/internal/logic/getdatasetlistlogic.go | 4 +- .../logic/getexporttasksofdatasetlogic.go | 4 +- .../rpc/internal/server/modelartsserver.go | 4 +- .../rpc/modelarts/pcm-modelarts.pb.go | 192 +++++++++--------- .../rpc/modelarts/pcm-modelarts_grpc.pb.go | 24 +-- .../rpc/modelartsclient/modelarts.go | 16 +- .../PCM-MODELARTS/rpc/pb/pcm-modelarts.proto | 14 +- 11 files changed, 157 insertions(+), 168 deletions(-) diff --git a/adaptor/PCM-AI/PCM-AI-CORE/api/internal/handler/listdatasethandler.go b/adaptor/PCM-AI/PCM-AI-CORE/api/internal/handler/listdatasethandler.go index 942369f9..bcad05bd 100644 --- a/adaptor/PCM-AI/PCM-AI-CORE/api/internal/handler/listdatasethandler.go +++ b/adaptor/PCM-AI/PCM-AI-CORE/api/internal/handler/listdatasethandler.go @@ -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 diff --git a/adaptor/PCM-AI/PCM-AI-CORE/api/internal/logic/listdatasetlogic.go b/adaptor/PCM-AI/PCM-AI-CORE/api/internal/logic/listdatasetlogic.go index ffd96f00..08e4bdf3 100644 --- a/adaptor/PCM-AI/PCM-AI-CORE/api/internal/logic/listdatasetlogic.go +++ b/adaptor/PCM-AI/PCM-AI-CORE/api/internal/logic/listdatasetlogic.go @@ -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 } diff --git a/adaptor/PCM-AI/PCM-AI-CORE/api/internal/types/types.go b/adaptor/PCM-AI/PCM-AI-CORE/api/internal/types/types.go index 8ae5a8c2..270ef443 100644 --- a/adaptor/PCM-AI/PCM-AI-CORE/api/internal/types/types.go +++ b/adaptor/PCM-AI/PCM-AI-CORE/api/internal/types/types.go @@ -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 { diff --git a/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api b/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api index 95559b08..4be9896c 100644 --- a/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api +++ b/adaptor/PCM-AI/PCM-AI-CORE/api/pcm-ai-core.api @@ -8,7 +8,7 @@ info( ) /******************find datasetList start*************************/ -type Datasets { +type DataSets { DatasetId string `json:"dataset_id" copier:"DatasetId"` DataFormat string `json:"data_format" copier:"DataFormat"` DataSources []DataSources `json:"data_sources" copier:"DataSources"` @@ -24,12 +24,12 @@ type DataSources { } type ( - DatasetReq { + DataSetReq { ProjectId string `json:"projectId" copier:"ProjectId"` } - DatasetResp { + DataSetResp { TotalNumber uint32 `json:"total_number" copier:"TotalNumber"` - DataSets []Datasets `json:"dataSets" copier:"DataSets"` + DataSets []DataSets `json:"data_sets" copier:"DataSets"` } ) @@ -1425,7 +1425,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 diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go index 574d06d7..c3b1911c 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go @@ -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) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttasksofdatasetlogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttasksofdatasetlogic.go index bec828a5..e4a08f94 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttasksofdatasetlogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttasksofdatasetlogic.go @@ -35,9 +35,9 @@ func NewGetExportTasksOfDatasetLogic(ctx context.Context, svcCtx *svc.ServiceCon // ExportTasks []*Modelarts.ExportTaskStatus `json:"export_tasks"` //} -func (l *GetExportTasksOfDatasetLogic) GetExportTasksOfDataset(in *modelarts.GetExportTasksOfDatasetReq) (*modelarts.GetExportTasksOfDatasetResp, error) { +func (l *GetExportTasksOfDatasetLogic) GetExportTasksOfDataset(in *modelarts.GetExportTasksOfDatasetReq) (*modelarts.GetExportTasksOfDataSetResp, error) { - var resp modelarts.GetExportTasksOfDatasetResp + var resp modelarts.GetExportTasksOfDataSetResp url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/datasets/" + in.DatasetId + "/export-tasks" token := common.GetToken() body, err := tool.HttpClient(tool.GET, url, nil, token) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/server/modelartsserver.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/server/modelartsserver.go index 574238b0..3ed818f6 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/server/modelartsserver.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/server/modelartsserver.go @@ -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) } @@ -124,7 +124,7 @@ func (s *ModelArtsServer) ExportTask(ctx context.Context, in *modelarts.ExportTa return l.ExportTask(in) } -func (s *ModelArtsServer) GetExportTasksOfDataset(ctx context.Context, in *modelarts.GetExportTasksOfDatasetReq) (*modelarts.GetExportTasksOfDatasetResp, error) { +func (s *ModelArtsServer) GetExportTasksOfDataset(ctx context.Context, in *modelarts.GetExportTasksOfDatasetReq) (*modelarts.GetExportTasksOfDataSetResp, error) { l := logic.NewGetExportTasksOfDatasetLogic(ctx, s.svcCtx) return l.GetExportTasksOfDataset(in) } diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go index d6017a3d..86df0981 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go @@ -515,7 +515,7 @@ func (*TokenResp) Descriptor() ([]byte, []int) { } // *****************find datasetList start************************ -type DatasetReq struct { +type DataSetReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -523,8 +523,8 @@ type DatasetReq struct { ProjectId string `protobuf:"bytes,1,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"` // @gotags: copier:"ProjectId" } -func (x *DatasetReq) Reset() { - *x = DatasetReq{} +func (x *DataSetReq) Reset() { + *x = DataSetReq{} if protoimpl.UnsafeEnabled { mi := &file_pcm_modelarts_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -532,13 +532,13 @@ func (x *DatasetReq) Reset() { } } -func (x *DatasetReq) String() string { +func (x *DataSetReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*DatasetReq) ProtoMessage() {} +func (*DataSetReq) ProtoMessage() {} -func (x *DatasetReq) ProtoReflect() protoreflect.Message { +func (x *DataSetReq) ProtoReflect() protoreflect.Message { mi := &file_pcm_modelarts_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -550,29 +550,29 @@ func (x *DatasetReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use DatasetReq.ProtoReflect.Descriptor instead. -func (*DatasetReq) Descriptor() ([]byte, []int) { +// Deprecated: Use DataSetReq.ProtoReflect.Descriptor instead. +func (*DataSetReq) Descriptor() ([]byte, []int) { return file_pcm_modelarts_proto_rawDescGZIP(), []int{10} } -func (x *DatasetReq) GetProjectId() string { +func (x *DataSetReq) GetProjectId() string { if x != nil { return x.ProjectId } return "" } -type DatasetResp struct { +type DataSetResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields TotalNumber uint32 `protobuf:"varint,1,opt,name=total_number,json=totalNumber,proto3" json:"total_number,omitempty"` // @gotags: copier:"TotalNumber" - Datasets []*Datasets `protobuf:"bytes,2,rep,name=datasets,proto3" json:"datasets,omitempty"` // @gotags: copier:"Datasets" + DataSets []*DataSets `protobuf:"bytes,2,rep,name=dataSets,proto3" json:"dataSets,omitempty"` // @gotags: copier:"DataSets" } -func (x *DatasetResp) Reset() { - *x = DatasetResp{} +func (x *DataSetResp) Reset() { + *x = DataSetResp{} if protoimpl.UnsafeEnabled { mi := &file_pcm_modelarts_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -580,13 +580,13 @@ func (x *DatasetResp) Reset() { } } -func (x *DatasetResp) String() string { +func (x *DataSetResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*DatasetResp) ProtoMessage() {} +func (*DataSetResp) ProtoMessage() {} -func (x *DatasetResp) ProtoReflect() protoreflect.Message { +func (x *DataSetResp) ProtoReflect() protoreflect.Message { mi := &file_pcm_modelarts_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -598,41 +598,41 @@ func (x *DatasetResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use DatasetResp.ProtoReflect.Descriptor instead. -func (*DatasetResp) Descriptor() ([]byte, []int) { +// Deprecated: Use DataSetResp.ProtoReflect.Descriptor instead. +func (*DataSetResp) Descriptor() ([]byte, []int) { return file_pcm_modelarts_proto_rawDescGZIP(), []int{11} } -func (x *DatasetResp) GetTotalNumber() uint32 { +func (x *DataSetResp) GetTotalNumber() uint32 { if x != nil { return x.TotalNumber } return 0 } -func (x *DatasetResp) GetDatasets() []*Datasets { +func (x *DataSetResp) GetDataSets() []*DataSets { if x != nil { - return x.Datasets + return x.DataSets } return nil } -type Datasets struct { +type DataSets struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"` // @gotags: copier:"DatasetId" - DataFormat string `protobuf:"bytes,2,opt,name=data_format,json=dataFormat,proto3" json:"data_format,omitempty"` // @gotags: copier:"DataFormat" - DataSources *DataSources `protobuf:"bytes,3,opt,name=data_sources,json=dataSources,proto3" json:"data_sources,omitempty"` // @gotags: copier:"DataSources" - DatasetFormat int32 `protobuf:"varint,4,opt,name=dataset_format,json=datasetFormat,proto3" json:"dataset_format,omitempty"` // @gotags: copier:"DatasetFormat" - DatasetName string `protobuf:"bytes,5,opt,name=dataset_name,json=datasetName,proto3" json:"dataset_name,omitempty"` // @gotags: copier:"DatasetName" - DatasetType int32 `protobuf:"varint,6,opt,name=dataset_type,json=datasetType,proto3" json:"dataset_type,omitempty"` // @gotags: copier:"DatasetType" - ImportData bool `protobuf:"varint,7,opt,name=import_data,json=importData,proto3" json:"import_data,omitempty"` // @gotags: copier:"ImportData" + DatasetId string `protobuf:"bytes,1,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"` // @gotags: copier:"DatasetId" + DataFormat string `protobuf:"bytes,2,opt,name=data_format,json=dataFormat,proto3" json:"data_format,omitempty"` // @gotags: copier:"DataFormat" + DataSources []*DataSources `protobuf:"bytes,3,rep,name=data_sources,json=dataSources,proto3" json:"data_sources,omitempty"` // @gotags: copier:"DataSources" + DatasetFormat int32 `protobuf:"varint,4,opt,name=dataset_format,json=datasetFormat,proto3" json:"dataset_format,omitempty"` // @gotags: copier:"DatasetFormat" + DatasetName string `protobuf:"bytes,5,opt,name=dataset_name,json=datasetName,proto3" json:"dataset_name,omitempty"` // @gotags: copier:"DatasetName" + DatasetType int32 `protobuf:"varint,6,opt,name=dataset_type,json=datasetType,proto3" json:"dataset_type,omitempty"` // @gotags: copier:"DatasetType" + ImportData bool `protobuf:"varint,7,opt,name=import_data,json=importData,proto3" json:"import_data,omitempty"` // @gotags: copier:"ImportData" } -func (x *Datasets) Reset() { - *x = Datasets{} +func (x *DataSets) Reset() { + *x = DataSets{} if protoimpl.UnsafeEnabled { mi := &file_pcm_modelarts_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -640,13 +640,13 @@ func (x *Datasets) Reset() { } } -func (x *Datasets) String() string { +func (x *DataSets) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Datasets) ProtoMessage() {} +func (*DataSets) ProtoMessage() {} -func (x *Datasets) ProtoReflect() protoreflect.Message { +func (x *DataSets) ProtoReflect() protoreflect.Message { mi := &file_pcm_modelarts_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -658,54 +658,54 @@ func (x *Datasets) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Datasets.ProtoReflect.Descriptor instead. -func (*Datasets) Descriptor() ([]byte, []int) { +// Deprecated: Use DataSets.ProtoReflect.Descriptor instead. +func (*DataSets) Descriptor() ([]byte, []int) { return file_pcm_modelarts_proto_rawDescGZIP(), []int{12} } -func (x *Datasets) GetDatasetId() string { +func (x *DataSets) GetDatasetId() string { if x != nil { return x.DatasetId } return "" } -func (x *Datasets) GetDataFormat() string { +func (x *DataSets) GetDataFormat() string { if x != nil { return x.DataFormat } return "" } -func (x *Datasets) GetDataSources() *DataSources { +func (x *DataSets) GetDataSources() []*DataSources { if x != nil { return x.DataSources } return nil } -func (x *Datasets) GetDatasetFormat() int32 { +func (x *DataSets) GetDatasetFormat() int32 { if x != nil { return x.DatasetFormat } return 0 } -func (x *Datasets) GetDatasetName() string { +func (x *DataSets) GetDatasetName() string { if x != nil { return x.DatasetName } return "" } -func (x *Datasets) GetDatasetType() int32 { +func (x *DataSets) GetDatasetType() int32 { if x != nil { return x.DatasetType } return 0 } -func (x *Datasets) GetImportData() bool { +func (x *DataSets) GetImportData() bool { if x != nil { return x.ImportData } @@ -9672,7 +9672,7 @@ func (x *GetExportTasksOfDatasetReq) GetOffset() int32 { return 0 } -type GetExportTasksOfDatasetResp struct { +type GetExportTasksOfDataSetResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -9698,8 +9698,8 @@ type GetExportTasksOfDatasetResp struct { Msg string `protobuf:"bytes,19,opt,name=msg,proto3" json:"msg,omitempty"` // @gotags: copier:"Msg" } -func (x *GetExportTasksOfDatasetResp) Reset() { - *x = GetExportTasksOfDatasetResp{} +func (x *GetExportTasksOfDataSetResp) Reset() { + *x = GetExportTasksOfDataSetResp{} if protoimpl.UnsafeEnabled { mi := &file_pcm_modelarts_proto_msgTypes[133] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -9707,13 +9707,13 @@ func (x *GetExportTasksOfDatasetResp) Reset() { } } -func (x *GetExportTasksOfDatasetResp) String() string { +func (x *GetExportTasksOfDataSetResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*GetExportTasksOfDatasetResp) ProtoMessage() {} +func (*GetExportTasksOfDataSetResp) ProtoMessage() {} -func (x *GetExportTasksOfDatasetResp) ProtoReflect() protoreflect.Message { +func (x *GetExportTasksOfDataSetResp) ProtoReflect() protoreflect.Message { mi := &file_pcm_modelarts_proto_msgTypes[133] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -9725,138 +9725,138 @@ func (x *GetExportTasksOfDatasetResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use GetExportTasksOfDatasetResp.ProtoReflect.Descriptor instead. -func (*GetExportTasksOfDatasetResp) Descriptor() ([]byte, []int) { +// Deprecated: Use GetExportTasksOfDataSetResp.ProtoReflect.Descriptor instead. +func (*GetExportTasksOfDataSetResp) Descriptor() ([]byte, []int) { return file_pcm_modelarts_proto_rawDescGZIP(), []int{133} } -func (x *GetExportTasksOfDatasetResp) GetCode() uint32 { +func (x *GetExportTasksOfDataSetResp) GetCode() uint32 { if x != nil { return x.Code } return 0 } -func (x *GetExportTasksOfDatasetResp) GetCreateTime() uint32 { +func (x *GetExportTasksOfDataSetResp) GetCreateTime() uint32 { if x != nil { return x.CreateTime } return 0 } -func (x *GetExportTasksOfDatasetResp) GetErrorCode() string { +func (x *GetExportTasksOfDataSetResp) GetErrorCode() string { if x != nil { return x.ErrorCode } return "" } -func (x *GetExportTasksOfDatasetResp) GetErrorMsg() string { +func (x *GetExportTasksOfDataSetResp) GetErrorMsg() string { if x != nil { return x.ErrorMsg } return "" } -func (x *GetExportTasksOfDatasetResp) GetExportFormat() int32 { +func (x *GetExportTasksOfDataSetResp) GetExportFormat() int32 { if x != nil { return x.ExportFormat } return 0 } -func (x *GetExportTasksOfDatasetResp) GetExportParams() *ExportParams { +func (x *GetExportTasksOfDataSetResp) GetExportParams() *ExportParams { if x != nil { return x.ExportParams } return nil } -func (x *GetExportTasksOfDatasetResp) GetExportTasks() []*ExportTaskStatus { +func (x *GetExportTasksOfDataSetResp) GetExportTasks() []*ExportTaskStatus { if x != nil { return x.ExportTasks } return nil } -func (x *GetExportTasksOfDatasetResp) GetExportType() int32 { +func (x *GetExportTasksOfDataSetResp) GetExportType() int32 { if x != nil { return x.ExportType } return 0 } -func (x *GetExportTasksOfDatasetResp) GetFinishedSampleCount() int32 { +func (x *GetExportTasksOfDataSetResp) GetFinishedSampleCount() int32 { if x != nil { return x.FinishedSampleCount } return 0 } -func (x *GetExportTasksOfDatasetResp) GetPath() string { +func (x *GetExportTasksOfDataSetResp) GetPath() string { if x != nil { return x.Path } return "" } -func (x *GetExportTasksOfDatasetResp) GetProgress() float32 { +func (x *GetExportTasksOfDataSetResp) GetProgress() float32 { if x != nil { return x.Progress } return 0 } -func (x *GetExportTasksOfDatasetResp) GetStatus() string { +func (x *GetExportTasksOfDataSetResp) GetStatus() string { if x != nil { return x.Status } return "" } -func (x *GetExportTasksOfDatasetResp) GetTaskId() string { +func (x *GetExportTasksOfDataSetResp) GetTaskId() string { if x != nil { return x.TaskId } return "" } -func (x *GetExportTasksOfDatasetResp) GetTotalCount() int64 { +func (x *GetExportTasksOfDataSetResp) GetTotalCount() int64 { if x != nil { return x.TotalCount } return 0 } -func (x *GetExportTasksOfDatasetResp) GetTotalSample() int64 { +func (x *GetExportTasksOfDataSetResp) GetTotalSample() int64 { if x != nil { return x.TotalSample } return 0 } -func (x *GetExportTasksOfDatasetResp) GetUpdateTime() uint32 { +func (x *GetExportTasksOfDataSetResp) GetUpdateTime() uint32 { if x != nil { return x.UpdateTime } return 0 } -func (x *GetExportTasksOfDatasetResp) GetVersionFormat() string { +func (x *GetExportTasksOfDataSetResp) GetVersionFormat() string { if x != nil { return x.VersionFormat } return "" } -func (x *GetExportTasksOfDatasetResp) GetVersionId() string { +func (x *GetExportTasksOfDataSetResp) GetVersionId() string { if x != nil { return x.VersionId } return "" } -func (x *GetExportTasksOfDatasetResp) GetMsg() string { +func (x *GetExportTasksOfDataSetResp) GetMsg() string { if x != nil { return x.Msg } @@ -18752,21 +18752,21 @@ var file_pcm_modelarts_proto_rawDesc = []byte{ 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x52, 0x04, 0x61, 0x75, 0x74, 0x68, 0x22, 0x0b, 0x0a, 0x09, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x0a, 0x44, 0x61, 0x74, - 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, + 0x61, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x6f, - 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x22, 0x61, 0x0a, 0x0b, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, + 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x22, 0x61, 0x0a, 0x0b, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2f, 0x0a, 0x08, 0x64, 0x61, 0x74, 0x61, - 0x73, 0x65, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x52, - 0x08, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x22, 0x93, 0x02, 0x0a, 0x08, 0x44, 0x61, - 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, + 0x53, 0x65, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x73, 0x52, + 0x08, 0x64, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x73, 0x22, 0x93, 0x02, 0x0a, 0x08, 0x44, 0x61, + 0x74, 0x61, 0x53, 0x65, 0x74, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x39, 0x0a, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x5f, 0x66, 0x6f, 0x72, @@ -20126,7 +20126,7 @@ var file_pcm_modelarts_proto_rawDesc = []byte{ 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x22, 0xa4, 0x05, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, - 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, + 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, @@ -21609,9 +21609,9 @@ var file_pcm_modelarts_proto_rawDesc = []byte{ 0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3f, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x15, 0x2e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, + 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x44, - 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4a, 0x0a, 0x0d, 0x43, 0x72, + 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4a, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x12, 0x1b, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, @@ -21698,7 +21698,7 @@ var file_pcm_modelarts_proto_rawDesc = []byte{ 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x26, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, - 0x54, 0x61, 0x73, 0x6b, 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, + 0x54, 0x61, 0x73, 0x6b, 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x77, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x12, 0x2a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x47, @@ -21829,9 +21829,9 @@ var file_pcm_modelarts_proto_goTypes = []interface{}{ (*Domain)(nil), // 7: modelarts.domain (*TokenReq)(nil), // 8: modelarts.TokenReq (*TokenResp)(nil), // 9: modelarts.TokenResp - (*DatasetReq)(nil), // 10: modelarts.DatasetReq - (*DatasetResp)(nil), // 11: modelarts.DatasetResp - (*Datasets)(nil), // 12: modelarts.Datasets + (*DataSetReq)(nil), // 10: modelarts.DataSetReq + (*DataSetResp)(nil), // 11: modelarts.DataSetResp + (*DataSets)(nil), // 12: modelarts.DataSets (*DataSources)(nil), // 13: modelarts.DataSources (*ImportTaskDataReq)(nil), // 14: modelarts.ImportTaskDataReq (*ImportTaskDataResp)(nil), // 15: modelarts.ImportTaskDataResp @@ -21952,7 +21952,7 @@ var file_pcm_modelarts_proto_goTypes = []interface{}{ (*SearchLabel)(nil), // 130: modelarts.SearchLabel (*SearchProp)(nil), // 131: modelarts.SearchProp (*GetExportTasksOfDatasetReq)(nil), // 132: modelarts.GetExportTasksOfDatasetReq - (*GetExportTasksOfDatasetResp)(nil), // 133: modelarts.GetExportTasksOfDatasetResp + (*GetExportTasksOfDataSetResp)(nil), // 133: modelarts.GetExportTasksOfDataSetResp (*ExportTaskStatus)(nil), // 134: modelarts.ExportTaskStatus (*GetExportTaskStatusOfDatasetReq)(nil), // 135: modelarts.GetExportTaskStatusOfDatasetReq (*GetExportTaskStatusOfDatasetResp)(nil), // 136: modelarts.GetExportTaskStatusOfDatasetResp @@ -22076,8 +22076,8 @@ var file_pcm_modelarts_proto_depIdxs = []int32{ 6, // 5: modelarts.password.user:type_name -> modelarts.user 7, // 6: modelarts.user.domain:type_name -> modelarts.domain 0, // 7: modelarts.TokenReq.auth:type_name -> modelarts.auth - 12, // 8: modelarts.DatasetResp.datasets:type_name -> modelarts.Datasets - 13, // 9: modelarts.Datasets.data_sources:type_name -> modelarts.DataSources + 12, // 8: modelarts.DataSetResp.dataSets:type_name -> modelarts.DataSets + 13, // 9: modelarts.DataSets.data_sources:type_name -> modelarts.DataSources 18, // 10: modelarts.ListImportTasksResp.import_tasks:type_name -> modelarts.Import_tasks 20, // 11: modelarts.Import_tasks.data_source:type_name -> modelarts.Data_source 23, // 12: modelarts.Import_tasks.file_statistics:type_name -> modelarts.File_statistics @@ -22194,8 +22194,8 @@ var file_pcm_modelarts_proto_depIdxs = []int32{ 131, // 123: modelarts.SearchCondition.metadata:type_name -> modelarts.SearchProp 130, // 124: modelarts.SearchLabels.labels:type_name -> modelarts.SearchLabel 240, // 125: modelarts.SearchProp.props:type_name -> modelarts.SearchProp.PropsEntry - 126, // 126: modelarts.GetExportTasksOfDatasetResp.export_params:type_name -> modelarts.ExportParams - 134, // 127: modelarts.GetExportTasksOfDatasetResp.export_tasks:type_name -> modelarts.ExportTaskStatus + 126, // 126: modelarts.GetExportTasksOfDataSetResp.export_params:type_name -> modelarts.ExportParams + 134, // 127: modelarts.GetExportTasksOfDataSetResp.export_tasks:type_name -> modelarts.ExportTaskStatus 126, // 128: modelarts.ExportTaskStatus.export_params:type_name -> modelarts.ExportParams 126, // 129: modelarts.GetExportTaskStatusOfDatasetResp.export_params:type_name -> modelarts.ExportParams 134, // 130: modelarts.GetExportTaskStatusOfDatasetResp.export_tasks:type_name -> modelarts.ExportTaskStatus @@ -22283,7 +22283,7 @@ var file_pcm_modelarts_proto_depIdxs = []int32{ 235, // 212: modelarts.CreateVisualizationJobParam.schedule:type_name -> modelarts.Schedule 129, // 213: modelarts.SearchProp.PropsEntry.value:type_name -> modelarts.weigou 8, // 214: modelarts.ModelArts.GetToken:input_type -> modelarts.TokenReq - 10, // 215: modelarts.ModelArts.GetDatasetList:input_type -> modelarts.DatasetReq + 10, // 215: modelarts.ModelArts.GetDatasetList:input_type -> modelarts.DataSetReq 193, // 216: modelarts.ModelArts.CreateDataSet:input_type -> modelarts.CreateDataSetReq 195, // 217: modelarts.ModelArts.DeleteDataSet:input_type -> modelarts.DeleteDataSetReq 14, // 218: modelarts.ModelArts.createTask:input_type -> modelarts.ImportTaskDataReq @@ -22321,7 +22321,7 @@ var file_pcm_modelarts_proto_depIdxs = []int32{ 227, // 250: modelarts.ModelArts.GetVisualizationJob:input_type -> modelarts.GetVisualizationJobReq 231, // 251: modelarts.ModelArts.CreateVisualizationJob:input_type -> modelarts.CreateVisualizationJobReq 9, // 252: modelarts.ModelArts.GetToken:output_type -> modelarts.TokenResp - 11, // 253: modelarts.ModelArts.GetDatasetList:output_type -> modelarts.DatasetResp + 11, // 253: modelarts.ModelArts.GetDatasetList:output_type -> modelarts.DataSetResp 194, // 254: modelarts.ModelArts.CreateDataSet:output_type -> modelarts.CreateDataSetResq 196, // 255: modelarts.ModelArts.DeleteDataSet:output_type -> modelarts.DeleteDataSetResq 15, // 256: modelarts.ModelArts.createTask:output_type -> modelarts.ImportTaskDataResp @@ -22337,7 +22337,7 @@ var file_pcm_modelarts_proto_depIdxs = []int32{ 119, // 266: modelarts.ModelArts.DeleteAlgorithms:output_type -> modelarts.DeleteAlgorithmsResp 121, // 267: modelarts.ModelArts.ShowAlgorithmByUuid:output_type -> modelarts.ShowAlgorithmByUuidResp 123, // 268: modelarts.ModelArts.ExportTask:output_type -> modelarts.ExportTaskResp - 133, // 269: modelarts.ModelArts.GetExportTasksOfDataset:output_type -> modelarts.GetExportTasksOfDatasetResp + 133, // 269: modelarts.ModelArts.GetExportTasksOfDataset:output_type -> modelarts.GetExportTasksOfDataSetResp 136, // 270: modelarts.ModelArts.GetExportTaskStatusOfDataset:output_type -> modelarts.GetExportTaskStatusOfDatasetResp 138, // 271: modelarts.ModelArts.CreateProcessorTask:output_type -> modelarts.CreateProcessorTaskResp 144, // 272: modelarts.ModelArts.DescribeProcessorTask:output_type -> modelarts.DescribeProcessorTaskResp @@ -22492,7 +22492,7 @@ func file_pcm_modelarts_proto_init() { } } file_pcm_modelarts_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DatasetReq); i { + switch v := v.(*DataSetReq); i { case 0: return &v.state case 1: @@ -22504,7 +22504,7 @@ func file_pcm_modelarts_proto_init() { } } file_pcm_modelarts_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DatasetResp); i { + switch v := v.(*DataSetResp); i { case 0: return &v.state case 1: @@ -22516,7 +22516,7 @@ func file_pcm_modelarts_proto_init() { } } file_pcm_modelarts_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Datasets); i { + switch v := v.(*DataSets); i { case 0: return &v.state case 1: @@ -23968,7 +23968,7 @@ func file_pcm_modelarts_proto_init() { } } file_pcm_modelarts_proto_msgTypes[133].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetExportTasksOfDatasetResp); i { + switch v := v.(*GetExportTasksOfDataSetResp); i { case 0: return &v.state case 1: diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go index 5acea059..778a6cbe 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go @@ -25,7 +25,7 @@ type ModelArtsClient interface { //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 @@ -56,7 +56,7 @@ type ModelArtsClient interface { 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) + GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDataSetResp, error) GetExportTaskStatusOfDataset(ctx context.Context, in *GetExportTaskStatusOfDatasetReq, opts ...grpc.CallOption) (*GetExportTaskStatusOfDatasetResp, error) //processor task CreateProcessorTask(ctx context.Context, in *CreateProcessorTaskReq, opts ...grpc.CallOption) (*CreateProcessorTaskResp, 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 @@ -245,8 +245,8 @@ func (c *modelArtsClient) ExportTask(ctx context.Context, in *ExportTaskReq, opt return out, nil } -func (c *modelArtsClient) GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error) { - out := new(GetExportTasksOfDatasetResp) +func (c *modelArtsClient) GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDataSetResp, error) { + out := new(GetExportTasksOfDataSetResp) err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetExportTasksOfDataset", in, out, opts...) if err != nil { return nil, err @@ -441,7 +441,7 @@ type ModelArtsServer interface { //get modelarts Token GetToken(context.Context, *TokenReq) (*TokenResp, error) //get modelarts Token - GetDatasetList(context.Context, *DatasetReq) (*DatasetResp, error) + GetDatasetList(context.Context, *DataSetReq) (*DataSetResp, error) //create DateSet CreateDataSet(context.Context, *CreateDataSetReq) (*CreateDataSetResq, error) //create DateSet @@ -472,7 +472,7 @@ type ModelArtsServer interface { ShowAlgorithmByUuid(context.Context, *ShowAlgorithmByUuidReq) (*ShowAlgorithmByUuidResp, error) //export task ExportTask(context.Context, *ExportTaskReq) (*ExportTaskResp, error) - GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDatasetResp, error) + GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDataSetResp, error) GetExportTaskStatusOfDataset(context.Context, *GetExportTaskStatusOfDatasetReq) (*GetExportTaskStatusOfDatasetResp, error) //processor task CreateProcessorTask(context.Context, *CreateProcessorTaskReq) (*CreateProcessorTaskResp, error) @@ -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) { @@ -556,7 +556,7 @@ func (UnimplementedModelArtsServer) ShowAlgorithmByUuid(context.Context, *ShowAl func (UnimplementedModelArtsServer) ExportTask(context.Context, *ExportTaskReq) (*ExportTaskResp, error) { return nil, status.Errorf(codes.Unimplemented, "method ExportTask not implemented") } -func (UnimplementedModelArtsServer) GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDatasetResp, error) { +func (UnimplementedModelArtsServer) GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDataSetResp, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExportTasksOfDataset not implemented") } func (UnimplementedModelArtsServer) GetExportTaskStatusOfDataset(context.Context, *GetExportTaskStatusOfDatasetReq) (*GetExportTaskStatusOfDatasetResp, 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) } diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go index 2d7fb957..66d5b874 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go @@ -63,13 +63,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 @@ -108,8 +108,8 @@ type ( FlavorResponse = modelarts.FlavorResponse GetExportTaskStatusOfDatasetReq = modelarts.GetExportTaskStatusOfDatasetReq GetExportTaskStatusOfDatasetResp = modelarts.GetExportTaskStatusOfDatasetResp + GetExportTasksOfDataSetResp = modelarts.GetExportTasksOfDataSetResp GetExportTasksOfDatasetReq = modelarts.GetExportTasksOfDatasetReq - GetExportTasksOfDatasetResp = modelarts.GetExportTasksOfDatasetResp GetNotebookStorageReq = modelarts.GetNotebookStorageReq GetNotebookStorageResp = modelarts.GetNotebookStorageResp GetVisualizationJobParam = modelarts.GetVisualizationJobParam @@ -254,7 +254,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 @@ -285,7 +285,7 @@ type ( 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) + GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDataSetResp, error) GetExportTaskStatusOfDataset(ctx context.Context, in *GetExportTaskStatusOfDatasetReq, opts ...grpc.CallOption) (*GetExportTaskStatusOfDatasetResp, error) // processor task CreateProcessorTask(ctx context.Context, in *CreateProcessorTaskReq, opts ...grpc.CallOption) (*CreateProcessorTaskResp, error) @@ -331,7 +331,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...) } @@ -426,7 +426,7 @@ func (m *defaultModelArts) ExportTask(ctx context.Context, in *ExportTaskReq, op return client.ExportTask(ctx, in, opts...) } -func (m *defaultModelArts) GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error) { +func (m *defaultModelArts) GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDataSetResp, error) { client := modelarts.NewModelArtsClient(m.cli.Conn()) return client.GetExportTasksOfDataset(ctx, in, opts...) } 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 dfbb78df..6fc22409 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto @@ -49,16 +49,16 @@ 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" repeated DataSources data_sources =3; // @gotags: copier:"DataSources" @@ -970,7 +970,7 @@ message GetExportTasksOfDatasetReq{ int32 offset = 5; // @gotags: copier:"Offset" } -message GetExportTasksOfDatasetResp{ +message GetExportTasksOfDataSetResp{ uint32 code = 1; // @gotags: copier:"Code" uint32 create_time = 2; // @gotags: copier:"CreateTime" string error_code = 3; // @gotags: copier:"ErrorCode" @@ -1916,7 +1916,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 @@ -1950,7 +1950,7 @@ service ModelArts { //export task rpc ExportTask(ExportTaskReq) returns (ExportTaskResp); - rpc GetExportTasksOfDataset(GetExportTasksOfDatasetReq) returns (GetExportTasksOfDatasetResp); + rpc GetExportTasksOfDataset(GetExportTasksOfDatasetReq) returns (GetExportTasksOfDataSetResp); rpc GetExportTaskStatusOfDataset(GetExportTaskStatusOfDatasetReq) returns (GetExportTaskStatusOfDatasetResp); //processor task rpc CreateProcessorTask(CreateProcessorTaskReq) returns (CreateProcessorTaskResp); From 5575df91a1ab2d4b05c7632d27cd7418acb32a40 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Thu, 23 Mar 2023 15:39:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/getexporttasksofdatasetlogic.go | 4 +- .../rpc/internal/server/modelartsserver.go | 2 +- .../rpc/modelarts/pcm-modelarts.pb.go | 68 +++++++++---------- .../rpc/modelarts/pcm-modelarts_grpc.pb.go | 10 +-- .../rpc/modelartsclient/modelarts.go | 6 +- .../PCM-MODELARTS/rpc/pb/pcm-modelarts.proto | 4 +- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttasksofdatasetlogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttasksofdatasetlogic.go index e4a08f94..bec828a5 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttasksofdatasetlogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttasksofdatasetlogic.go @@ -35,9 +35,9 @@ func NewGetExportTasksOfDatasetLogic(ctx context.Context, svcCtx *svc.ServiceCon // ExportTasks []*Modelarts.ExportTaskStatus `json:"export_tasks"` //} -func (l *GetExportTasksOfDatasetLogic) GetExportTasksOfDataset(in *modelarts.GetExportTasksOfDatasetReq) (*modelarts.GetExportTasksOfDataSetResp, error) { +func (l *GetExportTasksOfDatasetLogic) GetExportTasksOfDataset(in *modelarts.GetExportTasksOfDatasetReq) (*modelarts.GetExportTasksOfDatasetResp, error) { - var resp modelarts.GetExportTasksOfDataSetResp + var resp modelarts.GetExportTasksOfDatasetResp url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/datasets/" + in.DatasetId + "/export-tasks" token := common.GetToken() body, err := tool.HttpClient(tool.GET, url, nil, token) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/server/modelartsserver.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/server/modelartsserver.go index 3ed818f6..11e4bbe4 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/server/modelartsserver.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/server/modelartsserver.go @@ -124,7 +124,7 @@ func (s *ModelArtsServer) ExportTask(ctx context.Context, in *modelarts.ExportTa return l.ExportTask(in) } -func (s *ModelArtsServer) GetExportTasksOfDataset(ctx context.Context, in *modelarts.GetExportTasksOfDatasetReq) (*modelarts.GetExportTasksOfDataSetResp, error) { +func (s *ModelArtsServer) GetExportTasksOfDataset(ctx context.Context, in *modelarts.GetExportTasksOfDatasetReq) (*modelarts.GetExportTasksOfDatasetResp, error) { l := logic.NewGetExportTasksOfDatasetLogic(ctx, s.svcCtx) return l.GetExportTasksOfDataset(in) } diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go index 86df0981..cf2c51c4 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go @@ -9672,7 +9672,7 @@ func (x *GetExportTasksOfDatasetReq) GetOffset() int32 { return 0 } -type GetExportTasksOfDataSetResp struct { +type GetExportTasksOfDatasetResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -9698,8 +9698,8 @@ type GetExportTasksOfDataSetResp struct { Msg string `protobuf:"bytes,19,opt,name=msg,proto3" json:"msg,omitempty"` // @gotags: copier:"Msg" } -func (x *GetExportTasksOfDataSetResp) Reset() { - *x = GetExportTasksOfDataSetResp{} +func (x *GetExportTasksOfDatasetResp) Reset() { + *x = GetExportTasksOfDatasetResp{} if protoimpl.UnsafeEnabled { mi := &file_pcm_modelarts_proto_msgTypes[133] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -9707,13 +9707,13 @@ func (x *GetExportTasksOfDataSetResp) Reset() { } } -func (x *GetExportTasksOfDataSetResp) String() string { +func (x *GetExportTasksOfDatasetResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*GetExportTasksOfDataSetResp) ProtoMessage() {} +func (*GetExportTasksOfDatasetResp) ProtoMessage() {} -func (x *GetExportTasksOfDataSetResp) ProtoReflect() protoreflect.Message { +func (x *GetExportTasksOfDatasetResp) ProtoReflect() protoreflect.Message { mi := &file_pcm_modelarts_proto_msgTypes[133] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -9725,138 +9725,138 @@ func (x *GetExportTasksOfDataSetResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use GetExportTasksOfDataSetResp.ProtoReflect.Descriptor instead. -func (*GetExportTasksOfDataSetResp) Descriptor() ([]byte, []int) { +// Deprecated: Use GetExportTasksOfDatasetResp.ProtoReflect.Descriptor instead. +func (*GetExportTasksOfDatasetResp) Descriptor() ([]byte, []int) { return file_pcm_modelarts_proto_rawDescGZIP(), []int{133} } -func (x *GetExportTasksOfDataSetResp) GetCode() uint32 { +func (x *GetExportTasksOfDatasetResp) GetCode() uint32 { if x != nil { return x.Code } return 0 } -func (x *GetExportTasksOfDataSetResp) GetCreateTime() uint32 { +func (x *GetExportTasksOfDatasetResp) GetCreateTime() uint32 { if x != nil { return x.CreateTime } return 0 } -func (x *GetExportTasksOfDataSetResp) GetErrorCode() string { +func (x *GetExportTasksOfDatasetResp) GetErrorCode() string { if x != nil { return x.ErrorCode } return "" } -func (x *GetExportTasksOfDataSetResp) GetErrorMsg() string { +func (x *GetExportTasksOfDatasetResp) GetErrorMsg() string { if x != nil { return x.ErrorMsg } return "" } -func (x *GetExportTasksOfDataSetResp) GetExportFormat() int32 { +func (x *GetExportTasksOfDatasetResp) GetExportFormat() int32 { if x != nil { return x.ExportFormat } return 0 } -func (x *GetExportTasksOfDataSetResp) GetExportParams() *ExportParams { +func (x *GetExportTasksOfDatasetResp) GetExportParams() *ExportParams { if x != nil { return x.ExportParams } return nil } -func (x *GetExportTasksOfDataSetResp) GetExportTasks() []*ExportTaskStatus { +func (x *GetExportTasksOfDatasetResp) GetExportTasks() []*ExportTaskStatus { if x != nil { return x.ExportTasks } return nil } -func (x *GetExportTasksOfDataSetResp) GetExportType() int32 { +func (x *GetExportTasksOfDatasetResp) GetExportType() int32 { if x != nil { return x.ExportType } return 0 } -func (x *GetExportTasksOfDataSetResp) GetFinishedSampleCount() int32 { +func (x *GetExportTasksOfDatasetResp) GetFinishedSampleCount() int32 { if x != nil { return x.FinishedSampleCount } return 0 } -func (x *GetExportTasksOfDataSetResp) GetPath() string { +func (x *GetExportTasksOfDatasetResp) GetPath() string { if x != nil { return x.Path } return "" } -func (x *GetExportTasksOfDataSetResp) GetProgress() float32 { +func (x *GetExportTasksOfDatasetResp) GetProgress() float32 { if x != nil { return x.Progress } return 0 } -func (x *GetExportTasksOfDataSetResp) GetStatus() string { +func (x *GetExportTasksOfDatasetResp) GetStatus() string { if x != nil { return x.Status } return "" } -func (x *GetExportTasksOfDataSetResp) GetTaskId() string { +func (x *GetExportTasksOfDatasetResp) GetTaskId() string { if x != nil { return x.TaskId } return "" } -func (x *GetExportTasksOfDataSetResp) GetTotalCount() int64 { +func (x *GetExportTasksOfDatasetResp) GetTotalCount() int64 { if x != nil { return x.TotalCount } return 0 } -func (x *GetExportTasksOfDataSetResp) GetTotalSample() int64 { +func (x *GetExportTasksOfDatasetResp) GetTotalSample() int64 { if x != nil { return x.TotalSample } return 0 } -func (x *GetExportTasksOfDataSetResp) GetUpdateTime() uint32 { +func (x *GetExportTasksOfDatasetResp) GetUpdateTime() uint32 { if x != nil { return x.UpdateTime } return 0 } -func (x *GetExportTasksOfDataSetResp) GetVersionFormat() string { +func (x *GetExportTasksOfDatasetResp) GetVersionFormat() string { if x != nil { return x.VersionFormat } return "" } -func (x *GetExportTasksOfDataSetResp) GetVersionId() string { +func (x *GetExportTasksOfDatasetResp) GetVersionId() string { if x != nil { return x.VersionId } return "" } -func (x *GetExportTasksOfDataSetResp) GetMsg() string { +func (x *GetExportTasksOfDatasetResp) GetMsg() string { if x != nil { return x.Msg } @@ -20126,7 +20126,7 @@ var file_pcm_modelarts_proto_rawDesc = []byte{ 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x22, 0xa4, 0x05, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, - 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, + 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, @@ -21698,7 +21698,7 @@ var file_pcm_modelarts_proto_rawDesc = []byte{ 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x26, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, - 0x54, 0x61, 0x73, 0x6b, 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x74, 0x52, 0x65, + 0x54, 0x61, 0x73, 0x6b, 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x77, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x4f, 0x66, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x12, 0x2a, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x61, 0x72, 0x74, 0x73, 0x2e, 0x47, @@ -21952,7 +21952,7 @@ var file_pcm_modelarts_proto_goTypes = []interface{}{ (*SearchLabel)(nil), // 130: modelarts.SearchLabel (*SearchProp)(nil), // 131: modelarts.SearchProp (*GetExportTasksOfDatasetReq)(nil), // 132: modelarts.GetExportTasksOfDatasetReq - (*GetExportTasksOfDataSetResp)(nil), // 133: modelarts.GetExportTasksOfDataSetResp + (*GetExportTasksOfDatasetResp)(nil), // 133: modelarts.GetExportTasksOfDatasetResp (*ExportTaskStatus)(nil), // 134: modelarts.ExportTaskStatus (*GetExportTaskStatusOfDatasetReq)(nil), // 135: modelarts.GetExportTaskStatusOfDatasetReq (*GetExportTaskStatusOfDatasetResp)(nil), // 136: modelarts.GetExportTaskStatusOfDatasetResp @@ -22194,8 +22194,8 @@ var file_pcm_modelarts_proto_depIdxs = []int32{ 131, // 123: modelarts.SearchCondition.metadata:type_name -> modelarts.SearchProp 130, // 124: modelarts.SearchLabels.labels:type_name -> modelarts.SearchLabel 240, // 125: modelarts.SearchProp.props:type_name -> modelarts.SearchProp.PropsEntry - 126, // 126: modelarts.GetExportTasksOfDataSetResp.export_params:type_name -> modelarts.ExportParams - 134, // 127: modelarts.GetExportTasksOfDataSetResp.export_tasks:type_name -> modelarts.ExportTaskStatus + 126, // 126: modelarts.GetExportTasksOfDatasetResp.export_params:type_name -> modelarts.ExportParams + 134, // 127: modelarts.GetExportTasksOfDatasetResp.export_tasks:type_name -> modelarts.ExportTaskStatus 126, // 128: modelarts.ExportTaskStatus.export_params:type_name -> modelarts.ExportParams 126, // 129: modelarts.GetExportTaskStatusOfDatasetResp.export_params:type_name -> modelarts.ExportParams 134, // 130: modelarts.GetExportTaskStatusOfDatasetResp.export_tasks:type_name -> modelarts.ExportTaskStatus @@ -22337,7 +22337,7 @@ var file_pcm_modelarts_proto_depIdxs = []int32{ 119, // 266: modelarts.ModelArts.DeleteAlgorithms:output_type -> modelarts.DeleteAlgorithmsResp 121, // 267: modelarts.ModelArts.ShowAlgorithmByUuid:output_type -> modelarts.ShowAlgorithmByUuidResp 123, // 268: modelarts.ModelArts.ExportTask:output_type -> modelarts.ExportTaskResp - 133, // 269: modelarts.ModelArts.GetExportTasksOfDataset:output_type -> modelarts.GetExportTasksOfDataSetResp + 133, // 269: modelarts.ModelArts.GetExportTasksOfDataset:output_type -> modelarts.GetExportTasksOfDatasetResp 136, // 270: modelarts.ModelArts.GetExportTaskStatusOfDataset:output_type -> modelarts.GetExportTaskStatusOfDatasetResp 138, // 271: modelarts.ModelArts.CreateProcessorTask:output_type -> modelarts.CreateProcessorTaskResp 144, // 272: modelarts.ModelArts.DescribeProcessorTask:output_type -> modelarts.DescribeProcessorTaskResp @@ -23968,7 +23968,7 @@ func file_pcm_modelarts_proto_init() { } } file_pcm_modelarts_proto_msgTypes[133].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetExportTasksOfDataSetResp); i { + switch v := v.(*GetExportTasksOfDatasetResp); i { case 0: return &v.state case 1: diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go index 778a6cbe..edc8f988 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go @@ -56,7 +56,7 @@ type ModelArtsClient interface { 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) + GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error) GetExportTaskStatusOfDataset(ctx context.Context, in *GetExportTaskStatusOfDatasetReq, opts ...grpc.CallOption) (*GetExportTaskStatusOfDatasetResp, error) //processor task CreateProcessorTask(ctx context.Context, in *CreateProcessorTaskReq, opts ...grpc.CallOption) (*CreateProcessorTaskResp, error) @@ -245,8 +245,8 @@ func (c *modelArtsClient) ExportTask(ctx context.Context, in *ExportTaskReq, opt return out, nil } -func (c *modelArtsClient) GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDataSetResp, error) { - out := new(GetExportTasksOfDataSetResp) +func (c *modelArtsClient) GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error) { + out := new(GetExportTasksOfDatasetResp) err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetExportTasksOfDataset", in, out, opts...) if err != nil { return nil, err @@ -472,7 +472,7 @@ type ModelArtsServer interface { ShowAlgorithmByUuid(context.Context, *ShowAlgorithmByUuidReq) (*ShowAlgorithmByUuidResp, error) //export task ExportTask(context.Context, *ExportTaskReq) (*ExportTaskResp, error) - GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDataSetResp, error) + GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDatasetResp, error) GetExportTaskStatusOfDataset(context.Context, *GetExportTaskStatusOfDatasetReq) (*GetExportTaskStatusOfDatasetResp, error) //processor task CreateProcessorTask(context.Context, *CreateProcessorTaskReq) (*CreateProcessorTaskResp, error) @@ -556,7 +556,7 @@ func (UnimplementedModelArtsServer) ShowAlgorithmByUuid(context.Context, *ShowAl func (UnimplementedModelArtsServer) ExportTask(context.Context, *ExportTaskReq) (*ExportTaskResp, error) { return nil, status.Errorf(codes.Unimplemented, "method ExportTask not implemented") } -func (UnimplementedModelArtsServer) GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDataSetResp, error) { +func (UnimplementedModelArtsServer) GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDatasetResp, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExportTasksOfDataset not implemented") } func (UnimplementedModelArtsServer) GetExportTaskStatusOfDataset(context.Context, *GetExportTaskStatusOfDatasetReq) (*GetExportTaskStatusOfDatasetResp, error) { diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go index 66d5b874..c4bf1b26 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go @@ -108,8 +108,8 @@ type ( FlavorResponse = modelarts.FlavorResponse GetExportTaskStatusOfDatasetReq = modelarts.GetExportTaskStatusOfDatasetReq GetExportTaskStatusOfDatasetResp = modelarts.GetExportTaskStatusOfDatasetResp - GetExportTasksOfDataSetResp = modelarts.GetExportTasksOfDataSetResp GetExportTasksOfDatasetReq = modelarts.GetExportTasksOfDatasetReq + GetExportTasksOfDatasetResp = modelarts.GetExportTasksOfDatasetResp GetNotebookStorageReq = modelarts.GetNotebookStorageReq GetNotebookStorageResp = modelarts.GetNotebookStorageResp GetVisualizationJobParam = modelarts.GetVisualizationJobParam @@ -285,7 +285,7 @@ type ( 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) + GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error) GetExportTaskStatusOfDataset(ctx context.Context, in *GetExportTaskStatusOfDatasetReq, opts ...grpc.CallOption) (*GetExportTaskStatusOfDatasetResp, error) // processor task CreateProcessorTask(ctx context.Context, in *CreateProcessorTaskReq, opts ...grpc.CallOption) (*CreateProcessorTaskResp, error) @@ -426,7 +426,7 @@ func (m *defaultModelArts) ExportTask(ctx context.Context, in *ExportTaskReq, op return client.ExportTask(ctx, in, opts...) } -func (m *defaultModelArts) GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDataSetResp, error) { +func (m *defaultModelArts) GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error) { client := modelarts.NewModelArtsClient(m.cli.Conn()) return client.GetExportTasksOfDataset(ctx, in, opts...) } 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 6fc22409..73e13d73 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/pb/pcm-modelarts.proto @@ -970,7 +970,7 @@ message GetExportTasksOfDatasetReq{ int32 offset = 5; // @gotags: copier:"Offset" } -message GetExportTasksOfDataSetResp{ +message GetExportTasksOfDatasetResp{ uint32 code = 1; // @gotags: copier:"Code" uint32 create_time = 2; // @gotags: copier:"CreateTime" string error_code = 3; // @gotags: copier:"ErrorCode" @@ -1950,7 +1950,7 @@ service ModelArts { //export task rpc ExportTask(ExportTaskReq) returns (ExportTaskResp); - rpc GetExportTasksOfDataset(GetExportTasksOfDatasetReq) returns (GetExportTasksOfDataSetResp); + rpc GetExportTasksOfDataset(GetExportTasksOfDatasetReq) returns (GetExportTasksOfDatasetResp); rpc GetExportTaskStatusOfDataset(GetExportTaskStatusOfDatasetReq) returns (GetExportTaskStatusOfDatasetResp); //processor task rpc CreateProcessorTask(CreateProcessorTaskReq) returns (CreateProcessorTaskResp); From b04ab841427fa3058c5a3bfc0e05c2fa1ab280c4 Mon Sep 17 00:00:00 2001 From: devad Date: Thu, 23 Mar 2023 16:04:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20modelarts=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: devad --- .../rpc/modelarts/pcm-modelarts.pb.go | 4 +- .../rpc/modelarts/pcm-modelarts_grpc.pb.go | 86 +++++++++---------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go index cf2c51c4..bd58c74f 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.19.4 +// protoc v3.21.12 // source: pcm-modelarts.proto package modelarts @@ -9480,7 +9480,7 @@ type SearchLabel struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // @gotags: copier:"Name" Op string `protobuf:"bytes,2,opt,name=op,proto3" json:"op,omitempty"` // @gotags: copier:"Op" - // map property = 3; // @gotags: copier:"Property" + // map property = 3; // @gotags: copier:"Property" Type int64 `protobuf:"varint,4,opt,name=type,proto3" json:"type,omitempty"` // @gotags: copier:"Type" } diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go index edc8f988..3401d0ef 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts/pcm-modelarts_grpc.pb.go @@ -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 + // get modelarts Token GetDatasetList(ctx context.Context, in *DataSetReq, opts ...grpc.CallOption) (*DataSetResp, error) - //create DateSet + // 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) } @@ -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 + // get modelarts Token GetDatasetList(context.Context, *DataSetReq) (*DataSetResp, error) - //create DateSet + // 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()