Merge remote-tracking branch 'origin/V20220228' into fix-1494

routers/admin/cloudbrains.go

@@ -21,7 +21,7 @@ import (
 const (
 	tplCloudBrains     base.TplName = "admin/cloudbrain/list"
 	EXCEL_DATE_FORMAT               = "20060102150405"
-	CREATE_TIME_FORMAT              = "2006/01/02 15:04:05.00"
+	CREATE_TIME_FORMAT              = "2006/01/02 15:04:05"
 )
 
 func CloudBrains(ctx *context.Context) {
@@ -179,7 +179,7 @@ func DownloadCloudBrains(ctx *context.Context) {
 }
 
 func allValues(row int, rs *models.CloudbrainInfo, ctx *context.Context) map[string]string {
-	return map[string]string{getCellName("A", row): rs.JobName, getCellName("B", row): rs.Status, getCellName("C", row): rs.JobType, getCellName("D", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("E", row): getDurationTime(rs),
+	return map[string]string{getCellName("A", row): rs.JobName, getCellName("B", row): rs.JobType, getCellName("C", row): rs.Status, getCellName("D", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("E", row): getDurationTime(rs),
 		getCellName("F", row): rs.ComputeResource, getCellName("G", row): rs.Name, getCellName("H", row): getRepoPathName(rs), getCellName("I", row): rs.JobName,
 	}
 }
@@ -216,7 +216,7 @@ func getTotalPage(total int64, pageSize int) int {
 
 func allHeader(ctx *context.Context) map[string]string {
 
-	return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.modelarts.status"), "C1": ctx.Tr("repo.cloudbrain_task_type"), "D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.dura_time"), "F1": ctx.Tr("repo.modelarts.computing_resources"), "G1": ctx.Tr("repo.cloudbrain_creator"), "H1": ctx.Tr("repo.repo_name"), "I1": ctx.Tr("repo.cloudbrain_task_name")}
+	return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.cloudbrain_task_type"), "C1": ctx.Tr("repo.modelarts.status"), "D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.dura_time"), "F1": ctx.Tr("repo.modelarts.computing_resources"), "G1": ctx.Tr("repo.cloudbrain_creator"), "H1": ctx.Tr("repo.repo_name"), "I1": ctx.Tr("repo.cloudbrain_task_name")}
 
 }
 

routers/api/v1/api.go

@@ -59,10 +59,11 @@
 package v1
 
 import (
-	"code.gitea.io/gitea/routers/authentication"
 	"net/http"
 	"strings"
 
+	"code.gitea.io/gitea/routers/authentication"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/context"
@@ -880,9 +881,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 				}, reqAnyRepoReader())
 				m.Group("/cloudbrain", func() {
 					m.Get("/:jobid", repo.GetCloudbrainTask)
-					m.Get("/:jobid/log", repo.CloudbrainGetLog)
-					// m.Get("/:jobname", repo.GetCloudbrainTask)
-					// m.Get("/:jobname/log", repo.CloudbrainGetLog)
+					m.Get("/:jobname/log", repo.CloudbrainGetLog)
 				}, reqRepoReader(models.UnitTypeCloudBrain))
 				m.Group("/modelarts", func() {
 					m.Group("/notebook", func() {

routers/api/v1/repo/cloudbrain.go

@@ -97,13 +97,10 @@ func GetCloudbrainTask(ctx *context.APIContext) {
 }
 
 func CloudbrainGetLog(ctx *context.Context) {
-	// jobName := ctx.Params(":jobname")
-	// job, err := models.GetCloudbrainByName(jobName)
-	jobID := ctx.Params(":jobid")
-	repoID := ctx.Repo.Repository.ID
-	job, err := models.GetRepoCloudBrainByJobID(repoID, jobID)
+	jobName := ctx.Params(":jobname")
+	job, err := models.GetCloudbrainByName(jobName)
 	if err != nil {
-		log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["MsgID"])
+		log.Error("GetCloudbrainByJobName failed: %v", err, ctx.Data["MsgID"])
 		ctx.ServerError(err.Error(), err)
 		return
 	}
@@ -148,7 +145,7 @@ func CloudbrainGetLog(ctx *context.Context) {
 	}
 
 	ctx.JSON(http.StatusOK, map[string]interface{}{
-		"JobID":   jobID,
+		"JobName": jobName,
 		"Content": content,
 	})
 

templates/admin/cloudbrain/list.tmpl

@@ -60,12 +60,13 @@
                             </div>  
                         </div>                     
                         {{range .Tasks}}
+                        {{if .Repo}}
                         <div class="ui grid stackable item">
                             <div class="row">    
                                 <!-- 任务名 -->
                                 <div class="two wide column nowrap">
-                                    {{if eq .JobType "DEBUG"}}
-                                    <a class="title" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/{{.JobName}}" title="{{.JobName}}" style="font-size: 14px;">
+                                    {{if or (eq .JobType "DEBUG") (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}
+                                    <a class="title" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain/{{.JobName}}{{else}}/modelarts/notebook/{{.JobID}}{{end}}" title="{{.JobName}}" style="font-size: 14px;">
                                         <span class="fitted" style="width: 90%;vertical-align: middle;">{{.JobName}}</span>
                                     </a>
                                     {{else if eq .JobType "INFERENCE"}}
@@ -162,6 +163,102 @@
                                 </div>
                             </div>
                         </div>
+                        {{else}}
+                        <div class="ui grid stackable item">
+                            <div class="row">    
+                                <!-- 任务名 -->
+                                <div class="two wide column nowrap">
+                                    {{if eq .JobType "DEBUG"}}
+                                    <a class="title" href="" title="{{.JobName}}" style="font-size: 14px;">
+                                        <span class="fitted" style="width: 90%;vertical-align: middle;">{{.JobName}}</span>
+                                    </a>
+                                    {{else if eq .JobType "INFERENCE"}}
+                                    <a class="title" href="" title="{{.JobName}}" style="font-size: 14px;">
+                                        <span class="fitted" style="width: 90%;vertical-align: middle;">{{.JobName}}</span>
+                                    </a>
+                                    {{else if eq .JobType "TRAIN"}}
+                                    <a class="title" href="" title="{{.JobName}}" style="font-size: 14px;">
+                                        <span class="fitted" style="width: 90%;vertical-align: middle;">{{.JobName}}</span>
+                                    </a>
+                                    {{else if eq .JobType "BENCHMARK"}}
+                                    <a class="title" href="" title="{{.JobName}}" style="font-size: 14px;">
+                                        <span class="fitted" style="width: 90%;vertical-align: middle;">{{.JobName}}</span>
+                                    </a>
+                                    {{end}}
+                                </div>
+                                <!-- 任务类型 -->
+                                <div class="one wide column text center nowrap">   
+                                    <span style="font-size: 12px;">{{.JobType}} </span>                                  
+                                </div>
+                                <!-- 任务状态 -->
+                                <div class="two wide column text center nowrap" style="padding-left: 2.2rem !important; width: 10% !important;">
+                                    <span class="job-status" id="{{.JobID}}"  data-jobid="{{.JobID}}" data-version="{{.VersionName}}">
+                                            <span><i id="{{.JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i><span  id="{{.JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
+                                    </span>
+                                </div>
+                                <!-- 任务创建时间 -->
+                                <div class="two wide column text center nowrap" style="width: 10% !important;">
+                                    <span style="font-size: 12px;" class="">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span>
+                                </div>
+                                <!-- 任务运行时间 -->
+                                <div class="one wide column text center nowrap"> 
+                                    <span style="font-size: 12px;" id="duration-{{.JobID}}">{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}</span> 
+                                </div>
+                                <!-- 计算资源 -->
+                                <div class="one wide column text center nowrap">
+                                    <span style="font-size: 12px;">{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}</span> 
+                                </div>
+                                <!-- 创建者 -->
+                                <div class="one wide column text center nowrap">
+                                    {{if .User.Name}}
+                                        <a href="{{AppSubUrl}}/{{.User.Name}}" title="{{.User.Name}}"><img class="ui avatar image" src="{{.User.RelAvatarLink}}"></a>
+                                    {{else}}
+                                        <a title="Ghost"><img class="ui avatar image" src="{{AppSubUrl}}/user/avatar/Ghost/-1"></a>
+                                    {{end}}
+                                </div>
+                                <!-- 项目 -->
+                                <div class="two wide column text center nowrap">
+                                    <a href="" title="">--</a>
+                                </div>
+                                <!-- 云脑侧名称 -->
+                                <div class="two wide column text center nowrap" style="overflow: hidden;text-overflow:ellipsis;">
+                                    <span class="fitted">{{.JobName}}</span>
+                                </div>
+                                <div class="two wide column text center nowrap" style="width: 17.5%!important;">
+                                    {{if eq .JobType "DEBUG"}}
+                                    <div class="ui compact buttons">
+                                        <form id="debugAgainForm-{{.JobID}}">
+                                            {{$.CsrfTokenHtml}}
+                                            {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}}
+                                            <a style="margin: 0 1rem;" id="ai-debug-{{.JobID}}" class='ui basic disabled button'  >
+                                                {{$.i18n.Tr "repo.debug"}}
+                                            </a>
+                                            {{else}}
+                                            <a id="ai-debug-{{.JobID}}" class='ui basic disabled button' >
+                                                {{$.i18n.Tr "repo.debug_again"}}
+                                            </a>
+                                            {{end}}
+                                        </form>
+                                    </div>
+                                    {{end}}
+                                    <!-- 停止任务 -->
+                                    <div class="ui compact buttons">
+                                        <a style="padding: 0.5rem 1rem;" id="ai-stop-{{.JobID}}" class="ui basic disabled button"  data-jobid="{{.JobID}}" data-version="{{.VersionName}}" >
+                                            {{$.i18n.Tr "repo.stop"}}
+                                        </a>
+                                    </div>
+                                    <!-- 删除任务 -->
+                                    <form class="ui compact buttons" id="delForm-{{.JobID}}" action='' method="post">
+                                        {{$.CsrfTokenHtml}}
+                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{.JobID}}" class="ui basic disabled button" style="border-radius: .28571429rem;">
+                                            {{$.i18n.Tr "repo.delete"}}
+                                        </a>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+
+                        {{end}}
                         {{end}}
                         <div id="app" style="margin-top: 2rem;">
                             <div class="center">
@@ -216,5 +313,4 @@ function getParams(){
     })
 }
 getParams()
-console.log({{.Tasks}})
 </script>

templates/admin/cloudbrain/search.tmpl

@@ -32,15 +32,15 @@
             <i class="dropdown icon"></i>
             <div class="menu">
                 <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=" data-value='{{.i18n.Tr "admin.cloudbrain.all_status"}}'>{{.i18n.Tr "admin.cloudbrain.all_status"}}</a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STARTING" data-value="CPU/GPU">STARTING</a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=RESTARTING"  data-value="NPU">RESTARTING </a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=START_FAILED" data-value="all">START_FAILED</a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STOPPING" data-value="CPU/GPU">STOPPING</a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STOPPED"  data-value="NPU">STOPPED</a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=WAITING" data-value="all">WAITING</a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=COMPLETED" data-value="CPU/GPU">COMPLETED</a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=FAILED"  data-value="NPU">FAILED </a>
-                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=OTHER"  data-value="NPU">OTHER</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STARTING" data-value="STARTING">STARTING</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=RESTARTING"  data-value="RESTARTING">RESTARTING </a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=START_FAILED" data-value="START_FAILED">START_FAILED</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STOPPING" data-value="STOPPING">STOPPING</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=STOPPED"  data-value="STOPPED">STOPPED</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=WAITING" data-value="WAITING">WAITING</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=COMPLETED" data-value="COMPLETED">COMPLETED</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=FAILED"  data-value="FAILED">FAILED </a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType={{$.JobType}}&listType={{$.ListType}}&jobStatus=other"  data-value="OTHER">OTHER</a>
                 
             </div>
         </div>

templates/repo/issue/new_form.tmpl

@@ -185,40 +185,6 @@
     </div>
   </div>
 </form>
-<script src="https://cdn.jsdelivr.net/npm/jquery@3.2.1/dist/jquery.min.js"></script>
-<script>
-  // $(document).ready(function(){
-		// var reward_value = $('.ui.form').form('get value', 'dog')
-		// var reward_value = $('form').form('get value', 'dog')
-		// console.log(reward_value)
-		// alert(reward_value)
-		
-// 		$('.ui.green.button').click(function(){
-// 				$('.ui.form')
-// 					.form({
-// 						// on: 'blur',
-// 						inline: true,
-// 						fields: {
-// 							dog: {
-// 								identifier: 'dog',
-// 								rules: [
-// 									{
-// 										type: 'empty',
-// 										prompt: '请您输入项目奖励'
-// 									},
-// 									{
-// 										type   : 'integer[0..100]',
-// 										prompt : '项目奖励必须为整数，请您输入有效奖励金额'
-// 									}
-// 								]
-// 							}
-// 						},
-// 						onFailure: function(e){	
-// 							return false;
-// 						}
-// 				});
-// 			});
-// </script>
 {{if .PageIsComparePull}}
   <script>window.wipPrefixes = {{.PullRequestWorkInProgressPrefixes}}</script>
 {{end}}

templates/repo/issue/view_content/pull.tmpl

@@ -448,8 +448,8 @@
 	</div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/jquery@3.2.1/dist/jquery.min.js"></script>
-<script>
+<!-- <script src="https://cdn.jsdelivr.net/npm/jquery@3.2.1/dist/jquery.min.js"></script> -->
+<!-- <script>
 
 	$(document)
     .ready(function() {
@@ -477,4 +477,4 @@
 				});
 			});
 	})
-</script>
+</script> -->

web_src/js/components/MinioUploader.vue

@@ -81,7 +81,7 @@ export default {
       dictInvalidFileType: this.dropzoneParams.data('invalid-input-type'),
       dictFileTooBig: this.dropzoneParams.data('file-too-big'),
       dictRemoveFile: this.dropzoneParams.data('remove-file'),
-      // previewTemplate
+      previewTemplate
     });
     dropzoneUploader.on('addedfile', (file) => {
       setTimeout(() => {

web_src/js/components/ObsUploader.vue

@@ -82,7 +82,7 @@ export default {
       dictInvalidFileType: this.dropzoneParams.data('invalid-input-type'),
       dictFileTooBig: this.dropzoneParams.data('file-too-big'),
       dictRemoveFile: this.dropzoneParams.data('remove-file'),
-      // previewTemplate
+      previewTemplate
     });
     dropzoneUploader.on('addedfile', (file) => {
       setTimeout(() => {

web_src/js/components/WxAutorize.vue

@@ -15,7 +15,7 @@
                 <div class="wx-desc-bottom" style="color:#919191">微信扫码关注公众号即可完成绑定</div>
             </div>
             <div class="user-agreement">
-                <i class="ri-information-line orange"></i>绑定微信代表已阅读并接受<a>OpenI启智社区AI协作平台使用协议</a>
+                <i class="ri-information-line orange"></i>绑定微信代表已阅读并接受<a href="/home/term/"> OpenI启智社区AI协作平台使用协议</a>
             </div>
         </div>
     </div>

web_src/js/index.js

@@ -3622,7 +3622,7 @@ function initVueApp() {
         if (!window.location.search) {
           window.location.href = this.localHref + '?page='+val
         } else if (searchParams.has('page')) {
-          window.location.href = this.localHref.replace(/page=[0-9]/g,'page='+val)
+          window.location.href = this.localHref.replace(/page=[0-9]+/g,'page='+val)
         } else {
           window.location.href=location.href+'&page='+val
         }