octopus修改tokenservice代码

Former-commit-id: c6fb5065a61bf84a0a083a3b22cc098ac59320a4
This commit is contained in:
tzwang 2023-07-10 10:28:37 +08:00
parent a3b4d29a24
commit c3cf9946c9
54 changed files with 369 additions and 11 deletions

View File

@ -40,6 +40,9 @@ func generateTokenMap() map[string]TokenTimePair {
}
for k, v := range urlMap {
token, expiredAt := generateToken(jsonStr, v)
if token == "" {
continue
}
tokenTimePair := TokenTimePair{
Token: token,
ExpiredAt: expiredAt,
@ -67,18 +70,21 @@ func generateToken(jsonStr []byte, tokenUrl string) (string, time.Time) {
func GetToken(kForToken string) string {
if tokenMap[kForToken].Token == "" {
tokenMap = generateTokenMap()
return ""
}
tokenTimePair := tokenMap[kForToken]
if tokenTimePair.Token == "" {
return ""
}
if time.Now().After(tokenTimePair.ExpiredAt) {
tokenMap = generateTokenMap()
if tokenMap[kForToken].Token == "" {
return ""
} else {
return tokenMap[kForToken].Token
}
}
return tokenTimePair.Token
}

View File

@ -6,7 +6,9 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
"PCM/common/tool"
"context"
"errors"
"github.com/zeromicro/go-zero/core/logx"
"log"
)
type CreateDataSetLogic struct {
@ -30,6 +32,10 @@ func (l *CreateDataSetLogic) CreateDataSet(in *octopus.CreateDataSetReq) (*octop
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateDataSet
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *CreateDataSetVersionLogic) CreateDataSetVersion(in *octopus.CreateDataS
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateDataSetVersion
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -6,6 +6,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
"PCM/common/tool"
"context"
"errors"
"log"
"github.com/zeromicro/go-zero/core/logx"
)
@ -31,6 +33,10 @@ func (l *CreateImageLogic) CreateImage(in *octopus.CreateImageReq) (*octopus.Cre
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateImage
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -33,6 +35,10 @@ func (l *CreateModelDeployLogic) CreateModelDeploy(in *octopus.CreateModelDeploy
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateModelDeploy
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *CreateMyAlgorithmLogic) CreateMyAlgorithm(in *octopus.CreateMyAlgorithm
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateMyAlgorithm
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *CreateNotebookLogic) CreateNotebook(in *octopus.CreateNotebookReq) (*oc
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateNotebook
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -33,6 +35,10 @@ func (l *CreateTrainJobLogic) CreateTrainJob(in *octopus.CreateTrainJobReq) (*oc
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateTrainJob
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *DeleteDataSetLogic) DeleteDataSet(in *octopus.DeleteDataSetReq) (*octop
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteDataSet
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *DeleteDataSetVersionLogic) DeleteDataSetVersion(in *octopus.DeleteDataS
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteDataSetVersion
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *DeleteImageLogic) DeleteImage(in *octopus.DeleteImageReq) (*octopus.Del
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteImage
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *DeleteModelDeployLogic) DeleteModelDeploy(in *octopus.DeleteModelDeploy
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteModelDeploy
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
var queryStr string
for _, s := range in.GetJobIds() {

View File

@ -6,6 +6,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
"PCM/common/tool"
"context"
"errors"
"log"
"github.com/zeromicro/go-zero/core/logx"
)
@ -31,6 +33,10 @@ func (l *DeleteModelVersionLogic) DeleteModelVersion(in *octopus.DeleteModelVers
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteModelVersion
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *DeleteMyAlgorithmLogic) DeleteMyAlgorithm(in *octopus.DeleteMyAlgorithm
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteMyAlgorithm
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *DeleteMyModelLogic) DeleteMyModel(in *octopus.DeleteMyModelReq) (*octop
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteMyModel
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *DeleteNotebookLogic) DeleteNotebook(in *octopus.DeleteNotebookReq) (*oc
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteNotebook
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,11 @@ func (l *DeleteTrainJobLogic) DeleteTrainJob(in *octopus.DeleteTrainJobReq) (*oc
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteTrainJob
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
var queryStr string

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *DownloadAlgorithmLogic) DownloadAlgorithm(in *octopus.DownloadAlgorithm
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DownloadAlgorithm
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -6,6 +6,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
"PCM/common/tool"
"context"
"errors"
"log"
"github.com/zeromicro/go-zero/core/logx"
)
@ -31,6 +33,10 @@ func (l *DownloadModelVersionLogic) DownloadModelVersion(in *octopus.DownloadMod
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DownloadModelVersion
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetAlgorithmApplyListLogic) GetAlgorithmApplyList(in *octopus.GetAlgori
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetAlgorithmApplyList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetAlgorithmFrameworkListLogic) GetAlgorithmFrameworkList(in *octopus.G
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetAlgorithmFrameworkList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetAlgorithmListLogic) GetAlgorithmList(in *octopus.GetAlgorithmListReq
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetAlgorithmList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *GetAlgorithmLogic) GetAlgorithm(in *octopus.GetAlgorithmReq) (*octopus.
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetAlgorithm
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -70,6 +70,9 @@ func getCPFromOctopus() float32 {
var computingPowerInTops int32
for k, v := range urlMap {
token := common.GetToken(k)
if token == "" {
continue
}
body, err := common.OctopusHttpClient("GET", v, nil, token)
if err != nil {
continue

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetDatasetApplyListLogic) GetDatasetApplyList(in *octopus.GetDatasetApp
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetApplyList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetDatasetTypeListLogic) GetDatasetTypeList(in *octopus.GetDatasetTypeL
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetTypeList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetDatasetVersionListLogic) GetDatasetVersionList(in *octopus.GetDatase
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetVersionList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -89,6 +89,9 @@ func getGeneralInfoFromOctopus() (int32, int32) {
var memoryInGib int32
for k, v := range urlMap {
token := common.GetToken(k)
if token == "" {
continue
}
body, err := common.OctopusHttpClient("GET", v, nil, token)
if err != nil {
continue

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetModelDeployEventLogic) GetModelDeployEvent(in *octopus.GetModelDeplo
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetModelDeployEvent
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetModelDeployListLogic) GetModelDeployList(in *octopus.GetModelDeployL
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetModelDeployList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -6,6 +6,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
"PCM/common/tool"
"context"
"errors"
"log"
"github.com/zeromicro/go-zero/core/logx"
)
@ -31,6 +33,10 @@ func (l *GetModelDeployLogic) GetModelDeploy(in *octopus.GetModelDeployReq) (*oc
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetModelDeploy
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetModelVersionListLogic) GetModelVersionList(in *octopus.GetModelVersi
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetModelVersionList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -34,6 +36,10 @@ func (l *GetMyAlgorithmListLogic) GetMyAlgorithmList(in *octopus.GetMyAlgorithmL
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetMyAlgorithmList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -34,6 +36,10 @@ func (l *GetMyDatasetListLogic) GetMyDatasetList(in *octopus.GetMyDatasetListReq
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetMydatasetList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -34,6 +36,10 @@ func (l *GetMyModelListLogic) GetMyModelList(in *octopus.GetMyModelListReq) (*oc
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetMyModelList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -34,6 +36,10 @@ func (l *GetNotebookListLogic) GetNotebookList(in *octopus.GetNotebookListReq) (
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetNotebookList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *GetNotebookLogic) GetNotebook(in *octopus.GetNotebookReq) (*octopus.Get
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetNotebook
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetTrainJobEventLogic) GetTrainJobEvent(in *octopus.GetTrainJobEventReq
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetTrainJobEvent
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetTrainJobListLogic) GetTrainJobList(in *octopus.GetTrainJobListReq) (
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetTrainJobList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -6,6 +6,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
"PCM/common/tool"
"context"
"errors"
"log"
"github.com/zeromicro/go-zero/core/logx"
)
@ -31,6 +33,10 @@ func (l *GetTrainJobLogic) GetTrainJob(in *octopus.GetTrainJobReq) (*octopus.Get
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetTrainJob
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
@ -33,6 +35,10 @@ func (l *GetTrainJobMetricLogic) GetTrainJobMetric(in *octopus.GetTrainJobMetric
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetTrainJobMetric
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -6,6 +6,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
"PCM/common/tool"
"context"
"errors"
"log"
"strconv"
"github.com/zeromicro/go-zero/core/logx"
@ -33,6 +35,10 @@ func (l *GetUserImageListLogic) GetUserImageList(in *octopus.GetUserImageListReq
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetUserImageList
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *InferModelDeployLogic) InferModelDeploy(in *octopus.InferModelDeployReq
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.InferModelDeploy
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *StartNotebookLogic) StartNotebook(in *octopus.StartNotebookReq) (*octop
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StartNotebook
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *StopModelDeployLogic) StopModelDeploy(in *octopus.StopModelDeployReq) (
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StopModelDeploy
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *StopNotebookLogic) StopNotebook(in *octopus.StopNotebookReq) (*octopus.
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StopNotebook
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *StopTrainJobLogic) StopTrainJob(in *octopus.StopTrainJobReq) (*octopus.
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StopTrainJob
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *UploadAlgorithmConfirmLogic) UploadAlgorithmConfirm(in *octopus.UploadA
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadAlgorithmConfirm
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *UploadAlgorithmLogic) UploadAlgorithm(in *octopus.UploadAlgorithmReq) (
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadAlgorithm
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *UploadDataSetConfirmLogic) UploadDataSetConfirm(in *octopus.UploadDataS
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadDataSetConfirm
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *UploadDataSetLogic) UploadDataSet(in *octopus.UploadDataSetReq) (*octop
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadDataSet
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *UploadImageConfirmLogic) UploadImageConfirm(in *octopus.UploadImageConf
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadImageConfirm
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -4,6 +4,8 @@ import (
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
"PCM/common/tool"
"context"
"errors"
"log"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
@ -32,6 +34,10 @@ func (l *UploadImageLogic) UploadImage(in *octopus.UploadImageReq) (*octopus.Upl
var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadImage
token := common.GetToken(in.Platform)
if token == "" {
log.Println("获取token失败, platform : ", in.Platform)
return nil, errors.New("获取token失败")
}
req := tool.GetACHttpRequest()
_, err := req.

View File

@ -25,25 +25,70 @@ func NewGetComputingPowerLogic(ctx context.Context, svcCtx *svc.ServiceContext)
}
}
func (l *GetComputingPowerLogic) GetComputingPower() (resp *types.CpResp, err error) {
type client struct {
}
apiResp := types.CpResp{}
func (c *client) getComputingPower(cp computingPower, l *GetComputingPowerLogic) float32 {
return cp.GetComputing(l)
}
//启智章鱼资源算力
type OctopusComputingPower struct {
}
type AcComputingPower struct {
}
type computingPower interface {
GetComputing(l *GetComputingPowerLogic) float32
}
// 启智章鱼资源算力
func (cp OctopusComputingPower) GetComputing(l *GetComputingPowerLogic) float32 {
octopusCpReq := &octopus.ResourceReq{}
octopusCpResp, err := l.svcCtx.OctopusRpc.GetComputingPower(l.ctx, octopusCpReq)
if err != nil {
log.Println("OctopusRpc 算力请求失败", err)
}
return octopusCpResp.POpsAtFp16
}
//曙光账号算力
// 曙光账号算力
func (cp AcComputingPower) GetComputing(l *GetComputingPowerLogic) float32 {
acCpReq := &hpcAC.ResourceReq{}
acCpResp, err := l.svcCtx.ACRpc.GetComputingPower(l.ctx, acCpReq)
if err != nil {
log.Println("ACRpc 算力请求失败", err)
}
return acCpResp.POpsAtFp16
}
func (l *GetComputingPowerLogic) GetComputingPower() (resp *types.CpResp, err error) {
apiResp := types.CpResp{}
c := client{}
ot := OctopusComputingPower{}
ac := AcComputingPower{}
a := c.getComputingPower(ot, l)
b := c.getComputingPower(ac, l)
apiResp.POpsAtFp16 = a + b
////启智章鱼资源算力
//octopusCpReq := &octopus.ResourceReq{}
//octopusCpResp, err := l.svcCtx.OctopusRpc.GetComputingPower(l.ctx, octopusCpReq)
//if err != nil {
// log.Println("OctopusRpc 算力请求失败", err)
//}
//
////曙光账号算力
//acCpReq := &hpcAC.ResourceReq{}
//acCpResp, err := l.svcCtx.ACRpc.GetComputingPower(l.ctx, acCpReq)
//if err != nil {
// log.Println("ACRpc 算力请求失败", err)
//}
//
//computingPowerAggregated := acCpResp.POpsAtFp16 + octopusCpResp.POpsAtFp16
//apiResp.POpsAtFp16 = computingPowerAggregated
computingPowerAggregated := acCpResp.POpsAtFp16 + octopusCpResp.POpsAtFp16
apiResp.POpsAtFp16 = computingPowerAggregated
return &apiResp, nil
}