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

合并分支

This commit is contained in:
Diva123456 2023-02-27 15:15:20 +08:00
parent 13bb482ca0
commit 55032ff5bf
6 changed files with 2178 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,3 +38,14 @@ func (s *ModelArtsServer) ListJob(ctx context.Context, in *modelarts.ListImportT
l := logic.NewListJobLogic(ctx, s.svcCtx)
return l.ListJob(in)
}
// export task
func (s *ModelArtsServer) ExportTask(ctx context.Context, in *modelarts.ExportTaskReq) (*modelarts.ExportTaskResp, error) {
l := logic.NewExportTaskLogic(ctx, s.svcCtx)
return l.ExportTask(in)
}
func (s *ModelArtsServer) GetExportTasksOfDataset(ctx context.Context, in *modelarts.GetExportTasksOfDatasetReq) (*modelarts.GetExportTasksOfDatasetResp, error) {
l := logic.NewGetExportTasksOfDatasetLogic(ctx, s.svcCtx)
return l.GetExportTasksOfDataset(in)
}

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

File diff suppressed because it is too large Load Diff

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

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.12.4
// - protoc v3.19.4
// source: modelarts.proto
package modelarts
@ -27,6 +27,9 @@ type ModelArtsClient interface {
// find modelarts Token
FindDatasetList(ctx context.Context, in *FindDatasetReq, opts ...grpc.CallOption) (*FindDatasetResp, error)
ListJob(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)
}
type modelArtsClient struct {
@ -64,6 +67,24 @@ func (c *modelArtsClient) ListJob(ctx context.Context, in *ListImportTasks, opts
return out, nil
}
func (c *modelArtsClient) ExportTask(ctx context.Context, in *ExportTaskReq, opts ...grpc.CallOption) (*ExportTaskResp, error) {
out := new(ExportTaskResp)
err := c.cc.Invoke(ctx, "/modelarts.ModelArts/ExportTask", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
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
}
return out, nil
}
// ModelArtsServer is the server API for ModelArts service.
// All implementations must embed UnimplementedModelArtsServer
// for forward compatibility
@ -73,6 +94,9 @@ type ModelArtsServer interface {
// find modelarts Token
FindDatasetList(context.Context, *FindDatasetReq) (*FindDatasetResp, error)
ListJob(context.Context, *ListImportTasks) (*ReturnListImportTasks, error)
//export task
ExportTask(context.Context, *ExportTaskReq) (*ExportTaskResp, error)
GetExportTasksOfDataset(context.Context, *GetExportTasksOfDatasetReq) (*GetExportTasksOfDatasetResp, error)
mustEmbedUnimplementedModelArtsServer()
}
@ -89,6 +113,12 @@ func (UnimplementedModelArtsServer) FindDatasetList(context.Context, *FindDatase
func (UnimplementedModelArtsServer) ListJob(context.Context, *ListImportTasks) (*ReturnListImportTasks, error) {
return nil, status.Errorf(codes.Unimplemented, "method ListJob not implemented")
}
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) {
return nil, status.Errorf(codes.Unimplemented, "method GetExportTasksOfDataset not implemented")
}
func (UnimplementedModelArtsServer) mustEmbedUnimplementedModelArtsServer() {}
// UnsafeModelArtsServer may be embedded to opt out of forward compatibility for this service.
@ -156,6 +186,42 @@ func _ModelArts_ListJob_Handler(srv interface{}, ctx context.Context, dec func(i
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 {
return nil, err
}
if interceptor == nil {
return srv.(ModelArtsServer).ExportTask(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/modelarts.ModelArts/ExportTask",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ModelArtsServer).ExportTask(ctx, req.(*ExportTaskReq))
}
return interceptor(ctx, in, info, handler)
}
func _ModelArts_GetExportTasksOfDataset_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(GetExportTasksOfDatasetReq)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ModelArtsServer).GetExportTasksOfDataset(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/modelarts.ModelArts/GetExportTasksOfDataset",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ModelArtsServer).GetExportTasksOfDataset(ctx, req.(*GetExportTasksOfDatasetReq))
}
return interceptor(ctx, in, info, handler)
}
// ModelArts_ServiceDesc is the grpc.ServiceDesc for ModelArts service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
@ -175,6 +241,14 @@ var ModelArts_ServiceDesc = grpc.ServiceDesc{
MethodName: "ListJob",
Handler: _ModelArts_ListJob_Handler,
},
{
MethodName: "ExportTask",
Handler: _ModelArts_ExportTask_Handler,
},
{
MethodName: "GetExportTasksOfDataset",
Handler: _ModelArts_GetExportTasksOfDataset_Handler,
},
},
Streams: []grpc.StreamDesc{},
Metadata: "modelarts.proto",

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

