Merge branch 'pretrainmodel' of git.openi.org.cn:OpenI/aiforge into pretrainmodel

options/locale/locale_zh-CN.ini

@@ -3249,6 +3249,8 @@ load_code_failed=代码加载失败，请确认选择了正确的分支。
 
 
 error.dataset_select = 数据集选择错误：数量超过限制或者有同名数据集
+new_train_gpu_tooltips =训练脚本存储在<strong style="color:#010101">%s</strong>中，数据集存储在<strong style="color:#010101">%s</strong>中，训练输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。
+new_infer_gpu_tooltips = 数据集存储在<strong style="color:#010101">%s</strong>中，模型文件存储在<strong style="color:#010101">%s</strong>中，推理输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。
 
 [points]
 points = 积分
@@ -3260,5 +3262,4 @@ expected_time =	，预计可用
 points_acquisition_instructions = 积分获取说明
 insufficient_points_balance = 积分余额不足
 
-new_train_gpu_tooltips =训练脚本存储在<strong style="color:#010101">%s</strong>中，数据集存储在<strong style="color:#010101">%s</strong>中，训练输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。
-new_infer_gpu_tooltips = 数据集存储在<strong style="color:#010101">%s</strong>中，模型文件存储在<strong style="color:#010101">%s</strong>中，推理输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。
+

templates/admin/cloudbrain/list.tmpl

@@ -259,6 +259,14 @@
                                         </a>
                                         {{end}}
                                     </div>
+                                    <!-- 修改任务 -->
+                                    {{if eq .JobType "TRAIN"}}
+                                    <div class="ui compact buttons">
+                                        <a style="padding: 0.5rem 1rem;" class="ui basic blue button" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 1}}/modelarts/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 0}}/cloudbrain/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 2}}/grampus/train-job/{{.JobID}}{{end}}/create_version{{if .VersionName}}?version_name={{.VersionName}}{{end}}">
+                                            {{$.i18n.Tr "repo.modelarts.modify"}}
+                                        </a>
+                                    </div>
+                                    {{end}}
                                     <!-- 删除任务 -->
                                     <form class="ui compact buttons" id="delForm-{{$JobID}}"
                                         action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}/cloudbrain{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .Cloudbrain.Type 1}}/modelarts/train-job{{else if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{else if eq .Cloudbrain.Type 2}}/grampus/train-job{{end}}{{else if eq .JobType "INFERENCE"}}{{if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{end}}{{end}}/{{$JobID}}/del?isadminpage=true'

templates/repo/cloudbrain/trainjob/show.tmpl

@@ -251,12 +251,11 @@
                         <span class="accordion-panel-title-content">
                             <span>
                                  <div style="float: right;">
-                                    {{if and ($.canDownload) (eq .Status "SUCCEEDED") ($.Permission.CanWrite $.UnitTypeModelManage) }}
+                                    {{if and ($.canDownload) (ne .Status "WAITING") ($.Permission.CanWrite $.UnitTypeModelManage) }}
                                     <a class="ti-action-menu-item" id="{{.VersionName}}-create-model"
                                         onclick="showcreate({{.}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{else}}
-                                    <a class="ti-action-menu-item disabled" id="{{.VersionName}}-create-model"
-                                        onclick="showcreate({{.}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
+                                    <a class="ti-action-menu-item disabled" id="{{.VersionName}}-create-model">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{end}}
 
                                 </div>
@@ -633,7 +632,7 @@
                             <label for="modelSelectedFile">{{.i18n.Tr "repo.model.manage.modelfile"}}</label>
                         </div>
                         <div class="thirteen wide field" style="position:relative">
-                            <input id="modelSelectedFile" type="text"  readonly required onclick="showMenu();"  name="modelSelectedFile" >
+                            <input id="modelSelectedFile" type="text"  readonly required onclick="showMenu();"  name="modelSelectedFile">
                             <div id="menuContent" class="menuContent" style="display:none;">
                                 <ul id="treeDemo" class="ztree"></ul>
                             </div>
@@ -839,6 +838,10 @@
             .modal('show')
     }
     function createModel() {
+        if(!$('input#modelSelectedFile').val()){
+            $('input#modelSelectedFile').parent().addClass('error')
+            return  
+        }
         let url_href = `/${userName}/${repoPath}/modelmanage/create_new_model`
         let data = $("#formId").serialize()
         $("#mask").css({ "display": "block", "z-index": "9999" })

templates/repo/grampus/trainjob/show.tmpl

@@ -263,12 +263,11 @@
 
                                 </div>
                                  <div style="float: right;">
-                                    {{if and ($.canDownload) (eq .Status "SUCCEEDED") ($.Permission.CanWrite $.UnitTypeModelManage) }}
+                                    {{if and ($.canDownload) (ne .Status "WAITING") ($.Permission.CanWrite $.UnitTypeModelManage) }}
                                     <a class="ti-action-menu-item" id="{{.VersionName}}-create-model"
                                         onclick="showcreate({{.}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{else}}
-                                    <a class="ti-action-menu-item disabled" id="{{.VersionName}}-create-model"
-                                        onclick="showcreate({{.}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
+                                    <a class="ti-action-menu-item disabled" id="{{.VersionName}}-create-model">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{end}}
 
                                 </div>
