From ce893839956c6f78e81093d203919006aae629d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=BD?= Date: Fri, 12 Jun 2026 22:20:23 +0800 Subject: [PATCH 01/15] =?UTF-8?q?feat(knowledge):=20=E6=98=8E=E7=A1=AE?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=20RAG=20=E9=85=8D=E7=BD=AE=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/endpoints/knowledge.py | 1 + backend/app/schemas/knowledge.py | 6 +- .../app/services/knowledge/orchestrator.py | 167 +++++++++++++----- .../services/knowledge/test_orchestrator.py | 136 ++++++++++++++ docs/en/reference/yaml-specification.md | 16 ++ .../knowledge/configuring-retrievers.md | 12 +- docs/zh/reference/yaml-specification.md | 16 ++ .../knowledge/configuring-retrievers.md | 12 +- .../components/CreateKnowledgeBaseDialog.tsx | 42 ++++- .../document/components/KnowledgeBaseForm.tsx | 4 + .../document/components/KnowledgeDialogs.tsx | 1 + .../KnowledgeDocumentPageMobile.tsx | 1 + .../document/hooks/useKnowledgeBaseDialogs.ts | 1 + frontend/src/i18n/locales/en/knowledge.json | 7 + .../src/i18n/locales/zh-CN/knowledge.json | 7 + frontend/src/types/knowledge.ts | 2 + 16 files changed, 376 insertions(+), 55 deletions(-) diff --git a/backend/app/api/endpoints/knowledge.py b/backend/app/api/endpoints/knowledge.py index 7cd28516cf6..4edb7beb2e2 100644 --- a/backend/app/api/endpoints/knowledge.py +++ b/backend/app/api/endpoints/knowledge.py @@ -394,6 +394,7 @@ def create_knowledge_base( namespace=data.namespace or "default", kb_type=data.kb_type or "notebook", summary_enabled=data.summary_enabled, + rag_config_mode=data.rag_config_mode, retrieval_config=( data.retrieval_config.model_dump() if data.retrieval_config else None ), diff --git a/backend/app/schemas/knowledge.py b/backend/app/schemas/knowledge.py index dd987233837..9feec3e6039 100644 --- a/backend/app/schemas/knowledge.py +++ b/backend/app/schemas/knowledge.py @@ -8,7 +8,7 @@ from datetime import datetime from enum import Enum -from typing import Dict, List, Optional +from typing import Dict, List, Literal, Optional from pydantic import BaseModel, Field, field_validator, model_validator @@ -107,6 +107,10 @@ class KnowledgeBaseCreate(BaseModel): retrieval_config: Optional[RetrievalConfig] = Field( None, description="Retrieval configuration" ) + rag_config_mode: Literal["auto", "manual", "disabled"] = Field( + "auto", + description="RAG configuration mode: auto-fill, manual validation, or disabled", + ) summary_enabled: bool = Field( default=False, description="Enable automatic summary generation for documents", diff --git a/backend/app/services/knowledge/orchestrator.py b/backend/app/services/knowledge/orchestrator.py index 2d3f1f84af4..14c7e75443e 100644 --- a/backend/app/services/knowledge/orchestrator.py +++ b/backend/app/services/knowledge/orchestrator.py @@ -276,6 +276,107 @@ def get_default_embedding_model( "model_namespace": first.get("namespace", "default"), } + def _resolve_retrieval_config( + self, + *, + db: Session, + user: User, + namespace: str, + retrieval_config: Optional[Dict[str, Any]], + rag_config_mode: Literal["auto", "manual", "disabled"] = "auto", + retriever_name: Optional[str] = None, + retriever_namespace: Optional[str] = None, + embedding_model_name: Optional[str] = None, + embedding_model_namespace: Optional[str] = None, + ) -> Optional[Dict[str, Any]]: + """Resolve retrieval config according to the caller's explicit intent.""" + if rag_config_mode == "disabled": + return None + + resolved_config = dict(retrieval_config or {}) + embedding_config = dict(resolved_config.get("embedding_config") or {}) + + retriever_name = resolved_config.get("retriever_name") or retriever_name + retriever_namespace = ( + resolved_config.get("retriever_namespace") or retriever_namespace + ) + embedding_model_name = ( + embedding_config.get("model_name") or embedding_model_name + ) + embedding_model_namespace = ( + embedding_config.get("model_namespace") or embedding_model_namespace + ) + + if rag_config_mode == "manual": + if not retriever_name or not embedding_model_name: + raise ValueError( + "Manual RAG configuration requires retriever_name and " + "embedding_config.model_name" + ) + return self._build_complete_retrieval_config( + base_config=resolved_config, + retriever_name=retriever_name, + retriever_namespace=retriever_namespace, + embedding_model_name=embedding_model_name, + embedding_model_namespace=embedding_model_namespace, + ) + + if not retriever_name: + default_retriever = self.get_default_retriever(db, user.id, namespace) + if default_retriever: + retriever_name = default_retriever["retriever_name"] + retriever_namespace = default_retriever["retriever_namespace"] + + if not embedding_model_name: + default_embedding = self.get_default_embedding_model(db, user.id, namespace) + if default_embedding: + embedding_model_name = default_embedding["model_name"] + embedding_model_namespace = default_embedding["model_namespace"] + + if not retriever_name or not embedding_model_name: + logger.warning( + "[Orchestrator] Could not build retrieval_config: " + "retriever=%s, embedding=%s", + retriever_name, + embedding_model_name, + ) + return None + + logger.info( + "[Orchestrator] Built retrieval_config: retriever=%s, embedding=%s", + retriever_name, + embedding_model_name, + ) + return self._build_complete_retrieval_config( + base_config=resolved_config, + retriever_name=retriever_name, + retriever_namespace=retriever_namespace, + embedding_model_name=embedding_model_name, + embedding_model_namespace=embedding_model_namespace, + ) + + def _build_complete_retrieval_config( + self, + *, + base_config: Dict[str, Any], + retriever_name: str, + retriever_namespace: Optional[str], + embedding_model_name: str, + embedding_model_namespace: Optional[str], + ) -> Dict[str, Any]: + """Build the only retrieval_config shape allowed to be persisted.""" + resolved_config = dict(base_config) + resolved_config["retriever_name"] = retriever_name + resolved_config["retriever_namespace"] = retriever_namespace or "default" + resolved_config["embedding_config"] = { + "model_name": embedding_model_name, + "model_namespace": embedding_model_namespace or "default", + } + resolved_config.setdefault("retrieval_mode", "vector") + resolved_config.setdefault("top_k", 5) + resolved_config.setdefault("score_threshold", 0.5) + return resolved_config + def get_task_model_as_summary_model( self, db: Session, @@ -959,6 +1060,7 @@ def create_knowledge_base( namespace: str = "default", kb_type: str = "notebook", summary_enabled: bool = False, + rag_config_mode: Literal["auto", "manual", "disabled"] = "auto", # REST API scenario: pass complete config retrieval_config: Optional[Dict[str, Any]] = None, # MCP scenario: auto-select or explicitly specify @@ -973,11 +1075,12 @@ def create_knowledge_base( """ Create a knowledge base with auto-configuration support. - Supports two modes: - 1. REST API mode: Pass complete retrieval_config dict - 2. MCP mode: Auto-select or specify individual retriever/embedding params + Supports three RAG configuration modes: + 1. auto: Auto-select missing retriever/embedding while preserving tuning fields + 2. manual: Require a complete retrieval_config dict + 3. disabled: Create a knowledge base without RAG - Auto-selection logic (when retrieval_config is None): + Auto-selection logic (when rag_config_mode is auto): 1. retriever: If not specified, auto-select using get_default_retriever() 2. embedding: If not specified, auto-select using get_default_embedding_model() 3. summary_model: If not specified and summary_enabled=True: @@ -992,6 +1095,7 @@ def create_knowledge_base( namespace: Namespace (default for personal, group name for group) kb_type: Type (notebook or classic) summary_enabled: Enable summary generation + rag_config_mode: RAG configuration mode retrieval_config: Complete retrieval config dict (REST API mode) retriever_name: Optional retriever name (MCP mode) retriever_namespace: Optional retriever namespace (MCP mode) @@ -1009,53 +1113,22 @@ def create_knowledge_base( logger.info( f"[Orchestrator] create_knowledge_base called: name={name}, namespace={namespace}, " f"kb_type={kb_type}, summary_enabled={summary_enabled}, task_id={task_id}, " + f"rag_config_mode={rag_config_mode}, " f"user_id={user.id}, has_retrieval_config={retrieval_config is not None}, " f"has_summary_model_ref={summary_model_ref is not None}" ) - # Use provided retrieval_config or build one from individual params - resolved_retrieval_config = retrieval_config - - if resolved_retrieval_config is None: - # MCP mode: auto-select or use provided individual params - # Auto-select retriever if not specified - if retriever_name is None: - default_retriever = self.get_default_retriever(db, user.id, namespace) - if default_retriever: - retriever_name = default_retriever["retriever_name"] - retriever_namespace = default_retriever["retriever_namespace"] - - # Auto-select embedding model if not specified - if embedding_model_name is None: - default_embedding = self.get_default_embedding_model( - db, user.id, namespace - ) - if default_embedding: - embedding_model_name = default_embedding["model_name"] - embedding_model_namespace = default_embedding["model_namespace"] - - # Build retrieval_config if we have both retriever and embedding - if retriever_name and embedding_model_name: - resolved_retrieval_config = { - "retriever_name": retriever_name, - "retriever_namespace": retriever_namespace or "default", - "embedding_config": { - "model_name": embedding_model_name, - "model_namespace": embedding_model_namespace or "default", - }, - "retrieval_mode": "vector", - "top_k": 5, - "score_threshold": 0.5, - } - logger.info( - f"[Orchestrator] Built retrieval_config: retriever={retriever_name}, " - f"embedding={embedding_model_name}" - ) - else: - logger.warning( - f"[Orchestrator] Could not build retrieval_config: " - f"retriever={retriever_name}, embedding={embedding_model_name}" - ) + resolved_retrieval_config = self._resolve_retrieval_config( + db=db, + user=user, + namespace=namespace, + retrieval_config=retrieval_config, + rag_config_mode=rag_config_mode, + retriever_name=retriever_name, + retriever_namespace=retriever_namespace, + embedding_model_name=embedding_model_name, + embedding_model_namespace=embedding_model_namespace, + ) # Auto-select summary model if summary_enabled and not specified resolved_summary_model_ref = summary_model_ref diff --git a/backend/tests/services/knowledge/test_orchestrator.py b/backend/tests/services/knowledge/test_orchestrator.py index 412ba29dbba..587d439e311 100644 --- a/backend/tests/services/knowledge/test_orchestrator.py +++ b/backend/tests/services/knowledge/test_orchestrator.py @@ -171,6 +171,142 @@ def test_get_default_embedding_model_returns_none_when_user_not_found( assert result is None + def test_resolve_retrieval_config_completes_partial_frontend_payload( + self, orchestrator, mock_db, mock_user + ): + """Test partial retrieval config is completed before it is persisted.""" + partial_config = { + "retrieval_mode": "vector", + "top_k": 5, + "score_threshold": 0.5, + "embedding_config": { + "model_name": "embedding-1", + "model_namespace": "default", + }, + } + + with patch.object( + orchestrator, + "get_default_retriever", + return_value={ + "retriever_name": "retriever-1", + "retriever_namespace": "default", + }, + ) as mock_get_retriever: + with patch.object( + orchestrator, "get_default_embedding_model" + ) as mock_get_embedding: + result = orchestrator._resolve_retrieval_config( + db=mock_db, + user=mock_user, + namespace="default", + retrieval_config=partial_config, + ) + + assert result == { + "retriever_name": "retriever-1", + "retriever_namespace": "default", + "embedding_config": { + "model_name": "embedding-1", + "model_namespace": "default", + }, + "retrieval_mode": "vector", + "top_k": 5, + "score_threshold": 0.5, + } + mock_get_retriever.assert_called_once_with(mock_db, mock_user.id, "default") + mock_get_embedding.assert_not_called() + + def test_resolve_retrieval_config_returns_none_when_defaults_unavailable( + self, orchestrator, mock_db, mock_user + ): + """Test unresolved partial retrieval config is not persisted.""" + partial_config = { + "retrieval_mode": "vector", + "top_k": 5, + "score_threshold": 0.5, + } + + with patch.object( + orchestrator, "get_default_retriever", return_value=None + ) as mock_get_retriever: + with patch.object( + orchestrator, "get_default_embedding_model", return_value=None + ) as mock_get_embedding: + result = orchestrator._resolve_retrieval_config( + db=mock_db, + user=mock_user, + namespace="default", + retrieval_config=partial_config, + ) + + assert result is None + mock_get_retriever.assert_called_once_with(mock_db, mock_user.id, "default") + mock_get_embedding.assert_called_once_with(mock_db, mock_user.id, "default") + + def test_resolve_retrieval_config_disabled_returns_none( + self, orchestrator, mock_db, mock_user + ): + """Test disabled mode creates a knowledge base without RAG.""" + result = orchestrator._resolve_retrieval_config( + db=mock_db, + user=mock_user, + namespace="default", + retrieval_config={ + "retriever_name": "retriever-1", + "embedding_config": {"model_name": "embedding-1"}, + }, + rag_config_mode="disabled", + ) + + assert result is None + + def test_resolve_retrieval_config_manual_requires_complete_config( + self, orchestrator, mock_db, mock_user + ): + """Test manual mode rejects partial retrieval config.""" + with pytest.raises(ValueError, match="Manual RAG configuration requires"): + orchestrator._resolve_retrieval_config( + db=mock_db, + user=mock_user, + namespace="default", + retrieval_config={"retrieval_mode": "vector"}, + rag_config_mode="manual", + ) + + def test_resolve_retrieval_config_manual_does_not_auto_select( + self, orchestrator, mock_db, mock_user + ): + """Test manual mode validates config without default selection.""" + with patch.object(orchestrator, "get_default_retriever") as mock_get_retriever: + with patch.object( + orchestrator, "get_default_embedding_model" + ) as mock_get_embedding: + result = orchestrator._resolve_retrieval_config( + db=mock_db, + user=mock_user, + namespace="default", + retrieval_config={ + "retriever_name": "retriever-1", + "embedding_config": {"model_name": "embedding-1"}, + }, + rag_config_mode="manual", + ) + + assert result == { + "retriever_name": "retriever-1", + "retriever_namespace": "default", + "embedding_config": { + "model_name": "embedding-1", + "model_namespace": "default", + }, + "retrieval_mode": "vector", + "top_k": 5, + "score_threshold": 0.5, + } + mock_get_retriever.assert_not_called() + mock_get_embedding.assert_not_called() + def test_get_task_model_returns_none_when_task_not_found( self, orchestrator, mock_db ): diff --git a/docs/en/reference/yaml-specification.md b/docs/en/reference/yaml-specification.md index e121fbd0442..2b70c7de4a1 100644 --- a/docs/en/reference/yaml-specification.md +++ b/docs/en/reference/yaml-specification.md @@ -345,6 +345,22 @@ spec: KnowledgeBase is used to manage document knowledge bases, retrieval configuration, and summary capabilities. +### Retrieval Configuration + +| Field | Type | Required | Description | +|------|------|----------|-------------| +| `spec.retrievalConfig` | object | No | RAG retrieval configuration. Missing or `null` means the knowledge base has no RAG configuration | +| `spec.retrievalConfig.retriever_name` | string | Yes* | Retriever name | +| `spec.retrievalConfig.retriever_namespace` | string | No | Namespace where the retriever is defined, defaults to `default` | +| `spec.retrievalConfig.embedding_config.model_name` | string | Yes* | Embedding model name | +| `spec.retrievalConfig.embedding_config.model_namespace` | string | No | Namespace where the embedding model is defined, defaults to `default` | +| `spec.retrievalConfig.retrieval_mode` | string | No | Retrieval mode: `vector`, `keyword`, or `hybrid` | +| `spec.retrievalConfig.top_k` | integer | No | Number of results to return | +| `spec.retrievalConfig.score_threshold` | number | No | Minimum relevance threshold | +| `spec.retrievalConfig.hybrid_weights` | object | No | Hybrid retrieval weights | + +`retriever_name` and `embedding_config.model_name` are required only when `spec.retrievalConfig` exists. The create API field `rag_config_mode` expresses creation intent only (auto, manual, or disabled) and is not persisted as a KnowledgeBase YAML field. The persisted stable states are either a complete `retrievalConfig` or no `retrievalConfig`. + ### Summary-Related Configuration | Field | Type | Required | Description | diff --git a/docs/en/user-guide/knowledge/configuring-retrievers.md b/docs/en/user-guide/knowledge/configuring-retrievers.md index bc285fc8344..cce9a2d0efe 100644 --- a/docs/en/user-guide/knowledge/configuring-retrievers.md +++ b/docs/en/user-guide/knowledge/configuring-retrievers.md @@ -381,7 +381,17 @@ This approach is **less efficient** than RAG retrieval: ### Setting Up No-RAG Mode -1. **Create Knowledge Base**: In the create dialog, skip the retrieval configuration section +When creating a knowledge base, **RAG Configuration** in **Advanced Settings** provides three modes: + +| Mode | Behavior | Best For | +|------|----------|----------| +| Auto | The system selects an available retriever and embedding model while preserving retrieval parameters you changed | Recommended default | +| Manual | You must explicitly select both a retriever and an embedding model; creation is blocked if either one is missing | Fixed storage backend or model requirements | +| Disabled | Creates a no-RAG knowledge base without writing retrieval configuration | No vector database, small knowledge bases, or testing | + +To create a no-RAG knowledge base: + +1. **Create Knowledge Base**: Open advanced settings in the create dialog and set **RAG Configuration** to **Disabled** 2. **Upload Documents**: Documents are stored but not indexed for RAG 3. **Start Chatting**: AI will automatically use exploration tools diff --git a/docs/zh/reference/yaml-specification.md b/docs/zh/reference/yaml-specification.md index 82cbe6f2919..b75f43bfd34 100644 --- a/docs/zh/reference/yaml-specification.md +++ b/docs/zh/reference/yaml-specification.md @@ -345,6 +345,22 @@ spec: KnowledgeBase 用于管理文档知识库、检索配置和摘要能力。 +### 检索配置 + +| 字段 | 类型 | 必填 | 说明 | +|------|------|------|------| +| `spec.retrievalConfig` | object | 否 | RAG 检索配置。缺失或为 `null` 时表示无 RAG 知识库 | +| `spec.retrievalConfig.retriever_name` | string | 是* | 检索器名称 | +| `spec.retrievalConfig.retriever_namespace` | string | 否 | 检索器所在 namespace,默认 `default` | +| `spec.retrievalConfig.embedding_config.model_name` | string | 是* | Embedding 模型名称 | +| `spec.retrievalConfig.embedding_config.model_namespace` | string | 否 | Embedding 模型所在 namespace,默认 `default` | +| `spec.retrievalConfig.retrieval_mode` | string | 否 | 检索模式:`vector`、`keyword` 或 `hybrid` | +| `spec.retrievalConfig.top_k` | integer | 否 | 返回结果数量 | +| `spec.retrievalConfig.score_threshold` | number | 否 | 最低相关性阈值 | +| `spec.retrievalConfig.hybrid_weights` | object | 否 | 混合检索权重 | + +`retriever_name` 和 `embedding_config.model_name` 只有在 `spec.retrievalConfig` 存在时必填。创建 API 中的 `rag_config_mode` 只表达创建意图(自动配置、手动选择或不启用),不会作为 KnowledgeBase YAML 字段持久化。持久化后的稳定状态只有两种:完整的 `retrievalConfig`,或无 `retrievalConfig`。 + ### 摘要相关配置 | 字段 | 类型 | 必填 | 说明 | diff --git a/docs/zh/user-guide/knowledge/configuring-retrievers.md b/docs/zh/user-guide/knowledge/configuring-retrievers.md index c858be9e30e..90ae9e1bf52 100644 --- a/docs/zh/user-guide/knowledge/configuring-retrievers.md +++ b/docs/zh/user-guide/knowledge/configuring-retrievers.md @@ -381,7 +381,17 @@ AI:让我探索知识库以查找相关信息。 ### 设置无 RAG 模式 -1. **创建知识库**:在创建对话框中,跳过检索配置部分 +创建知识库时,**高级设置** 中的 **RAG 配置** 提供三种模式: + +| 模式 | 行为 | 适用场景 | +|------|------|----------| +| 自动配置 | 系统自动选择可用的检索器和 Embedding 模型,并保留您调整过的检索参数 | 推荐默认选项 | +| 手动选择 | 必须明确选择检索器和 Embedding 模型,缺少任一项时不能创建 | 需要固定存储后端或模型时 | +| 不启用 | 创建无 RAG 知识库,不写入检索配置 | 没有向量库、小型知识库或测试场景 | + +无 RAG 模式的创建步骤: + +1. **创建知识库**:在创建对话框中打开高级设置,将 **RAG 配置** 设为 **不启用** 2. **上传文档**:文档被存储但不进行 RAG 索引 3. **开始聊天**:AI 将自动使用探索工具 diff --git a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx index d2980965df5..757a155d012 100644 --- a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx +++ b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx @@ -27,6 +27,7 @@ import type { SummaryModelRef, KnowledgeBaseType, RetrievalConfig, + RagConfigMode, InitialMember, MemberRole, } from '@/types/knowledge' @@ -49,6 +50,7 @@ interface CreateKnowledgeBaseDialogProps { name: string description?: string retrieval_config?: Partial + rag_config_mode?: RagConfigMode summary_enabled?: boolean summary_model_ref?: SummaryModelRef | null guided_questions?: string[] @@ -117,6 +119,7 @@ export function CreateKnowledgeBaseDialog({ const [summaryModelRef, setSummaryModelRef] = useState(null) const [summaryModelError, setSummaryModelError] = useState('') const [guidedQuestions, setGuidedQuestions] = useState([]) + const [ragConfigMode, setRagConfigMode] = useState('auto') const [retrievalConfig, setRetrievalConfig] = useState>({ retrieval_mode: 'vector', top_k: 5, @@ -185,9 +188,6 @@ export function CreateKnowledgeBaseDialog({ return } - // Note: retrieval_config is now optional - users can create KB without RAG - // AI will use kb_ls/kb_head tools to explore documents instead of RAG search - try { // Filter out empty guided questions const validGuidedQuestions = guidedQuestions.filter(q => q.trim().length > 0) @@ -197,11 +197,19 @@ export function CreateKnowledgeBaseDialog({ role: e.role, entity_display_name: e.label, })) as InitialMember[] + const hasCompleteRetrievalConfig = + retrievalConfig.retriever_name && retrievalConfig.embedding_config?.model_name + if (ragConfigMode === 'manual' && !hasCompleteRetrievalConfig) { + setError(t('knowledge:document.ragConfigMode.manualIncomplete')) + setAccordionValue('advanced') + return + } await onSubmit({ name: name.trim(), description: description.trim() || undefined, - retrieval_config: retrievalConfig, + retrieval_config: ragConfigMode === 'disabled' ? undefined : retrievalConfig, + rag_config_mode: ragConfigMode, summary_enabled: summaryEnabled, summary_model_ref: summaryEnabled ? summaryModelRef : null, guided_questions: @@ -221,6 +229,7 @@ export function CreateKnowledgeBaseDialog({ setSummaryEnabled(true) setSummaryModelRef(null) setGuidedQuestions([]) + setRagConfigMode('auto') setRetrievalConfig({ retrieval_mode: 'vector', top_k: 5, @@ -248,6 +257,7 @@ export function CreateKnowledgeBaseDialog({ setSummaryModelRef(null) setSummaryModelError('') setGuidedQuestions([]) + setRagConfigMode('auto') setRetrievalConfig({ retrieval_mode: 'vector', top_k: 5, @@ -284,6 +294,7 @@ export function CreateKnowledgeBaseDialog({ // Determine if this is a notebook type const isNotebook = selectedKbType === 'notebook' + const ragModeOptions: RagConfigMode[] = ['auto', 'manual', 'disabled'] return ( @@ -402,7 +413,28 @@ export function CreateKnowledgeBaseDialog({ advancedOpen={accordionValue === 'advanced'} onAdvancedOpenChange={open => setAccordionValue(open ? 'advanced' : '')} advancedDescription={t('knowledge:document.advancedSettings.collapsed')} - showRetrievalSection={true} + retrievalModeSection={ +
+ +
+ {ragModeOptions.map(mode => ( + + ))} +
+
+ } + showRetrievalSection={ragConfigMode !== 'disabled'} retrievalConfig={retrievalConfig} onRetrievalConfigChange={setRetrievalConfig} retrievalScope={effectiveScope} diff --git a/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx b/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx index cdf9f78001d..efa86b9c4ba 100644 --- a/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx +++ b/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx @@ -46,6 +46,7 @@ interface KnowledgeBaseFormProps { advancedOpen: boolean onAdvancedOpenChange: (open: boolean) => void advancedDescription?: string + retrievalModeSection?: ReactNode showRetrievalSection: boolean retrievalConfig: Partial onRetrievalConfigChange: (config: Partial) => void @@ -82,6 +83,7 @@ export function KnowledgeBaseForm({ advancedOpen, onAdvancedOpenChange, advancedDescription, + retrievalModeSection, showRetrievalSection, retrievalConfig, onRetrievalConfigChange, @@ -183,6 +185,8 @@ export function KnowledgeBaseForm({ + {retrievalModeSection} + {showRetrievalSection && ( + rag_config_mode?: RagConfigMode summary_enabled?: boolean summary_model_ref?: SummaryModelRef | null /** Knowledge base display type: 'notebook' (three-column with chat) or 'classic' (document list only) */ From 2ffb96c86292a37707fbbb4da5d8e547641ddb57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=BD?= Date: Fri, 12 Jun 2026 23:30:51 +0800 Subject: [PATCH 02/15] =?UTF-8?q?fix(docker):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AE=B9=E5=99=A8=E5=90=AF=E5=8A=A8=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3656be7e543..5486de0ff5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -162,7 +162,6 @@ services: # - RUNTIME_OTEL_ENABLED=false # - RUNTIME_OTEL_SERVICE_NAME=wegent-frontend # - RUNTIME_OTEL_COLLECTOR_ENDPOINT=http://localhost:4318 - working_dir: /app depends_on: - backend networks: From 4d860622041914901c1631d1112497adcc26abf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=BD?= Date: Fri, 12 Jun 2026 23:49:52 +0800 Subject: [PATCH 03/15] =?UTF-8?q?refactor(knowledge):=20=E7=AE=80=E5=8C=96?= =?UTF-8?q?=20RAG=20=E8=87=AA=E5=8A=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/endpoints/knowledge.py | 1 - backend/app/schemas/kind.py | 19 +++-- backend/app/schemas/knowledge.py | 28 +++++-- .../app/services/knowledge/orchestrator.py | 31 +------ .../services/knowledge/test_orchestrator.py | 81 ++++++++++--------- docs/en/reference/yaml-specification.md | 2 +- .../knowledge/configuring-retrievers.md | 18 +---- docs/zh/reference/yaml-specification.md | 2 +- .../knowledge/configuring-retrievers.md | 18 +---- .../components/CreateKnowledgeBaseDialog.tsx | 47 ++--------- .../components/EditKnowledgeBaseDialog.tsx | 6 +- .../document/components/KnowledgeBaseForm.tsx | 14 ++-- .../document/components/KnowledgeDialogs.tsx | 1 - .../KnowledgeDocumentPageMobile.tsx | 1 - .../components/RetrievalSettingsSection.tsx | 21 +---- .../document/hooks/useKnowledgeBaseDialogs.ts | 1 - frontend/src/i18n/locales/en/knowledge.json | 8 -- .../src/i18n/locales/zh-CN/knowledge.json | 8 -- frontend/src/types/knowledge.ts | 20 ++++- 19 files changed, 122 insertions(+), 205 deletions(-) diff --git a/backend/app/api/endpoints/knowledge.py b/backend/app/api/endpoints/knowledge.py index 4edb7beb2e2..7cd28516cf6 100644 --- a/backend/app/api/endpoints/knowledge.py +++ b/backend/app/api/endpoints/knowledge.py @@ -394,7 +394,6 @@ def create_knowledge_base( namespace=data.namespace or "default", kb_type=data.kb_type or "notebook", summary_enabled=data.summary_enabled, - rag_config_mode=data.rag_config_mode, retrieval_config=( data.retrieval_config.model_dump() if data.retrieval_config else None ), diff --git a/backend/app/schemas/kind.py b/backend/app/schemas/kind.py index bf22047b7e1..f720aabdc69 100644 --- a/backend/app/schemas/kind.py +++ b/backend/app/schemas/kind.py @@ -810,6 +810,13 @@ class EmbeddingModelRef(BaseModel): model_namespace: str = Field("default", description="Embedding model namespace") +class CompleteEmbeddingModelRef(BaseModel): + """Complete reference to an Embedding Model.""" + + model_name: str = Field(..., min_length=1, description="Embedding model name") + model_namespace: str = Field("default", description="Embedding model namespace") + + class RetrieverRef(BaseModel): """Reference to a Retriever""" @@ -835,16 +842,12 @@ def model_post_init(self, __context): class RetrievalConfig(BaseModel): - """Retrieval configuration for knowledge base - - Note: retriever_name and embedding_config are optional to support knowledge bases - that don't use RAG (using kb_ls/kb_head tools instead for document exploration). - """ + """Complete retrieval configuration for a RAG-enabled knowledge base.""" - retriever_name: Optional[str] = Field(None, description="Retriever name") + retriever_name: str = Field(..., min_length=1, description="Retriever name") retriever_namespace: str = Field("default", description="Retriever namespace") - embedding_config: Optional[EmbeddingModelRef] = Field( - None, description="Embedding model configuration" + embedding_config: CompleteEmbeddingModelRef = Field( + ..., description="Embedding model configuration" ) retrieval_mode: str = Field( "vector", description="Retrieval mode: 'vector', 'keyword', or 'hybrid'" diff --git a/backend/app/schemas/knowledge.py b/backend/app/schemas/knowledge.py index 9feec3e6039..34d4cced6d4 100644 --- a/backend/app/schemas/knowledge.py +++ b/backend/app/schemas/knowledge.py @@ -8,7 +8,7 @@ from datetime import datetime from enum import Enum -from typing import Dict, List, Literal, Optional +from typing import Dict, List, Optional from pydantic import BaseModel, Field, field_validator, model_validator @@ -94,6 +94,26 @@ class InitialMemberCreate(BaseModel): ) +class RetrievalConfigCreate(BaseModel): + """Partial retrieval configuration accepted during knowledge base creation.""" + + retriever_name: Optional[str] = Field(None, description="Retriever name") + retriever_namespace: str = Field("default", description="Retriever namespace") + embedding_config: Optional[EmbeddingModelRef] = Field( + None, description="Embedding model configuration" + ) + retrieval_mode: str = Field( + "vector", description="Retrieval mode: 'vector', 'keyword', or 'hybrid'" + ) + top_k: int = Field(5, ge=1, le=10, description="Number of results to return") + score_threshold: float = Field( + 0.7, ge=0.0, le=1.0, description="Minimum score threshold" + ) + hybrid_weights: Optional[HybridWeights] = Field( + None, description="Hybrid search weights" + ) + + class KnowledgeBaseCreate(BaseModel): """Schema for creating a knowledge base.""" @@ -104,13 +124,9 @@ class KnowledgeBaseCreate(BaseModel): "notebook", description="Knowledge base type: 'notebook' (3-column layout with chat) or 'classic' (document list only)", ) - retrieval_config: Optional[RetrievalConfig] = Field( + retrieval_config: Optional[RetrievalConfigCreate] = Field( None, description="Retrieval configuration" ) - rag_config_mode: Literal["auto", "manual", "disabled"] = Field( - "auto", - description="RAG configuration mode: auto-fill, manual validation, or disabled", - ) summary_enabled: bool = Field( default=False, description="Enable automatic summary generation for documents", diff --git a/backend/app/services/knowledge/orchestrator.py b/backend/app/services/knowledge/orchestrator.py index 14c7e75443e..9ac3e2ce9e3 100644 --- a/backend/app/services/knowledge/orchestrator.py +++ b/backend/app/services/knowledge/orchestrator.py @@ -283,16 +283,12 @@ def _resolve_retrieval_config( user: User, namespace: str, retrieval_config: Optional[Dict[str, Any]], - rag_config_mode: Literal["auto", "manual", "disabled"] = "auto", retriever_name: Optional[str] = None, retriever_namespace: Optional[str] = None, embedding_model_name: Optional[str] = None, embedding_model_namespace: Optional[str] = None, ) -> Optional[Dict[str, Any]]: - """Resolve retrieval config according to the caller's explicit intent.""" - if rag_config_mode == "disabled": - return None - + """Build a complete retrieval config, auto-filling missing core fields.""" resolved_config = dict(retrieval_config or {}) embedding_config = dict(resolved_config.get("embedding_config") or {}) @@ -307,20 +303,6 @@ def _resolve_retrieval_config( embedding_config.get("model_namespace") or embedding_model_namespace ) - if rag_config_mode == "manual": - if not retriever_name or not embedding_model_name: - raise ValueError( - "Manual RAG configuration requires retriever_name and " - "embedding_config.model_name" - ) - return self._build_complete_retrieval_config( - base_config=resolved_config, - retriever_name=retriever_name, - retriever_namespace=retriever_namespace, - embedding_model_name=embedding_model_name, - embedding_model_namespace=embedding_model_namespace, - ) - if not retriever_name: default_retriever = self.get_default_retriever(db, user.id, namespace) if default_retriever: @@ -1060,7 +1042,6 @@ def create_knowledge_base( namespace: str = "default", kb_type: str = "notebook", summary_enabled: bool = False, - rag_config_mode: Literal["auto", "manual", "disabled"] = "auto", # REST API scenario: pass complete config retrieval_config: Optional[Dict[str, Any]] = None, # MCP scenario: auto-select or explicitly specify @@ -1075,12 +1056,7 @@ def create_knowledge_base( """ Create a knowledge base with auto-configuration support. - Supports three RAG configuration modes: - 1. auto: Auto-select missing retriever/embedding while preserving tuning fields - 2. manual: Require a complete retrieval_config dict - 3. disabled: Create a knowledge base without RAG - - Auto-selection logic (when rag_config_mode is auto): + Auto-selection logic: 1. retriever: If not specified, auto-select using get_default_retriever() 2. embedding: If not specified, auto-select using get_default_embedding_model() 3. summary_model: If not specified and summary_enabled=True: @@ -1095,7 +1071,6 @@ def create_knowledge_base( namespace: Namespace (default for personal, group name for group) kb_type: Type (notebook or classic) summary_enabled: Enable summary generation - rag_config_mode: RAG configuration mode retrieval_config: Complete retrieval config dict (REST API mode) retriever_name: Optional retriever name (MCP mode) retriever_namespace: Optional retriever namespace (MCP mode) @@ -1113,7 +1088,6 @@ def create_knowledge_base( logger.info( f"[Orchestrator] create_knowledge_base called: name={name}, namespace={namespace}, " f"kb_type={kb_type}, summary_enabled={summary_enabled}, task_id={task_id}, " - f"rag_config_mode={rag_config_mode}, " f"user_id={user.id}, has_retrieval_config={retrieval_config is not None}, " f"has_summary_model_ref={summary_model_ref is not None}" ) @@ -1123,7 +1097,6 @@ def create_knowledge_base( user=user, namespace=namespace, retrieval_config=retrieval_config, - rag_config_mode=rag_config_mode, retriever_name=retriever_name, retriever_namespace=retriever_namespace, embedding_model_name=embedding_model_name, diff --git a/backend/tests/services/knowledge/test_orchestrator.py b/backend/tests/services/knowledge/test_orchestrator.py index 587d439e311..89315a1bdb6 100644 --- a/backend/tests/services/knowledge/test_orchestrator.py +++ b/backend/tests/services/knowledge/test_orchestrator.py @@ -171,10 +171,10 @@ def test_get_default_embedding_model_returns_none_when_user_not_found( assert result is None - def test_resolve_retrieval_config_completes_partial_frontend_payload( + def test_resolve_retrieval_config_completes_partial_explicit_config( self, orchestrator, mock_db, mock_user ): - """Test partial retrieval config is completed before it is persisted.""" + """Test explicit retrieval config is completed before persistence.""" partial_config = { "retrieval_mode": "vector", "top_k": 5, @@ -217,16 +217,50 @@ def test_resolve_retrieval_config_completes_partial_frontend_payload( mock_get_retriever.assert_called_once_with(mock_db, mock_user.id, "default") mock_get_embedding.assert_not_called() - def test_resolve_retrieval_config_returns_none_when_defaults_unavailable( + def test_resolve_retrieval_config_auto_selects_when_config_absent( self, orchestrator, mock_db, mock_user ): - """Test unresolved partial retrieval config is not persisted.""" - partial_config = { + """Test auto mode builds a complete config when no config is provided.""" + with patch.object( + orchestrator, + "get_default_retriever", + return_value={ + "retriever_name": "retriever-1", + "retriever_namespace": "default", + }, + ) as mock_get_retriever: + with patch.object( + orchestrator, + "get_default_embedding_model", + return_value={ + "model_name": "embedding-1", + "model_namespace": "default", + }, + ) as mock_get_embedding: + result = orchestrator._resolve_retrieval_config( + db=mock_db, + user=mock_user, + namespace="default", + retrieval_config=None, + ) + + assert result == { + "retriever_name": "retriever-1", + "retriever_namespace": "default", + "embedding_config": { + "model_name": "embedding-1", + "model_namespace": "default", + }, "retrieval_mode": "vector", "top_k": 5, "score_threshold": 0.5, } + mock_get_retriever.assert_called_once_with(mock_db, mock_user.id, "default") + mock_get_embedding.assert_called_once_with(mock_db, mock_user.id, "default") + def test_resolve_retrieval_config_returns_none_when_defaults_unavailable( + self, orchestrator, mock_db, mock_user + ): with patch.object( orchestrator, "get_default_retriever", return_value=None ) as mock_get_retriever: @@ -237,47 +271,17 @@ def test_resolve_retrieval_config_returns_none_when_defaults_unavailable( db=mock_db, user=mock_user, namespace="default", - retrieval_config=partial_config, + retrieval_config=None, ) assert result is None mock_get_retriever.assert_called_once_with(mock_db, mock_user.id, "default") mock_get_embedding.assert_called_once_with(mock_db, mock_user.id, "default") - def test_resolve_retrieval_config_disabled_returns_none( - self, orchestrator, mock_db, mock_user - ): - """Test disabled mode creates a knowledge base without RAG.""" - result = orchestrator._resolve_retrieval_config( - db=mock_db, - user=mock_user, - namespace="default", - retrieval_config={ - "retriever_name": "retriever-1", - "embedding_config": {"model_name": "embedding-1"}, - }, - rag_config_mode="disabled", - ) - - assert result is None - - def test_resolve_retrieval_config_manual_requires_complete_config( - self, orchestrator, mock_db, mock_user - ): - """Test manual mode rejects partial retrieval config.""" - with pytest.raises(ValueError, match="Manual RAG configuration requires"): - orchestrator._resolve_retrieval_config( - db=mock_db, - user=mock_user, - namespace="default", - retrieval_config={"retrieval_mode": "vector"}, - rag_config_mode="manual", - ) - - def test_resolve_retrieval_config_manual_does_not_auto_select( + def test_resolve_retrieval_config_complete_explicit_config_does_not_auto_select( self, orchestrator, mock_db, mock_user ): - """Test manual mode validates config without default selection.""" + """Test a complete explicit config is persisted without default selection.""" with patch.object(orchestrator, "get_default_retriever") as mock_get_retriever: with patch.object( orchestrator, "get_default_embedding_model" @@ -290,7 +294,6 @@ def test_resolve_retrieval_config_manual_does_not_auto_select( "retriever_name": "retriever-1", "embedding_config": {"model_name": "embedding-1"}, }, - rag_config_mode="manual", ) assert result == { diff --git a/docs/en/reference/yaml-specification.md b/docs/en/reference/yaml-specification.md index 2b70c7de4a1..0bbcc503494 100644 --- a/docs/en/reference/yaml-specification.md +++ b/docs/en/reference/yaml-specification.md @@ -359,7 +359,7 @@ KnowledgeBase is used to manage document knowledge bases, retrieval configuratio | `spec.retrievalConfig.score_threshold` | number | No | Minimum relevance threshold | | `spec.retrievalConfig.hybrid_weights` | object | No | Hybrid retrieval weights | -`retriever_name` and `embedding_config.model_name` are required only when `spec.retrievalConfig` exists. The create API field `rag_config_mode` expresses creation intent only (auto, manual, or disabled) and is not persisted as a KnowledgeBase YAML field. The persisted stable states are either a complete `retrievalConfig` or no `retrievalConfig`. +`retriever_name` and `embedding_config.model_name` are required only when `spec.retrievalConfig` exists. When creating a knowledge base, the backend automatically fills in a missing retriever and embedding model; if no usable defaults are available, it does not write `retrievalConfig`. The persisted stable states are either a complete `retrievalConfig` or no `retrievalConfig`. ### Summary-Related Configuration diff --git a/docs/en/user-guide/knowledge/configuring-retrievers.md b/docs/en/user-guide/knowledge/configuring-retrievers.md index cce9a2d0efe..35a89b9fe66 100644 --- a/docs/en/user-guide/knowledge/configuring-retrievers.md +++ b/docs/en/user-guide/knowledge/configuring-retrievers.md @@ -379,23 +379,13 @@ This approach is **less efficient** than RAG retrieval: | Accuracy | Semantic understanding | Depends on document summaries | | Best For | Large knowledge bases | Small knowledge bases (<50 docs) | -### Setting Up No-RAG Mode +### Automatic Configuration On Creation -When creating a knowledge base, **RAG Configuration** in **Advanced Settings** provides three modes: +When creating a knowledge base, the system automatically selects an available retriever and embedding model while preserving retrieval parameters you changed in advanced settings. -| Mode | Behavior | Best For | -|------|----------|----------| -| Auto | The system selects an available retriever and embedding model while preserving retrieval parameters you changed | Recommended default | -| Manual | You must explicitly select both a retriever and an embedding model; creation is blocked if either one is missing | Fixed storage backend or model requirements | -| Disabled | Creates a no-RAG knowledge base without writing retrieval configuration | No vector database, small knowledge bases, or testing | +If the current environment has no usable default retriever or embedding model, the knowledge base can still be created, but no RAG retrieval configuration is written. Uploaded documents are stored, and AI will use knowledge exploration tools to read the content in later conversations. -To create a no-RAG knowledge base: - -1. **Create Knowledge Base**: Open advanced settings in the create dialog and set **RAG Configuration** to **Disabled** -2. **Upload Documents**: Documents are stored but not indexed for RAG -3. **Start Chatting**: AI will automatically use exploration tools - -> **Note**: You can always add RAG configuration later by editing the knowledge base settings after configuring a retriever. +> **Note**: After configuring a retriever and embedding model, newly created knowledge bases will automatically receive RAG retrieval configuration. ## Related Documentation diff --git a/docs/zh/reference/yaml-specification.md b/docs/zh/reference/yaml-specification.md index b75f43bfd34..275a8539447 100644 --- a/docs/zh/reference/yaml-specification.md +++ b/docs/zh/reference/yaml-specification.md @@ -359,7 +359,7 @@ KnowledgeBase 用于管理文档知识库、检索配置和摘要能力。 | `spec.retrievalConfig.score_threshold` | number | 否 | 最低相关性阈值 | | `spec.retrievalConfig.hybrid_weights` | object | 否 | 混合检索权重 | -`retriever_name` 和 `embedding_config.model_name` 只有在 `spec.retrievalConfig` 存在时必填。创建 API 中的 `rag_config_mode` 只表达创建意图(自动配置、手动选择或不启用),不会作为 KnowledgeBase YAML 字段持久化。持久化后的稳定状态只有两种:完整的 `retrievalConfig`,或无 `retrievalConfig`。 +`retriever_name` 和 `embedding_config.model_name` 只有在 `spec.retrievalConfig` 存在时必填。创建知识库时,后端会自动补齐缺失的检索器和 Embedding 模型;如果无法找到可用默认配置,则不会写入 `retrievalConfig`。持久化后的稳定状态只有两种:完整的 `retrievalConfig`,或无 `retrievalConfig`。 ### 摘要相关配置 diff --git a/docs/zh/user-guide/knowledge/configuring-retrievers.md b/docs/zh/user-guide/knowledge/configuring-retrievers.md index 90ae9e1bf52..8a25f38d370 100644 --- a/docs/zh/user-guide/knowledge/configuring-retrievers.md +++ b/docs/zh/user-guide/knowledge/configuring-retrievers.md @@ -379,23 +379,13 @@ AI:让我探索知识库以查找相关信息。 | 准确性 | 语义理解 | 取决于文档摘要 | | 适用场景 | 大型知识库 | 小型知识库(<50 个文档) | -### 设置无 RAG 模式 +### 创建时自动配置 -创建知识库时,**高级设置** 中的 **RAG 配置** 提供三种模式: +创建知识库时,系统会自动选择可用的检索器和 Embedding 模型,并保留您在高级设置中调整过的检索参数。 -| 模式 | 行为 | 适用场景 | -|------|------|----------| -| 自动配置 | 系统自动选择可用的检索器和 Embedding 模型,并保留您调整过的检索参数 | 推荐默认选项 | -| 手动选择 | 必须明确选择检索器和 Embedding 模型,缺少任一项时不能创建 | 需要固定存储后端或模型时 | -| 不启用 | 创建无 RAG 知识库,不写入检索配置 | 没有向量库、小型知识库或测试场景 | +如果当前环境没有可用的默认检索器或 Embedding 模型,知识库仍可创建,但不会写入 RAG 检索配置。上传的文档会被保存,后续对话中 AI 将使用知识库探索工具读取内容。 -无 RAG 模式的创建步骤: - -1. **创建知识库**:在创建对话框中打开高级设置,将 **RAG 配置** 设为 **不启用** -2. **上传文档**:文档被存储但不进行 RAG 索引 -3. **开始聊天**:AI 将自动使用探索工具 - -> **注意**:配置检索器后,您可以随时通过编辑知识库设置来添加 RAG 配置。 +> **注意**:配置检索器和 Embedding 模型后,后续新建知识库会自动启用 RAG 检索配置。 ## 相关文档 diff --git a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx index 757a155d012..a0629bd3a83 100644 --- a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx +++ b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx @@ -26,8 +26,7 @@ import { useTranslation } from '@/hooks/useTranslation' import type { SummaryModelRef, KnowledgeBaseType, - RetrievalConfig, - RagConfigMode, + RetrievalConfigDraft, InitialMember, MemberRole, } from '@/types/knowledge' @@ -49,8 +48,7 @@ interface CreateKnowledgeBaseDialogProps { onSubmit: (data: { name: string description?: string - retrieval_config?: Partial - rag_config_mode?: RagConfigMode + retrieval_config?: RetrievalConfigDraft summary_enabled?: boolean summary_model_ref?: SummaryModelRef | null guided_questions?: string[] @@ -119,8 +117,7 @@ export function CreateKnowledgeBaseDialog({ const [summaryModelRef, setSummaryModelRef] = useState(null) const [summaryModelError, setSummaryModelError] = useState('') const [guidedQuestions, setGuidedQuestions] = useState([]) - const [ragConfigMode, setRagConfigMode] = useState('auto') - const [retrievalConfig, setRetrievalConfig] = useState>({ + const [retrievalConfig, setRetrievalConfig] = useState({ retrieval_mode: 'vector', top_k: 5, score_threshold: 0.5, @@ -197,19 +194,10 @@ export function CreateKnowledgeBaseDialog({ role: e.role, entity_display_name: e.label, })) as InitialMember[] - const hasCompleteRetrievalConfig = - retrievalConfig.retriever_name && retrievalConfig.embedding_config?.model_name - if (ragConfigMode === 'manual' && !hasCompleteRetrievalConfig) { - setError(t('knowledge:document.ragConfigMode.manualIncomplete')) - setAccordionValue('advanced') - return - } - await onSubmit({ name: name.trim(), description: description.trim() || undefined, - retrieval_config: ragConfigMode === 'disabled' ? undefined : retrievalConfig, - rag_config_mode: ragConfigMode, + retrieval_config: retrievalConfig, summary_enabled: summaryEnabled, summary_model_ref: summaryEnabled ? summaryModelRef : null, guided_questions: @@ -229,7 +217,6 @@ export function CreateKnowledgeBaseDialog({ setSummaryEnabled(true) setSummaryModelRef(null) setGuidedQuestions([]) - setRagConfigMode('auto') setRetrievalConfig({ retrieval_mode: 'vector', top_k: 5, @@ -257,7 +244,6 @@ export function CreateKnowledgeBaseDialog({ setSummaryModelRef(null) setSummaryModelError('') setGuidedQuestions([]) - setRagConfigMode('auto') setRetrievalConfig({ retrieval_mode: 'vector', top_k: 5, @@ -294,7 +280,6 @@ export function CreateKnowledgeBaseDialog({ // Determine if this is a notebook type const isNotebook = selectedKbType === 'notebook' - const ragModeOptions: RagConfigMode[] = ['auto', 'manual', 'disabled'] return ( @@ -412,29 +397,7 @@ export function CreateKnowledgeBaseDialog({ advancedVariant="accordion" advancedOpen={accordionValue === 'advanced'} onAdvancedOpenChange={open => setAccordionValue(open ? 'advanced' : '')} - advancedDescription={t('knowledge:document.advancedSettings.collapsed')} - retrievalModeSection={ -
- -
- {ragModeOptions.map(mode => ( - - ))} -
-
- } - showRetrievalSection={ragConfigMode !== 'disabled'} + showRetrievalSection retrievalConfig={retrievalConfig} onRetrievalConfigChange={setRetrievalConfig} retrievalScope={effectiveScope} diff --git a/frontend/src/features/knowledge/document/components/EditKnowledgeBaseDialog.tsx b/frontend/src/features/knowledge/document/components/EditKnowledgeBaseDialog.tsx index bc846a05202..1a5a4ae214e 100644 --- a/frontend/src/features/knowledge/document/components/EditKnowledgeBaseDialog.tsx +++ b/frontend/src/features/knowledge/document/components/EditKnowledgeBaseDialog.tsx @@ -21,10 +21,10 @@ import { getKnowledgeBase } from '@/apis/knowledge' import type { KnowledgeBase, KnowledgeBaseUpdate, + RetrievalConfigDraft, RetrievalConfigUpdate, SummaryModelRef, } from '@/types/knowledge' -import type { RetrievalConfig } from './RetrievalSettingsSection' // Maximum documents allowed for notebook type const NOTEBOOK_MAX_DOCUMENTS = 50 @@ -62,7 +62,7 @@ export function EditKnowledgeBaseDialog({ const [summaryModelError, setSummaryModelError] = useState('') const [error, setError] = useState('') const [showAdvanced, setShowAdvanced] = useState(false) - const [retrievalConfig, setRetrievalConfig] = useState>({}) + const [retrievalConfig, setRetrievalConfig] = useState({}) const [guidedQuestions, setGuidedQuestions] = useState([]) // Call limit configuration state @@ -114,7 +114,7 @@ export function EditKnowledgeBaseDialog({ } }, [fullKnowledgeBase, knowledgeBase]) - const handleRetrievalConfigChange = useCallback((config: Partial) => { + const handleRetrievalConfigChange = useCallback((config: RetrievalConfigDraft) => { setRetrievalConfig(config) }, []) diff --git a/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx b/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx index efa86b9c4ba..532a8464ad6 100644 --- a/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx +++ b/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx @@ -19,7 +19,11 @@ import { } from '@/components/ui/accordion' import { ChevronDown, ChevronRight, Plus, X } from 'lucide-react' import { useTranslation } from '@/hooks/useTranslation' -import type { KnowledgeResourceScope, RetrievalConfig, SummaryModelRef } from '@/types/knowledge' +import type { + KnowledgeResourceScope, + RetrievalConfigDraft, + SummaryModelRef, +} from '@/types/knowledge' import { RetrievalSettingsSection } from './RetrievalSettingsSection' import { SummaryModelSelector } from './SummaryModelSelector' @@ -45,11 +49,10 @@ interface KnowledgeBaseFormProps { advancedVariant: 'accordion' | 'collapsible' advancedOpen: boolean onAdvancedOpenChange: (open: boolean) => void - advancedDescription?: string retrievalModeSection?: ReactNode showRetrievalSection: boolean - retrievalConfig: Partial - onRetrievalConfigChange: (config: Partial) => void + retrievalConfig: RetrievalConfigDraft + onRetrievalConfigChange: (config: RetrievalConfigDraft) => void retrievalScope?: KnowledgeResourceScope retrievalGroupName?: string retrievalReadOnly?: boolean @@ -82,7 +85,6 @@ export function KnowledgeBaseForm({ advancedVariant, advancedOpen, onAdvancedOpenChange, - advancedDescription, retrievalModeSection, showRetrievalSection, retrievalConfig, @@ -134,8 +136,6 @@ export function KnowledgeBaseForm({ const advancedContent = (
- {advancedDescription &&

{advancedDescription}

} -
diff --git a/frontend/src/features/knowledge/document/components/KnowledgeDialogs.tsx b/frontend/src/features/knowledge/document/components/KnowledgeDialogs.tsx index cb507cf99aa..59fd4c9577b 100644 --- a/frontend/src/features/knowledge/document/components/KnowledgeDialogs.tsx +++ b/frontend/src/features/knowledge/document/components/KnowledgeDialogs.tsx @@ -210,7 +210,6 @@ export function useKnowledgeDialogs(props: KnowledgeDialogsProps): KnowledgeDial description: data.description, namespace, retrieval_config: data.retrieval_config, - rag_config_mode: data.rag_config_mode, summary_enabled: data.summary_enabled, summary_model_ref: data.summary_model_ref, kb_type: kbType, diff --git a/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx b/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx index e66d1b9383e..a0ca354c590 100644 --- a/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx +++ b/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx @@ -175,7 +175,6 @@ export function KnowledgeDocumentPageMobile({ description: data.description, namespace, retrieval_config: data.retrieval_config, - rag_config_mode: data.rag_config_mode, summary_enabled: data.summary_enabled, summary_model_ref: data.summary_model_ref, kb_type: kbType, diff --git a/frontend/src/features/knowledge/document/components/RetrievalSettingsSection.tsx b/frontend/src/features/knowledge/document/components/RetrievalSettingsSection.tsx index 4fc0ccf0f6f..1f968080c43 100644 --- a/frontend/src/features/knowledge/document/components/RetrievalSettingsSection.tsx +++ b/frontend/src/features/knowledge/document/components/RetrievalSettingsSection.tsx @@ -15,27 +15,12 @@ import { useTranslation } from '@/hooks/useTranslation' import { useRetrievers } from '../hooks/useRetrievers' import { useEmbeddingModels } from '../hooks/useEmbeddingModels' import { useRetrievalMethods } from '../hooks/useRetrievalMethods' +import type { RetrievalConfigDraft } from '@/types/knowledge' import Link from 'next/link' -export interface RetrievalConfig { - retriever_name?: string - retriever_namespace?: string - embedding_config?: { - model_name?: string - model_namespace?: string - } - retrieval_mode?: 'vector' | 'keyword' | 'hybrid' - top_k?: number - score_threshold?: number - hybrid_weights?: { - vector_weight: number - keyword_weight: number - } -} - interface RetrievalSettingsSectionProps { - config: Partial - onChange: (config: Partial) => void + config: RetrievalConfigDraft + onChange: (config: RetrievalConfigDraft) => void readOnly?: boolean partialReadOnly?: boolean // When true, only retriever and embedding model are read-only scope?: 'personal' | 'group' | 'organization' | 'all' diff --git a/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts b/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts index ad7f4d65a54..605b109b4b0 100644 --- a/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts +++ b/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts @@ -152,7 +152,6 @@ export function useKnowledgeBaseDialogs({ description: data.description, namespace, retrieval_config: data.retrieval_config, - rag_config_mode: data.rag_config_mode, summary_enabled: data.summary_enabled, summary_model_ref: data.summary_model_ref, kb_type: kbType, diff --git a/frontend/src/i18n/locales/en/knowledge.json b/frontend/src/i18n/locales/en/knowledge.json index 79691286fe9..e55dec00796 100644 --- a/frontend/src/i18n/locales/en/knowledge.json +++ b/frontend/src/i18n/locales/en/knowledge.json @@ -535,17 +535,9 @@ }, "advancedSettings": { "title": "Advanced Settings", - "collapsed": "Click to expand advanced settings", "expanded": "Click to collapse", "readOnly": "Read-only" }, - "ragConfigMode": { - "title": "RAG Configuration", - "auto": "Auto", - "manual": "Manual", - "disabled": "Disabled", - "manualIncomplete": "Manual RAG requires both a retriever and an embedding model" - }, "retrieval": { "retriever": "Retriever", "retrieverSelect": "Select a retriever", diff --git a/frontend/src/i18n/locales/zh-CN/knowledge.json b/frontend/src/i18n/locales/zh-CN/knowledge.json index 8750f9066aa..84e921e938e 100644 --- a/frontend/src/i18n/locales/zh-CN/knowledge.json +++ b/frontend/src/i18n/locales/zh-CN/knowledge.json @@ -535,17 +535,9 @@ }, "advancedSettings": { "title": "高级设置", - "collapsed": "点击展开高级设置", "expanded": "点击收起", "readOnly": "只读" }, - "ragConfigMode": { - "title": "RAG 配置", - "auto": "自动配置", - "manual": "手动选择", - "disabled": "不启用", - "manualIncomplete": "手动选择 RAG 时必须选择检索引擎和 Embedding 模型" - }, "retrieval": { "retriever": "检索引擎", "retrieverSelect": "选择检索引擎", diff --git a/frontend/src/types/knowledge.ts b/frontend/src/types/knowledge.ts index bc1bad0c16b..d7ee332e07a 100644 --- a/frontend/src/types/knowledge.ts +++ b/frontend/src/types/knowledge.ts @@ -29,6 +29,22 @@ export type KnowledgeResourceScope = 'personal' | 'organization' | 'group' | 'al // Retrieval Config types export interface RetrievalConfig { + retriever_name: string + retriever_namespace?: string + embedding_config: { + model_name: string + model_namespace?: string + } + retrieval_mode?: 'vector' | 'keyword' | 'hybrid' + top_k?: number + score_threshold?: number + hybrid_weights?: { + vector_weight: number + keyword_weight: number + } +} + +export interface RetrievalConfigDraft { retriever_name?: string retriever_namespace?: string embedding_config?: { @@ -286,7 +302,6 @@ export interface SummaryModelRef { // - notebook: Three-column layout with chat area and document panel (new style) // - classic: Document list only without chat functionality (legacy style) export type KnowledgeBaseType = 'notebook' | 'classic' -export type RagConfigMode = 'auto' | 'manual' | 'disabled' // Knowledge Base types export interface KnowledgeBase { @@ -325,8 +340,7 @@ export interface KnowledgeBaseCreate { name: string description?: string namespace?: string - retrieval_config?: Partial - rag_config_mode?: RagConfigMode + retrieval_config?: RetrievalConfigDraft summary_enabled?: boolean summary_model_ref?: SummaryModelRef | null /** Knowledge base display type: 'notebook' (three-column with chat) or 'classic' (document list only) */ From 80e98efd6920e6047ac41660ce31ddf78c5693e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=BD?= Date: Sat, 13 Jun 2026 00:11:06 +0800 Subject: [PATCH 04/15] =?UTF-8?q?feat(knowledge):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=97=A0=20RAG=20=E5=88=9B=E5=BB=BA=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/endpoints/knowledge.py | 1 + backend/app/schemas/knowledge.py | 6 +++- .../app/services/knowledge/orchestrator.py | 12 +++++++ .../services/knowledge/test_orchestrator.py | 20 ++++++++++++ docs/en/reference/yaml-specification.md | 2 +- .../knowledge/configuring-retrievers.md | 17 ++++++++-- docs/zh/reference/yaml-specification.md | 2 +- .../knowledge/configuring-retrievers.md | 17 ++++++++-- .../components/CreateKnowledgeBaseDialog.tsx | 32 +++++++++++++++++-- .../document/components/KnowledgeDialogs.tsx | 1 + .../KnowledgeDocumentPageMobile.tsx | 1 + .../document/hooks/useKnowledgeBaseDialogs.ts | 1 + frontend/src/i18n/locales/en/knowledge.json | 5 +++ .../src/i18n/locales/zh-CN/knowledge.json | 5 +++ frontend/src/types/knowledge.ts | 2 ++ 15 files changed, 113 insertions(+), 11 deletions(-) diff --git a/backend/app/api/endpoints/knowledge.py b/backend/app/api/endpoints/knowledge.py index 7cd28516cf6..4edb7beb2e2 100644 --- a/backend/app/api/endpoints/knowledge.py +++ b/backend/app/api/endpoints/knowledge.py @@ -394,6 +394,7 @@ def create_knowledge_base( namespace=data.namespace or "default", kb_type=data.kb_type or "notebook", summary_enabled=data.summary_enabled, + rag_config_mode=data.rag_config_mode, retrieval_config=( data.retrieval_config.model_dump() if data.retrieval_config else None ), diff --git a/backend/app/schemas/knowledge.py b/backend/app/schemas/knowledge.py index 34d4cced6d4..6393c5d3abb 100644 --- a/backend/app/schemas/knowledge.py +++ b/backend/app/schemas/knowledge.py @@ -8,7 +8,7 @@ from datetime import datetime from enum import Enum -from typing import Dict, List, Optional +from typing import Dict, List, Literal, Optional from pydantic import BaseModel, Field, field_validator, model_validator @@ -127,6 +127,10 @@ class KnowledgeBaseCreate(BaseModel): retrieval_config: Optional[RetrievalConfigCreate] = Field( None, description="Retrieval configuration" ) + rag_config_mode: Literal["auto", "disabled"] = Field( + "auto", + description="RAG configuration mode: auto-fill or disabled", + ) summary_enabled: bool = Field( default=False, description="Enable automatic summary generation for documents", diff --git a/backend/app/services/knowledge/orchestrator.py b/backend/app/services/knowledge/orchestrator.py index 9ac3e2ce9e3..89085dbf5f5 100644 --- a/backend/app/services/knowledge/orchestrator.py +++ b/backend/app/services/knowledge/orchestrator.py @@ -283,12 +283,16 @@ def _resolve_retrieval_config( user: User, namespace: str, retrieval_config: Optional[Dict[str, Any]], + rag_config_mode: Literal["auto", "disabled"] = "auto", retriever_name: Optional[str] = None, retriever_namespace: Optional[str] = None, embedding_model_name: Optional[str] = None, embedding_model_namespace: Optional[str] = None, ) -> Optional[Dict[str, Any]]: """Build a complete retrieval config, auto-filling missing core fields.""" + if rag_config_mode == "disabled": + return None + resolved_config = dict(retrieval_config or {}) embedding_config = dict(resolved_config.get("embedding_config") or {}) @@ -1042,6 +1046,7 @@ def create_knowledge_base( namespace: str = "default", kb_type: str = "notebook", summary_enabled: bool = False, + rag_config_mode: Literal["auto", "disabled"] = "auto", # REST API scenario: pass complete config retrieval_config: Optional[Dict[str, Any]] = None, # MCP scenario: auto-select or explicitly specify @@ -1056,6 +1061,10 @@ def create_knowledge_base( """ Create a knowledge base with auto-configuration support. + Supports two RAG modes: + 1. auto: Use a complete provided config or auto-select missing defaults. + 2. disabled: Create a knowledge base without RAG retrieval config. + Auto-selection logic: 1. retriever: If not specified, auto-select using get_default_retriever() 2. embedding: If not specified, auto-select using get_default_embedding_model() @@ -1071,6 +1080,7 @@ def create_knowledge_base( namespace: Namespace (default for personal, group name for group) kb_type: Type (notebook or classic) summary_enabled: Enable summary generation + rag_config_mode: RAG configuration mode retrieval_config: Complete retrieval config dict (REST API mode) retriever_name: Optional retriever name (MCP mode) retriever_namespace: Optional retriever namespace (MCP mode) @@ -1088,6 +1098,7 @@ def create_knowledge_base( logger.info( f"[Orchestrator] create_knowledge_base called: name={name}, namespace={namespace}, " f"kb_type={kb_type}, summary_enabled={summary_enabled}, task_id={task_id}, " + f"rag_config_mode={rag_config_mode}, " f"user_id={user.id}, has_retrieval_config={retrieval_config is not None}, " f"has_summary_model_ref={summary_model_ref is not None}" ) @@ -1097,6 +1108,7 @@ def create_knowledge_base( user=user, namespace=namespace, retrieval_config=retrieval_config, + rag_config_mode=rag_config_mode, retriever_name=retriever_name, retriever_namespace=retriever_namespace, embedding_model_name=embedding_model_name, diff --git a/backend/tests/services/knowledge/test_orchestrator.py b/backend/tests/services/knowledge/test_orchestrator.py index 89315a1bdb6..40c9ae88a62 100644 --- a/backend/tests/services/knowledge/test_orchestrator.py +++ b/backend/tests/services/knowledge/test_orchestrator.py @@ -278,6 +278,26 @@ def test_resolve_retrieval_config_returns_none_when_defaults_unavailable( mock_get_retriever.assert_called_once_with(mock_db, mock_user.id, "default") mock_get_embedding.assert_called_once_with(mock_db, mock_user.id, "default") + def test_resolve_retrieval_config_disabled_returns_none_without_auto_select( + self, orchestrator, mock_db, mock_user + ): + """Test disabled mode creates a knowledge base without RAG.""" + with patch.object(orchestrator, "get_default_retriever") as mock_get_retriever: + with patch.object( + orchestrator, "get_default_embedding_model" + ) as mock_get_embedding: + result = orchestrator._resolve_retrieval_config( + db=mock_db, + user=mock_user, + namespace="default", + retrieval_config={"retrieval_mode": "vector"}, + rag_config_mode="disabled", + ) + + assert result is None + mock_get_retriever.assert_not_called() + mock_get_embedding.assert_not_called() + def test_resolve_retrieval_config_complete_explicit_config_does_not_auto_select( self, orchestrator, mock_db, mock_user ): diff --git a/docs/en/reference/yaml-specification.md b/docs/en/reference/yaml-specification.md index 0bbcc503494..96f4c0904a6 100644 --- a/docs/en/reference/yaml-specification.md +++ b/docs/en/reference/yaml-specification.md @@ -359,7 +359,7 @@ KnowledgeBase is used to manage document knowledge bases, retrieval configuratio | `spec.retrievalConfig.score_threshold` | number | No | Minimum relevance threshold | | `spec.retrievalConfig.hybrid_weights` | object | No | Hybrid retrieval weights | -`retriever_name` and `embedding_config.model_name` are required only when `spec.retrievalConfig` exists. When creating a knowledge base, the backend automatically fills in a missing retriever and embedding model; if no usable defaults are available, it does not write `retrievalConfig`. The persisted stable states are either a complete `retrievalConfig` or no `retrievalConfig`. +`retriever_name` and `embedding_config.model_name` are required only when `spec.retrievalConfig` exists. By default, the backend automatically fills in a missing retriever and embedding model during creation; if the create request explicitly uses no-RAG mode, or if no usable defaults are available, it does not write `retrievalConfig`. The create request field `rag_config_mode` expresses creation intent only and is not persisted as a KnowledgeBase YAML field. The persisted stable states are either a complete `retrievalConfig` or no `retrievalConfig`. ### Summary-Related Configuration diff --git a/docs/en/user-guide/knowledge/configuring-retrievers.md b/docs/en/user-guide/knowledge/configuring-retrievers.md index 35a89b9fe66..7ce2ffa2b3e 100644 --- a/docs/en/user-guide/knowledge/configuring-retrievers.md +++ b/docs/en/user-guide/knowledge/configuring-retrievers.md @@ -379,11 +379,22 @@ This approach is **less efficient** than RAG retrieval: | Accuracy | Semantic understanding | Depends on document summaries | | Best For | Large knowledge bases | Small knowledge bases (<50 docs) | -### Automatic Configuration On Creation +### Choosing The RAG Mode On Creation -When creating a knowledge base, the system automatically selects an available retriever and embedding model while preserving retrieval parameters you changed in advanced settings. +When creating a knowledge base, **RAG Retrieval** in **Advanced Settings** provides two modes: -If the current environment has no usable default retriever or embedding model, the knowledge base can still be created, but no RAG retrieval configuration is written. Uploaded documents are stored, and AI will use knowledge exploration tools to read the content in later conversations. +| Mode | Behavior | Best For | +|------|----------|----------| +| Auto | The system selects an available retriever and embedding model while preserving retrieval parameters you changed | Recommended default | +| No RAG | Creates a no-RAG knowledge base without writing retrieval configuration | No vector database, small knowledge bases, or testing | + +If you choose automatic configuration but the current environment has no usable default retriever or embedding model, the knowledge base can still be created, but no RAG retrieval configuration is written. Uploaded documents are stored, and AI will use knowledge exploration tools to read the content in later conversations. + +To create a no-RAG knowledge base: + +1. **Create Knowledge Base**: Open advanced settings in the create dialog and set **RAG Retrieval** to **No RAG** +2. **Upload Documents**: Documents are stored but not indexed for RAG +3. **Start Chatting**: AI will automatically use exploration tools > **Note**: After configuring a retriever and embedding model, newly created knowledge bases will automatically receive RAG retrieval configuration. diff --git a/docs/zh/reference/yaml-specification.md b/docs/zh/reference/yaml-specification.md index 275a8539447..34858de6ced 100644 --- a/docs/zh/reference/yaml-specification.md +++ b/docs/zh/reference/yaml-specification.md @@ -359,7 +359,7 @@ KnowledgeBase 用于管理文档知识库、检索配置和摘要能力。 | `spec.retrievalConfig.score_threshold` | number | 否 | 最低相关性阈值 | | `spec.retrievalConfig.hybrid_weights` | object | 否 | 混合检索权重 | -`retriever_name` 和 `embedding_config.model_name` 只有在 `spec.retrievalConfig` 存在时必填。创建知识库时,后端会自动补齐缺失的检索器和 Embedding 模型;如果无法找到可用默认配置,则不会写入 `retrievalConfig`。持久化后的稳定状态只有两种:完整的 `retrievalConfig`,或无 `retrievalConfig`。 +`retriever_name` 和 `embedding_config.model_name` 只有在 `spec.retrievalConfig` 存在时必填。创建知识库默认会自动补齐缺失的检索器和 Embedding 模型;如果创建请求明确使用无 RAG 模式,或无法找到可用默认配置,则不会写入 `retrievalConfig`。创建请求中的 `rag_config_mode` 只表达创建意图,不作为 KnowledgeBase YAML 字段持久化。持久化后的稳定状态只有两种:完整的 `retrievalConfig`,或无 `retrievalConfig`。 ### 摘要相关配置 diff --git a/docs/zh/user-guide/knowledge/configuring-retrievers.md b/docs/zh/user-guide/knowledge/configuring-retrievers.md index 8a25f38d370..e5e14fbfb8d 100644 --- a/docs/zh/user-guide/knowledge/configuring-retrievers.md +++ b/docs/zh/user-guide/knowledge/configuring-retrievers.md @@ -379,11 +379,22 @@ AI:让我探索知识库以查找相关信息。 | 准确性 | 语义理解 | 取决于文档摘要 | | 适用场景 | 大型知识库 | 小型知识库(<50 个文档) | -### 创建时自动配置 +### 创建时选择 RAG 模式 -创建知识库时,系统会自动选择可用的检索器和 Embedding 模型,并保留您在高级设置中调整过的检索参数。 +创建知识库时,**高级设置** 中的 **RAG 检索** 提供两种模式: -如果当前环境没有可用的默认检索器或 Embedding 模型,知识库仍可创建,但不会写入 RAG 检索配置。上传的文档会被保存,后续对话中 AI 将使用知识库探索工具读取内容。 +| 模式 | 行为 | 适用场景 | +|------|------|----------| +| 自动配置 | 系统自动选择可用的检索器和 Embedding 模型,并保留您调整过的检索参数 | 推荐默认选项 | +| 无 RAG | 创建无 RAG 知识库,不写入检索配置 | 没有向量库、小型知识库或测试场景 | + +如果选择自动配置,但当前环境没有可用的默认检索器或 Embedding 模型,知识库仍可创建,但不会写入 RAG 检索配置。上传的文档会被保存,后续对话中 AI 将使用知识库探索工具读取内容。 + +无 RAG 模式的创建步骤: + +1. **创建知识库**:在创建对话框中打开高级设置,将 **RAG 检索** 设为 **无 RAG** +2. **上传文档**:文档被存储但不进行 RAG 索引 +3. **开始聊天**:AI 将自动使用探索工具 > **注意**:配置检索器和 Embedding 模型后,后续新建知识库会自动启用 RAG 检索配置。 diff --git a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx index a0629bd3a83..24343032a1e 100644 --- a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx +++ b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx @@ -27,6 +27,7 @@ import type { SummaryModelRef, KnowledgeBaseType, RetrievalConfigDraft, + RagConfigMode, InitialMember, MemberRole, } from '@/types/knowledge' @@ -49,6 +50,7 @@ interface CreateKnowledgeBaseDialogProps { name: string description?: string retrieval_config?: RetrievalConfigDraft + rag_config_mode?: RagConfigMode summary_enabled?: boolean summary_model_ref?: SummaryModelRef | null guided_questions?: string[] @@ -117,6 +119,7 @@ export function CreateKnowledgeBaseDialog({ const [summaryModelRef, setSummaryModelRef] = useState(null) const [summaryModelError, setSummaryModelError] = useState('') const [guidedQuestions, setGuidedQuestions] = useState([]) + const [ragConfigMode, setRagConfigMode] = useState('auto') const [retrievalConfig, setRetrievalConfig] = useState({ retrieval_mode: 'vector', top_k: 5, @@ -197,7 +200,8 @@ export function CreateKnowledgeBaseDialog({ await onSubmit({ name: name.trim(), description: description.trim() || undefined, - retrieval_config: retrievalConfig, + retrieval_config: ragConfigMode === 'disabled' ? undefined : retrievalConfig, + rag_config_mode: ragConfigMode, summary_enabled: summaryEnabled, summary_model_ref: summaryEnabled ? summaryModelRef : null, guided_questions: @@ -217,6 +221,7 @@ export function CreateKnowledgeBaseDialog({ setSummaryEnabled(true) setSummaryModelRef(null) setGuidedQuestions([]) + setRagConfigMode('auto') setRetrievalConfig({ retrieval_mode: 'vector', top_k: 5, @@ -244,6 +249,7 @@ export function CreateKnowledgeBaseDialog({ setSummaryModelRef(null) setSummaryModelError('') setGuidedQuestions([]) + setRagConfigMode('auto') setRetrievalConfig({ retrieval_mode: 'vector', top_k: 5, @@ -280,6 +286,7 @@ export function CreateKnowledgeBaseDialog({ // Determine if this is a notebook type const isNotebook = selectedKbType === 'notebook' + const ragModeOptions: RagConfigMode[] = ['auto', 'disabled'] return ( @@ -397,7 +404,28 @@ export function CreateKnowledgeBaseDialog({ advancedVariant="accordion" advancedOpen={accordionValue === 'advanced'} onAdvancedOpenChange={open => setAccordionValue(open ? 'advanced' : '')} - showRetrievalSection + retrievalModeSection={ +
+ +
+ {ragModeOptions.map(mode => ( + + ))} +
+
+ } + showRetrievalSection={ragConfigMode !== 'disabled'} retrievalConfig={retrievalConfig} onRetrievalConfigChange={setRetrievalConfig} retrievalScope={effectiveScope} diff --git a/frontend/src/features/knowledge/document/components/KnowledgeDialogs.tsx b/frontend/src/features/knowledge/document/components/KnowledgeDialogs.tsx index 59fd4c9577b..cb507cf99aa 100644 --- a/frontend/src/features/knowledge/document/components/KnowledgeDialogs.tsx +++ b/frontend/src/features/knowledge/document/components/KnowledgeDialogs.tsx @@ -210,6 +210,7 @@ export function useKnowledgeDialogs(props: KnowledgeDialogsProps): KnowledgeDial description: data.description, namespace, retrieval_config: data.retrieval_config, + rag_config_mode: data.rag_config_mode, summary_enabled: data.summary_enabled, summary_model_ref: data.summary_model_ref, kb_type: kbType, diff --git a/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx b/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx index a0ca354c590..e66d1b9383e 100644 --- a/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx +++ b/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx @@ -175,6 +175,7 @@ export function KnowledgeDocumentPageMobile({ description: data.description, namespace, retrieval_config: data.retrieval_config, + rag_config_mode: data.rag_config_mode, summary_enabled: data.summary_enabled, summary_model_ref: data.summary_model_ref, kb_type: kbType, diff --git a/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts b/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts index 605b109b4b0..ad7f4d65a54 100644 --- a/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts +++ b/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts @@ -152,6 +152,7 @@ export function useKnowledgeBaseDialogs({ description: data.description, namespace, retrieval_config: data.retrieval_config, + rag_config_mode: data.rag_config_mode, summary_enabled: data.summary_enabled, summary_model_ref: data.summary_model_ref, kb_type: kbType, diff --git a/frontend/src/i18n/locales/en/knowledge.json b/frontend/src/i18n/locales/en/knowledge.json index e55dec00796..d7dd3bf444f 100644 --- a/frontend/src/i18n/locales/en/knowledge.json +++ b/frontend/src/i18n/locales/en/knowledge.json @@ -538,6 +538,11 @@ "expanded": "Click to collapse", "readOnly": "Read-only" }, + "ragConfigMode": { + "title": "RAG Retrieval", + "auto": "Auto", + "disabled": "No RAG" + }, "retrieval": { "retriever": "Retriever", "retrieverSelect": "Select a retriever", diff --git a/frontend/src/i18n/locales/zh-CN/knowledge.json b/frontend/src/i18n/locales/zh-CN/knowledge.json index 84e921e938e..39605bbb698 100644 --- a/frontend/src/i18n/locales/zh-CN/knowledge.json +++ b/frontend/src/i18n/locales/zh-CN/knowledge.json @@ -538,6 +538,11 @@ "expanded": "点击收起", "readOnly": "只读" }, + "ragConfigMode": { + "title": "RAG 检索", + "auto": "自动配置", + "disabled": "无 RAG" + }, "retrieval": { "retriever": "检索引擎", "retrieverSelect": "选择检索引擎", diff --git a/frontend/src/types/knowledge.ts b/frontend/src/types/knowledge.ts index d7ee332e07a..2ae5977c1cc 100644 --- a/frontend/src/types/knowledge.ts +++ b/frontend/src/types/knowledge.ts @@ -302,6 +302,7 @@ export interface SummaryModelRef { // - notebook: Three-column layout with chat area and document panel (new style) // - classic: Document list only without chat functionality (legacy style) export type KnowledgeBaseType = 'notebook' | 'classic' +export type RagConfigMode = 'auto' | 'disabled' // Knowledge Base types export interface KnowledgeBase { @@ -341,6 +342,7 @@ export interface KnowledgeBaseCreate { description?: string namespace?: string retrieval_config?: RetrievalConfigDraft + rag_config_mode?: RagConfigMode summary_enabled?: boolean summary_model_ref?: SummaryModelRef | null /** Knowledge base display type: 'notebook' (three-column with chat) or 'classic' (document list only) */ From c94f1339b2dbfb85c586b389acd9e459d973b50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=BD?= Date: Sat, 13 Jun 2026 00:30:08 +0800 Subject: [PATCH 05/15] =?UTF-8?q?refactor(knowledge):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E5=88=9B=E5=BB=BA=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CreateKnowledgeBaseDialog.tsx | 42 ----- .../components/EditKnowledgeBaseDialog.tsx | 1 - .../document/components/KnowledgeBaseForm.tsx | 147 ++++++++++-------- .../KnowledgeDocumentPageMobile.tsx | 1 - .../document/hooks/useKnowledgeBaseDialogs.ts | 1 - 5 files changed, 79 insertions(+), 113 deletions(-) diff --git a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx index 24343032a1e..0e768ebb0da 100644 --- a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx +++ b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx @@ -28,11 +28,8 @@ import type { KnowledgeBaseType, RetrievalConfigDraft, RagConfigMode, - InitialMember, - MemberRole, } from '@/types/knowledge' import { KnowledgeBaseForm } from './KnowledgeBaseForm' -import { KnowledgeBaseAuthSection } from './KnowledgeBaseAuthSection' /** Available group for selection */ export interface AvailableGroup { @@ -60,8 +57,6 @@ interface CreateKnowledgeBaseDialogProps { selectedGroupId?: string /** Knowledge base type selected by user */ kb_type: KnowledgeBaseType - /** Initial members (users/groups) to add after creation */ - members?: InitialMember[] }) => Promise loading?: boolean scope?: 'personal' | 'group' | 'organization' | 'all' @@ -135,17 +130,6 @@ export function CreateKnowledgeBaseDialog({ const [exemptCalls, setExemptCalls] = useState(5) // Selected group for creating KB (used when showGroupSelector is true) const [selectedGroupId, setSelectedGroupId] = useState(defaultGroupId || 'personal') - // Auth section: initial members to add - const [authEntries, setAuthEntries] = useState< - Array<{ - id: string - label: string - entityType: string - entityId: string - role: MemberRole - }> - >([]) - // Reset selectedKbType and selectedGroupId when dialog opens useEffect(() => { if (open) { @@ -191,12 +175,6 @@ export function CreateKnowledgeBaseDialog({ try { // Filter out empty guided questions const validGuidedQuestions = guidedQuestions.filter(q => q.trim().length > 0) - const members = authEntries.map(e => ({ - entity_type: e.entityType, - entity_id: e.entityId, - role: e.role, - entity_display_name: e.label, - })) as InitialMember[] await onSubmit({ name: name.trim(), description: description.trim() || undefined, @@ -212,7 +190,6 @@ export function CreateKnowledgeBaseDialog({ exempt_calls_before_check: exemptCalls, selectedGroupId: showGroupSelector ? selectedGroupId : undefined, kb_type: selectedKbType, - members: members.length > 0 ? members : undefined, }) setName('') setDescription('') @@ -233,7 +210,6 @@ export function CreateKnowledgeBaseDialog({ }) setMaxCalls(10) setExemptCalls(5) - setAuthEntries([]) } catch (err) { setError(err instanceof Error ? err.message : t('common:error')) } @@ -264,7 +240,6 @@ export function CreateKnowledgeBaseDialog({ setError('') setAccordionValue('') setSelectedGroupId(defaultGroupId || 'personal') - setAuthEntries([]) } onOpenChange(newOpen) } @@ -401,14 +376,10 @@ export function CreateKnowledgeBaseDialog({ setMaxCalls(nextMax) setExemptCalls(nextExempt) }} - advancedVariant="accordion" advancedOpen={accordionValue === 'advanced'} onAdvancedOpenChange={open => setAccordionValue(open ? 'advanced' : '')} retrievalModeSection={
-
{ragModeOptions.map(mode => ( + {open && ( +
+ {children} +
+ )} + + ) +} + export function KnowledgeBaseForm({ typeSection, name, @@ -82,7 +117,6 @@ export function KnowledgeBaseForm({ bindModel, callLimits, onCallLimitsChange, - advancedVariant, advancedOpen, onAdvancedOpenChange, retrievalModeSection, @@ -93,7 +127,6 @@ export function KnowledgeBaseForm({ retrievalGroupName, retrievalReadOnly, retrievalPartialReadOnly, - beforeSummarySection, showGuidedQuestions = false, guidedQuestions = [], onGuidedQuestionsChange, @@ -135,8 +168,31 @@ export function KnowledgeBaseForm({ } const advancedContent = ( -
-
+
+ {(retrievalModeSection || showRetrievalSection) && ( +
+
+ +
+ + {retrievalModeSection} + + {showRetrievalSection && ( + + )} +
+ )} + +

@@ -184,19 +240,6 @@ export function KnowledgeBaseForm({

- - {retrievalModeSection} - - {showRetrievalSection && ( - - )}
) @@ -230,8 +273,6 @@ export function KnowledgeBaseForm({ />
- {beforeSummarySection} -
@@ -315,44 +356,14 @@ export function KnowledgeBaseForm({
)} - {advancedVariant === 'accordion' ? ( - onAdvancedOpenChange(value === 'advanced')} - > - - - {t('knowledge:document.advancedSettings.title')} - - - {advancedContent} - - - - ) : ( -
- - {advancedOpen && ( -
- {advancedContent} -
- )} -
- )} + + {advancedContent} +
) } diff --git a/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx b/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx index e66d1b9383e..b327a1a2bfe 100644 --- a/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx +++ b/frontend/src/features/knowledge/document/components/KnowledgeDocumentPageMobile.tsx @@ -182,7 +182,6 @@ export function KnowledgeDocumentPageMobile({ guided_questions: data.guided_questions, max_calls_per_conversation: data.max_calls_per_conversation, exempt_calls_before_check: data.exempt_calls_before_check, - members: data.members, }) // Save model preference when summary is enabled and model is selected diff --git a/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts b/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts index ad7f4d65a54..73568159411 100644 --- a/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts +++ b/frontend/src/features/knowledge/document/hooks/useKnowledgeBaseDialogs.ts @@ -159,7 +159,6 @@ export function useKnowledgeBaseDialogs({ guided_questions: data.guided_questions, max_calls_per_conversation: data.max_calls_per_conversation, exempt_calls_before_check: data.exempt_calls_before_check, - members: data.members, }) if (data.summary_enabled && data.summary_model_ref) { From 0239cafcb88e9af3aefba7f790b8b3aaaf29c388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=BD?= Date: Sat, 13 Jun 2026 00:43:16 +0800 Subject: [PATCH 06/15] =?UTF-8?q?refactor(knowledge):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20RAG=20=E5=88=9B=E5=BB=BA=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CreateKnowledgeBaseDialog.tsx | 146 ++++++++++++------ .../document/components/KnowledgeBaseForm.tsx | 50 +++--- 2 files changed, 126 insertions(+), 70 deletions(-) diff --git a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx index 0e768ebb0da..ad8ab8980d7 100644 --- a/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx +++ b/frontend/src/features/knowledge/document/components/CreateKnowledgeBaseDialog.tsx @@ -30,6 +30,8 @@ import type { RagConfigMode, } from '@/types/knowledge' import { KnowledgeBaseForm } from './KnowledgeBaseForm' +import { useRetrievers } from '../hooks/useRetrievers' +import { useEmbeddingModels } from '../hooks/useEmbeddingModels' /** Available group for selection */ export interface AvailableGroup { @@ -90,6 +92,18 @@ function GroupTypeIcon({ type }: { type: 'personal' | 'group' | 'organization' | } } +function createDefaultRetrievalConfig(): RetrievalConfigDraft { + return { + retrieval_mode: 'vector', + top_k: 5, + score_threshold: 0.5, + hybrid_weights: { + vector_weight: 0.7, + keyword_weight: 0.3, + }, + } +} + export function CreateKnowledgeBaseDialog({ open, onOpenChange, @@ -115,21 +129,39 @@ export function CreateKnowledgeBaseDialog({ const [summaryModelError, setSummaryModelError] = useState('') const [guidedQuestions, setGuidedQuestions] = useState([]) const [ragConfigMode, setRagConfigMode] = useState('auto') - const [retrievalConfig, setRetrievalConfig] = useState({ - retrieval_mode: 'vector', - top_k: 5, - score_threshold: 0.5, - hybrid_weights: { - vector_weight: 0.7, - keyword_weight: 0.3, - }, - }) + const [retrievalConfig, setRetrievalConfig] = useState( + createDefaultRetrievalConfig + ) const [error, setError] = useState('') const [accordionValue, setAccordionValue] = useState('') const [maxCalls, setMaxCalls] = useState(10) const [exemptCalls, setExemptCalls] = useState(5) // Selected group for creating KB (used when showGroupSelector is true) const [selectedGroupId, setSelectedGroupId] = useState(defaultGroupId || 'personal') + + // Get the selected group for retrieval scope + const selectedGroup = availableGroups?.find(g => g.id === selectedGroupId) + // Map dingtalk to personal scope since KBs cannot be created in dingtalk scope + const mapScope = ( + t: 'personal' | 'group' | 'organization' | 'dingtalk' | 'all' | undefined + ): 'personal' | 'organization' | 'group' | 'all' => { + if (t === 'dingtalk') return 'personal' + return t || 'personal' + } + const effectiveScope = mapScope(showGroupSelector && selectedGroup ? selectedGroup.type : scope) + const effectiveGroupName = + showGroupSelector && selectedGroup && selectedGroup.type === 'group' + ? selectedGroup.name + : groupName + const { retrievers, loading: loadingRetrievers } = useRetrievers( + effectiveScope, + effectiveGroupName + ) + const { models: embeddingModels, loading: loadingEmbeddingModels } = useEmbeddingModels( + effectiveScope, + effectiveGroupName + ) + // Reset selectedKbType and selectedGroupId when dialog opens useEffect(() => { if (open) { @@ -143,7 +175,62 @@ export function CreateKnowledgeBaseDialog({ setSelectedKbType(newType) } - // Note: Auto-selection of retriever and embedding model is handled by RetrievalSettingsSection + useEffect(() => { + if (!open || ragConfigMode === 'disabled' || loadingRetrievers || retrievers.length === 0) { + return + } + + setRetrievalConfig(current => { + const currentRetrieverExists = + current.retriever_name && + retrievers.some( + retriever => + retriever.name === current.retriever_name && + retriever.namespace === current.retriever_namespace + ) + + if (currentRetrieverExists) { + return current + } + + const defaultRetriever = retrievers[0] + return { + ...current, + retriever_name: defaultRetriever.name, + retriever_namespace: defaultRetriever.namespace, + } + }) + }, [open, ragConfigMode, loadingRetrievers, retrievers]) + + useEffect(() => { + if ( + !open || + ragConfigMode === 'disabled' || + loadingEmbeddingModels || + embeddingModels.length === 0 + ) { + return + } + + setRetrievalConfig(current => { + const currentModelExists = + current.embedding_config?.model_name && + embeddingModels.some(model => model.name === current.embedding_config?.model_name) + + if (currentModelExists) { + return current + } + + const defaultModel = embeddingModels[0] + return { + ...current, + embedding_config: { + model_name: defaultModel.name, + model_namespace: defaultModel.namespace || 'default', + }, + } + }) + }, [open, ragConfigMode, loadingEmbeddingModels, embeddingModels]) const handleSubmit = async () => { setError('') @@ -199,15 +286,7 @@ export function CreateKnowledgeBaseDialog({ setSummaryModelRef(null) setGuidedQuestions([]) setRagConfigMode('auto') - setRetrievalConfig({ - retrieval_mode: 'vector', - top_k: 5, - score_threshold: 0.5, - hybrid_weights: { - vector_weight: 0.7, - keyword_weight: 0.3, - }, - }) + setRetrievalConfig(createDefaultRetrievalConfig()) setMaxCalls(10) setExemptCalls(5) } catch (err) { @@ -226,15 +305,7 @@ export function CreateKnowledgeBaseDialog({ setSummaryModelError('') setGuidedQuestions([]) setRagConfigMode('auto') - setRetrievalConfig({ - retrieval_mode: 'vector', - top_k: 5, - score_threshold: 0.5, - hybrid_weights: { - vector_weight: 0.7, - keyword_weight: 0.3, - }, - }) + setRetrievalConfig(createDefaultRetrievalConfig()) setMaxCalls(10) setExemptCalls(5) setError('') @@ -244,21 +315,6 @@ export function CreateKnowledgeBaseDialog({ onOpenChange(newOpen) } - // Get the selected group for retrieval scope - const selectedGroup = availableGroups?.find(g => g.id === selectedGroupId) - // Map dingtalk to personal scope since KBs cannot be created in dingtalk scope - const mapScope = ( - t: 'personal' | 'group' | 'organization' | 'dingtalk' | 'all' | undefined - ): 'personal' | 'organization' | 'group' | 'all' => { - if (t === 'dingtalk') return 'personal' - return t || 'personal' - } - const effectiveScope = mapScope(showGroupSelector && selectedGroup ? selectedGroup.type : scope) - const effectiveGroupName = - showGroupSelector && selectedGroup && selectedGroup.type === 'group' - ? selectedGroup.name - : groupName - // Determine if this is a notebook type const isNotebook = selectedKbType === 'notebook' const ragModeOptions: RagConfigMode[] = ['auto', 'disabled'] @@ -266,13 +322,13 @@ export function CreateKnowledgeBaseDialog({ return ( {t('knowledge:document.knowledgeBase.create')} -
+
diff --git a/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx b/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx index 1eda8259285..fbe77fbff6c 100644 --- a/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx +++ b/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx @@ -169,29 +169,6 @@ export function KnowledgeBaseForm({ const advancedContent = (
- {(retrievalModeSection || showRetrievalSection) && ( -
-
- -
- - {retrievalModeSection} - - {showRetrievalSection && ( - - )} -
- )} -
@@ -240,6 +217,29 @@ export function KnowledgeBaseForm({
+ + {(retrievalModeSection || showRetrievalSection) && ( +
+
+ +
+ + {retrievalModeSection} + + {showRetrievalSection && ( + + )} +
+ )}
) @@ -273,7 +273,7 @@ export function KnowledgeBaseForm({ />
-
+
{showGuidedQuestions && ( -
+

From e4d98a58e2b8def4084a7156d7ba9658f1bfaad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BE=BD?= Date: Sat, 13 Jun 2026 15:21:22 +0800 Subject: [PATCH 07/15] =?UTF-8?q?refactor(knowledge):=20=E5=AF=B9=E9=BD=90?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E5=88=9B=E5=BB=BA=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../document/components/KnowledgeBaseForm.tsx | 307 ++++++++++-------- frontend/src/i18n/locales/en/knowledge.json | 5 + .../src/i18n/locales/zh-CN/knowledge.json | 5 + 3 files changed, 177 insertions(+), 140 deletions(-) diff --git a/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx b/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx index fbe77fbff6c..9267713cd7b 100644 --- a/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx +++ b/frontend/src/features/knowledge/document/components/KnowledgeBaseForm.tsx @@ -4,7 +4,7 @@ 'use client' -import { ReactNode, useId } from 'react' +import { ReactNode, useId, useState } from 'react' import { Label } from '@/components/ui/label' import { Input } from '@/components/ui/input' import { Textarea } from '@/components/ui/textarea' @@ -14,6 +14,10 @@ import { Button } from '@/components/ui/button' import { ChevronDown, Plus, X } from 'lucide-react' import { useTranslation } from '@/hooks/useTranslation' import { cn } from '@/lib/utils' +import { + SimpleConfigGroup, + SimpleConfigRow, +} from '@/features/settings/components/team-edit/SimpleConfigLayout' import type { KnowledgeResourceScope, RetrievalConfigDraft, @@ -64,24 +68,37 @@ function FormSection({ sectionId, open, onOpenChange, + defaultOpen = true, children, }: { title: string sectionId: string - open: boolean - onOpenChange: (open: boolean) => void + open?: boolean + onOpenChange?: (open: boolean) => void + defaultOpen?: boolean children: ReactNode }) { const contentId = useId() + const [internalOpen, setInternalOpen] = useState(defaultOpen) + const isOpen = open ?? internalOpen + + const handleOpenChange = () => { + const nextOpen = !isOpen + if (onOpenChange) { + onOpenChange(nextOpen) + return + } + setInternalOpen(nextOpen) + } return (

- {open && ( + {isOpen && (
{children}
@@ -168,14 +185,12 @@ export function KnowledgeBaseForm({ } const advancedContent = ( -
-
-
- -

- {t('knowledge:document.callLimits.description')} -

-
+ +
@@ -216,144 +231,156 @@ export function KnowledgeBaseForm({

-
+
{(retrievalModeSection || showRetrievalSection) && ( -
-
- -
- - {retrievalModeSection} + +
+ {retrievalModeSection} - {showRetrievalSection && ( - - )} -
+ {showRetrievalSection && ( + + )} +
+ )} -
+ ) return ( -
- {typeSection} +
+ + + {typeSection} -
- - onNameChange(e.target.value)} - placeholder={t('knowledge:document.knowledgeBase.namePlaceholder')} - maxLength={100} - data-testid="kb-name-input" - /> -
-
- -