Merge branch 'V20211228' into fix-981

README.md

@@ -46,3 +46,6 @@
  - 点击[这里](https://git.openi.org.cn/OpenI/aiforge/issues)在线提交问题（点击页面右上角绿色按钮**创建任务**）
  - 加入微信群实时交流，获得进一步的支持
    <img src="https://git.openi.org.cn/OpenI/aiforge/wiki/raw/img/wechatgroup.jpg" width=200px />
+
+## 启智社区小白训练营：
+- 结合案例给大家详细讲解如何使用社区平台，帮助无技术背景的小白成长为启智社区达人 (https://git.openi.org.cn/zeizei/OpenI_Learning)

options/locale/locale_en-US.ini

@@ -903,6 +903,8 @@ model.manage.F1 = F1
 model.manage.Precision = Precision
 model.manage.Recall = Recall
 model.manage.sava_model = Sava Model
+model.manage.model_manage = ModelManage
+model.manage.model_accuracy = Model Accuracy
 
 template.items = Template Items
 template.git_content = Git Content (Default Branch)

options/locale/locale_zh-CN.ini

@@ -913,6 +913,8 @@ model.manage.F1 = F1值
 model.manage.Precision = 精确率
 model.manage.Recall = 召回率
 model.manage.sava_model =  保存模型
+model.manage.model_manage = 模型管理
+model.manage.model_accuracy = 模型精度
 
 template.items=模板选项
 template.git_content=Git数据(默认分支)

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{}{
@@ -325,21 +324,3 @@ func ModelList(ctx *context.APIContext) {
 		"PageIsCloudBrain": true,
 	})
 }
-
-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
-}

routers/repo/cloudbrain.go

@@ -294,7 +294,7 @@ func CloudBrainRestart(ctx *context.Context) {
 			if count >= 1 {
 				log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
 				resultCode = "-1"
-				errorMsg = "the user already has running or waiting task"
+				errorMsg = "you have already a running or waiting task, can not create more"
 				break
 			}
 		}

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
+}

templates/repo/debugjob/index.tmpl

@@ -334,10 +334,15 @@
                                                 </a>
                                                 {{end}}
                                             {{else}}
-                                            
-                                            <a  class="ui basic disabled button">
-                                                {{$.i18n.Tr "repo.debug_again"}}
-                                            </a>
+                                                {{if eq .Status "RUNNING"}}
+                                                    <a  class="ui basic disabled button">
+                                                        {{$.i18n.Tr "repo.debug"}}
+                                                    </a>
+                                                {{else}}
+                                                <a  class="ui basic disabled button">
+                                                    {{$.i18n.Tr "repo.debug_again"}}
+                                                </a>
+                                                {{end}}
                                             {{end}}
                                         </form>
                                         

templates/repo/issue/list.tmpl

@@ -4,6 +4,7 @@
 	}
 	.ovfl{
 		overflow-y:hidden !important;
+		min-width: 140px!important;
 	}
 </style>
 {{template "base/head" .}}

templates/repo/modelmanage/showinfo.tmpl

@@ -69,7 +69,7 @@
                 <!-- <a href="javascript:window.history.back();"><i class="arrow left icon"></i>返回</a> -->
             <div class="ui breadcrumb">
                 <a class="section" href="{{$.RepoLink}}/modelmanage/show_model">
-                    模型管理 
+                    {{$.i18n.Tr "repo.model.manage.model_manage"}}
                 </a>
                 <div class="divider"> / </div>
                 <div class="active section">{{.name}}</div>
@@ -83,15 +83,15 @@
                 <table class="tableStyle" style="margin-top:20px;">
                     <tbody>
                         <tr>
-                            <td class="ti-text-form-label text-width80">模型名称</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.model_name"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="ModelName" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">版本</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.version"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="Version" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">标签</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.migrate_items_labels"}}</td>
                             <td class="ti-text-form-content">
                                 <div id="Label" style="overflow: hidden;width: 95%;">
                                     
@@ -101,15 +101,15 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">大小</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.model_size"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="Size" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">创建时间</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.createtime"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="CreateTime" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">模型描述</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.description"}}</td>
                             <td class="ti-text-form-content" >
                                 <div id="edit-td" style="display:flex">
                                     <span id="Description" title="" class="iword-elipsis"></span>
@@ -118,38 +118,42 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">代码版本</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.code_version"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="CodeBranch" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">启动文件</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.start_file"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="BootFile" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">训练数据集</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="DatasetName" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">运行参数</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="Parameters" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">规格</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}}</td>
+                            <td class="ti-text-form-content word-elipsis"><span id="EngineName" title=""></span></td>
+                        </tr>
+                        <tr>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.standard"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="FlavorName" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">计算节点</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.compute_node"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="WorkServerNumber" title=""></span></td>
                         </tr>
                     </tbody>
                 </table>
             </div>
             <div class="half-table">
-                <span class="model_header_text">模型精度</span>
+                <span class="model_header_text">{{$.i18n.Tr "repo.model.manage.model_accuracy"}}</span>
                 <table class="tableStyle" style="margin-top:20px;">
                     <tbody>
                         <tr>
-                            <td class="ti-text-form-label text-width80">准确率</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.Accuracy"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="Accuracy" title=""></span></td>
                         </tr>
                         <tr>
@@ -157,11 +161,11 @@
                             <td class="ti-text-form-content word-elipsis"><span id="F1" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">精确率</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.Precision"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="Precision" title=""></span></td>
                         </tr>
                         <tr>
-                            <td class="ti-text-form-label text-width80">召回率</td>
+                            <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.Recall"}}</td>
                             <td class="ti-text-form-content word-elipsis"><span id="Recall" title=""></span></td>
                         </tr>
                     </tbody>
@@ -209,11 +213,9 @@ function transObj(data){
     let modelAcc = JSON.parse(Accuracy)
     TrainTaskInfo = JSON.parse(TrainTaskInfo)
     // Parameters = JSON.parse(Parameters)
-    console.log("TrainTaskInfo",TrainTaskInfo)
-    let {Parameters} = TrainTaskInfo
+    let {Parameters,EngineName} = TrainTaskInfo
     Parameters = JSON.parse(Parameters)
     Parameters = Parameters.parameter.length === 0 ? '--':Parameters.parameter
-    console.log(Parameters)
     let size = tranSize(Size) 
     let time = transTime(CreatedUnix)
     let initObj = {
@@ -230,7 +232,8 @@ function transObj(data){
         Parameters:TrainTaskInfo.Parameters || '--',
         FlavorName:TrainTaskInfo.FlavorName || '--',
         WorkServerNumber:TrainTaskInfo.WorkServerNumber || '--',
-        Parameters:Parameters
+        Parameters:Parameters,
+        EngineName:EngineName,
     }
     let initModelAcc = {
         Accuracy: modelAcc.Accuracy || '--',
@@ -319,7 +322,6 @@ function renderInfo(obj,accObj,id){
 
         }
         else if(key==="Parameters"){
-            console.log("obj[key",obj[key])
             if(obj[key]==='--'){
                 $(`#${key}`).text(obj[key])
             }else{
@@ -328,7 +330,6 @@ function renderInfo(obj,accObj,id){
                 return labelValue
                 });
                 const parameter = parameterArray.join(';  ')
-                console.log(parameter)
                 $(`#${key}`).text(parameter)
                 $(`#${key}`).attr("title",parameter)
             }