annzee
/
PCM
forked from JCCE/PCM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

proto更新

This commit is contained in:
lee 2023-02-27 16:18:39 +08:00
parent 39a728f407
commit 47509a34aa
7 changed files with 668 additions and 911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
adaptor/AIComputing/modelarts/rpc/internal/logic/finddatasetlistlogic.go
View File

@ -1,32 +0,0 @@
package logic
import (
"context"
"PCM/adaptor/AIComputing/modelarts/rpc/internal/svc"
"PCM/adaptor/AIComputing/modelarts/rpc/modelarts"
"github.com/zeromicro/go-zero/core/logx"
)
type FindDatasetListLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
}
func NewFindDatasetListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FindDatasetListLogic {
return &FindDatasetListLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
}
}
// find modelarts Token
func (l *FindDatasetListLogic) FindDatasetList(in *modelarts.FindDatasetReq) (*modelarts.FindDatasetResp, error) {
// todo: add your logic here and delete this line
return &modelarts.FindDatasetResp{}, nil
}

89
adaptor/AIComputing/modelarts/rpc/internal/logic/listjoblogic.go
View File

File diff suppressed because one or more lines are too long

12
adaptor/AIComputing/modelarts/rpc/internal/server/modelartsserver.go
View File

@ -29,15 +29,15 @@ func (s *ModelArtsServer) GetToken(ctx context.Context, in *modelarts.TokenReq)
}
// creat task
func (s *ModelArtsServer) FindDatasetList(ctx context.Context, in *modelarts.FindDatasetReq) (*modelarts.FindDatasetResp, error) {
l := logic.NewFindDatasetListLogic(ctx, s.svcCtx)
return l.FindDatasetList(in)
func (s *ModelArtsServer) CreateTask(ctx context.Context, in *modelarts.ImportTaskData) (*modelarts.ExportTaskData, error) {
l := logic.NewCreateTaskLogic(ctx, s.svcCtx)
return l.CreateTask(in)
}
// find taskList
func (s *ModelArtsServer) ListJob(ctx context.Context, in *modelarts.ListImportTasks) (*modelarts.ReturnListImportTasks, error) {
l := logic.NewListJobLogic(ctx, s.svcCtx)
return l.ListJob(in)
func (s *ModelArtsServer) GetDatasetList(ctx context.Context, in *modelarts.ListImportTasks) (*modelarts.ReturnListImportTasks, error) {
l := logic.NewGetDatasetListLogic(ctx, s.svcCtx)
return l.GetDatasetList(in)
}
// export task

1328
adaptor/AIComputing/modelarts/rpc/modelarts/modelarts.pb.go
View File

File diff suppressed because it is too large Load Diff

52
adaptor/AIComputing/modelarts/rpc/modelarts/modelarts_grpc.pb.go
View File

@ -25,9 +25,9 @@ type ModelArtsClient interface {
// get modelarts Token
GetToken(ctx context.Context, in *TokenReq, opts ...grpc.CallOption) (*TokenResp, error)
// creat task
FindDatasetList(ctx context.Context, in *FindDatasetReq, opts ...grpc.CallOption) (*FindDatasetResp, error)
CreateTask(ctx context.Context, in *ImportTaskData, opts ...grpc.CallOption) (*ExportTaskData, error)
// find taskList
ListJob(ctx context.Context, in *ListImportTasks, opts ...grpc.CallOption) (*ReturnListImportTasks, error)
GetDatasetList(ctx context.Context, in *ListImportTasks, opts ...grpc.CallOption) (*ReturnListImportTasks, 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)
@ -50,18 +50,18 @@ func (c *modelArtsClient) GetToken(ctx context.Context, in *TokenReq, opts ...gr
return out, nil
}
func (c *modelArtsClient) FindDatasetList(ctx context.Context, in *FindDatasetReq, opts ...grpc.CallOption) (*FindDatasetResp, error) {
out := new(FindDatasetResp)
err := c.cc.Invoke(ctx, "/modelarts.ModelArts/findDatasetList", in, out, opts...)
func (c *modelArtsClient) CreateTask(ctx context.Context, in *ImportTaskData, opts ...grpc.CallOption) (*ExportTaskData, error) {
out := new(ExportTaskData)
err := c.cc.Invoke(ctx, "/modelarts.ModelArts/createTask", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *modelArtsClient) ListJob(ctx context.Context, in *ListImportTasks, opts ...grpc.CallOption) (*ReturnListImportTasks, error) {
func (c *modelArtsClient) GetDatasetList(ctx context.Context, in *ListImportTasks, opts ...grpc.CallOption) (*ReturnListImportTasks, error) {
out := new(ReturnListImportTasks)
err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ListJob", in, out, opts...)
err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetDatasetList", in, out, opts...)
if err != nil {
return nil, err
}
@ -93,9 +93,9 @@ type ModelArtsServer interface {
// get modelarts Token
GetToken(context.Context, *TokenReq) (*TokenResp, error)
// creat task
FindDatasetList(context.Context, *FindDatasetReq) (*FindDatasetResp, error)
CreateTask(context.Context, *ImportTaskData) (*ExportTaskData, error)
// find taskList
ListJob(context.Context, *ListImportTasks) (*ReturnListImportTasks, error)
GetDatasetList(context.Context, *ListImportTasks) (*ReturnListImportTasks, error)
//export task
ExportTask(context.Context, *ExportTaskReq) (*ExportTaskResp, error)
GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDatasetResp, error)
@ -109,11 +109,11 @@ type UnimplementedModelArtsServer struct {
func (UnimplementedModelArtsServer) GetToken(context.Context, *TokenReq) (*TokenResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method GetToken not implemented")
}
func (UnimplementedModelArtsServer) FindDatasetList(context.Context, *FindDatasetReq) (*FindDatasetResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method FindDatasetList not implemented")
func (UnimplementedModelArtsServer) CreateTask(context.Context, *ImportTaskData) (*ExportTaskData, error) {
return nil, status.Errorf(codes.Unimplemented, "method CreateTask not implemented")
}
func (UnimplementedModelArtsServer) ListJob(context.Context, *ListImportTasks) (*ReturnListImportTasks, error) {
return nil, status.Errorf(codes.Unimplemented, "method ListJob not implemented")
func (UnimplementedModelArtsServer) GetDatasetList(context.Context, *ListImportTasks) (*ReturnListImportTasks, error) {
return nil, status.Errorf(codes.Unimplemented, "method GetDatasetList not implemented")
}
func (UnimplementedModelArtsServer) ExportTask(context.Context, *ExportTaskReq) (*ExportTaskResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method ExportTask not implemented")
@ -152,38 +152,38 @@ func _ModelArts_GetToken_Handler(srv interface{}, ctx context.Context, dec func(
return interceptor(ctx, in, info, handler)
}
func _ModelArts_FindDatasetList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(FindDatasetReq)
func _ModelArts_CreateTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(ImportTaskData)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ModelArtsServer).FindDatasetList(ctx, in)
return srv.(ModelArtsServer).CreateTask(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/modelarts.ModelArts/findDatasetList",
FullMethod: "/modelarts.ModelArts/createTask",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ModelArtsServer).FindDatasetList(ctx, req.(*FindDatasetReq))
return srv.(ModelArtsServer).CreateTask(ctx, req.(*ImportTaskData))
}
return interceptor(ctx, in, info, handler)
}
func _ModelArts_ListJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
func _ModelArts_GetDatasetList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(ListImportTasks)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ModelArtsServer).ListJob(ctx, in)
return srv.(ModelArtsServer).GetDatasetList(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/modelarts.ModelArts/ListJob",
FullMethod: "/modelarts.ModelArts/GetDatasetList",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ModelArtsServer).ListJob(ctx, req.(*ListImportTasks))
return srv.(ModelArtsServer).GetDatasetList(ctx, req.(*ListImportTasks))
}
return interceptor(ctx, in, info, handler)
}
@ -236,12 +236,12 @@ var ModelArts_ServiceDesc = grpc.ServiceDesc{
Handler: _ModelArts_GetToken_Handler,
},
{
MethodName: "findDatasetList",
Handler: _ModelArts_FindDatasetList_Handler,
MethodName: "createTask",
Handler: _ModelArts_CreateTask_Handler,
},
{
MethodName: "ListJob",
Handler: _ModelArts_ListJob_Handler,
MethodName: "GetDatasetList",
Handler: _ModelArts_GetDatasetList_Handler,
},
{
MethodName: "ExportTask",

19
adaptor/AIComputing/modelarts/rpc/modelartsclient/modelarts.go
View File

@ -15,20 +15,19 @@ import (
type (
AnnotationFormatConfig = modelarts.AnnotationFormatConfig
Auth = modelarts.Auth
BodyTaskData = modelarts.BodyTaskData
DataSource = modelarts.DataSource
DataSources = modelarts.DataSources
Datasets = modelarts.Datasets
Domain = modelarts.Domain
ExportParams = modelarts.ExportParams
ExportTaskData = modelarts.ExportTaskData
ExportTaskReq = modelarts.ExportTaskReq
ExportTaskResp = modelarts.ExportTaskResp
ExportTaskStatus = modelarts.ExportTaskStatus
FileStatistics = modelarts.FileStatistics
FindDatasetReq = modelarts.FindDatasetReq
FindDatasetResp = modelarts.FindDatasetResp
GetExportTasksOfDatasetReq = modelarts.GetExportTasksOfDatasetReq
GetExportTasksOfDatasetResp = modelarts.GetExportTasksOfDatasetResp
Identity = modelarts.Identity
ImportTaskData = modelarts.ImportTaskData
ImportTasks = modelarts.ImportTasks
ListImportTasks = modelarts.ListImportTasks
Methods = modelarts.Methods
@ -51,9 +50,9 @@ type (
// get modelarts Token
GetToken(ctx context.Context, in *TokenReq, opts ...grpc.CallOption) (*TokenResp, error)
// creat task
FindDatasetList(ctx context.Context, in *FindDatasetReq, opts ...grpc.CallOption) (*FindDatasetResp, error)
CreateTask(ctx context.Context, in *ImportTaskData, opts ...grpc.CallOption) (*ExportTaskData, error)
// find taskList
ListJob(ctx context.Context, in *ListImportTasks, opts ...grpc.CallOption) (*ReturnListImportTasks, error)
GetDatasetList(ctx context.Context, in *ListImportTasks, opts ...grpc.CallOption) (*ReturnListImportTasks, 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)
@ -77,15 +76,15 @@ func (m *defaultModelArts) GetToken(ctx context.Context, in *TokenReq, opts ...g
}
// creat task
func (m *defaultModelArts) FindDatasetList(ctx context.Context, in *FindDatasetReq, opts ...grpc.CallOption) (*FindDatasetResp, error) {
func (m *defaultModelArts) CreateTask(ctx context.Context, in *ImportTaskData, opts ...grpc.CallOption) (*ExportTaskData, error) {
client := modelarts.NewModelArtsClient(m.cli.Conn())
return client.FindDatasetList(ctx, in, opts...)
return client.CreateTask(ctx, in, opts...)
}
// find taskList
func (m *defaultModelArts) ListJob(ctx context.Context, in *ListImportTasks, opts ...grpc.CallOption) (*ReturnListImportTasks, error) {
func (m *defaultModelArts) GetDatasetList(ctx context.Context, in *ListImportTasks, opts ...grpc.CallOption) (*ReturnListImportTasks, error) {
client := modelarts.NewModelArtsClient(m.cli.Conn())
return client.ListJob(ctx, in, opts...)
return client.GetDatasetList(ctx, in, opts...)
}
// export task

47
adaptor/AIComputing/modelarts/rpc/pb/modelarts.proto
View File

@ -48,35 +48,24 @@ message TokenResp{
}
/******************auth end*************************/
/******************find datasetList start*************************/
message datasets{
string dataset_id = 1; // @gotags: copier:"Dataset_id"
string dataset_name =2; // @gotags: copier:"Dataset_name"
string dataset_type =3; // @gotags: copier:"Dataset_type"
string status =4; // @gotags: copier:"Status"
dataSources dataSources =5; // @gotags: copier:"DataSources"
/******************createTaskData start*************************/
message ImportTaskData{
string dataset_id = 1;
string project_id = 2;
BodyTaskData bodyTaskData = 3;
}
message BodyTaskData{
string import_path =1;
}
message findDatasetReq{
string project_id = 1; // @gotags: copier:"ProjectId"
}
message findDatasetResp{
int32 total_number = 1; // @gotags: copier:"TotalNumber"
datasets datasets = 2; // @gotags: copier:"Datasets"
}
message dataSources{
int32 data_type = 1; // @gotags: copier:"TotalNumber"
string data_path = 2;
message ExportTaskData{
string task_id =1;
}
/******************createTaskData end*************************/
/******************find datasetList end*************************/
/******************Job Start*************************/
/******************taskList Start*************************/
//入参，dataset_id：数据集id。project_id：用户项目ID。
message ListImportTasks{
string dataset_id = 1; // @gotags: copier:"Dataset_id"
@ -157,13 +146,7 @@ message File_statistics{
uint32 file_size_finished = 3; //@gotags: copier:"File_size_finished"
uint32 file_size_total = 4; //@gotags: copier:"File_size_total"
}
/******************Job End*************************/
/******************Job Start*************************/
//创建导入任务，
/******************Job End*************************/
/******************taskList End*************************/
/******************Task(export) Start*************************/
message ExportTaskReq{
@ -315,9 +298,9 @@ service ModelArts {
rpc GetToken(TokenReq) returns (TokenResp);
//creat task
rpc findDatasetList(findDatasetReq) returns (findDatasetResp);
rpc createTask(ImportTaskData) returns(ExportTaskData);
//find taskList
rpc ListJob(ListImportTasks) returns (ReturnListImportTasks);
rpc GetDatasetList(ListImportTasks) returns (ReturnListImportTasks);
//export task
rpc ExportTask(ExportTaskReq) returns (ExportTaskResp);