stop train-job

modules/modelarts/resty.go

@@ -636,3 +636,44 @@ sendjob:
 
 	return &result, nil
 }
+
+func StopTrainJob(jobID, versionID string) (*models.TrainJobResult, error) {
+	checkSetting()
+	client := getRestyClient()
+	var result models.TrainJobResult
+
+	retry := 0
+
+sendjob:
+	res, err := client.R().
+		SetAuthToken(TOKEN).
+		SetResult(&result).
+		Post(HOST + "/v1/" + setting.ProjectID + urlTrainJob + "/" + jobID + "/versions/" + versionID + "/stop")
+
+	if err != nil {
+		return &result, fmt.Errorf("resty StopTrainJob: %v", err)
+	}
+
+	if res.StatusCode() == http.StatusUnauthorized && retry < 1 {
+		retry++
+		_ = getToken()
+		goto sendjob
+	}
+
+	if res.StatusCode() != http.StatusOK {
+		var temp models.ErrorResult
+		if err = json.Unmarshal([]byte(res.String()), &temp); err != nil {
+			log.Error("json.Unmarshal failed(%s): %v", res.String(), err.Error())
+			return &result, fmt.Errorf("json.Unmarshal failed(%s): %v", res.String(), err.Error())
+		}
+		log.Error("StopTrainJob failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
+		return &result, fmt.Errorf("StopTrainJob failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
+	}
+
+	if !result.IsSuccess {
+		log.Error("StopTrainJob(%s) failed", jobID)
+		return &result, fmt.Errorf("停止训练作业失败:%s", result.ErrorMsg)
+	}
+
+	return &result, nil
+}

routers/repo/modelarts.go

@@ -654,3 +654,22 @@ func TrainJobDel(ctx *context.Context) {
 
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job")
 }
+
+func TrainJobStop(ctx *context.Context) {
+	var jobID = ctx.Params(":jobid")
+	task, err := models.GetCloudbrainByJobID(jobID)
+	if err != nil {
+		log.Error("GetCloudbrainByJobID(%s) failed:%v", task.JobName, err.Error())
+		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobShow, nil)
+		return
+	}
+
+	_, err = modelarts.StopTrainJob(jobID, strconv.FormatInt(task.VersionID, 10))
+	if err != nil {
+		log.Error("StopTrainJob(%s) failed:%v", task.JobName, err.Error())
+		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobShow, nil)
+		return
+	}
+
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job")
+}

routers/routes/routes.go

@@ -933,8 +933,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Get("", reqRepoCloudBrainReader, repo.TrainJobIndex)
 				m.Group("/:jobid", func() {
 					m.Get("", reqRepoCloudBrainReader, repo.TrainJobShow)
-					m.Get("/debug", reqRepoCloudBrainReader, repo.NotebookDebug)
-					m.Post("/stop", reqRepoCloudBrainWriter, repo.NotebookStop)
+					m.Post("/stop", reqRepoCloudBrainWriter, repo.TrainJobStop)
 					m.Post("/del", reqRepoCloudBrainWriter, repo.TrainJobDel)
 					m.Get("/log", reqRepoCloudBrainReader, repo.TrainJobGetLog)
 				})

templates/repo/modelarts/trainjob/index.tmpl

@@ -126,9 +126,9 @@
                                             <!-- 停止 -->
                                             <div class="two wide column">
                                                 <div class="ui text center clipboard">
-                                                    <form id="stopForm-{{.JobID}}" action="{{if ne .Status "RUNNING"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/stop{{end}}" method="post">
+                                                    <form id="stopForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/stop" method="post">
                                                         {{$.CsrfTokenHtml}}
-                                                        <a class="fitted" onclick="document.getElementById('stopForm-{{.JobID}}').submit();" style="{{if ne .Status "RUNNING"}}color:#CCCCCC{{end}}; font-size:16px; font-weight:bold">停止</a>
+                                                        <a class="fitted" onclick="document.getElementById('stopForm-{{.JobID}}').submit();" style="font-size:16px; font-weight:bold">停止</a>
                                                     </form>
                                                 </div>
                                             </div>