fix bugs

internal/server/octopusserver.go

@@ -5,6 +5,7 @@ package server
 
 import (
 	"context"
+
 	"gitlink.org.cn/JointCloud/pcm-octopus/internal/logic"
 	"gitlink.org.cn/JointCloud/pcm-octopus/internal/svc"
 	"gitlink.org.cn/JointCloud/pcm-octopus/octopus"

octopus/octopus_grpc.pb.go

@@ -1,8 +1,8 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.3.0
-// - protoc             v3.19.4
+// - protoc             v4.25.3
-// source: octopus.proto
+// source: pb/octopus.proto
 
 package octopus
 
@@ -82,7 +82,7 @@ const (
 type OctopusClient interface {
 	GetComputingPower(ctx context.Context, in *ResourceReq, opts ...grpc.CallOption) (*CpResp, error)
 	GetGeneralInfo(ctx context.Context, in *ResourceReq, opts ...grpc.CallOption) (*GiResp, error)
-	//Algorithm
+	// Algorithm
 	GetMyAlgorithmList(ctx context.Context, in *GetMyAlgorithmListReq, opts ...grpc.CallOption) (*GetMyAlgorithmListResp, error)
 	GetAlgorithmList(ctx context.Context, in *GetAlgorithmListReq, opts ...grpc.CallOption) (*GetAlgorithmListResp, error)
 	GetAlgorithm(ctx context.Context, in *GetAlgorithmReq, opts ...grpc.CallOption) (*GetAlgorithmResp, error)
@@ -93,7 +93,7 @@ type OctopusClient interface {
 	DownloadAlgorithm(ctx context.Context, in *DownloadAlgorithmReq, opts ...grpc.CallOption) (*DownloadAlgorithmResp, error)
 	UploadAlgorithm(ctx context.Context, in *UploadAlgorithmReq, opts ...grpc.CallOption) (*UploadAlgorithmResp, error)
 	UploadAlgorithmConfirm(ctx context.Context, in *UploadAlgorithmConfirmReq, opts ...grpc.CallOption) (*UploadAlgorithmConfirmResp, error)
-	//DatasetService
+	// DatasetService
 	GetMyDatasetList(ctx context.Context, in *GetMyDatasetListReq, opts ...grpc.CallOption) (*GetMyDatasetListResp, error)
 	GetDatasetVersionList(ctx context.Context, in *GetDatasetVersionListReq, opts ...grpc.CallOption) (*GetDatasetVersionListResp, error)
 	CreateDataSet(ctx context.Context, in *CreateDataSetReq, opts ...grpc.CallOption) (*CreateDataSetResp, error)
@@ -104,7 +104,7 @@ type OctopusClient interface {
 	DeleteDataSetVersion(ctx context.Context, in *DeleteDataSetVersionReq, opts ...grpc.CallOption) (*DeleteDataSetVersionResp, error)
 	GetDatasetApplyList(ctx context.Context, in *GetDatasetApplyListReq, opts ...grpc.CallOption) (*GetDatasetApplyListResp, error)
 	GetDatasetTypeList(ctx context.Context, in *GetDatasetTypeListRep, opts ...grpc.CallOption) (*GetDatasetTypeListResp, error)
-	//ModelDeployService
+	// ModelDeployService
 	CreateModelDeploy(ctx context.Context, in *CreateModelDeployReq, opts ...grpc.CallOption) (*CreateModelDeployResp, error)
 	GetModelDeployList(ctx context.Context, in *GetModelDeployListReq, opts ...grpc.CallOption) (*GetModelDeployListResp, error)
 	GetModelDeploy(ctx context.Context, in *GetModelDeployReq, opts ...grpc.CallOption) (*GetModelDeployResp, error)
@@ -112,27 +112,27 @@ type OctopusClient interface {
 	StopModelDeploy(ctx context.Context, in *StopModelDeployReq, opts ...grpc.CallOption) (*StopModelDeployResp, error)
 	DeleteModelDeploy(ctx context.Context, in *DeleteModelDeployReq, opts ...grpc.CallOption) (*DeleteModelDeployResp, error)
 	InferModelDeploy(ctx context.Context, in *InferModelDeployReq, opts ...grpc.CallOption) (*InferModelDeployResp, error)
-	//Develop
+	// Develop
 	GetNotebookList(ctx context.Context, in *GetNotebookListReq, opts ...grpc.CallOption) (*GetNotebookListResp, error)
 	GetNotebook(ctx context.Context, in *GetNotebookReq, opts ...grpc.CallOption) (*GetNotebookResp, error)
 	DeleteNotebook(ctx context.Context, in *DeleteNotebookReq, opts ...grpc.CallOption) (*DeleteNotebookResp, 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)
-	//ImageService
+	// ImageService
 	GetUserImageList(ctx context.Context, in *GetUserImageListReq, opts ...grpc.CallOption) (*GetUserImageListResp, error)
 	GetPresetImageList(ctx context.Context, in *GetPresetImageListReq, opts ...grpc.CallOption) (*GetPresetImageListResp, error)
 	CreateImage(ctx context.Context, in *CreateImageReq, opts ...grpc.CallOption) (*CreateImageResp, error)
 	DeleteImage(ctx context.Context, in *DeleteImageReq, opts ...grpc.CallOption) (*DeleteImageResp, error)
 	UploadImage(ctx context.Context, in *UploadImageReq, opts ...grpc.CallOption) (*UploadImageResp, error)
 	UploadImageConfirm(ctx context.Context, in *UploadImageConfirmReq, opts ...grpc.CallOption) (*UploadImageConfirmResp, error)
-	//Model
+	// Model
 	GetMyModelList(ctx context.Context, in *GetMyModelListReq, opts ...grpc.CallOption) (*GetMyModelListResp, error)
 	GetModelVersionList(ctx context.Context, in *GetModelVersionListReq, opts ...grpc.CallOption) (*GetModelVersionListResp, error)
 	DeleteMyModel(ctx context.Context, in *DeleteMyModelReq, opts ...grpc.CallOption) (*DeleteMyModelResp, error)
 	DeleteModelVersion(ctx context.Context, in *DeleteModelVersionReq, opts ...grpc.CallOption) (*DeleteModelVersionResp, error)
 	DownloadModelVersion(ctx context.Context, in *DownloadModelVersionReq, opts ...grpc.CallOption) (*DownloadModelVersionResp, error)
-	//TrainJobService
+	// TrainJobService
 	CreateTrainJob(ctx context.Context, in *CreateTrainJobReq, opts ...grpc.CallOption) (*CreateTrainJobResp, error)
 	GetTrainJobList(ctx context.Context, in *GetTrainJobListReq, opts ...grpc.CallOption) (*GetTrainJobListResp, error)
 	GetTrainJob(ctx context.Context, in *GetTrainJobReq, opts ...grpc.CallOption) (*GetTrainJobResp, error)
@@ -140,9 +140,9 @@ type OctopusClient interface {
 	StopTrainJob(ctx context.Context, in *StopTrainJobReq, opts ...grpc.CallOption) (*StopTrainJobResp, error)
 	GetTrainJobEvent(ctx context.Context, in *GetTrainJobEventReq, opts ...grpc.CallOption) (*GetTrainJobEventResp, error)
 	GetTrainJobMetric(ctx context.Context, in *GetTrainJobMetricReq, opts ...grpc.CallOption) (*GetTrainJobMetricResp, error)
-	//ResourceSpecService
+	// ResourceSpecService
 	GetResourceSpecs(ctx context.Context, in *GetResourceSpecsReq, opts ...grpc.CallOption) (*GetResourceSpecsResp, error)
-	//Billing
+	// Billing
 	GetUserBalance(ctx context.Context, in *GetUserBalanceReq, opts ...grpc.CallOption) (*GetUserBalanceResp, error)
 }
 
@@ -655,7 +655,7 @@ func (c *octopusClient) GetUserBalance(ctx context.Context, in *GetUserBalanceRe
 type OctopusServer interface {
 	GetComputingPower(context.Context, *ResourceReq) (*CpResp, error)
 	GetGeneralInfo(context.Context, *ResourceReq) (*GiResp, error)
-	//Algorithm
+	// Algorithm
 	GetMyAlgorithmList(context.Context, *GetMyAlgorithmListReq) (*GetMyAlgorithmListResp, error)
 	GetAlgorithmList(context.Context, *GetAlgorithmListReq) (*GetAlgorithmListResp, error)
 	GetAlgorithm(context.Context, *GetAlgorithmReq) (*GetAlgorithmResp, error)
@@ -666,7 +666,7 @@ type OctopusServer interface {
 	DownloadAlgorithm(context.Context, *DownloadAlgorithmReq) (*DownloadAlgorithmResp, error)
 	UploadAlgorithm(context.Context, *UploadAlgorithmReq) (*UploadAlgorithmResp, error)
 	UploadAlgorithmConfirm(context.Context, *UploadAlgorithmConfirmReq) (*UploadAlgorithmConfirmResp, error)
-	//DatasetService
+	// DatasetService
 	GetMyDatasetList(context.Context, *GetMyDatasetListReq) (*GetMyDatasetListResp, error)
 	GetDatasetVersionList(context.Context, *GetDatasetVersionListReq) (*GetDatasetVersionListResp, error)
 	CreateDataSet(context.Context, *CreateDataSetReq) (*CreateDataSetResp, error)
@@ -677,7 +677,7 @@ type OctopusServer interface {
 	DeleteDataSetVersion(context.Context, *DeleteDataSetVersionReq) (*DeleteDataSetVersionResp, error)
 	GetDatasetApplyList(context.Context, *GetDatasetApplyListReq) (*GetDatasetApplyListResp, error)
 	GetDatasetTypeList(context.Context, *GetDatasetTypeListRep) (*GetDatasetTypeListResp, error)
-	//ModelDeployService
+	// ModelDeployService
 	CreateModelDeploy(context.Context, *CreateModelDeployReq) (*CreateModelDeployResp, error)
 	GetModelDeployList(context.Context, *GetModelDeployListReq) (*GetModelDeployListResp, error)
 	GetModelDeploy(context.Context, *GetModelDeployReq) (*GetModelDeployResp, error)
@@ -685,27 +685,27 @@ type OctopusServer interface {
 	StopModelDeploy(context.Context, *StopModelDeployReq) (*StopModelDeployResp, error)
 	DeleteModelDeploy(context.Context, *DeleteModelDeployReq) (*DeleteModelDeployResp, error)
 	InferModelDeploy(context.Context, *InferModelDeployReq) (*InferModelDeployResp, error)
-	//Develop
+	// Develop
 	GetNotebookList(context.Context, *GetNotebookListReq) (*GetNotebookListResp, error)
 	GetNotebook(context.Context, *GetNotebookReq) (*GetNotebookResp, error)
 	DeleteNotebook(context.Context, *DeleteNotebookReq) (*DeleteNotebookResp, error)
 	CreateNotebook(context.Context, *CreateNotebookReq) (*CreateNotebookResp, error)
 	StartNotebook(context.Context, *StartNotebookReq) (*StartNotebookResp, error)
 	StopNotebook(context.Context, *StopNotebookReq) (*StopNotebookResp, error)
-	//ImageService
+	// ImageService
 	GetUserImageList(context.Context, *GetUserImageListReq) (*GetUserImageListResp, error)
 	GetPresetImageList(context.Context, *GetPresetImageListReq) (*GetPresetImageListResp, error)
 	CreateImage(context.Context, *CreateImageReq) (*CreateImageResp, error)
 	DeleteImage(context.Context, *DeleteImageReq) (*DeleteImageResp, error)
 	UploadImage(context.Context, *UploadImageReq) (*UploadImageResp, error)
 	UploadImageConfirm(context.Context, *UploadImageConfirmReq) (*UploadImageConfirmResp, error)
-	//Model
+	// Model
 	GetMyModelList(context.Context, *GetMyModelListReq) (*GetMyModelListResp, error)
 	GetModelVersionList(context.Context, *GetModelVersionListReq) (*GetModelVersionListResp, error)
 	DeleteMyModel(context.Context, *DeleteMyModelReq) (*DeleteMyModelResp, error)
 	DeleteModelVersion(context.Context, *DeleteModelVersionReq) (*DeleteModelVersionResp, error)
 	DownloadModelVersion(context.Context, *DownloadModelVersionReq) (*DownloadModelVersionResp, error)
-	//TrainJobService
+	// TrainJobService
 	CreateTrainJob(context.Context, *CreateTrainJobReq) (*CreateTrainJobResp, error)
 	GetTrainJobList(context.Context, *GetTrainJobListReq) (*GetTrainJobListResp, error)
 	GetTrainJob(context.Context, *GetTrainJobReq) (*GetTrainJobResp, error)
@@ -713,9 +713,9 @@ type OctopusServer interface {
 	StopTrainJob(context.Context, *StopTrainJobReq) (*StopTrainJobResp, error)
 	GetTrainJobEvent(context.Context, *GetTrainJobEventReq) (*GetTrainJobEventResp, error)
 	GetTrainJobMetric(context.Context, *GetTrainJobMetricReq) (*GetTrainJobMetricResp, error)
-	//ResourceSpecService
+	// ResourceSpecService
 	GetResourceSpecs(context.Context, *GetResourceSpecsReq) (*GetResourceSpecsResp, error)
-	//Billing
+	// Billing
 	GetUserBalance(context.Context, *GetUserBalanceReq) (*GetUserBalanceResp, error)
 	mustEmbedUnimplementedOctopusServer()
 }
@@ -2121,5 +2121,5 @@ var Octopus_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "octopus.proto",
+	Metadata: "pb/octopus.proto",
 }

octopusclient/octopus.go

@@ -6,7 +6,7 @@ package octopusclient
 import (
 	"context"
 
-	"gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopus"
+	"gitlink.org.cn/JointCloud/pcm-octopus/octopus"
 
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"