services/ai_task_service/task/task_service.go

@@ -1,6 +1,15 @@
 package task
 
 import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"net/url"
+	"path"
+	"strconv"
+	"strings"
+
 	"code.gitea.io/gitea/entity"
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/convert"
@@ -16,14 +25,6 @@ import (
 	"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
 	"code.gitea.io/gitea/services/cloudbrain/resource"
 	"code.gitea.io/gitea/services/lock"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-	"path"
-	"strconv"
-	"strings"
 )
 
 type QueryFunc func(opts entity.JobIdAndVersionId) (*entity.QueryTaskResponse, error)
@@ -358,7 +359,7 @@ func DelTask(id int64, deleteRemote DeleteFunc) error {
 	if cloudbrain.ComputeResource == models.NPUResource {
 		storageType = models.TypeCloudBrainTwo
 	}
-	cloudbrainTask.DeleteCloudbrainJobStorage(cloudbrain.JobName, storageType)
+	go cloudbrainTask.DeleteCloudbrainJobStorage(cloudbrain.JobName, storageType)
 	return nil
 }
 

services/cloudbrain/cloudbrainTask/common.go

@@ -3,7 +3,6 @@ package cloudbrainTask
 import (
 	"os"
 
-	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
@@ -16,24 +15,24 @@ func DeleteCloudbrainJobStorage(jobName string, cloudbrainType int) error {
 	if err != nil {
 		log.Error("RemoveAll(%s) failed:%v", localJobPath, err)
 	}
+	deleteS3Storage(jobName, cloudbrainType)
+	return nil
+}
 
+func deleteS3Storage(jobName string, cloudbrainType int) {
 	//delete oss
-	if cloudbrainType == models.TypeCloudBrainOne {
-		dirPath := setting.CBCodePathPrefix + jobName + "/"
-		err = storage.Attachments.DeleteDir(dirPath)
-		if err != nil {
-			log.Error("DeleteDir(%s) failed:%v", localJobPath, err)
-		}
-	} else if cloudbrainType == models.TypeCloudBrainTwo {
-		//dirPath := setting.CodePathPrefix + jobName + "/"
-		//err = storage.ObsRemoveObject(setting.Bucket, dirPath)
-		//if err != nil {
-		//	log.Error("ObsRemoveObject(%s) failed:%v", localJobPath, err)
-		//}
-		log.Info("no need to delete")
-	} else {
-		log.Error("cloudbrainType(%d) error", cloudbrainType)
+
+	dirPath := setting.CBCodePathPrefix + jobName + "/"
+	err := storage.Attachments.DeleteDir(dirPath)
+	if err != nil {
+		log.Error("DeleteDir(%s) failed:%v", dirPath, err)
 	}
 
-	return nil
+	dirPath = setting.CodePathPrefix + jobName + "/"
+	err = storage.ObsRemoveObject(setting.Bucket, dirPath)
+	if err != nil {
+		log.Error("ObsRemoveObject(%s) failed:%v", dirPath, err)
+	}
+	log.Info("no need to delete")
+
 }