Merge pull request #937 from Abirdcfly/fixbool

fix: app enableUploadFile cant set to false
kubeagi · Mar 27, 2024 · 797f359 · 797f359
2 parents 696905e + 557aa33
commit 797f359
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/api/base/v1alpha1/application_types.go b/api/base/v1alpha1/application_types.go
@@ -58,7 +58,7 @@ type WebConfig struct {
 	ShowRetrievalInfo bool `json:"showRetrievalInfo,omitempty"`
 	ShowNextGuide     bool `json:"showNextGuide,omitempty"`
 	// +kubebuilder:default:=true
-	EnableUploadFile bool `json:"enableUploadFile,omitempty"`
+	EnableUploadFile *bool `json:"enableUploadFile,omitempty"`
 }
 
 type Node struct {

diff --git a/api/base/v1alpha1/zz_generated.deepcopy.go b/api/base/v1alpha1/zz_generated.deepcopy.go
diff --git a/apiserver/pkg/application/application.go b/apiserver/pkg/application/application.go
@@ -101,7 +101,7 @@ func cr2app(prompt *apiprompt.Prompt, chainConfig *apichain.CommonChainConfig, r
 		ShowRetrievalInfo: pointer.Bool(app.Spec.ShowRetrievalInfo),
 		DocNullReturn:     pointer.String(app.Spec.DocNullReturn),
 		ChatTimeout:       pointer.Float64(app.Spec.ChatTimeoutSecond),
-		EnableUploadFile:  pointer.Bool(app.Spec.EnableUploadFile),
+		EnableUploadFile:  app.Spec.EnableUploadFile,
 	}
 	if prompt != nil {
 		gApp.UserPrompt = pointer.String(prompt.Spec.UserMessage)
@@ -741,7 +741,9 @@ func mutateApp(app *v1alpha1.Application, input generated.UpdateApplicationConfi
 	app.Spec.ShowNextGuide = pointer.BoolDeref(input.ShowNextGuide, app.Spec.ShowNextGuide)
 	app.Spec.DocNullReturn = pointer.StringDeref(input.DocNullReturn, app.Spec.DocNullReturn)
 	app.Spec.ChatTimeoutSecond = pointer.Float64Deref(input.ChatTimeout, v1alpha1.DefaultChatTimeoutSeconds)
-	app.Spec.EnableUploadFile = pointer.BoolDeref(input.EnableUploadFile, app.Spec.EnableUploadFile)
+	if input.EnableUploadFile != nil {
+		app.Spec.EnableUploadFile = input.EnableUploadFile
+	}
 	return nil
 }
 

diff --git a/apiserver/service/chat.go b/apiserver/service/chat.go
@@ -226,7 +226,7 @@ func (cs *ChatService) ChatFile() gin.HandlerFunc {
 			c.JSON(http.StatusBadRequest, chat.ErrorResp{Err: err.Error()})
 			return
 		}
-		if !app.Spec.EnableUploadFile {
+		if pointer.BoolDeref(app.Spec.EnableUploadFile, false) {
 			c.JSON(http.StatusForbidden, chat.ErrorResp{Err: "file upload is not enabled"})
 			return
 		}