提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/ai_model_manage.go

@@ -44,6 +44,7 @@ type AiModelConvert struct {
 	ID                 string `xorm:"pk"`
 	Name               string `xorm:"INDEX NOT NULL"`
 	Status             string `xorm:"NULL"`
+	StatusResult       string `xorm:"NULL"`
 	SrcEngine          int    `xorm:"NOT NULL DEFAULT 0"`
 	RepoId             int64  `xorm:"INDEX NULL"`
 	ModelId            string `xorm:"NOT NULL"`
@@ -149,6 +150,21 @@ func UpdateModelConvertModelArts(id string, CloudBrainTaskId string, VersionId s
 	return nil
 }
 
+func UpdateModelConvertFailed(id string, status string, statusResult string) error {
+	var sess *xorm.Session
+	sess = x.ID(id)
+	defer sess.Close()
+	re, err := sess.Cols("status", "status_result").Update(&AiModelConvert{
+		Status:       status,
+		StatusResult: statusResult,
+	})
+	if err != nil {
+		return err
+	}
+	log.Info("success to update cloud_brain_task_id from  db.re=" + fmt.Sprint((re)))
+	return nil
+}
+
 func UpdateModelConvertCBTI(id string, CloudBrainTaskId string) error {
 	var sess *xorm.Session
 	sess = x.ID(id)

modules/modelarts/modelarts.go

@@ -393,17 +393,11 @@ func GenerateModelConvertTrainJob(req *GenerateTrainJobReq) (*models.CreateTrain
 		Description: req.Description,
 		Config: models.UserImageConfig{
 			WorkServerNum: req.WorkServerNumber,
-			AppUrl:        req.CodeObsPath,
-			BootFileUrl:   req.BootFileUrl,
-			DataUrl:       req.DataUrl,
-			TrainUrl:      req.TrainUrl,
-			LogUrl:        req.LogUrl,
 			PoolID:        req.PoolID,
 			CreateVersion: true,
 			Flavor: models.Flavor{
 				Code: req.FlavorCode,
 			},
-			Parameter:    req.Parameters,
 			UserImageUrl: req.UserImageUrl,
 			UserCommand:  req.UserCommand,
 		},

routers/repo/ai_model_convert.go

@@ -236,6 +236,7 @@ func createNpuTrainJob(modelConvert *models.AiModelConvert, ctx *context.Context
 		models.UpdateModelConvertModelArts(modelConvert.ID, fmt.Sprint(result.JobID), fmt.Sprint(result.VersionID))
 	} else {
 		log.Info("create modelarts taks failed.error=" + err.Error())
+		models.UpdateModelConvertFailed(modelConvert.ID, "FAILED", err.Error())
 	}
 	return err
 }
@@ -446,10 +447,12 @@ func createGpuTrainJob(modelConvert *models.AiModelConvert, ctx *context.Context
 	})
 	if err != nil {
 		log.Error("CreateJob failed:", err.Error(), ctx.Data["MsgID"])
+		models.UpdateModelConvertFailed(modelConvert.ID, "FAILED", err.Error())
 		return err
 	}
 	if jobResult.Code != Success {
 		log.Error("CreateJob(%s) failed:%s", modelConvert.ID, jobResult.Msg, ctx.Data["MsgID"])
+		models.UpdateModelConvertFailed(modelConvert.ID, "FAILED", err.Error())
 		return errors.New(jobResult.Msg)
 	}