floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated createdeploytask logic

This commit is contained in:
tzwang 2024-09-23 15:29:30 +08:00
parent bf513496e7
commit 125536012d
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/logic/inference/createdeploytasklogic.go
View File

@ -47,7 +47,7 @@ func (l *CreateDeployTaskLogic) CreateDeployTask(req *types.CreateDeployTaskReq)
return nil, err return nil, err
} }
if duplicated { if duplicated {
return nil, errors.New("TaskName doesn't exist") return nil, errors.New("TaskName already exists")
} }
taskId, err := l.svcCtx.Scheduler.AiStorages.SaveInferDeployTask(req.TaskName, req.ModelName, req.ModelType, req.TaskDesc) taskId, err := l.svcCtx.Scheduler.AiStorages.SaveInferDeployTask(req.TaskName, req.ModelName, req.ModelType, req.TaskDesc)

2
internal/storeLink/octopus.go
View File

@ -1238,7 +1238,7 @@ func (o *OctopusLink) CreateInferDeployInstance(ctx context.Context, option *opt
desc := option.ModelType + FORWARD_SLASH + option.ModelName + FORWARD_SLASH + strings.ToLower(BIV100) desc := option.ModelType + FORWARD_SLASH + option.ModelName + FORWARD_SLASH + strings.ToLower(BIV100)
param := &octopus.CreateNotebookParam{ param := &octopus.CreateNotebookParam{
Name: option.TaskName, Name: DEPLOY_INSTANCE_PREFIEX + DASH + utils.TimeString(),
ResourcePool: RESOURCE_POOL, ResourcePool: RESOURCE_POOL,
ResourceSpecId: option.ResourceId, ResourceSpecId: option.ResourceId,
AlgorithmId: option.AlgorithmId, AlgorithmId: option.AlgorithmId,

2
internal/storeLink/shuguangai.go
View File

@ -929,7 +929,7 @@ func (s *ShuguangAi) CreateInferDeployInstance(ctx context.Context, option *opti
} }
desc := option.ModelType + FORWARD_SLASH + option.ModelName + FORWARD_SLASH + strings.ToLower(DCU) desc := option.ModelType + FORWARD_SLASH + option.ModelName + FORWARD_SLASH + strings.ToLower(DCU)
instanceServiceName := "infer_instance" + UNDERSCORE + utils.RandomString(15) instanceServiceName := "infer_instance" + UNDERSCORE + utils.TimeString()
resourceGroup := "kshdtest" resourceGroup := "kshdtest"
script, ok := ModelNameCmdMap[option.ModelName] script, ok := ModelNameCmdMap[option.ModelName]

12
pkg/utils/string.go
View File

@ -17,15 +17,23 @@ package utils
import ( import (
"math/rand" "math/rand"
"strings" "strings"
"time"
) )
const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" const (
CHARSET = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
TIMEFORMAT = "20060102150405"
)
func RandomString(n int) string { func RandomString(n int) string {
sb := strings.Builder{} sb := strings.Builder{}
sb.Grow(n) sb.Grow(n)
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
sb.WriteByte(charset[rand.Intn(len(charset))]) sb.WriteByte(CHARSET[rand.Intn(len(CHARSET))])
} }
return sb.String() return sb.String()
} }
func TimeString() string {
return time.Now().Format(TIMEFORMAT)
}