@ -13,27 +13,39 @@ import (
)
type (
Auth = modelarts.Auth
DataSource = modelarts.DataSource
DataSources = modelarts.DataSources
Datasets = modelarts.Datasets
Domain = modelarts.Domain
FileStatistics = modelarts.FileStatistics
FindDatasetReq = modelarts.FindDatasetReq
FindDatasetResp = modelarts.FindDatasetResp
Identity = modelarts.Identity
ImportTasks = modelarts.ImportTasks
ListImportTasks = modelarts.ListImportTasks
Methods = modelarts.Methods
Password = modelarts.Password
Project = modelarts.Project
ReturnListImportTasks = modelarts.ReturnListImportTasks
SchemaMaps = modelarts.SchemaMaps
Scope = modelarts.Scope
SourceInfo = modelarts.SourceInfo
TokenReq = modelarts.TokenReq
TokenResp = modelarts.TokenResp
User = modelarts.User
AnnotationFormatConfig = modelarts.AnnotationFormatConfig
Auth = modelarts.Auth
DataSource = modelarts.DataSource
DataSources = modelarts.DataSources
Datasets = modelarts.Datasets
Domain = modelarts.Domain
ExportParams = modelarts.ExportParams
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
ImportTasks = modelarts.ImportTasks
ListImportTasks = modelarts.ListImportTasks
Methods = modelarts.Methods
Password = modelarts.Password
Project = modelarts.Project
ReturnListImportTasks = modelarts.ReturnListImportTasks
SchemaMaps = modelarts.SchemaMaps
Scope = modelarts.Scope
SearchCondition = modelarts.SearchCondition
SearchLabel = modelarts.SearchLabel
SearchLabels = modelarts.SearchLabels
SearchProp = modelarts.SearchProp
SourceInfo = modelarts.SourceInfo
TokenReq = modelarts.TokenReq
TokenResp = modelarts.TokenResp
User = modelarts.User
Weigou = modelarts.Weigou
ModelArts interface {
// get modelarts Token
@ -41,6 +53,9 @@ type (
// find modelarts Token
FindDatasetList(ctx context.Context, in *FindDatasetReq, opts ...grpc.CallOption) (*FindDatasetResp, error)
ListJob(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)
}
defaultModelArts struct {
@ -70,3 +85,14 @@ func (m *defaultModelArts) ListJob(ctx context.Context, in *ListImportTasks, opt
client := modelarts.NewModelArtsClient(m.cli.Conn())
return client.ListJob(ctx, in, opts...)
}
// export task
func (m *defaultModelArts) ExportTask(ctx context.Context, in *ExportTaskReq, opts ...grpc.CallOption) (*ExportTaskResp, error) {
client := modelarts.NewModelArtsClient(m.cli.Conn())
return client.ExportTask(ctx, in, opts...)
}
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...)
}

3
adaptor/slurm/slurmShuguang/rpc/internal/logic/listhistoryjoblogic.go
View File

@ -3,6 +3,7 @@ package logic
import (
"PCM/adaptor/slurm/slurmShuguang/rpc/internal/util"
"context"
"github.com/bitly/go-simplejson"
"io"
"log"
"net/http"
@ -12,7 +13,6 @@ import (
"PCM/adaptor/slurm/slurmShuguang/rpc/internal/svc"
"PCM/adaptor/slurm/slurmShuguang/rpc/slurmShuguang"
"github.com/bitly/go-simplejson"
"github.com/zeromicro/go-zero/core/logx"
)
@ -87,7 +87,6 @@ func (l *ListHistoryJobLogic) ListHistoryJob(in *slurmShuguang.ListHistoryJobReq
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
}
}(respUrl.Body)

21
go.mod
View File

@ -4,28 +4,26 @@ go 1.19
require (
github.com/bitly/go-simplejson v0.5.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0
github.com/jinzhu/copier v0.3.5
github.com/pkg/errors v0.9.1
github.com/shopspring/decimal v1.3.1
github.com/sony/sonyflake v1.1.0
github.com/zeromicro/go-zero v1.4.4
google.golang.org/grpc v1.53.0
google.golang.org/grpc v1.50.1
google.golang.org/protobuf v1.28.1
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml v1.2.0
)
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/favadi/protoc-go-inject-tag v1.4.0 // indirect
github.com/felixge/fgprof v0.9.3 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
@ -39,6 +37,7 @@ require (
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mattn/go-colorable v0.1.9 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
@ -69,14 +68,14 @@ require (
go.uber.org/automaxprocs v1.5.1 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
google.golang.org/genproto v0.0.0-20221111202108-142d8a6fa32e // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect