Enhance knowledge base configuration by normalizing and validating custom instruction fields. Implemented length checks for prompt instructions and added tests for validation logic. Updated GraphSettings to retain custom instructions when extraction is disabled.

This commit is contained in:
wizardchen
2026-07-13 12:14:36 +08:00
committed by lyingbug
parent c1cddb4d4d
commit 5eefa70e6f
9 changed files with 158 additions and 35 deletions
+37 -1
View File
@@ -404,6 +404,8 @@ func (h *InitializationHandler) UpdateKBConfig(c *gin.Context) {
Relations: relations,
CustomInstructions: strings.TrimSpace(req.NodeExtract.CustomInstructions),
}
} else if kb.ExtractConfig != nil {
kb.ExtractConfig.Enabled = false
} else {
kb.ExtractConfig = &types.ExtractConfig{Enabled: false}
}
@@ -433,6 +435,7 @@ func (h *InitializationHandler) UpdateKBConfig(c *gin.Context) {
CustomInstructions: strings.TrimSpace(req.QuestionGeneration.CustomInstructions),
}
}
types.NormalizeKnowledgeBasePromptInstructions(kb)
if err := validateKnowledgeBasePromptInstructions(kb); err != nil {
c.Error(err)
return
@@ -1470,6 +1473,20 @@ func (h *InitializationHandler) buildConfigResponse(ctx context.Context, models
} else {
config["multimodal"].(map[string]interface{})["enabled"] = hasMultimodal
}
if kb.VLMConfig.DescriptionLanguage != "" || kb.VLMConfig.CustomInstructions != "" {
if config["multimodal"] == nil {
config["multimodal"] = map[string]interface{}{
"enabled": hasMultimodal,
}
}
multimodal := config["multimodal"].(map[string]interface{})
if kb.VLMConfig.DescriptionLanguage != "" {
multimodal["descriptionLanguage"] = kb.VLMConfig.DescriptionLanguage
}
if kb.VLMConfig.CustomInstructions != "" {
multimodal["customInstructions"] = kb.VLMConfig.CustomInstructions
}
}
// 如果没有Rerank模型,设置rerank为disabled
if config["rerank"] == nil {
@@ -1499,6 +1516,9 @@ func (h *InitializationHandler) buildConfigResponse(ctx context.Context, models
if len(kb.ChunkingConfig.Languages) > 0 {
ds["languages"] = kb.ChunkingConfig.Languages
}
if kb.ChunkingConfig.TableMetadataInstructions != "" {
ds["tableMetadataInstructions"] = kb.ChunkingConfig.TableMetadataInstructions
}
config["documentSplitting"] = ds
// 添加多模态的存储配置信息(优先读新字段,兼容旧 cos_config)
@@ -1533,19 +1553,35 @@ func (h *InitializationHandler) buildConfigResponse(ctx context.Context, models
}
if kb.ExtractConfig != nil {
config["nodeExtract"] = map[string]interface{}{
nodeExtract := map[string]interface{}{
"enabled": kb.ExtractConfig.Enabled,
"text": kb.ExtractConfig.Text,
"tags": kb.ExtractConfig.Tags,
"nodes": kb.ExtractConfig.Nodes,
"relations": kb.ExtractConfig.Relations,
}
if kb.ExtractConfig.CustomInstructions != "" {
nodeExtract["customInstructions"] = kb.ExtractConfig.CustomInstructions
}
config["nodeExtract"] = nodeExtract
} else {
config["nodeExtract"] = map[string]interface{}{
"enabled": false,
}
}
if kb.QuestionGenerationConfig != nil {
config["questionGeneration"] = map[string]interface{}{
"enabled": kb.QuestionGenerationConfig.Enabled,
"questionCount": kb.QuestionGenerationConfig.QuestionCount,
"customInstructions": kb.QuestionGenerationConfig.CustomInstructions,
}
} else {
config["questionGeneration"] = map[string]interface{}{
"enabled": false,
}
}
return config
}
+4 -23
View File
@@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
stderrors "errors"
"fmt"
"net/http"
"strconv"
"strings"
@@ -362,6 +361,7 @@ func (h *KnowledgeBaseHandler) CreateKnowledgeBase(c *gin.Context) {
c.Error(err)
return
}
types.NormalizeKnowledgeBasePromptInstructions(&req)
if err := validateKnowledgeBasePromptInstructions(&req); err != nil {
c.Error(err)
return
@@ -1249,7 +1249,7 @@ func validateExtractConfig(config *types.ExtractConfig) error {
return nil
}
if !config.Enabled {
*config = types.ExtractConfig{Enabled: false}
config.Enabled = false
return nil
}
// Validate text field
@@ -1310,27 +1310,8 @@ func validateExtractConfig(config *types.ExtractConfig) error {
}
func validateKnowledgeBasePromptInstructions(kb *types.KnowledgeBase) error {
if kb == nil {
return nil
}
fields := map[string]string{
"table metadata instructions": kb.ChunkingConfig.TableMetadataInstructions,
"image instructions": kb.VLMConfig.CustomInstructions,
}
if kb.WikiConfig != nil {
fields["wiki content instructions"] = kb.WikiConfig.ContentInstructions
fields["wiki extraction instructions"] = kb.WikiConfig.ExtractionInstructions
}
if kb.QuestionGenerationConfig != nil {
fields["question generation instructions"] = kb.QuestionGenerationConfig.CustomInstructions
}
if kb.ExtractConfig != nil {
fields["graph extraction instructions"] = kb.ExtractConfig.CustomInstructions
}
for name, value := range fields {
if len([]rune(value)) > types.MaxCustomPromptInstructionsLength {
return apperrors.NewBadRequestError(fmt.Sprintf("%s exceeds %d characters", name, types.MaxCustomPromptInstructionsLength))
}
if err := types.ValidateKnowledgeBasePromptInstructions(kb); err != nil {
return apperrors.NewBadRequestError(err.Error())
}
return nil
}