From 001c6ea57218af7e06b3c2062b84d2dc1d26e0f1 Mon Sep 17 00:00:00 2001
From: yuyuanshifu <747342561@qq.com>
Date: Thu, 4 Feb 2021 19:11:08 +0800
Subject: [PATCH] show modelarts

---
 modules/modelarts/resty.go          |  4 ++--
 routers/repo/modelarts.go           | 22 +++++++++-------------
 templates/repo/modelarts/index.tmpl |  2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go
index b756bdb58..93ddfb75d 100755
--- a/modules/modelarts/resty.go
+++ b/modules/modelarts/resty.go
@@ -139,7 +139,7 @@ sendjob:
 		SetHeader("Content-Type", "application/json").
 		SetAuthToken(TOKEN).
 		SetResult(&result).
-		Get(HOST + "/v1/" + setting.ProjectID + urlNotebook + jobID)
+		Get(HOST + "/v1/" + setting.ProjectID + urlNotebook + "/" + jobID)
 
 	if err != nil {
 		return nil, fmt.Errorf("resty GetJob: %v", err)
@@ -179,7 +179,7 @@ sendjob:
 		SetBody(param).
 		SetAuthToken(TOKEN).
 		SetResult(&result).
-		Post(HOST + "/v1/" + setting.ProjectID + urlNotebook + jobID + "/action")
+		Post(HOST + "/v1/" + setting.ProjectID + urlNotebook + "/" + jobID + "/action")
 
 	if err != nil {
 		return &result, fmt.Errorf("resty StopJob: %v", err)
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 5e0589cbf..6a9e7240b 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -9,7 +9,6 @@ import (
 	"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/log"
 	"code.gitea.io/gitea/modules/setting"
@@ -95,8 +94,6 @@ func ModelArtsCreate(ctx *context.Context, form auth.CreateModelArtsForm) {
 	description := form.Description
 	//repo := ctx.Repo.Repository
 
-	log.Info(uuid)
-
 	err := modelarts.GenerateTask(ctx, jobName, uuid, description)
 	if err != nil {
 		ctx.RenderWithErr(err.Error(), tplModelArtsNew, &form)
@@ -113,26 +110,24 @@ func ModelArtsShow(ctx *context.Context) {
 	task, err := models.GetCloudbrainByJobID(jobID)
 	if err != nil {
 		ctx.Data["error"] = err.Error()
+		ctx.RenderWithErr(err.Error(), tplModelArtsIndex, nil)
+		return
 	}
 
-	//result, err := modelarts.GetJob(jobID)
-	result, err := cloudbrain.GetJob(jobID)
+	result, err := modelarts.GetJob(jobID)
 	if err != nil {
 		ctx.Data["error"] = err.Error()
+		ctx.RenderWithErr(err.Error(), tplModelArtsIndex, nil)
+		return
 	}
 
 	if result != nil {
-		jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
-		ctx.Data["result"] = jobRes
-		taskRoles := jobRes.TaskRoles
-		taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
-		ctx.Data["taskRes"] = taskRes
-		task.Status = taskRes.TaskStatuses[0].State
-		task.ContainerID = taskRes.TaskStatuses[0].ContainerID
-		task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP
+		task.Status = result.Status
 		err = models.UpdateJob(task)
 		if err != nil {
 			ctx.Data["error"] = err.Error()
+			ctx.RenderWithErr(err.Error(), tplModelArtsIndex, nil)
+			return
 		}
 	}
 
@@ -151,6 +146,7 @@ func ModelArtsDebug(ctx *context.Context) {
 
 	//https://console.ai.pcl.cn/modelarts/internal/hub/notebook/user/DE-afcdf674-6489-11eb-bfe7-0255ac100057/lab
 	//debugUrl := setting.DebugServerHost + "jpylab_" + task.JobID + "_" + task.SubTaskName
+	//debugUrl := setting.ModelArtsHost + "/modelarts/internal/hub/notebook/user/" + task.JobID + "/lab"
 	debugUrl := "https://console.ai.pcl.cn/modelarts/internal/hub/notebook/user/" + task.JobID + "/lab"
 	ctx.Redirect(debugUrl)
 }
diff --git a/templates/repo/modelarts/index.tmpl b/templates/repo/modelarts/index.tmpl
index 8536dd897..1c00c103c 100755
--- a/templates/repo/modelarts/index.tmpl
+++ b/templates/repo/modelarts/index.tmpl
@@ -266,7 +266,7 @@
                                     </span>
                                 </div>
 
-                                <!-- 删除镜像 -->
+                                <!-- 删除任务 -->
                                 <div class="one wide column">
                                     <div class="ui text center clipboard">
                                         <form id="delForm-{{.JobID}}" action="{{if ne .Status "STOPPED"}}javascript:void(0){{else}}{{$.Link}}/{{.JobID}}/del{{end}}" method="post">