mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-08-05 15:20:30 +08:00
Fixes #17202 (and complements #12109). ## Problem `RAGFlowTxtParser.parser_txt` (`deepdoc/parser/txt_parser.py:36-47`) and `rag.nlp.naive_merge` (`rag/nlp/__init__.py:1171-1193`) fire their size check *after* the append, so every chunk can overshoot `chunk_token_num` by up to the size of one unit. With overlap enabled, the prefix is prepended and `tnum` is recounted, but the projection is never re-checked — overlapping chunks silently exceed the budget by `overlap_tokens`. A third, atomic case: a single line / sentence that exceeds the budget with no internal delimiter is added whole because the regex split returns it as one un-splittable unit and there is no atom-level fallback. `RAGFlowHtmlParser.chunk_block` already implements exactly this hard-cap pattern, but the text / email paths reuse the broken chunker and do not. Measured on a live dataset (336 `.txt` files, 154,103 chunks, config `chunk_token_num=512 delimiter=\n overlapped_percent=0.1`): 56.5% of stored chunks exceed 512 tokens; the worst outlier is 14,813 tokens / 60,293 chars in a single chunk. Symptom downstream: rerank failures on the >2048-token outliers (ref. #12109) and silent embedding truncation on every oversize chunk. ## Fix Mirror the proven pattern in `RAGFlowHtmlParser.chunk_block`: 1. **Proactive projected-total check** in `TxtParser.parser_txt` and in `naive_merge.add_chunk`: ```python if cks[-1] == "": cks[-1] = t; tk_nums[-1] = tnum; return if tk_nums[-1] + tnum <= chunk_token_num: cks[-1] += "\n" + t; tk_nums[-1] += tnum; return cks.append(t); tk_nums.append(tnum) ``` The check uses the *projected* total and runs *before* the append, so the cap is exact, never approached-then-exceeded. 2. **Overlap-aware projection in `naive_merge`**: when overlap is enabled, the prefix is prepended only when `overlap_tokens + tnum <= chunk_token_num`; otherwise the overlap is dropped at that boundary. The naive_merge-with-images mirror gets the same treatment. Custom-delimiter behaviour is preserved per the existing test suite. 3. **Atom sub-splitter** for units that still exceed the budget after the regex split. Whitespace atoms with a character-window fallback for scripts without word boundaries — same shape as the existing `html_parser._split_oversized_block`, so behaviour matches for HTML vs `.txt` vs PDF atomic-oversize. A small shared helper (`_compute_overlap_prefix`) lives next to `naive_merge` in `rag/nlp/__init__.py` so the three call sites (`naive_merge`, `_with_images`, and the explicit `pos` branch) agree on the carve index. ## Result on the dataset above | | Before | After | |---|---|---| | Chunks > 512 tokens | 56.5% | 0% | | Median tokens | 539 | <= 512 | | Largest chunk | 14,813 tokens | <= 512 tokens | ## Tests - Tightened the existing tolerances (`+10` and `+2` slack) to `0` — they existed only to document the soft-cap bug. - Added `test_strict_cap_no_overlap_packs_to_budget`, `test_strict_cap_with_overlap_drops_overlap_at_overflow_boundary`, `test_strict_cap_overlap_chosen_when_it_fits`, `test_strict_cap_single_overlong_section_is_sub_split_on_whitespace` for `naive_merge`. - Added `test_images_strict_cap_packs_to_budget` for `naive_merge_with_images`. - New `test/unit_test/deepdoc/parser/test_txt_parser.py` covers `parser_txt` strict cap and atom sub-split. Uses the same path-loading pattern as the existing `test_html_parser.py` to avoid pulling the deep import chain into a test-time-only venv. All 22 unit tests pass on the host venv: ``` test_naive_merge.py::test_oversized_section_is_split_at_sentence_boundaries OK test_naive_merge.py::test_small_sections_are_merged_not_oversplit OK test_naive_merge.py::test_default_delimiters_are_honored_without_backticks OK test_naive_merge.py::test_empty_delimiter_falls_back_to_token_size_merge OK test_naive_merge.py::test_overlap_prefix_is_counted_in_token_budget OK test_naive_merge.py::test_custom_delimiter_ignores_chunk_size OK test_naive_merge.py::test_custom_delimiter_does_not_size_merge OK test_naive_merge.py::test_images_oversized_section_is_split OK test_naive_merge.py::test_images_custom_delimiter_preserved OK test_naive_merge.py::test_images_plain_string_input OK test_naive_merge.py::test_images_mismatched_lengths_returns_empty OK test_naive_merge.py::test_images_shared_lazyimage_not_stacked_… OK test_naive_merge.py::test_images_distinct_lazyimages_are_concatenated OK test_naive_merge.py::test_strict_cap_no_overlap_packs_to_budget OK test_naive_merge.py::test_strict_cap_with_overlap_drops_… OK test_naive_merge.py::test_strict_cap_single_overlong_section_… OK test_naive_merge.py::test_strict_cap_overlap_chosen_when_it_fits OK test_naive_merge.py::test_images_strict_cap_packs_to_budget OK test_txt_parser.py::test_no_overshoot_when_packing_short_lines OK test_txt_parser.py::test_no_overshoot_at_chunk_boundary OK test_txt_parser.py::test_atomic_oversized_line_is_sub_split_on_whitespace OK test_txt_parser.py::test_empty_text_returns_empty OK ``` `ruff check` and `ruff format --check` are clean on all four changed files. ## Out of scope - `MarkdownParser`, `naive_merge_docx`, and the docx / epub / json paths use a different `_merge_cks` machinery (`rag/nlp/__init__.py:1574`) that already enforces the budget. They are unchanged. - The `chunk_block` call sites in `deepdoc/parser/html_parser.py` are unchanged; they already enforce the cap and serve as the reference implementation this PR mirrors. Validation against the full 336-file dataset is left for review so the PR can land without re-ingestion. --------- Co-authored-by: skbs-eng <skbs-eng@users.noreply.github.com> Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
231 lines
8.8 KiB
Python
231 lines
8.8 KiB
Python
#
|
|
# Copyright 2025 The InfiniFlow Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
"""Regression tests for case-sensitive delimiter parsing.
|
|
|
|
Locks in case-sensitive matching for the two delimiter-parsing
|
|
implementations that pass ``re.I`` to ``re.finditer`` (#17384). The flag is
|
|
currently dead code — it does not propagate from ``re.finditer`` to
|
|
``m.group(1)`` or to downstream ``re.split`` / ``re.match`` calls — but the
|
|
inconsistency with the three sibling implementations is misleading. These
|
|
tests guard against any future refactor that accidentally makes matching
|
|
case-insensitive.
|
|
|
|
Affected sites
|
|
--------------
|
|
* ``rag.nlp.get_delimiters`` (line 1633)
|
|
* ``deepdoc.parser.txt_parser.parser_txt`` (line 51)
|
|
|
|
Sibling sites that already correctly omit ``re.I``
|
|
--------------------------------------------------
|
|
* ``rag.nlp.naive_merge`` custom-delimiter path (line 1195)
|
|
* ``rag.nlp.naive_merge_with_images`` custom-delimiter path (line 1269)
|
|
* ``rag.nlp._build_cks`` (line 1389)
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import ast
|
|
import re
|
|
import sys
|
|
import types
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def stub_pdf_parser(monkeypatch):
|
|
"""Stub ``deepdoc.parser.pdf_parser`` for the duration of each test.
|
|
|
|
``naive_merge`` does ``from deepdoc.parser.pdf_parser import
|
|
RAGFlowPdfParser`` inside the function body, and the deepdoc package's
|
|
``__init__`` pulls in ``infinity`` (a native extension) plus OCR parsers
|
|
that aren't relevant to delimiter parsing. ``monkeypatch.setitem`` (a)
|
|
replaces any pre-existing parser entry — not just stubs one in if absent
|
|
— and (b) restores ``sys.modules`` after the test so the mock never leaks
|
|
across tests.
|
|
"""
|
|
pdf_parser = types.ModuleType("deepdoc.parser.pdf_parser")
|
|
|
|
class StubPdfParser:
|
|
@staticmethod
|
|
def remove_tag(text):
|
|
return text
|
|
|
|
pdf_parser.RAGFlowPdfParser = StubPdfParser
|
|
monkeypatch.setitem(sys.modules, "deepdoc.parser.pdf_parser", pdf_parser)
|
|
|
|
|
|
from rag import nlp
|
|
from rag.nlp import get_delimiters, naive_merge
|
|
|
|
_REPO_ROOT = Path(__file__).resolve().parents[3]
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# get_delimiters — direct pattern checks
|
|
# --------------------------------------------------------------------------- #
|
|
|
|
|
|
def test_get_delimiters_bare_char_a_returns_literal_pattern():
|
|
"""Bare-char delimiter ``a`` must produce the pattern ``a``, not ``a|A``."""
|
|
assert get_delimiters("a") == "a"
|
|
|
|
|
|
def test_get_delimiters_bare_char_A_returns_literal_pattern():
|
|
assert get_delimiters("A") == "A"
|
|
|
|
|
|
def test_get_delimiters_backtick_end_returns_exact_token():
|
|
"""Backtick-wrapped delimiter must preserve the captured group verbatim.
|
|
|
|
A regression that introduced case-insensitive alternation would produce
|
|
``end|End|END|eNd|...`` instead of the literal ``end``.
|
|
"""
|
|
assert get_delimiters("`end`") == "end"
|
|
|
|
|
|
def test_get_delimiters_pattern_splits_case_sensitively():
|
|
"""The pattern returned by ``get_delimiters`` must split case-sensitively
|
|
when fed to ``re.split`` without any flags."""
|
|
pat = get_delimiters("a")
|
|
# Only the lowercase 'a' splits; uppercase 'A' is preserved intact.
|
|
assert re.split(f"({pat})", "AaBb") == ["A", "a", "Bb"]
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# naive_merge — end-to-end (exercises get_delimiters + re.split)
|
|
# --------------------------------------------------------------------------- #
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def force_every_section_above_budget(monkeypatch):
|
|
"""Mock ``num_tokens_from_string`` so every section trips the chunk-size
|
|
guard and starts a fresh chunk. This isolates delimiter behavior from
|
|
chunk-size heuristics."""
|
|
|
|
def fake(_s):
|
|
return 9 if len(_s) >= 4 else 8
|
|
|
|
monkeypatch.setattr(nlp, "num_tokens_from_string", fake)
|
|
|
|
|
|
def test_naive_merge_bare_char_a_splits_only_at_lowercase_a():
|
|
"""Bare-char ``a`` must split only at lowercase ``a``, not at ``A``."""
|
|
chunks = naive_merge(["BaAb"], chunk_token_num=8, delimiter="a")
|
|
assert [c.strip() for c in chunks if c.strip()] == ["B", "Ab"]
|
|
|
|
|
|
def test_naive_merge_bare_char_A_splits_only_at_uppercase_A():
|
|
chunks = naive_merge(["BaAb"], chunk_token_num=8, delimiter="A")
|
|
assert [c.strip() for c in chunks if c.strip()] == ["Ba", "b"]
|
|
|
|
|
|
def test_naive_merge_backtick_end_splits_only_at_lowercase_end():
|
|
"""Backtick-wrapped ``end`` must split only at the exact lowercase
|
|
``end``, not at ``End`` / ``END`` / ``eNd`` / etc."""
|
|
chunks = naive_merge(
|
|
["the end and End and END come"],
|
|
chunk_token_num=8,
|
|
delimiter="`end`",
|
|
)
|
|
assert [c.strip() for c in chunks if c.strip()] == [
|
|
"the",
|
|
"and End and END come",
|
|
]
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# Static source checks — guard against re.I creeping back into the two sites
|
|
#
|
|
# ``parser_txt`` is not exercised directly here because importing it pulls in
|
|
# the full ``deepdoc.parser`` package (``infinity`` native extension, OCR
|
|
# parsers, etc.). The two sites share the same ``re.finditer`` pattern, so
|
|
# the behavioral tests above (which exercise ``get_delimiters`` via
|
|
# ``naive_merge``) are sufficient to lock in the chunking semantics. The
|
|
# static checks below ensure the cleanup lands in both files and cannot be
|
|
# silently undone.
|
|
# --------------------------------------------------------------------------- #
|
|
|
|
|
|
_CASE_INSENSITIVE_RE_ATTRS = frozenset({"I", "IGNORECASE"})
|
|
|
|
|
|
def _iter_re_finditer_calls(func_node: ast.AST):
|
|
"""Yield ``ast.Call`` nodes whose callee is ``re.finditer``."""
|
|
for node in ast.walk(func_node):
|
|
if not isinstance(node, ast.Call):
|
|
continue
|
|
func = node.func
|
|
if isinstance(func, ast.Attribute) and func.attr == "finditer" and isinstance(func.value, ast.Name) and func.value.id == "re":
|
|
yield node
|
|
|
|
|
|
def _is_case_insensitive_flag(arg: ast.AST) -> bool:
|
|
"""True if ``arg`` is the expression ``re.I`` or ``re.IGNORECASE``."""
|
|
return isinstance(arg, ast.Attribute) and isinstance(arg.value, ast.Name) and arg.value.id == "re" and arg.attr in _CASE_INSENSITIVE_RE_ATTRS
|
|
|
|
|
|
def _find_function_def(tree: ast.Module, fn_name: str) -> ast.FunctionDef | None:
|
|
"""Locate a function/method named ``fn_name`` anywhere in the module AST.
|
|
|
|
Looks at both top-level ``def`` statements and methods inside classes
|
|
(e.g. ``parser_txt`` is a ``@classmethod`` on ``RAGFlowTxtParser``).
|
|
"""
|
|
for node in ast.walk(tree):
|
|
if isinstance(node, ast.FunctionDef) and node.name == fn_name:
|
|
return node
|
|
return None
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"rel_path, fn_name",
|
|
[
|
|
("rag/nlp/__init__.py", "get_delimiters"),
|
|
("deepdoc/parser/txt_parser.py", "parser_txt"),
|
|
],
|
|
)
|
|
def test_no_re_I_on_re_finditer(rel_path, fn_name):
|
|
"""The ``re.finditer`` calls inside the two delimiter-parsing functions
|
|
must not pass ``re.I`` (or any case-insensitive flag) to the regex
|
|
engine.
|
|
|
|
Why this matters even though the flag is currently dead code: the three
|
|
sibling implementations (``naive_merge`` L1195, ``naive_merge_with_images``
|
|
L1269, ``_build_cks`` L1389) already correctly omit ``re.I``. Keeping
|
|
the two outlier sites consistent makes a future refactor less likely to
|
|
propagate the flag to a downstream ``re.split`` / ``re.match`` call
|
|
where it would actually change behavior.
|
|
|
|
The check is structural (AST-based) rather than line-number-based so
|
|
unrelated edits above either implementation cannot move the call beyond
|
|
a fragile ±N-line window.
|
|
"""
|
|
source = (_REPO_ROOT / rel_path).read_text(encoding="utf-8")
|
|
tree = ast.parse(source, filename=rel_path)
|
|
|
|
func_def = _find_function_def(tree, fn_name)
|
|
assert func_def is not None, f"function {fn_name!r} not found in {rel_path}"
|
|
|
|
calls = list(_iter_re_finditer_calls(func_def))
|
|
assert calls, f"expected at least one `re.finditer(...)` call inside {fn_name!r} in {rel_path}"
|
|
|
|
for call in calls:
|
|
all_args = [*call.args, *(kw.value for kw in call.keywords)]
|
|
for arg in all_args:
|
|
assert not _is_case_insensitive_flag(arg), f"`re.I` / `re.IGNORECASE` must not be passed to `re.finditer` inside {fn_name!r} ({rel_path}). See issue #17384."
|