Merge branch 'V20220801' into fix-2370

routers/repo/ai_model_manage.go

@@ -152,6 +152,10 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 }
 
 func SaveNewNameModel(ctx *context.Context) {
+	if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
+		ctx.Error(403, ctx.Tr("repo.model_noright"))
+		return
+	}
 	name := ctx.Query("Name")
 	if name == "" {
 		ctx.Error(500, fmt.Sprintf("name or version is null."))
@@ -169,6 +173,10 @@ func SaveNewNameModel(ctx *context.Context) {
 }
 
 func SaveModel(ctx *context.Context) {
+	if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
+		ctx.Error(403, ctx.Tr("repo.model_noright"))
+		return
+	}
 	log.Info("save model start.")
 	JobId := ctx.Query("JobId")
 	VersionName := ctx.Query("VersionName")
@@ -177,16 +185,8 @@ func SaveModel(ctx *context.Context) {
 	label := ctx.Query("Label")
 	description := ctx.Query("Description")
 	engine := ctx.QueryInt("Engine")
-	trainTaskCreate := ctx.QueryBool("trainTaskCreate")
 	modelSelectedFile := ctx.Query("modelSelectedFile")
 	log.Info("engine=" + fmt.Sprint(engine) + " modelSelectedFile=" + modelSelectedFile)
-	if !trainTaskCreate {
-		if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
-			//ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
-			ctx.JSON(403, ctx.Tr("repo.model_noright"))
-			return
-		}
-	}
 
 	if JobId == "" || VersionName == "" {
 		ctx.Error(500, fmt.Sprintf("JobId or VersionName is null."))

templates/repo/cloudbrain/inference/new.tmpl

@@ -421,7 +421,7 @@
                     identifier  : 'display_job_name',
                     rules: [
                     {
-                        type: 'regExp[/^[a-zA-Z0-9-_]{1,64}[^-]$/]',
+                        type: 'regExp[/^[a-zA-Z0-9-_]{1,64}[a-zA-Z0-9_]$/]',
                     }
                     ]
                 },
@@ -472,9 +472,9 @@
             document.getElementById("mask").style.display = "none"
         }
     }
+    validate();
     $('.ui.create_train_job.green.button').click(function(e) {
         send_run_para()
         get_name()
-        validate()
     })
 </script>

templates/repo/cloudbrain/new.tmpl

@@ -294,6 +294,27 @@
         context.value = ''
         $(".icon.icons").css("visibility", "hidden")
     }
+    function validate(){
+        $('.ui.form').form({
+            on: 'blur',
+            fields: {               
+                display_job_name:{
+                    identifier  : 'display_job_name',
+                    rules: [
+                    {
+                        type: 'regExp[/^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/]',
+                    }
+                    ]
+                },                
+            },
+            onSuccess: function(){                
+            },
+            onFailure: function(e){
+                return false;
+            }
+        })
+    }
+    validate();
     form.onsubmit = function (e) {
         let value_task = $("input[name='display_job_name']").val()
         let value_image = $("input[name='image']").val()

templates/repo/cloudbrain/trainjob/new.tmpl

@@ -483,9 +483,9 @@
         $("input#ai_flaver_name").val(name2)
 
     }
+    validate();
     $('.ui.create_train_job.green.button').click(function (e) {
         get_name()
-        send_run_para()
-        validate()
+        send_run_para()       
     })
 </script>

templates/repo/grampus/trainjob/gpu/new.tmpl

@@ -433,9 +433,9 @@
         $("input#ai_flavor_name").val(name2)
 
     }
+    validate();
     $('.ui.create_train_job.green.button').click(function(e) {
         get_name()
         send_run_para()
-        validate() 
     })
 </script>

templates/repo/grampus/trainjob/npu/new.tmpl

@@ -425,9 +425,9 @@
         $("input#trainjob_work_server_num").val(val_server_num_select)
 
     }
+    validate();
     $('.ui.create_train_job.green.button').click(function(e) {
         get_name()
         send_run_para()
-        validate()
     })
 </script>

templates/repo/modelarts/inferencejob/new.tmpl

@@ -438,7 +438,7 @@
                     identifier  : 'display_job_name',
                     rules: [
                     {
-                        type: 'regExp[/^[a-zA-Z0-9-_]{1,64}[^-]$/]',
+                        type: 'regExp[/^[a-zA-Z0-9-_]{1,64}[a-zA-Z0-9_]$/]',
                     }
                     ]
                 },
@@ -489,9 +489,9 @@
             document.getElementById("mask").style.display = "none"
         }
     }
+    validate();
     $('.ui.create_train_job.green.button').click(function(e) {
         send_run_para()
         get_name()
-        validate()
     })
 </script>

templates/repo/modelarts/notebook/new.tmpl

@@ -110,6 +110,28 @@
 
     $('#messageInfo').css('display','none')
 
+    function validate(){
+        $('.ui.form').form({
+            on: 'blur',
+            fields: {               
+                display_job_name:{
+                    identifier  : 'display_job_name',
+                    rules: [
+                    {
+                        type: 'regExp[/^[a-z0-9][a-z0-9-_]{1,36}$/]',
+                    }
+                    ]
+                },                
+            },
+            onSuccess: function(){                
+            },
+            onFailure: function(e){
+                return false;
+            }
+        })
+    }
+    validate();
+
     form.onsubmit = function(e){
         let value_task = $("input[name='display_job_name']").val()
 

templates/repo/modelarts/trainjob/new.tmpl

@@ -500,9 +500,9 @@
         $("input#trainjob_work_server_num").val(val_server_num_select)
 
     }
+    validate();
     $('.ui.create_train_job.green.button').click(function (e) {
         get_name()
         send_run_para()
-        validate()
     })
 </script>