fix:查询获取训练作业支持的公共规格接口

Former-commit-id: 732d42912260e3e5f21a3792e1dad9037aba04cf

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common/AuthService.go

@@ -12,7 +12,7 @@ import (
 const (
 	IAMUser        = "pcmmodelarts"
 	IAMPassword    = "!QAZ2wsx3edc4"
-	IAMDomain      = "hid_btkv2tt4_rcdv0q"
+	IAMDomain      = "hw_008618597947378_01"
 	AuthMethod     = "password"
 	IAMTokenUrl    = "https://iam.cn-north-4.myhuaweicloud.com/v3/auth/tokens"
 	ProjectName    = "cn-north-4"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/config/config.go

@@ -9,4 +9,5 @@ type Config struct {
 	zrpc.RpcServerConf
 	LogConf        logx.LogConf
 	PcmCoreRpcConf zrpc.RpcClientConf
+	ModelArtsConfig
 }

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/config/modelartsConfig.go

@@ -0,0 +1,13 @@
+package config
+
+type ModelArtsConfig struct {
+	ModelArtsUrl         string `json:"ModelArtsUrl"`
+	IAMUser              string `json:"IAMUser"`
+	NanjingModelArtsUrl  string `json:"NanjingModelArtsUrl"`
+	AK                   string `json:"AK"`
+	SK                   string `json:"SK"`
+	XProjectId           string `json:"X-Project-Id"`
+	XDomainId            string `json:"X-Domain-Id"`
+	HaweiModelArtsType   string `json:"HaweiModelArtsType"`
+	NanjingModelArtsType string `json:"NanjingModelArtsType"`
+}

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

@@ -118,6 +118,12 @@ func (s *ModelArtsServer) ShowAlgorithmByUuid(ctx context.Context, in *modelarts
 	return l.ShowAlgorithmByUuid(in)
 }
 
+// training-job-flavors 获取训练作业支持的公共规格
+func (s *ModelArtsServer) GetTrainingJobFlavors(ctx context.Context, in *modelarts.TrainingJobFlavorsReq) (*modelarts.TrainingJobFlavorsResp, error) {
+	l := logic.NewGetTrainingJobFlavorsLogic(ctx, s.svcCtx)
+	return l.GetTrainingJobFlavors(in)
+}
+
 // export task
 func (s *ModelArtsServer) ExportTask(ctx context.Context, in *modelarts.ExportTaskReq) (*modelarts.ExportTaskDataResp, error) {
 	l := logic.NewExportTaskLogic(ctx, s.svcCtx)

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

@@ -54,6 +54,8 @@ type ModelArtsClient interface {
 	DeleteAlgorithms(ctx context.Context, in *DeleteAlgorithmsReq, opts ...grpc.CallOption) (*DeleteAlgorithmsResp, error)
 	//    ShowAlgorithmByUuid 展示算法详情
 	ShowAlgorithmByUuid(ctx context.Context, in *ShowAlgorithmByUuidReq, opts ...grpc.CallOption) (*ShowAlgorithmByUuidResp, error)
+	//   training-job-flavors 获取训练作业支持的公共规格
+	GetTrainingJobFlavors(ctx context.Context, in *TrainingJobFlavorsReq, opts ...grpc.CallOption) (*TrainingJobFlavorsResp, error)
 	//export task
 	ExportTask(ctx context.Context, in *ExportTaskReq, opts ...grpc.CallOption) (*ExportTaskDataResp, error)
 	GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error)
@@ -236,6 +238,15 @@ func (c *modelArtsClient) ShowAlgorithmByUuid(ctx context.Context, in *ShowAlgor
 	return out, nil
 }
 
+func (c *modelArtsClient) GetTrainingJobFlavors(ctx context.Context, in *TrainingJobFlavorsReq, opts ...grpc.CallOption) (*TrainingJobFlavorsResp, error) {
+	out := new(TrainingJobFlavorsResp)
+	err := c.cc.Invoke(ctx, "/modelarts.ModelArts/GetTrainingJobFlavors", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *modelArtsClient) ExportTask(ctx context.Context, in *ExportTaskReq, opts ...grpc.CallOption) (*ExportTaskDataResp, error) {
 	out := new(ExportTaskDataResp)
 	err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ExportTask", in, out, opts...)
@@ -470,6 +481,8 @@ type ModelArtsServer interface {
 	DeleteAlgorithms(context.Context, *DeleteAlgorithmsReq) (*DeleteAlgorithmsResp, error)
 	//    ShowAlgorithmByUuid 展示算法详情
 	ShowAlgorithmByUuid(context.Context, *ShowAlgorithmByUuidReq) (*ShowAlgorithmByUuidResp, error)
+	//   training-job-flavors 获取训练作业支持的公共规格
+	GetTrainingJobFlavors(context.Context, *TrainingJobFlavorsReq) (*TrainingJobFlavorsResp, error)
 	//export task
 	ExportTask(context.Context, *ExportTaskReq) (*ExportTaskDataResp, error)
 	GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDatasetResp, error)
@@ -553,6 +566,9 @@ func (UnimplementedModelArtsServer) DeleteAlgorithms(context.Context, *DeleteAlg
 func (UnimplementedModelArtsServer) ShowAlgorithmByUuid(context.Context, *ShowAlgorithmByUuidReq) (*ShowAlgorithmByUuidResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ShowAlgorithmByUuid not implemented")
 }
+func (UnimplementedModelArtsServer) GetTrainingJobFlavors(context.Context, *TrainingJobFlavorsReq) (*TrainingJobFlavorsResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetTrainingJobFlavors not implemented")
+}
 func (UnimplementedModelArtsServer) ExportTask(context.Context, *ExportTaskReq) (*ExportTaskDataResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ExportTask not implemented")
 }
@@ -920,6 +936,24 @@ func _ModelArts_ShowAlgorithmByUuid_Handler(srv interface{}, ctx context.Context
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ModelArts_GetTrainingJobFlavors_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(TrainingJobFlavorsReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ModelArtsServer).GetTrainingJobFlavors(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/modelarts.ModelArts/GetTrainingJobFlavors",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ModelArtsServer).GetTrainingJobFlavors(ctx, req.(*TrainingJobFlavorsReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _ModelArts_ExportTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ExportTaskReq)
 	if err := dec(in); err != nil {
@@ -1387,6 +1421,10 @@ var ModelArts_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ShowAlgorithmByUuid",
 			Handler:    _ModelArts_ShowAlgorithmByUuid_Handler,
 		},
+		{
+			MethodName: "GetTrainingJobFlavors",
+			Handler:    _ModelArts_GetTrainingJobFlavors_Handler,
+		},
 		{
 			MethodName: "ExportTask",
 			Handler:    _ModelArts_ExportTask_Handler,

adaptor/PCM-AI/PCM-MODELARTS/rpc/modelartsclient/modelarts.go

@@ -241,6 +241,8 @@ type (
 	TemplateParam                    = modelarts.TemplateParam
 	TokenReq                         = modelarts.TokenReq
 	TokenResp                        = modelarts.TokenResp
+	TrainingJobFlavorsReq            = modelarts.TrainingJobFlavorsReq
+	TrainingJobFlavorsResp           = modelarts.TrainingJobFlavorsResp
 	User                             = modelarts.User
 	UserNotebookDomain               = modelarts.UserNotebookDomain
 	UserNotebookResp                 = modelarts.UserNotebookResp
@@ -283,6 +285,8 @@ type (
 		DeleteAlgorithms(ctx context.Context, in *DeleteAlgorithmsReq, opts ...grpc.CallOption) (*DeleteAlgorithmsResp, error)
 		// ShowAlgorithmByUuid 展示算法详情
 		ShowAlgorithmByUuid(ctx context.Context, in *ShowAlgorithmByUuidReq, opts ...grpc.CallOption) (*ShowAlgorithmByUuidResp, error)
+		// training-job-flavors 获取训练作业支持的公共规格
+		GetTrainingJobFlavors(ctx context.Context, in *TrainingJobFlavorsReq, opts ...grpc.CallOption) (*TrainingJobFlavorsResp, error)
 		// export task
 		ExportTask(ctx context.Context, in *ExportTaskReq, opts ...grpc.CallOption) (*ExportTaskDataResp, error)
 		GetExportTasksOfDataset(ctx context.Context, in *GetExportTasksOfDatasetReq, opts ...grpc.CallOption) (*GetExportTasksOfDatasetResp, error)
@@ -420,6 +424,12 @@ func (m *defaultModelArts) ShowAlgorithmByUuid(ctx context.Context, in *ShowAlgo
 	return client.ShowAlgorithmByUuid(ctx, in, opts...)
 }
 
+// training-job-flavors 获取训练作业支持的公共规格
+func (m *defaultModelArts) GetTrainingJobFlavors(ctx context.Context, in *TrainingJobFlavorsReq, opts ...grpc.CallOption) (*TrainingJobFlavorsResp, error) {
+	client := modelarts.NewModelArtsClient(m.cli.Conn())
+	return client.GetTrainingJobFlavors(ctx, in, opts...)
+}
+
 // export task
 func (m *defaultModelArts) ExportTask(ctx context.Context, in *ExportTaskReq, opts ...grpc.CallOption) (*ExportTaskDataResp, error) {
 	client := modelarts.NewModelArtsClient(m.cli.Conn())

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

@@ -297,7 +297,7 @@ message cpu{
   int32 core_num =2;
 }
 message npu{
-  string unit_num =1;
+  int32 unit_num =1;
   string product_name =2;
   string memory =3;
 }
@@ -924,6 +924,22 @@ message ShowAlgorithmByUuidResp{
 
 /******************Show Algorithm By Uuid end*************************/
 
+/******************TrainingJobFlavors start*************************/
+message TrainingJobFlavorsReq{
+  string project_id =1;   // @gotags: copier:"ProjectId"
+  string flavor_type =2; // @gotags: copier:"FlavorType"
+  string modelArtsType =3;   // @gotags: copier:"modelArtsType"
+}
+
+message TrainingJobFlavorsResp{
+  int32 total_count = 1; // @gotags: copier:"TotalCount"
+  repeated FlavorResponse flavors = 2; // @gotags: copier:"FlavorResponse"
+  string  msg =3;// @gotags: copier:"Msg"
+  int32  code =4;// @gotags: copier:"Code"
+}
+
+/******************TrainingJobFlavors end*************************/
+
 /******************Task(export) Start*************************/
 message ExportTaskReq{
   string annotation_format = 1; // @gotags: copier:"AnnotationFormat"
@@ -2060,6 +2076,8 @@ service ModelArts {
   rpc DeleteAlgorithms(DeleteAlgorithmsReq) returns (DeleteAlgorithmsResp);
   //    ShowAlgorithmByUuid 展示算法详情
   rpc ShowAlgorithmByUuid(ShowAlgorithmByUuidReq) returns (ShowAlgorithmByUuidResp);
+  //   training-job-flavors 获取训练作业支持的公共规格
+  rpc GetTrainingJobFlavors(TrainingJobFlavorsReq) returns (TrainingJobFlavorsResp);
 
 
   //export task
@@ -2094,4 +2112,6 @@ service ModelArts {
   //visualization-jobs
   rpc GetVisualizationJob(GetVisualizationJobReq) returns (GetVisualizationJobResp);
   rpc CreateVisualizationJob(CreateVisualizationJobReq) returns (CreateVisualizationJobResp);
+
+
 }