@@ -832,6 +831,11 @@
             .modal('show')
     }
     function createModel() {
+        if(!$('input#modelSelectedFile').val()){
+            $('input#modelSelectedFile').parent().addClass('error')
+            return
+            
+        }
         let url_href = `/${userName}/${repoPath}/modelmanage/create_new_model`
         let data = $("#formId").serialize()
         $("#mask").css({ "display": "block", "z-index": "9999" })

templates/repo/modelarts/trainjob/index.tmpl

@@ -172,7 +172,7 @@
                                     
                                     <div class="ui compact buttons">
                                         {{$.CsrfTokenHtml}}
-                                        {{if .CanDel}}
+                                        {{if .CanModify}}
                                         <a style="padding: 0.5rem 1rem;" class="ui basic blue button" href="{{if eq .Cloudbrain.Type 1}}{{$.Link}}/{{.JobID}}{{else if eq .Cloudbrain.Type 0}}{{$.RepoLink}}/cloudbrain/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 2}}{{$.RepoLink}}/grampus/train-job/{{.JobID}}{{end}}/create_version{{if .VersionName}}?version_name={{.VersionName}}{{end}}">
                                             {{$.i18n.Tr "repo.modelarts.modify"}}
                                         </a>

templates/repo/modelarts/trainjob/show.tmpl

@@ -251,8 +251,7 @@
                                     <a class="ti-action-menu-item" id="{{.VersionName}}-create-model"
                                         onclick="showcreate({{.}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{else}}
-                                    <a class="ti-action-menu-item disabled" id="{{.VersionName}}-create-model"
-                                        onclick="showcreate({{.}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
+                                    <a class="ti-action-menu-item disabled" id="{{.VersionName}}-create-model">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{end}}
 
                                     {{if .CanModify}}
@@ -892,6 +891,10 @@
             .modal('show')
     }
     function createModel() {
+        if(!$('input#modelSelectedFile').val()){
+            $('input#modelSelectedFile').parent().addClass('error')
+            return  
+        }
         let url_href = `/${userName}/${repoPath}/modelmanage/create_new_model`
         let data = $("#formId").serialize()
         $("#mask").css({ "display": "block", "z-index": "9999" })

templates/user/dashboard/cloudbrains.tmpl

@@ -230,6 +230,14 @@
                                     </div>
 
                                     {{end}}
+                                    <!-- 修改任务 -->
+                                    {{if eq .JobType "TRAIN"}}
+                                    <div class="ui compact buttons">
+                                        <a style="padding: 0.5rem 1rem;" class="ui basic blue button" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 1}}/modelarts/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 0}}/cloudbrain/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 2}}/grampus/train-job/{{.JobID}}{{end}}/create_version{{if .VersionName}}?version_name={{.VersionName}}{{end}}">
+                                            {{$.i18n.Tr "repo.modelarts.modify"}}
+                                        </a>
+                                    </div>
+                                    {{end}}
                                     <!-- 删除任务 -->
                                     <form class="ui compact buttons" id="delForm-{{$JobID}}"
                                         action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}/cloudbrain{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .Cloudbrain.Type 1}}/modelarts/train-job{{else if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{else if eq .Cloudbrain.Type 2}}/grampus/train-job{{end}}{{else if eq .JobType "INFERENCE"}}{{if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{end}}{{end}}/{{$JobID}}/del?ishomepage=true'