From 125536012dad57eb5e4cbcbb517790b471027157 Mon Sep 17 00:00:00 2001 From: tzwang Date: Mon, 23 Sep 2024 15:29:30 +0800 Subject: [PATCH] updated createdeploytask logic --- internal/logic/inference/createdeploytasklogic.go | 2 +- internal/storeLink/octopus.go | 2 +- internal/storeLink/shuguangai.go | 2 +- pkg/utils/string.go | 12 ++++++++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/internal/logic/inference/createdeploytasklogic.go b/internal/logic/inference/createdeploytasklogic.go index bb1b4e0c..eeb79340 100644 --- a/internal/logic/inference/createdeploytasklogic.go +++ b/internal/logic/inference/createdeploytasklogic.go @@ -47,7 +47,7 @@ func (l *CreateDeployTaskLogic) CreateDeployTask(req *types.CreateDeployTaskReq) return nil, err } 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) diff --git a/internal/storeLink/octopus.go b/internal/storeLink/octopus.go index 74368949..42157c30 100644 --- a/internal/storeLink/octopus.go +++ b/internal/storeLink/octopus.go @@ -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) param := &octopus.CreateNotebookParam{ - Name: option.TaskName, + Name: DEPLOY_INSTANCE_PREFIEX + DASH + utils.TimeString(), ResourcePool: RESOURCE_POOL, ResourceSpecId: option.ResourceId, AlgorithmId: option.AlgorithmId, diff --git a/internal/storeLink/shuguangai.go b/internal/storeLink/shuguangai.go index bac1659a..1fb447a8 100644 --- a/internal/storeLink/shuguangai.go +++ b/internal/storeLink/shuguangai.go @@ -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) - instanceServiceName := "infer_instance" + UNDERSCORE + utils.RandomString(15) + instanceServiceName := "infer_instance" + UNDERSCORE + utils.TimeString() resourceGroup := "kshdtest" script, ok := ModelNameCmdMap[option.ModelName] diff --git a/pkg/utils/string.go b/pkg/utils/string.go index b0f6d09a..440a56da 100644 --- a/pkg/utils/string.go +++ b/pkg/utils/string.go @@ -17,15 +17,23 @@ package utils import ( "math/rand" "strings" + "time" ) -const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" +const ( + CHARSET = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" + TIMEFORMAT = "20060102150405" +) func RandomString(n int) string { sb := strings.Builder{} sb.Grow(n) for i := 0; i < n; i++ { - sb.WriteByte(charset[rand.Intn(len(charset))]) + sb.WriteByte(CHARSET[rand.Intn(len(CHARSET))]) } return sb.String() } + +func TimeString() string { + return time.Now().Format(TIMEFORMAT) +}