diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 079eea2a3..ad95dd6f8 100755 --- a/modules/modelarts/resty.go +++ b/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) } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ff0cfedea..7d1d7a3e0 100644 --- a/options/locale/locale_en-US.ini +++ b/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 @@ -808,10 +809,10 @@ modelarts.train_job.fast_parameter_setting=fast_parameter_setting modelarts.train_job.fast_parameter_setting_config=fast_parameter_setting_config modelarts.train_job.fast_parameter_setting_config_link=fast_parameter_setting_config_link modelarts.train_job.frames=frames -modelarts.train_job.algorithm_origin=算法来源 +modelarts.train_job.algorithm_origin=Algorithm Origin modelarts.train_job.AI_driver=AI Engine modelarts.train_job.start_file=Start File -modelarts.train_job.boot_file_helper=启动文件是您程序执行的入口文件，必须是以.py结尾的文件。 +modelarts.train_job.boot_file_helper=The startup file is the entry file that your program executes, and it must be a file ending in .py modelarts.train_job.dataset=Dataset modelarts.train_job.run_parameter=Run Parameter modelarts.train_job.add_run_parameter=Add Run Parameter @@ -822,8 +823,8 @@ modelarts.train_job.resource_setting_info=resource_setting_info modelarts.train_job.resource_pool=resource_pool modelarts.train_job.resource_type=resource_type modelarts.train_job.standard=Standard -modelarts.train_job.NAS_address=NAS地址 -modelarts.train_job.NAS_mount_path=NAS挂载路径 +modelarts.train_job.NAS_address=NAS Address +modelarts.train_job.NAS_mount_path=NAS Mount Path modelarts.train_job.query_whether_save_parameter=query_whether_save_parameter modelarts.train_job.save_helper=save_helper modelarts.train_job.common_frame=common_frame diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index d6ac9f870..81b4a8459 100755 --- a/options/locale/locale_zh-CN.ini +++ b/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=确定 diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index a49d4026f..03fba6cd1 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -321,6 +321,11 @@ func CloudBrainShow(ctx *context.Context) { func CloudBrainDebug(ctx *context.Context) { var jobID = ctx.Params(":jobid") + if !ctx.IsSigned { + log.Error("the user has not signed in") + ctx.Error(http.StatusForbidden, "","the user has not signed in") + return + } task, err := models.GetCloudbrainByJobID(jobID) if err != nil { ctx.ServerError("GetCloudbrainByJobID failed", err) @@ -333,6 +338,11 @@ func CloudBrainDebug(ctx *context.Context) { func CloudBrainCommitImage(ctx *context.Context, form auth.CommitImageCloudBrainForm) { var jobID = ctx.Params(":jobid") + if !ctx.IsSigned { + log.Error("the user has not signed in") + ctx.Error(http.StatusForbidden, "","the user has not signed in") + return + } task, err := models.GetCloudbrainByJobID(jobID) if err != nil { ctx.JSON(200, map[string]string{ diff --git a/templates/repo/cloudbrain/index.tmpl b/templates/repo/cloudbrain/index.tmpl index 2201cd272..9099cb17a 100755 --- a/templates/repo/cloudbrain/index.tmpl +++ b/templates/repo/cloudbrain/index.tmpl @@ -254,8 +254,8 @@ Ascend NPU - - {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}} + {{if .Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}}{{end}} @@ -357,15 +357,27 @@ {{end}} + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} {{$.i18n.Tr "repo.debug"}} + {{else}} + + {{$.i18n.Tr "repo.debug"}} + + {{end}}
{{$.CsrfTokenHtml}} + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} {{$.i18n.Tr "repo.stop"}} + {{else}} + + {{$.i18n.Tr "repo.stop"}} + + {{end}}
@@ -376,16 +388,25 @@ + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} {{$.i18n.Tr "repo.submit_image"}} - + {{else}} + {{$.i18n.Tr "repo.submit_image"}} + {{end}}
{{$.CsrfTokenHtml}} + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} {{$.i18n.Tr "repo.delete"}} + {{else}} + + {{$.i18n.Tr "repo.delete"}} + + {{end}}
diff --git a/templates/repo/modelarts/notebook/index.tmpl b/templates/repo/modelarts/notebook/index.tmpl index 721089727..021394a07 100755 --- a/templates/repo/modelarts/notebook/index.tmpl +++ b/templates/repo/modelarts/notebook/index.tmpl @@ -224,8 +224,8 @@ Ascend NPU - - {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}} + {{if .Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}}{{end}} @@ -310,15 +310,29 @@
+ --> + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} {{$.i18n.Tr "repo.debug"}} + {{else}} + + {{$.i18n.Tr "repo.debug"}} + + {{end}} +
{{$.CsrfTokenHtml}} - + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.stop"}} + {{else}} + + {{$.i18n.Tr "repo.stop"}} + + {{end}} +
@@ -337,9 +351,15 @@
{{$.CsrfTokenHtml}} - + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.delete"}} + {{else}} + + {{$.i18n.Tr "repo.delete"}} + + {{end}}
@@ -457,17 +477,23 @@ } 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"){ + if(status=="STOPPED" || status=="FAILED" ){ $('#stop-model-debug-'+jobID).removeClass('blue') $('#stop-model-debug-'+jobID).addClass('disabled') $('#model-delete-'+jobID).removeClass('disabled') $('#model-delete-'+jobID).addClass('red') } + 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); }); diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl index eee186b38..4337d6de8 100755 --- a/templates/repo/modelarts/trainjob/index.tmpl +++ b/templates/repo/modelarts/trainjob/index.tmpl @@ -247,8 +247,8 @@ Ascend NPU - - {{$.i18n.Tr "repo.modelarts.train_job.new_train"}} + {{if .Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.modelarts.train_job.new_train"}}{{end}} @@ -291,7 +291,7 @@ {{$.i18n.Tr "repo.cloudbrain_creator"}}
- {{$.i18n.Tr "repo.cloudbrain_operate"}} + {{$.i18n.Tr "repo.cloudbrain_operate"}}
@@ -354,9 +354,15 @@ -->
{{$.CsrfTokenHtml}} - + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.stop"}} + {{else}} + + {{$.i18n.Tr "repo.stop"}} + + {{end}}
@@ -373,9 +379,15 @@
{{$.CsrfTokenHtml}} - + {{if $.Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.delete"}} + {{else}} + + {{$.i18n.Tr "repo.delete"}} + + {{end}}
@@ -529,6 +541,10 @@ $('#model-delete-'+jobID).removeClass('disabled') $('#model-delete-'+jobID).addClass('red') } + if(status=="START_FAILED"){ + $('#stop-model-debug-'+jobID).removeClass('blue') + $('#stop-model-debug-'+jobID).addClass('disabled') + } }).fail(function(err) { console.log(err); }); diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl index 3e3e2fc2a..6e98158d9 100755 --- a/templates/repo/modelarts/trainjob/new.tmpl +++ b/templates/repo/modelarts/trainjob/new.tmpl @@ -165,7 +165,7 @@ -->
- +