Browse Source

Merge pull request 'fix-473后端部分' (#579) from fix-473 into V20211101

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/579
Reviewed-by: lewis <747342561@qq.com>
pull/580/head
lewis 3 years ago
parent
commit
934a121f99
3 changed files with 12 additions and 1 deletions
  1. +1
    -0
      options/locale/locale_zh-CN.ini
  2. +7
    -0
      routers/repo/cloudbrain.go
  3. +4
    -1
      routers/repo/modelarts.go

+ 1
- 0
options/locale/locale_zh-CN.ini View File

@@ -776,6 +776,7 @@ cloudbrain_creator=创建者
cloudbrain_task=任务名称 cloudbrain_task=任务名称
cloudbrain_operate=操作 cloudbrain_operate=操作
cloudbrain_status_createtime=状态/创建时间 cloudbrain_status_createtime=状态/创建时间
cloudbrain_jobname_err=只能以小写字母或数字开头且只包含小写字母、数字、_和-,不能以_结尾,最长36个字符。


template.items=模板选项 template.items=模板选项
template.git_content=Git数据(默认分支) template.git_content=Git数据(默认分支)


+ 7
- 0
routers/repo/cloudbrain.go View File

@@ -40,6 +40,8 @@ var (
categories *models.Categories categories *models.Categories
) )


var jobNamePattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$`)

// MustEnableDataset check if repository enable internal cb // MustEnableDataset check if repository enable internal cb
func MustEnableCloudbrain(ctx *context.Context) { func MustEnableCloudbrain(ctx *context.Context) {
if !ctx.Repo.CanRead(models.UnitTypeCloudBrain) { if !ctx.Repo.CanRead(models.UnitTypeCloudBrain) {
@@ -200,6 +202,11 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
gpuQueue := setting.JobType gpuQueue := setting.JobType
codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
resourceSpecId := form.ResourceSpecId resourceSpecId := form.ResourceSpecId
if !jobNamePattern.MatchString(jobName) {
ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tplModelArtsNew, &form)
return
}


if jobType != string(models.JobTypeBenchmark) && jobType != string(models.JobTypeDebug) && jobType != string(models.JobTypeSnn4imagenet) && jobType != string(models.JobTypeBrainScore) { if jobType != string(models.JobTypeBenchmark) && jobType != string(models.JobTypeDebug) && jobType != string(models.JobTypeSnn4imagenet) && jobType != string(models.JobTypeBrainScore) {
log.Error("jobtype error:", jobType, ctx.Data["MsgID"]) log.Error("jobtype error:", jobType, ctx.Data["MsgID"])


+ 4
- 1
routers/repo/modelarts.go View File

@@ -100,7 +100,10 @@ func ModelArtsCreate(ctx *context.Context, form auth.CreateModelArtsForm) {
uuid := form.Attachment uuid := form.Attachment
description := form.Description description := form.Description
//repo := ctx.Repo.Repository //repo := ctx.Repo.Repository

if !jobNamePattern.MatchString(jobName) {
ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tplModelArtsNew, &form)
return
}
err := modelarts.GenerateTask(ctx, jobName, uuid, description) err := modelarts.GenerateTask(ctx, jobName, uuid, description)
if err != nil { if err != nil {
ctx.RenderWithErr(err.Error(), tplModelArtsNew, &form) ctx.RenderWithErr(err.Error(), tplModelArtsNew, &form)


Loading…
Cancel
Save