提交代码

modules/modelarts/modelarts.go

@@ -28,7 +28,7 @@ const (
 	//notebook
 	storageTypeOBS                 = "obs"
 	autoStopDuration               = 4 * 60 * 60
-	autoStopDurationMs             = 4 * 60 * 60 * 1000
+	AutoStopDurationMs             = 4 * 60 * 60 * 1000
 	MORDELART_USER_IMAGE_ENGINE_ID = -1
 	DataSetMountPath               = "/home/ma-user/work"
 	NotebookEnv                    = "Python3"
@@ -281,7 +281,7 @@ func GenerateTask(ctx *context.Context, jobName, uuid, description, flavor strin
 	return nil
 }
 
-func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, description, imageId string, spec *models.Specification, bootFile string) (string, error) {
+func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, description, imageId string, spec *models.Specification, bootFile string,autoStopDurationInMs int64) (string, error) {
 	if poolInfos == nil {
 		json.Unmarshal([]byte(setting.PoolInfos), &poolInfos)
 	}
@@ -296,7 +296,7 @@ func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, desc
 		JobName:     jobName,
 		Description: description,
 		Flavor:      spec.SourceSpecId,
-		Duration:    autoStopDurationMs,
+		Duration:    autoStopDurationInMs,
 		ImageID:     imageId,
 		PoolID:      poolInfos.PoolInfo[0].PoolId,
 		Feature:     models.NotebookFeature,

modules/modelarts_cd/modelarts.go

@@ -88,7 +88,7 @@ type Parameters struct {
 	} `json:"parameter"`
 }
 
-func GenerateNotebook(ctx *context.Context, displayJobName, jobName, uuid, description, imageId string, spec *models.Specification, bootFile string) (string, error) {
+func GenerateNotebook(ctx *context.Context, displayJobName, jobName, uuid, description, imageId string, spec *models.Specification, bootFile string,autoStopDurationInMs int64) (string, error) {
 	imageName, err := GetNotebookImageName(imageId)
 	if err != nil {
 		log.Error("GetNotebookImageName failed: %v", err.Error())
@@ -99,7 +99,7 @@ func GenerateNotebook(ctx *context.Context, displayJobName, jobName, uuid, descr
 		JobName:     jobName,
 		Description: description,
 		Flavor:      spec.SourceSpecId,
-		Duration:    autoStopDurationMs,
+		Duration:    autoStopDurationInMs,
 		ImageID:     imageId,
 		Feature:     models.NotebookFeature,
 		Volume: models.VolumeReq{

routers/repo/modelarts.go

@@ -240,9 +240,9 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm
 	}
 
 	if setting.ModelartsCD.Enabled {
-		_, err = modelarts_cd.GenerateNotebook(ctx, displayJobName, jobName, uuid, description, imageId, spec, "")
+		_, err = modelarts_cd.GenerateNotebook(ctx, displayJobName, jobName, uuid, description, imageId, spec, "",modelarts.AutoStopDurationMs)
 	} else {
-		_, err = modelarts.GenerateNotebook2(ctx, displayJobName, jobName, uuid, description, imageId, spec, "")
+		_, err = modelarts.GenerateNotebook2(ctx, displayJobName, jobName, uuid, description, imageId, spec, "",modelarts.AutoStopDurationMs)
 	}
 
 	if err != nil {

services/cloudbrain/cloudbrainTask/notebook.go

@@ -292,9 +292,9 @@ func modelartsFileNoteBookCreate(ctx *context.Context, option api.CreateFileNote
 
 	var jobId string
 	if setting.ModelartsCD.Enabled {
-		jobId, err = modelarts_cd.GenerateNotebook(ctx, displayJobName, jobName, "", getDescription(option), setting.FileNoteBook.ImageIdNPUCD, spec, option.File)
+		jobId, err = modelarts_cd.GenerateNotebook(ctx, displayJobName, jobName, "", getDescription(option), setting.FileNoteBook.ImageIdNPUCD, spec, option.File,modelarts.AutoStopDurationMs/4)
 	} else {
-		jobId, err = modelarts.GenerateNotebook2(ctx, displayJobName, jobName, "", getDescription(option), setting.FileNoteBook.ImageIdNPU, spec, option.File)
+		jobId, err = modelarts.GenerateNotebook2(ctx, displayJobName, jobName, "", getDescription(option), setting.FileNoteBook.ImageIdNPU, spec, option.File,modelarts.AutoStopDurationMs/4)
 	}
 
 	if err != nil {