Merge pull request 'fix issue' (#672) from liuzx_trainjob into V20211101

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/672
Reviewed-by: lewis <747342561@qq.com>

modules/modelarts/resty.go

@@ -366,10 +366,14 @@ sendjob:
 			return &result, fmt.Errorf("json.Unmarshal failed(%s): %v", res.String(), err.Error())
 		}
 		log.Error("createTrainJob failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
-		if res.StatusCode() == 400 {
+		if temp.ErrorCode == "ModelArts.0404" {
 			temp.ErrorCode = "0404"
 			temp.ErrorMsg = "启动文件未找到！"
 		}
+		if temp.ErrorCode == "ModelArts.0104" {
+			temp.ErrorCode = "0104"
+			temp.ErrorMsg = "运行参数错误！"
+		}
 		return &result, fmt.Errorf("createTrainJob failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
 	}
 

options/locale/locale_en-US.ini

@@ -792,6 +792,7 @@ modelarts.train_job.new_debug= New Debug Task
 modelarts.train_job.new_train=New Train Task
 modelarts.train_job.config=Configuration information
 modelarts.train_job.new=New train Task
+modelarts.train_job.new_place=The description should not exceed 256 characters
 
 
 

options/locale/locale_zh-CN.ini

@@ -793,16 +793,17 @@ modelarts.train_job.new_debug=新建调试任务
 modelarts.train_job.new_train=新建训练任务
 modelarts.train_job.config=配置信息
 modelarts.train_job.new=新建训练任务
+modelarts.train_job.new_place=描述字数不超过256个字符
 
 
 
 modelarts.train_job.basic_info=基本信息
-modelarts.train_job.job_status=作业状态
-modelarts.train_job.job_name=作业名称
-modelarts.train_job.version=作业版本
+modelarts.train_job.job_status=任务状态
+modelarts.train_job.job_name=任务名称
+modelarts.train_job.version=任务版本
 modelarts.train_job.start_time=开始时间
 modelarts.train_job.dura_time=运行时长
-modelarts.train_job.description=作业描述
+modelarts.train_job.description=任务描述
 modelarts.train_job.parameter_setting=参数设置
 modelarts.train_job.parameter_setting_info=参数信息
 modelarts.train_job.fast_parameter_setting=一键式参数配置
@@ -830,12 +831,12 @@ modelarts.train_job.query_whether_save_parameter=保存作业参数
 modelarts.train_job.save_helper=保存当前作业的配置参数，后续您可以使用已保存的配置参数快速创建训练作业。
 modelarts.train_job.common_frame=常用框架
 modelarts.train_job.amount_of_compute_node=计算节点个数
-modelarts.train_job.job_parameter_name=作业参数名称
-modelarts.train_job.parameter_description=作业参数描述
+modelarts.train_job.job_parameter_name=任务参数名称
+modelarts.train_job.parameter_description=任务参数描述
 modelarts.log=日志
 modelarts.version_manage=版本管理
 modelarts.back=返回
-modelarts.train_job_para_admin=作业参数管理
+modelarts.train_job_para_admin=任务参数管理
 modelarts.train_job_para.edit=编辑
 modelarts.train_job_para.connfirm=确定
 

templates/repo/modelarts/notebook/index.tmpl

@@ -324,7 +324,7 @@
                                         <form id="stopForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/stop" method="post" style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
                                             {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
-                                            <a id="stop-model-debug-{{.JobID}}" style="margin-right: 2rem;" class="ui basic {{if or (eq .Status "STOPPED") (eq .Status "FAILED") (eq .Status "START_FAILED")}}disabled {{else}}blue {{end}}button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
+                                            <a id="stop-model-debug-{{.JobID}}" style="margin-right: 2rem;" class="ui basic {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING" "WAITING"}}disabled {{else}}blue {{end}}button" onclick="document.getElementById('stopForm-{{.JobID}}').submit();">
                                                 {{$.i18n.Tr "repo.stop"}}
                                             </a>
                                             {{else}}
@@ -352,7 +352,7 @@
                                     <form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
                                         {{$.CsrfTokenHtml}}
                                         {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
-                                        <a id="model-delete-{{.JobID}}" class="ui compact {{if eq .Status "RUNNING"}}disabled {{else}}red {{end}}button" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
+                                        <a id="model-delete-{{.JobID}}" class="ui compact {{if eq .Status "RUNNING" "CREATING" "WAITING" "STARTING" "STOPPING" }}disabled {{else}}red {{end}}button" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
                                             {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                         {{else}}
@@ -477,10 +477,10 @@
 
                 }
                 if(status!=="STOPPED" || status!=="FAILED"){
-                   $('#stop-model-debug-'+jobID).removeClass('disabled')
-                   $('#stop-model-debug-'+jobID).addClass('blue')
-                   $('#model-delete-'+jobID).removeClass('red')
-                   $('#model-delete-'+jobID).addClass('disabled')
+                //    $('#stop-model-debug-'+jobID).removeClass('disabled')
+                //    $('#stop-model-debug-'+jobID).addClass('blue')
+                //    $('#model-delete-'+jobID).removeClass('red')
+                //    $('#model-delete-'+jobID).addClass('disabled')
                 }
                 if(status=="STOPPED" || status=="FAILED" ){
                    $('#stop-model-debug-'+jobID).removeClass('blue')
@@ -491,6 +491,8 @@
                 if(status=="START_FAILED"){
                     $('#stop-model-debug-'+jobID).removeClass('blue')
                     $('#stop-model-debug-'+jobID).addClass('disabled')
+                    $('#model-delete-'+jobID).removeClass('disabled')
+                    $('#model-delete-'+jobID).addClass('red')
                 }
             }).fail(function(err) {
                 console.log(err);

templates/repo/modelarts/trainjob/index.tmpl

@@ -291,7 +291,7 @@
                                     <span>{{$.i18n.Tr "repo.cloudbrain_creator"}}</span> 
                                 </div>
                                 <div class="five wide column text center">
-                                    <span>{{$.i18n.Tr "repo.cloudbrain_operate"}}</span>
+                                    <span style="margin-left: 6rem;">{{$.i18n.Tr "repo.cloudbrain_operate"}}</span>
                                 </div>
 
                             </div>
@@ -380,7 +380,7 @@
                                     <form class="ui compact buttons" id="delForm-{{.JobID}}" action="{{$.Link}}/{{.JobID}}/del" method="post">
                                         {{$.CsrfTokenHtml}}
                                         {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
-                                        <a id="model-delete-{{.JobID}}" class="ui compact {{if eq .Status "RUNNING" }}disabled {{else}}red {{end}}button" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
+                                        <a id="model-delete-{{.JobID}}" class="ui compact {{if or (eq .Status "RUNNING") (eq .Status "INIT")  (eq .Status "CREATING") (eq .Status "WAITING") }}disabled {{else}}red {{end}}button" onclick="assertDelete(this)" style="border-radius: .28571429rem;">
                                             {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                         {{else}}

templates/repo/modelarts/trainjob/new.tmpl

@@ -165,7 +165,7 @@
                 -->
                 <div class="unite min_title inline field">
                     <label for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}&nbsp;&nbsp;</label>
-                    <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="256" placeholder="描述字符不超过256个字符" onchange="this.value=this.value.substring(0, 256)" onkeydown="this.value=this.value.substring(0, 256)" onkeyup="this.value=this.value.substring(0, 256)"></textarea>
+                    <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="256" placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}} onchange="this.value=this.value.substring(0, 256)" onkeydown="this.value=this.value.substring(0, 256)" onkeyup="this.value=this.value.substring(0, 256)"></textarea>
                 </div>
                 <!-- <h4 class="ui dividing header">{{.i18n.Tr "repo.modelarts.train_job.parameter_setting"}}</h4>
                 <div class="inline field">