diff --git a/models/modelarts_deploy.go b/models/modelarts_deploy.go index de1b91fcdc..e8afc6f94e 100644 --- a/models/modelarts_deploy.go +++ b/models/modelarts_deploy.go @@ -1,6 +1,8 @@ package models import ( + "time" + "code.gitea.io/gitea/modules/timeutil" ) @@ -25,6 +27,7 @@ type ModelartsDeploy struct { Finetune bool FinetuneModelType int FinetuneCategory int + DeletedAt time.Time `xorm:"deleted"` } type CreateDeployModelParams struct { diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index c07faddacc..a4da5980c5 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -1859,22 +1859,28 @@ sendjob: func ServiceDelete(jobID string) error { if deploy, _ := models.GetModelartsDeployByJobID(jobID); deploy != nil { if deploy.Status == "STOP" || deploy.Status == "FAILED" { - err := DeleteDeployService(deploy.ServiceID) - if err != nil { - log.Error("盘古微调部署: Delete DeployService API failed:%s %v", jobID, err.Error()) - return err + if deploy.ServiceID != "" { + err := DeleteDeployService(deploy.ServiceID) + if err != nil { + log.Error("panguService: Delete DeployService API failed:%s %v", jobID, err.Error()) + return err + } + log.Info("panguService: deploy service delete success %s", jobID) } - err = DeleteDeployModel(deploy.ModelID) - if err != nil { - log.Error("盘古微调部署: Delete DeployModel API failed:%s %v", jobID, err.Error()) - return err + if deploy.ModelID != "" { + err := DeleteDeployModel(deploy.ModelID) + if err != nil { + log.Error("panguService: Delete DeployModel API failed:%s %v", jobID, err.Error()) + return err + } + log.Info("panguService: deploy model delete success %s", jobID) } - - err = models.DeleteModelartsDeploy(jobID) + err := models.DeleteModelartsDeploy(jobID) if err != nil { - log.Error("盘古微调部署: Delete ModelartsDeploy from DB failed:%s %v", jobID, err.Error()) + log.Error("panguService: Delete ModelartsDeploy from DB failed:%s %v", jobID, err.Error()) return err } + log.Info("panguService: deploy DB record delete success %s", jobID) } else { log.Error("the job(%s) is a deploying finetune job, can be not deleted", jobID) return fmt.Errorf("1")