From f6c75361d08e25f09de1db2c8d4542f7fbb94143 Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Mon, 27 Dec 2021 15:54:23 +0800
Subject: [PATCH] del job

---
 routers/api/v1/repo/modelarts.go | 39 ++++++++++++++++----------------
 routers/repo/modelarts.go        | 30 ++++++++++++++++++++----
 2 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index 676097465..0e90b43d3 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -7,7 +7,6 @@ package repo
 
 import (
 	"net/http"
-	"os"
 	"strconv"
 	"strings"
 
@@ -15,8 +14,8 @@ import (
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/modelarts"
-	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
+	routerRepo "code.gitea.io/gitea/routers/repo"
 )
 
 func GetModelArtsNotebook(ctx *context.APIContext) {
@@ -258,7 +257,7 @@ func DelTrainJobVersion(ctx *context.APIContext) {
 			}
 		}
 	} else { //已删除该任务下的所有版本
-		deleteJobStorage(task.JobName)
+		routerRepo.DeleteJobStorage(task.JobName)
 	}
 
 	ctx.JSON(http.StatusOK, map[string]interface{}{
@@ -326,20 +325,20 @@ func ModelList(ctx *context.APIContext) {
 	})
 }
 
-func deleteJobStorage(jobName string) error {
-	//delete local
-	localJobPath := setting.JobPath + jobName
-	err := os.RemoveAll(localJobPath)
-	if err != nil {
-		log.Error("RemoveAll(%s) failed:%v", localJobPath, err)
-	}
-
-	//delete oss
-	dirPath := setting.CodePathPrefix + jobName + "/"
-	err = storage.ObsRemoveObject(setting.Bucket, dirPath)
-	if err != nil {
-		log.Error("ObsRemoveObject(%s) failed:%v", localJobPath, err)
-	}
-
-	return nil
-}
+//func DeleteJobStorage(jobName string) error {
+//	//delete local
+//	localJobPath := setting.JobPath + jobName
+//	err := os.RemoveAll(localJobPath)
+//	if err != nil {
+//		log.Error("RemoveAll(%s) failed:%v", localJobPath, err)
+//	}
+//
+//	//delete oss
+//	dirPath := setting.CodePathPrefix + jobName + "/"
+//	err = storage.ObsRemoveObject(setting.Bucket, dirPath)
+//	if err != nil {
+//		log.Error("ObsRemoveObject(%s) failed:%v", localJobPath, err)
+//	}
+//
+//	return nil
+//}
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index c292f0d31..31b0b196b 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -11,11 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"code.gitea.io/gitea/modules/cloudbrain"
-
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
+	"code.gitea.io/gitea/modules/cloudbrain"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
@@ -249,7 +248,7 @@ func NotebookManage(ctx *context.Context) {
 				break
 			}
 
-			if !ctx.IsSigned || (ctx.User.ID != task.UserID && !ctx.IsUserSiteAdmin() && !ctx.IsUserRepoOwner()){
+			if !ctx.IsSigned || (ctx.User.ID != task.UserID && !ctx.IsUserSiteAdmin() && !ctx.IsUserRepoOwner()) {
 				log.Error("the user has no right ro stop the job", task.JobName, ctx.Data["MsgID"])
 				resultCode = "-1"
 				errorMsg = "you have no right to stop the job"
@@ -263,7 +262,7 @@ func NotebookManage(ctx *context.Context) {
 				break
 			}
 
-			if !ctx.IsSigned || (ctx.User.ID != task.UserID && !ctx.IsUserSiteAdmin()){
+			if !ctx.IsSigned || (ctx.User.ID != task.UserID && !ctx.IsUserSiteAdmin()) {
 				log.Error("the user has no right ro restart the job", task.JobName, ctx.Data["MsgID"])
 				resultCode = "-1"
 				errorMsg = "you have no right to restart the job"
@@ -1413,6 +1412,11 @@ func TrainJobDel(ctx *context.Context) {
 		}
 	}
 
+	//删除存储
+	if len(VersionListTasks) > 0 {
+		DeleteJobStorage(VersionListTasks[0].JobName)
+	}
+
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job")
 }
 
@@ -1538,3 +1542,21 @@ func ModelDownload(ctx *context.Context) {
 	}
 	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
 }
+
+func DeleteJobStorage(jobName string) error {
+	//delete local
+	localJobPath := setting.JobPath + jobName
+	err := os.RemoveAll(localJobPath)
+	if err != nil {
+		log.Error("RemoveAll(%s) failed:%v", localJobPath, err)
+	}
+
+	//delete oss
+	dirPath := setting.CodePathPrefix + jobName + "/"
+	err = storage.ObsRemoveObject(setting.Bucket, dirPath)
+	if err != nil {
+		log.Error("ObsRemoveObject(%s) failed:%v", localJobPath, err)
+	}
+
+	return nil
+}