fix: openai model validator

0xJacky · Jan 29, 2024 · da2c6d8 · da2c6d8
1 parent db832d0
commit da2c6d8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/app/src/views/preference/OpenAISettings.vue b/app/src/views/preference/OpenAISettings.vue
@@ -54,7 +54,7 @@ const errors: Record<string, Record<string, string>> = inject('errors') as Recor
     <AFormItem
       :label="$gettext('API Token')"
       :validate-status="errors?.openai?.token ? 'error' : ''"
-      :help="errors?.openai?.token === 'alphanumdash'
+      :help="errors?.openai?.token === 'alpha_num_dash_dot'
         ? $gettext('Token is not valid')
         : ''"
     >

diff --git a/internal/validation/alpha_num_dash_dot.go b/internal/validation/alpha_num_dash_dot.go
@@ -0,0 +1,10 @@
+package validation
+
+import (
+	val "github.com/go-playground/validator/v10"
+	"regexp"
+)
+
+func alphaNumDashDot(fl val.FieldLevel) bool {
+	return regexp.MustCompile(`^[a-zA-Z0-9-.]+$`).MatchString(fl.Field().String())
+}
diff --git a/internal/validation/alphanumdash.go b/internal/validation/alphanumdash.go
diff --git a/internal/validation/validation.go b/internal/validation/validation.go
@@ -12,7 +12,7 @@ func Init() {
 		logger.Fatal("binding validator engine is not initialized")
 	}
 
-	err := v.RegisterValidation("alphanumdash", alphaNumDash)
+	err := v.RegisterValidation("alpha_num_dash_dot", alphaNumDashDot)
 
 	if err != nil {
 		logger.Fatal(err)

diff --git a/settings/openai.go b/settings/openai.go
@@ -2,9 +2,9 @@ package settings
 
 type OpenAI struct {
 	BaseUrl string `json:"base_url" binding:"omitempty,url"`
-	Token   string `json:"token" binding:"omitempty,alphanumdash"`
+	Token   string `json:"token" binding:"omitempty,alpha_num_dash_dot"`
 	Proxy   string `json:"proxy" binding:"omitempty,url"`
-	Model   string `json:"model" binding:"omitempty,alphanumdash"`
+	Model   string `json:"model" binding:"omitempty,alpha_num_dash_dot"`
 }
 
 var OpenAISettings = OpenAI{}