提交代码

modules/setting/setting.go

@@ -713,13 +713,14 @@ var (
 	}{}
 
 	FileNoteBook = struct {
-		ProjectName string
-		ImageGPU    string
-		SpecIdGPU   int64
-		SpecIdCPU   int64
-		ImageIdNPU  string
-		ImageNPU    string
-		SpecIdNPU   int64
+		ProjectName  string
+		ImageGPU     string
+		SpecIdGPU    int64
+		SpecIdCPU    int64
+		ImageIdNPU   string
+		SpecIdNPU    int64
+		ImageIdNPUCD string
+		SpecIdNPUCD  int64
 	}{}
 
 	ModelConvert = struct {
@@ -1590,11 +1591,12 @@ func NewContext() {
 	sec = Cfg.Section("file_notebook")
 	FileNoteBook.ProjectName = sec.Key("project_name").MustString("openi-notebook")
 	FileNoteBook.ImageIdNPU = sec.Key("imageid_npu").MustString("")
-	FileNoteBook.ImageNPU = sec.Key("image_npu").MustString("")
 	FileNoteBook.ImageGPU = sec.Key("image_gpu").MustString("")
 	FileNoteBook.SpecIdCPU = sec.Key("specid_cpu").MustInt64(-1)
 	FileNoteBook.SpecIdGPU = sec.Key("specid_gpu").MustInt64(-1)
 	FileNoteBook.SpecIdNPU = sec.Key("specid_npu").MustInt64(-1)
+	FileNoteBook.ImageIdNPUCD = sec.Key("imageid_npu_cd").MustString("")
+	FileNoteBook.SpecIdNPUCD = sec.Key("specid_npu_cd").MustInt64(-1)
 
 	getGrampusConfig()
 	getModelartsCDConfig()

services/cloudbrain/cloudbrainTask/notebook.go

@@ -255,10 +255,12 @@ func modelartsFileNoteBookCreate(ctx *context.Context, option api.CreateFileNote
 	}
 
 	var aiCenterCode = models.AICenterOfCloudBrainTwo
+	var specId = setting.FileNoteBook.SpecIdNPU
 	if setting.ModelartsCD.Enabled {
 		aiCenterCode = models.AICenterOfChengdu
+		specId = setting.FileNoteBook.SpecIdNPUCD
 	}
-	spec, err := resource.GetAndCheckSpec(ctx.User.ID, setting.FileNoteBook.SpecIdNPU, models.FindSpecsOptions{
+	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
 		JobType:         models.JobTypeDebug,
 		ComputeResource: models.NPU,
 		Cluster:         models.OpenICluster,
@@ -278,7 +280,7 @@ 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.ImageIdNPU, spec, option.File)
+		jobId, err = modelarts_cd.GenerateNotebook(ctx, displayJobName, jobName, "", getDescription(option), setting.FileNoteBook.ImageIdNPUCD, spec, option.File)
 	} else {
 		jobId, err = modelarts.GenerateNotebook2(ctx, displayJobName, jobName, "", getDescription(option), setting.FileNoteBook.ImageIdNPU, spec, option.File)
 	}