删除模型、查询模型详细信息合并分支

adaptor/AIComputing/modelarts/rpc/internal/server/modelartsserver.go

@@ -86,11 +86,21 @@ func (s *ModelArtsServer) CreateModel(ctx context.Context, in *modelarts.CreateM
 	return l.CreateModel(in)
 }
 
+func (s *ModelArtsServer) DeleteModel(ctx context.Context, in *modelarts.DeleteModelReq) (*modelarts.DeleteModelResp, error) {
+	l := logic.NewDeleteModelLogic(ctx, s.svcCtx)
+	return l.DeleteModel(in)
+}
+
 func (s *ModelArtsServer) ListModels(ctx context.Context, in *modelarts.ListModelReq) (*modelarts.ListModelResp, error) {
 	l := logic.NewListModelsLogic(ctx, s.svcCtx)
 	return l.ListModels(in)
 }
 
+func (s *ModelArtsServer) ShowModels(ctx context.Context, in *modelarts.ShowModelReq) (*modelarts.ShowModelResp, error) {
+	l := logic.NewShowModelsLogic(ctx, s.svcCtx)
+	return l.ShowModels(in)
+}
+
 // service management
 func (s *ModelArtsServer) CreateService(ctx context.Context, in *modelarts.CreatServiceReq) (*modelarts.CreatServiceResp, error) {
 	l := logic.NewCreateServiceLogic(ctx, s.svcCtx)

adaptor/AIComputing/modelarts/rpc/modelarts/modelarts_grpc.pb.go

@@ -42,7 +42,9 @@ type ModelArtsClient interface {
 	DescribeProcessorTask(ctx context.Context, in *DescribeProcessorTaskReq, opts ...grpc.CallOption) (*DescribeProcessorTaskResp, error)
 	// 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
 	CreateService(ctx context.Context, in *CreatServiceReq, opts ...grpc.CallOption) (*CreatServiceResp, error)
 	ListServices(ctx context.Context, in *ListServicesReq, opts ...grpc.CallOption) (*ListServicesResp, error)
@@ -155,6 +157,15 @@ func (c *modelArtsClient) CreateModel(ctx context.Context, in *CreateModelReq, o
 	return out, nil
 }
 
+func (c *modelArtsClient) DeleteModel(ctx context.Context, in *DeleteModelReq, opts ...grpc.CallOption) (*DeleteModelResp, error) {
+	out := new(DeleteModelResp)
+	err := c.cc.Invoke(ctx, "/modelarts.ModelArts/DeleteModel", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *modelArtsClient) ListModels(ctx context.Context, in *ListModelReq, opts ...grpc.CallOption) (*ListModelResp, error) {
 	out := new(ListModelResp)
 	err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ListModels", in, out, opts...)
@@ -164,6 +175,15 @@ func (c *modelArtsClient) ListModels(ctx context.Context, in *ListModelReq, opts
 	return out, nil
 }
 
+func (c *modelArtsClient) ShowModels(ctx context.Context, in *ShowModelReq, opts ...grpc.CallOption) (*ShowModelResp, error) {
+	out := new(ShowModelResp)
+	err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ShowModels", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *modelArtsClient) CreateService(ctx context.Context, in *CreatServiceReq, opts ...grpc.CallOption) (*CreatServiceResp, error) {
 	out := new(CreatServiceResp)
 	err := c.cc.Invoke(ctx, "/modelarts.ModelArts/CreateService", in, out, opts...)
@@ -206,7 +226,9 @@ type ModelArtsServer interface {
 	DescribeProcessorTask(context.Context, *DescribeProcessorTaskReq) (*DescribeProcessorTaskResp, error)
 	// 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
 	CreateService(context.Context, *CreatServiceReq) (*CreatServiceResp, error)
 	ListServices(context.Context, *ListServicesReq) (*ListServicesResp, error)
@@ -250,9 +272,15 @@ func (UnimplementedModelArtsServer) DescribeProcessorTask(context.Context, *Desc
 func (UnimplementedModelArtsServer) CreateModel(context.Context, *CreateModelReq) (*CreateModelResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateModel not implemented")
 }
+func (UnimplementedModelArtsServer) DeleteModel(context.Context, *DeleteModelReq) (*DeleteModelResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeleteModel not implemented")
+}
 func (UnimplementedModelArtsServer) ListModels(context.Context, *ListModelReq) (*ListModelResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListModels not implemented")
 }
+func (UnimplementedModelArtsServer) ShowModels(context.Context, *ShowModelReq) (*ShowModelResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ShowModels not implemented")
+}
 func (UnimplementedModelArtsServer) CreateService(context.Context, *CreatServiceReq) (*CreatServiceResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateService not implemented")
 }
@@ -470,6 +498,24 @@ func _ModelArts_CreateModel_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ModelArts_DeleteModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteModelReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ModelArtsServer).DeleteModel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/modelarts.ModelArts/DeleteModel",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ModelArtsServer).DeleteModel(ctx, req.(*DeleteModelReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _ModelArts_ListModels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ListModelReq)
 	if err := dec(in); err != nil {
@@ -488,6 +534,24 @@ func _ModelArts_ListModels_Handler(srv interface{}, ctx context.Context, dec fun
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ModelArts_ShowModels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ShowModelReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ModelArtsServer).ShowModels(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/modelarts.ModelArts/ShowModels",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ModelArtsServer).ShowModels(ctx, req.(*ShowModelReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _ModelArts_CreateService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(CreatServiceReq)
 	if err := dec(in); err != nil {
@@ -575,10 +639,18 @@ var ModelArts_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "CreateModel",
 			Handler:    _ModelArts_CreateModel_Handler,
 		},
+		{
+			MethodName: "DeleteModel",
+			Handler:    _ModelArts_DeleteModel_Handler,
+		},
 		{
 			MethodName: "ListModels",
 			Handler:    _ModelArts_ListModels_Handler,
 		},
+		{
+			MethodName: "ShowModels",
+			Handler:    _ModelArts_ShowModels_Handler,
+		},
 		{
 			MethodName: "CreateService",
 			Handler:    _ModelArts_CreateService_Handler,

adaptor/AIComputing/modelarts/rpc/modelartsclient/modelarts.go

@@ -43,6 +43,9 @@ type (
 	DatasetReq                      = modelarts.DatasetReq
 	DatasetResp                     = modelarts.DatasetResp
 	Datasets                        = modelarts.Datasets
+	DeleteModelReq                  = modelarts.DeleteModelReq
+	DeleteModelResp                 = modelarts.DeleteModelResp
+	DeleteModelResponseFailedList   = modelarts.DeleteModelResponseFailedList
 	DescribeProcessorTaskReq        = modelarts.DescribeProcessorTaskReq
 	DescribeProcessorTaskResp       = modelarts.DescribeProcessorTaskResp
 	Disk                            = modelarts.Disk
@@ -86,8 +89,10 @@ type (
 	Metadata1                       = modelarts.Metadata1
 	Methods                         = modelarts.Methods
 	ModelDependencies               = modelarts.ModelDependencies
+	ModelHealth                     = modelarts.ModelHealth
 	ModelInOutputParams             = modelarts.ModelInOutputParams
 	ModelListItem                   = modelarts.ModelListItem
+	ModelParamsInfo                 = modelarts.ModelParamsInfo
 	ModelSpecification              = modelarts.ModelSpecification
 	Nfs                             = modelarts.Nfs
 	Npu                             = modelarts.Npu
@@ -118,6 +123,8 @@ type (
 	SearchParams                    = modelarts.SearchParams
 	SearchProp                      = modelarts.SearchProp
 	ServiceConfig                   = modelarts.ServiceConfig
+	ShowModelReq                    = modelarts.ShowModelReq
+	ShowModelResp                   = modelarts.ShowModelResp
 	SourceInfo                      = modelarts.SourceInfo
 	Spec                            = modelarts.Spec
 	Spec1                           = modelarts.Spec1
@@ -155,7 +162,9 @@ type (
 		DescribeProcessorTask(ctx context.Context, in *DescribeProcessorTaskReq, opts ...grpc.CallOption) (*DescribeProcessorTaskResp, error)
 		// 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
 		CreateService(ctx context.Context, in *CreatServiceReq, opts ...grpc.CallOption) (*CreatServiceResp, error)
 		ListServices(ctx context.Context, in *ListServicesReq, opts ...grpc.CallOption) (*ListServicesResp, error)
@@ -236,11 +245,21 @@ func (m *defaultModelArts) CreateModel(ctx context.Context, in *CreateModelReq,
 	return client.CreateModel(ctx, in, opts...)
 }
 
+func (m *defaultModelArts) DeleteModel(ctx context.Context, in *DeleteModelReq, opts ...grpc.CallOption) (*DeleteModelResp, error) {
+	client := modelarts.NewModelArtsClient(m.cli.Conn())
+	return client.DeleteModel(ctx, in, opts...)
+}
+
 func (m *defaultModelArts) ListModels(ctx context.Context, in *ListModelReq, opts ...grpc.CallOption) (*ListModelResp, error) {
 	client := modelarts.NewModelArtsClient(m.cli.Conn())
 	return client.ListModels(ctx, in, opts...)
 }
 
+func (m *defaultModelArts) ShowModels(ctx context.Context, in *ShowModelReq, opts ...grpc.CallOption) (*ShowModelResp, error) {
+	client := modelarts.NewModelArtsClient(m.cli.Conn())
+	return client.ShowModels(ctx, in, opts...)
+}
+
 // service management
 func (m *defaultModelArts) CreateService(ctx context.Context, in *CreatServiceReq, opts ...grpc.CallOption) (*CreatServiceResp, error) {
 	client := modelarts.NewModelArtsClient(m.cli.Conn())

adaptor/AIComputing/modelarts/rpc/pb/modelarts.proto

@@ -952,6 +952,26 @@ message Packages{
 }
 /******************Create Model End*************************/
 
+/******************Delete Model Start*************************/
+message DeleteModelReq{
+  string project_id = 1;
+  string model_id = 2;
+  bool cascade = 3;
+}
+
+message DeleteModelResp{
+  int32 code = 1;  // @gotags: copier:"Code"
+  repeated string delete_success_list = 2;
+  repeated DeleteModelResponseFailedList delete_failed_list = 3;
+}
+
+message DeleteModelResponseFailedList{
+  string error_msg = 1;
+  string error_code = 2;
+  string model_id = 3;
+}
+/******************Delete Model End*************************/
+
 /******************List Model Start*************************/
 message ListModelReq{
   string model_name = 2;
@@ -972,7 +992,6 @@ message ListModelResp{
   int32 total_count = 2;
   int32 count = 3;
   repeated ModelListItem models = 4;
-
 }
 
 message ModelListItem {
@@ -998,7 +1017,6 @@ message ModelListItem {
   string source_copy = 20;
   string subscription_id = 21;
   string extra = 22;
-
 }
 
 message ModelSpecification{
@@ -1009,6 +1027,71 @@ message ModelSpecification{
 }
 /******************List Model End*************************/
 
+/******************Show Model Start*************************/
+message ShowModelReq{
+  string project_id = 1;
+  string model_id = 2;
+}
+
+message ShowModelResp{
+  int32 code = 1;  // @gotags: copier:"Code"
+  string model_version = 2;
+  string source_job_version = 3;
+  string source_location = 4;
+  string source_job_id = 5;
+  string source_copy = 6;
+  string description = 7;
+  string project = 8;
+  string workspace_id = 9;
+  string model_algorithm = 10;
+  string model_name = 11;
+  string tenant = 12;
+  repeated GuideDoc model_docs = 13;
+  string owner = 14;
+  string execution_code = 15;
+  string schema_doc = 16;
+  string image_address = 17;
+  repeated ModelParamsInfo output_params = 18;
+  ModelHealth healthy = 19;
+  string runtime = 20;
+  string model_metrics = 21;
+  string source_type = 22;
+  string model_type = 23;
+  string model_id = 24;
+  repeated ModelDependencies dependencies = 25;
+  uint32 model_size = 26;
+  string apis = 27;
+  string model_source = 28;
+  bool tunable = 29;
+  bool market_flag = 30;
+  bool publishable_flag = 31;
+  repeated string model_labels = 32;
+  map<string,string> labels_map = 33;
+  repeated string install_type = 34;
+  string config = 35;
+  ModelSpecification specification = 36;
+  repeated ModelParamsInfo input_params = 37;
+  uint32 create_at = 38;
+}
+
+message ModelHealth{
+  string protocol = 1;
+  string initial_delay_seconds = 2;
+  string timeout_seconds = 3;
+  string url = 4;
+}
+
+message ModelParamsInfo{
+  string protocol = 1;
+  bytes min = 2;
+  string method = 3;
+  bytes max = 4;
+  string param_desc = 5;
+  string param_name = 6;
+  string url = 7;
+  string param_type = 8;
+}
+/******************Show Model End*************************/
 
 // Slurm Services for Shuguang Branch
 service ModelArts {
@@ -1037,7 +1120,9 @@ service ModelArts {
 
   //model management
   rpc CreateModel(CreateModelReq) returns (CreateModelResp);
+  rpc DeleteModel(DeleteModelReq) returns (DeleteModelResp);
   rpc ListModels(ListModelReq) returns (ListModelResp);
+  rpc ShowModels(ShowModelReq) returns (ShowModelResp);
 
   //service management
   rpc CreateService(CreatServiceReq) returns (CreatServiceResp);