+
{selectedValues?.slice(0, maxCount)?.map((value) => {
const option = flatOptions.find((o) => o.value === value);
@@ -348,9 +348,9 @@ export const MultiSelect = React.forwardRef<
)}
-
+
{
event.stopPropagation();
handleClear();
@@ -358,17 +358,17 @@ export const MultiSelect = React.forwardRef<
/>
-
+
) : (
-
+
{placeholder}
-
+
)}
@@ -379,14 +379,16 @@ export const MultiSelect = React.forwardRef<
onEscapeKeyDown={() => setIsPopoverOpen(false)}
>
-
+ {options && options.length > 0 && (
+
+ )}
No results found.
- {showSelectAll && (
+ {showSelectAll && options && options.length > 0 && (
)}
- setIsPopoverOpen(false)}
- className="flex-1 justify-center cursor-pointer max-w-full"
- >
- {t('common.close')}
-
+ {options && options.length > 0 && (
+ setIsPopoverOpen(false)}
+ className="flex-1 justify-center cursor-pointer max-w-full"
+ >
+ {t('common.close')}
+
+ )}
diff --git a/web/src/pages/next-search/search-setting-aisummery-config.tsx b/web/src/pages/next-search/search-setting-aisummery-config.tsx
deleted file mode 100644
index 8764c3014..000000000
--- a/web/src/pages/next-search/search-setting-aisummery-config.tsx
+++ /dev/null
@@ -1,236 +0,0 @@
-import { SliderInputSwitchFormField } from '@/components/llm-setting-items/slider';
-import { SelectWithSearch } from '@/components/originui/select-with-search';
-import {
- FormControl,
- FormField,
- FormItem,
- FormLabel,
- FormMessage,
-} from '@/components/ui/form';
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select';
-import {
- LlmModelType,
- ModelVariableType,
- settledModelVariableMap,
-} from '@/constants/knowledge';
-import { useTranslate } from '@/hooks/common-hooks';
-import { useComposeLlmOptionsByModelTypes } from '@/hooks/llm-hooks';
-import { camelCase, isEqual } from 'lodash';
-import { useCallback } from 'react';
-import { useFormContext } from 'react-hook-form';
-import { z } from 'zod';
-
-interface LlmSettingFieldItemsProps {
- prefix?: string;
- options?: any[];
-}
-const LlmSettingEnableSchema = {
- temperatureEnabled: z.boolean(),
- topPEnabled: z.boolean(),
- presencePenaltyEnabled: z.boolean(),
- frequencyPenaltyEnabled: z.boolean(),
-};
-export const LlmSettingSchema = {
- llm_id: z.string(),
- parameter: z.string().optional(),
- temperature: z.coerce.number().optional(),
- top_p: z.coerce.number().optional(),
- presence_penalty: z.coerce.number().optional(),
- frequency_penalty: z.coerce.number().optional(),
- ...LlmSettingEnableSchema,
- // maxTokensEnabled: z.boolean(),
-};
-
-export function LlmSettingFieldItems({
- prefix,
- options,
-}: LlmSettingFieldItemsProps) {
- const form = useFormContext();
- const { t } = useTranslate('chat');
-
- const modelOptions = useComposeLlmOptionsByModelTypes([
- LlmModelType.Chat,
- LlmModelType.Image2text,
- ]);
-
- const handleChange = useCallback(
- (parameter: string) => {
- const values =
- settledModelVariableMap[
- parameter as keyof typeof settledModelVariableMap
- ];
- const enabledKeys = Object.keys(LlmSettingEnableSchema);
-
- for (const key in values) {
- if (Object.prototype.hasOwnProperty.call(values, key)) {
- const element = values[key as keyof typeof values];
- form.setValue(`${prefix}.${key}`, element);
- }
- }
- if (enabledKeys && enabledKeys.length) {
- for (const key of enabledKeys) {
- form.setValue(`${prefix}.${key}`, true);
- }
- }
- },
- [form, prefix],
- );
-
- const parameterOptions = Object.values(ModelVariableType).map((x) => ({
- label: t(camelCase(x)),
- value: x,
- })) as unknown as { label: string; value: ModelVariableType | 'Custom' }[];
- parameterOptions.push({
- label: t(camelCase('Custom')),
- value: 'Custom',
- });
-
- const getFieldWithPrefix = useCallback(
- (name: string) => {
- return prefix ? `${prefix}.${name}` : name;
- },
- [prefix],
- );
-
- const checkParameterIsEquel = () => {
- const [
- parameter,
- topPValue,
- frequencyPenaltyValue,
- temperatureValue,
- presencePenaltyValue,
- ] = form.getValues([
- getFieldWithPrefix('parameter'),
- getFieldWithPrefix('temperature'),
- getFieldWithPrefix('top_p'),
- getFieldWithPrefix('frequency_penalty'),
- getFieldWithPrefix('presence_penalty'),
- ]);
- if (parameter && parameter !== 'Custom') {
- const parameterValue =
- settledModelVariableMap[parameter as keyof typeof ModelVariableType];
- const parameterRealValue = {
- top_p: topPValue,
- temperature: temperatureValue,
- frequency_penalty: frequencyPenaltyValue,
- presence_penalty: presencePenaltyValue,
- };
- if (!isEqual(parameterValue, parameterRealValue)) {
- form.setValue(getFieldWithPrefix('parameter'), 'Custom');
- }
- }
- };
-
- return (
-
-
(
-
-
- *
- {t('model')}
-
-
-
-
-
-
- )}
- />
- (
-
- {t('freedom')}
-
-
-
-
-
-
-
- )}
- />
- {
- checkParameterIsEquel();
- }}
- >
- {
- checkParameterIsEquel();
- }}
- >
- {
- checkParameterIsEquel();
- }}
- >
- {
- checkParameterIsEquel();
- }}
- >
- {/* */}
-
- );
-}
diff --git a/web/src/pages/next-search/search-setting.tsx b/web/src/pages/next-search/search-setting.tsx
index 665d7e49b..365c366cb 100644
--- a/web/src/pages/next-search/search-setting.tsx
+++ b/web/src/pages/next-search/search-setting.tsx
@@ -1,6 +1,10 @@
// src/pages/next-search/search-setting.tsx
import { AvatarUpload } from '@/components/avatar-upload';
+import {
+ LlmSettingFieldItems,
+ LlmSettingSchema,
+} from '@/components/llm-setting-items/next';
import {
MetadataFilter,
MetadataFilterSchema,
@@ -46,10 +50,10 @@ import {
IllmSettingProps,
useUpdateSearch,
} from '../next-searches/hooks';
-import {
- LlmSettingFieldItems,
- LlmSettingSchema,
-} from './search-setting-aisummery-config';
+// import {
+// LlmSettingFieldItems,
+// LlmSettingSchema,
+// } from './search-setting-aisummery-config';
interface SearchSettingProps {
open: boolean;
@@ -397,6 +401,7 @@ const SearchSetting: React.FC
= ({
isTooltipShown
similarityName="search_config.similarity_threshold"
vectorSimilarityWeightName="search_config.vector_similarity_weight"
+ numberInputClassName="rounded-sm"
>
{/* Rerank Model */}
= ({
= ({
)}
/>
{aiSummaryDisabled && (
+ //
)}
{/* Feature Controls */}
From 1033a3ae268367dbd2715ddc522ff6ee9a05064c Mon Sep 17 00:00:00 2001
From: FallingSnowFlake
Date: Fri, 21 Nov 2025 14:33:29 +0800
Subject: [PATCH 2/5] Fix: improve PDF text type detection by expanding regex
content (#11432)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- Add whitespace validation to the PDF English text checking regex
- Reduce false negatives in English PDF content recognition
### What problem does this PR solve?
The core idea is to **expand the regex content used for English text
detection** so it can accommodate more valid characters commonly found
in English PDFs. The modifications include:
- Adding support for **space** in the regex.
- Ensuring the update does not reduce existing detection accuracy.
### Type of change
- [✅] Bug Fix (non-breaking change which fixes an issue)
---
deepdoc/parser/pdf_parser.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/deepdoc/parser/pdf_parser.py b/deepdoc/parser/pdf_parser.py
index 6d8431c82..f6613c2f5 100644
--- a/deepdoc/parser/pdf_parser.py
+++ b/deepdoc/parser/pdf_parser.py
@@ -1091,7 +1091,7 @@ class RAGFlowPdfParser:
logging.debug("Images converted.")
self.is_english = [
- re.search(r"[a-zA-Z0-9,/¸;:'\[\]\(\)!@#$%^&*\"?<>._-]{30,}", "".join(random.choices([c["text"] for c in self.page_chars[i]], k=min(100, len(self.page_chars[i])))))
+ re.search(r"[ a-zA-Z0-9,/¸;:'\[\]\(\)!@#$%^&*\"?<>._-]{30,}", "".join(random.choices([c["text"] for c in self.page_chars[i]], k=min(100, len(self.page_chars[i])))))
for i in range(len(self.page_chars))
]
if sum([1 if e else 0 for e in self.is_english]) > len(self.page_images) / 2:
@@ -1148,7 +1148,7 @@ class RAGFlowPdfParser:
if not self.is_english and not any([c for c in self.page_chars]) and self.boxes:
bxes = [b for bxs in self.boxes for b in bxs]
- self.is_english = re.search(r"[\na-zA-Z0-9,/¸;:'\[\]\(\)!@#$%^&*\"?<>._-]{30,}", "".join([b["text"] for b in random.choices(bxes, k=min(30, len(bxes)))]))
+ self.is_english = re.search(r"[ \na-zA-Z0-9,/¸;:'\[\]\(\)!@#$%^&*\"?<>._-]{30,}", "".join([b["text"] for b in random.choices(bxes, k=min(30, len(bxes)))]))
logging.debug(f"Is it English: {self.is_english}")
From db0f6840d988db04192d9c05139f21c5afa26c28 Mon Sep 17 00:00:00 2001
From: Yongteng Lei
Date: Fri, 21 Nov 2025 14:36:26 +0800
Subject: [PATCH 3/5] Feat: ignore chunk size when using custom delimiters
(#11434)
### What problem does this PR solve?
Ignore chunk size when using custom delimiter.
### Type of change
- [x] New Feature (non-breaking change which adds functionality)
---
rag/nlp/__init__.py | 76 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 68 insertions(+), 8 deletions(-)
diff --git a/rag/nlp/__init__.py b/rag/nlp/__init__.py
index f61019377..add454ade 100644
--- a/rag/nlp/__init__.py
+++ b/rag/nlp/__init__.py
@@ -437,16 +437,16 @@ def not_title(txt):
return re.search(r"[,;，。；！!]", txt)
def tree_merge(bull, sections, depth):
-
+
if not sections or bull < 0:
return sections
if isinstance(sections[0], type("")):
sections = [(s, "") for s in sections]
-
+
# filter out position information in pdf sections
sections = [(t, o) for t, o in sections if
t and len(t.split("@")[0].strip()) > 1 and not re.match(r"[0-9]+$", t.split("@")[0].strip())]
-
+
def get_level(bull, section):
text, layout = section
text = re.sub(r"\u3000", " ", text).strip()
@@ -465,7 +465,7 @@ def tree_merge(bull, sections, depth):
level, text = get_level(bull, section)
if not text.strip("\n"):
continue
-
+
lines.append((level, text))
level_set.add(level)
@@ -608,6 +608,26 @@ def naive_merge(sections: str | list, chunk_token_num=128, delimiter="\n。；
cks[-1] += t
tk_nums[-1] += tnum
+ custom_delimiters = [m.group(1) for m in re.finditer(r"`([^`]+)`", delimiter)]
+ has_custom = bool(custom_delimiters)
+ if has_custom:
+ custom_pattern = "|".join(re.escape(t) for t in sorted(set(custom_delimiters), key=len, reverse=True))
+ cks, tk_nums = [], []
+ for sec, pos in sections:
+ split_sec = re.split(r"(%s)" % custom_pattern, sec, flags=re.DOTALL)
+ for sub_sec in split_sec:
+ if re.fullmatch(custom_pattern, sub_sec or ""):
+ continue
+ text = "\n" + sub_sec
+ local_pos = pos
+ if num_tokens_from_string(text) < 8:
+ local_pos = ""
+ if local_pos and text.find(local_pos) < 0:
+ text += local_pos
+ cks.append(text)
+ tk_nums.append(num_tokens_from_string(text))
+ return cks
+
dels = get_delimiters(delimiter)
for sec, pos in sections:
if num_tokens_from_string(sec) < chunk_token_num:
@@ -657,6 +677,29 @@ def naive_merge_with_images(texts, images, chunk_token_num=128, delimiter="\n。
result_images[-1] = concat_img(result_images[-1], image)
tk_nums[-1] += tnum
+ custom_delimiters = [m.group(1) for m in re.finditer(r"`([^`]+)`", delimiter)]
+ has_custom = bool(custom_delimiters)
+ if has_custom:
+ custom_pattern = "|".join(re.escape(t) for t in sorted(set(custom_delimiters), key=len, reverse=True))
+ cks, result_images, tk_nums = [], [], []
+ for text, image in zip(texts, images):
+ text_str = text[0] if isinstance(text, tuple) else text
+ text_pos = text[1] if isinstance(text, tuple) and len(text) > 1 else ""
+ split_sec = re.split(r"(%s)" % custom_pattern, text_str)
+ for sub_sec in split_sec:
+ if re.fullmatch(custom_pattern, sub_sec or ""):
+ continue
+ text_seg = "\n" + sub_sec
+ local_pos = text_pos
+ if num_tokens_from_string(text_seg) < 8:
+ local_pos = ""
+ if local_pos and text_seg.find(local_pos) < 0:
+ text_seg += local_pos
+ cks.append(text_seg)
+ result_images.append(image)
+ tk_nums.append(num_tokens_from_string(text_seg))
+ return cks, result_images
+
dels = get_delimiters(delimiter)
for text, image in zip(texts, images):
# if text is tuple, unpack it
@@ -748,6 +791,23 @@ def naive_merge_docx(sections, chunk_token_num=128, delimiter="\n。；！？"):
images[-1] = concat_img(images[-1], image)
tk_nums[-1] += tnum
+ custom_delimiters = [m.group(1) for m in re.finditer(r"`([^`]+)`", delimiter)]
+ has_custom = bool(custom_delimiters)
+ if has_custom:
+ custom_pattern = "|".join(re.escape(t) for t in sorted(set(custom_delimiters), key=len, reverse=True))
+ cks, images, tk_nums = [], [], []
+ pattern = r"(%s)" % custom_pattern
+ for sec, image in sections:
+ split_sec = re.split(pattern, sec)
+ for sub_sec in split_sec:
+ if not sub_sec or re.fullmatch(custom_pattern, sub_sec):
+ continue
+ text_seg = "\n" + sub_sec
+ cks.append(text_seg)
+ images.append(image)
+ tk_nums.append(num_tokens_from_string(text_seg))
+ return cks, images
+
dels = get_delimiters(delimiter)
pattern = r"(%s)" % dels
@@ -789,7 +849,7 @@ class Node:
self.level = level
self.depth = depth
self.texts = texts or []
- self.children = []
+ self.children = []
def add_child(self, child_node):
self.children.append(child_node)
@@ -835,7 +895,7 @@ class Node:
return self
def get_tree(self):
- tree_list = []
+ tree_list = []
self._dfs(self, tree_list, [])
return tree_list
@@ -860,7 +920,7 @@ class Node:
# A leaf title within depth emits its title path as a chunk (header-only section)
elif not child and (1 <= level <= self.depth):
tree_list.append("\n".join(path_titles))
-
+
# Recurse into children with the updated title path
for c in child:
- self._dfs(c, tree_list, path_titles)
\ No newline at end of file
+ self._dfs(c, tree_list, path_titles)
From 249296e417e75d50053f4a49402b7b6a6eab2502 Mon Sep 17 00:00:00 2001
From: Kevin Hu
Date: Fri, 21 Nov 2025 14:51:58 +0800
Subject: [PATCH 4/5] Feat: API supports toc_enhance. (#11437)
### What problem does this PR solve?
Close #11433
### Type of change
- [x] New Feature (non-breaking change which adds functionality)
---
README.md | 2 +-
README_id.md | 2 +-
README_ja.md | 2 +-
README_ko.md | 2 +-
README_pt_br.md | 2 +-
README_tzh.md | 2 +-
README_zh.md | 2 +-
agent/component/iteration.py | 2 +-
api/apps/__init__.py | 6 +++++-
api/apps/sdk/doc.py | 6 ++++++
docs/references/http_api_reference.md | 6 ++++++
11 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index d82721d98..ded81f099 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ Try our demo at [https://demo.ragflow.io](https://demo.ragflow.io).
## 🔥 Latest Updates
- 2025-11-19 Supports Gemini 3 Pro.
-- 2025-11-12 Supports data synchronization from Confluence, AWS S3, Discord, Google Drive.
+- 2025-11-12 Supports data synchronization from Confluence, S3, Notion, Discord, Google Drive.
- 2025-10-23 Supports MinerU & Docling as document parsing methods.
- 2025-10-15 Supports orchestrable ingestion pipeline.
- 2025-08-08 Supports OpenAI's latest GPT-5 series models.
diff --git a/README_id.md b/README_id.md
index 953fce4c5..11b09b4fb 100644
--- a/README_id.md
+++ b/README_id.md
@@ -86,7 +86,7 @@ Coba demo kami di [https://demo.ragflow.io](https://demo.ragflow.io).
## 🔥 Pembaruan Terbaru
- 2025-11-19 Mendukung Gemini 3 Pro.
-- 2025-11-12 Mendukung sinkronisasi data dari Confluence, AWS S3, Discord, Google Drive.
+- 2025-11-12 Mendukung sinkronisasi data dari Confluence, S3, Notion, Discord, Google Drive.
- 2025-10-23 Mendukung MinerU & Docling sebagai metode penguraian dokumen.
- 2025-10-15 Dukungan untuk jalur data yang terorkestrasi.
- 2025-08-08 Mendukung model seri GPT-5 terbaru dari OpenAI.
diff --git a/README_ja.md b/README_ja.md
index 7711d3ff0..5e471b5c2 100644
--- a/README_ja.md
+++ b/README_ja.md
@@ -67,7 +67,7 @@
## 🔥 最新情報
- 2025-11-19 Gemini 3 Proをサポートしています
-- 2025-11-12 Confluence、AWS S3、Discord、Google Drive からのデータ同期をサポートします。
+- 2025-11-12 Confluence、S3、Notion、Discord、Google Drive からのデータ同期をサポートします。
- 2025-10-23 ドキュメント解析方法として MinerU と Docling をサポートします。
- 2025-10-15 オーケストレーションされたデータパイプラインのサポート。
- 2025-08-08 OpenAI の最新 GPT-5 シリーズモデルをサポートします。
diff --git a/README_ko.md b/README_ko.md
index 386fd2faa..f34f23279 100644
--- a/README_ko.md
+++ b/README_ko.md
@@ -68,7 +68,7 @@
## 🔥 업데이트
- 2025-11-19 Gemini 3 Pro를 지원합니다.
-- 2025-11-12 Confluence, AWS S3, Discord, Google Drive에서 데이터 동기화를 지원합니다.
+- 2025-11-12 Confluence, S3, Notion, Discord, Google Drive에서 데이터 동기화를 지원합니다.
- 2025-10-23 문서 파싱 방법으로 MinerU 및 Docling을 지원합니다.
- 2025-10-15 조정된 데이터 파이프라인 지원.
- 2025-08-08 OpenAI의 최신 GPT-5 시리즈 모델을 지원합니다.
diff --git a/README_pt_br.md b/README_pt_br.md
index 487ec5530..71690ebb9 100644
--- a/README_pt_br.md
+++ b/README_pt_br.md
@@ -87,7 +87,7 @@ Experimente nossa demo em [https://demo.ragflow.io](https://demo.ragflow.io).
## 🔥 Últimas Atualizações
- 19-11-2025 Suporta Gemini 3 Pro.
-- 12-11-2025 Suporta a sincronização de dados do Confluence, AWS S3, Discord e Google Drive.
+- 12-11-2025 Suporta a sincronização de dados do Confluence, S3, Notion, Discord e Google Drive.
- 23-10-2025 Suporta MinerU e Docling como métodos de análise de documentos.
- 15-10-2025 Suporte para pipelines de dados orquestrados.
- 08-08-2025 Suporta a mais recente série GPT-5 da OpenAI.
diff --git a/README_tzh.md b/README_tzh.md
index eab5938e4..7756aacc8 100644
--- a/README_tzh.md
+++ b/README_tzh.md
@@ -86,7 +86,7 @@
## 🔥 近期更新
- 2025-11-19 支援 Gemini 3 Pro.
-- 2025-11-12 支援從 Confluence、AWS S3、Discord、Google Drive 進行資料同步。
+- 2025-11-12 支援從 Confluence、S3、Notion、Discord、Google Drive 進行資料同步。
- 2025-10-23 支援 MinerU 和 Docling 作為文件解析方法。
- 2025-10-15 支援可編排的資料管道。
- 2025-08-08 支援 OpenAI 最新的 GPT-5 系列模型。
diff --git a/README_zh.md b/README_zh.md
index 58394b5fd..799c3aaea 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -86,7 +86,7 @@
## 🔥 近期更新
- 2025-11-19 支持 Gemini 3 Pro.
-- 2025-11-12 支持从 Confluence、AWS S3、Discord、Google Drive 进行数据同步。
+- 2025-11-12 支持从 Confluence、S3、Notion、Discord、Google Drive 进行数据同步。
- 2025-10-23 支持 MinerU 和 Docling 作为文档解析方法。
- 2025-10-15 支持可编排的数据管道。
- 2025-08-08 支持 OpenAI 最新的 GPT-5 系列模型。
diff --git a/agent/component/iteration.py b/agent/component/iteration.py
index cff09d622..ae5c0b677 100644
--- a/agent/component/iteration.py
+++ b/agent/component/iteration.py
@@ -32,7 +32,7 @@ class IterationParam(ComponentParamBase):
def __init__(self):
super().__init__()
self.items_ref = ""
- self.veriable={}
+ self.variable={}
def get_input_form(self) -> dict[str, dict]:
return {
diff --git a/api/apps/__init__.py b/api/apps/__init__.py
index a53f67c06..a6e33c13b 100644
--- a/api/apps/__init__.py
+++ b/api/apps/__init__.py
@@ -24,7 +24,7 @@ from flasgger import Swagger
from itsdangerous.url_safe import URLSafeTimedSerializer as Serializer
from quart_cors import cors
from common.constants import StatusEnum
-from api.db.db_models import close_connection
+from api.db.db_models import close_connection, APIToken
from api.db.services import UserService
from api.utils.json_encode import CustomJSONEncoder
from api.utils import commands
@@ -124,6 +124,10 @@ def _load_user():
user = UserService.query(
access_token=access_token, status=StatusEnum.VALID.value
)
+ if not user and len(authorization.split()) == 2:
+ objs = APIToken.query(token=authorization.split()[1])
+ if objs:
+ user = UserService.query(id=objs[0].tenant_id, status=StatusEnum.VALID.value)
if user:
if not user[0].access_token or not user[0].access_token.strip():
logging.warning(f"User {user[0].email} has empty access_token in database")
diff --git a/api/apps/sdk/doc.py b/api/apps/sdk/doc.py
index 30fbd835e..52acebc43 100644
--- a/api/apps/sdk/doc.py
+++ b/api/apps/sdk/doc.py
@@ -1434,6 +1434,7 @@ async def retrieval_test(tenant_id):
question = req["question"]
doc_ids = req.get("document_ids", [])
use_kg = req.get("use_kg", False)
+ toc_enhance = req.get("toc_enhance", False)
langs = req.get("cross_languages", [])
if not isinstance(doc_ids, list):
return get_error_data_result("`documents` should be a list")
@@ -1487,6 +1488,11 @@ async def retrieval_test(tenant_id):
highlight=highlight,
rank_feature=label_question(question, kbs),
)
+ if toc_enhance:
+ chat_mdl = LLMBundle(kb.tenant_id, LLMType.CHAT)
+ cks = settings.retriever.retrieval_by_toc(question, ranks["chunks"], tenant_ids, chat_mdl, size)
+ if cks:
+ ranks["chunks"] = cks
if use_kg:
ck = settings.kg_retriever.retrieval(question, [k.tenant_id for k in kbs], kb_ids, embd_mdl, LLMBundle(kb.tenant_id, LLMType.CHAT))
if ck["content_with_weight"]:
diff --git a/docs/references/http_api_reference.md b/docs/references/http_api_reference.md
index bc1b15670..253745432 100644
--- a/docs/references/http_api_reference.md
+++ b/docs/references/http_api_reference.md
@@ -2072,6 +2072,7 @@ Retrieves chunks from specified datasets.
- `"cross_languages"`: `list[string]`
- `"metadata_condition"`: `object`
- `"use_kg"`: `boolean`
+ - `"toc_enhance"`: `boolean`
##### Request example
```bash
@@ -2122,6 +2123,8 @@ curl --request POST \
The number of chunks engaged in vector cosine computation. Defaults to `1024`.
- `"use_kg"`: (*Body parameter*), `boolean`
The search includes text chunks related to the knowledge graph of the selected dataset to handle complex multi-hop queries. Defaults to `False`.
+- `"toc_enhance"`: (*Body parameter*), `boolean`
+ The search includes table of content enhancement in order to boost rank of relevant chunks. Files parsed with `TOC Enhance` enabled is prerequisite. Defaults to `False`.
- `"rerank_id"`: (*Body parameter*), `integer`
The ID of the rerank model.
- `"keyword"`: (*Body parameter*), `boolean`
@@ -2136,6 +2139,9 @@ curl --request POST \
The languages that should be translated into, in order to achieve keywords retrievals in different languages.
- `"metadata_condition"`: (*Body parameter*), `object`
The metadata condition used for filtering chunks:
+ - `"logic"`: (*Body parameter*), `string`
+ - `"and"` Intersection of the result from each condition (default).
+ - `"or"` union of the result from each condition.
- `"conditions"`: (*Body parameter*), `array`
A list of metadata filter conditions.
- `"name"`: `string` - The metadata field name to filter by, e.g., `"author"`, `"company"`, `"url"`. Ensure this parameter before use. See [Set metadata](../guides/dataset/set_metadata.md) for details.
From 13299197b8e176a9f98e701062a2d6bc62def738 Mon Sep 17 00:00:00 2001
From: balibabu
Date: Fri, 21 Nov 2025 16:21:27 +0800
Subject: [PATCH 5/5] Feat: Enable logical operators in metadata. #11387
#11376 (#11442)
### What problem does this PR solve?
Feat: Enable logical operators in metadata. #11387 #11376
### Type of change
- [x] New Feature (non-breaking change which adds functionality)
---
web/src/components/metadata-filter/index.tsx | 1 +
.../metadata-filter-conditions.tsx | 162 ++++++++++--------
web/src/constants/agent.tsx | 5 +
.../hooks/logic-hooks/use-build-options.ts | 12 ++
web/src/pages/agent/constant/index.tsx | 5 +-
.../pages/agent/form/switch-form/index.tsx | 14 +-
6 files changed, 119 insertions(+), 80 deletions(-)
create mode 100644 web/src/hooks/logic-hooks/use-build-options.ts
diff --git a/web/src/components/metadata-filter/index.tsx b/web/src/components/metadata-filter/index.tsx
index 8dbdce42f..48388e4c2 100644
--- a/web/src/components/metadata-filter/index.tsx
+++ b/web/src/components/metadata-filter/index.tsx
@@ -14,6 +14,7 @@ type MetadataFilterProps = {
export const MetadataFilterSchema = {
meta_data_filter: z
.object({
+ logic: z.string().optional(),
method: z.string().optional(),
manual: z
.array(
diff --git a/web/src/components/metadata-filter/metadata-filter-conditions.tsx b/web/src/components/metadata-filter/metadata-filter-conditions.tsx
index 80cb6409b..aee103a1f 100644
--- a/web/src/components/metadata-filter/metadata-filter-conditions.tsx
+++ b/web/src/components/metadata-filter/metadata-filter-conditions.tsx
@@ -15,14 +15,17 @@ import {
} from '@/components/ui/form';
import { Input } from '@/components/ui/input';
import { Separator } from '@/components/ui/separator';
-import { SwitchOperatorOptions } from '@/constants/agent';
+import { SwitchLogicOperator, SwitchOperatorOptions } from '@/constants/agent';
import { useBuildSwitchOperatorOptions } from '@/hooks/logic-hooks/use-build-operator-options';
+import { useBuildSwitchLogicOperatorOptions } from '@/hooks/logic-hooks/use-build-options';
import { useFetchKnowledgeMetadata } from '@/hooks/use-knowledge-request';
import { PromptEditor } from '@/pages/agent/form/components/prompt-editor';
import { Plus, X } from 'lucide-react';
import { useCallback } from 'react';
import { useFieldArray, useFormContext } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
+import { RAGFlowFormItem } from '../ragflow-form';
+import { RAGFlowSelect } from '../ui/select';
export function MetadataFilterConditions({
kbIds,
@@ -36,10 +39,13 @@ export function MetadataFilterConditions({
const { t } = useTranslation();
const form = useFormContext();
const name = prefix + 'meta_data_filter.manual';
+ const logic = prefix + 'meta_data_filter.logic';
const metadata = useFetchKnowledgeMetadata(kbIds);
const switchOperatorOptions = useBuildSwitchOperatorOptions();
+ const switchLogicOperatorOptions = useBuildSwitchLogicOperatorOptions();
+
const { fields, remove, append } = useFieldArray({
name,
control: form.control,
@@ -47,13 +53,14 @@ export function MetadataFilterConditions({
const add = useCallback(
(key: string) => () => {
+ form.setValue(logic, SwitchLogicOperator.And);
append({
key,
value: '',
op: SwitchOperatorOptions[0].value,
});
},
- [append],
+ [append, form, logic],
);
return (
@@ -77,73 +84,92 @@ export function MetadataFilterConditions({