2025-01-21 20:52:28 +08:00
|
|
|
#
|
|
|
|
|
# Copyright 2025 The InfiniFlow Authors. All Rights Reserved.
|
|
|
|
|
#
|
2024-08-15 09:17:36 +08:00
|
|
|
# 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.
|
|
|
|
|
#
|
2025-01-21 20:52:28 +08:00
|
|
|
|
fix: laws.py added missing import logging (#3501)
### What problem does this PR solve?
_Choosing Laws Chunk Method results in an error when parsing a document.
The error is caused by a missing import in the `laws.py` file._
```
Traceback (most recent call last):
File "/ragflow/rag/svr/task_executor.py", line 445, in handle_task
do_handle_task(task)
File "/ragflow/rag/svr/task_executor.py", line 384, in do_handle_task
cks = build(r)
^^^^^^^^
File "/ragflow/rag/svr/task_executor.py", line 196, in build
cks = chunker.chunk(row["name"], binary=binary, from_page=row["from_page"],
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/ragflow/rag/app/laws.py", line 161, in chunk
for txt, poss in pdf_parser(filename if not binary else binary,
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/ragflow/rag/app/laws.py", line 124, in __call__
logging.debug("layouts:".format(
^^^^^^^
NameError: name 'logging' is not defined. Did you forget to import 'logging'
```
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- [ ] New Feature (non-breaking change which adds functionality)
- [ ] Documentation Update
- [ ] Refactoring
- [ ] Performance Improvement
- [ ] Other (please describe):
Co-authored-by: Michal Masrna <m.marna1@gmail.com>
2024-11-19 15:01:08 +01:00
|
|
|
import logging
|
2024-08-15 09:17:36 +08:00
|
|
|
import re
|
2026-06-22 07:16:44 +05:30
|
|
|
from html import escape as html_escape
|
2024-08-15 09:17:36 +08:00
|
|
|
from io import BytesIO
|
|
|
|
|
from docx import Document
|
2026-06-22 07:16:44 +05:30
|
|
|
from docx.table import Table as DocxTable
|
|
|
|
|
from docx.text.paragraph import Paragraph
|
2024-08-15 09:17:36 +08:00
|
|
|
|
Fix: Remove hardcoded page limits causing parsing failures on large PDFs (>300 pages) (#14382)
### What problem does this PR solve?
Fixes #14196
## Problem
When using DeepDOC to parse large PDFs (over 1000 pages), the parser
silently truncated processing at 300 pages due to a hardcoded default
`page_to=299` in `RAGFlowPdfParser.__images__()`. This caused:
- **Errors** on pages beyond the limit
- **Poor image quality** as the parser attempted to compensate with
missing page data
- **Inconsistent chunk splitting** between full PDF imports and partial
imports
Additionally, the codebase scattered magic numbers (`299`, `600`,
`10000`, `100000`, `100000000`, `10000000000`, `10**9`) across 22 files
as sentinel values for "parse all pages", making future maintenance
error-prone.
## Root Cause
```python
# deepdoc/parser/pdf_parser.py (before)
def __images__(self, fnm, zoomin=3, page_from=0, page_to=299, callback=None):
# Only the first 300 pages were rendered; everything beyond was silently dropped
```
While most callers in `rag/app/*.py` correctly passed `to_page=100000`,
the base class `RAGFlowPdfParser.__call__()` and `parse_into_bboxes()`
invoked `__images__` **without** forwarding `page_from`/`page_to`,
falling back to the restrictive default of 299.
## Solution
### 1. Define constants in `common/constants.py`
```python
MAXIMUM_PAGE_NUMBER = 100000 # Used by the parsing layer
MAXIMUM_TASK_PAGE_NUMBER = MAXIMUM_PAGE_NUMBER * 1000 # Used by the task/DB layer
```
### 2. Replace all hardcoded sentinel values
| Layer | Files Changed | Old Values | New Value |
|---|---|---|---|
| **Deepdoc parsers** | `pdf_parser.py`, `mineru_parser.py`,
`docling_parser.py`, `opendataloader_parser.py`, `paddleocr_parser.py`,
`docx_parser.py` | `299`, `600`, `10**9`, `100000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Chunk parsers** | `naive.py`, `book.py`, `qa.py`, `one.py`,
`manual.py`, `paper.py`, `presentation.py`, `laws.py`, `resume.py`,
`email.py`, `table.py` | `100000`, `10000`, `10000000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Task/DB layer** | `db_models.py`, `task_service.py`,
`document_service.py`, `file_service.py` | `100000000` |
`MAXIMUM_TASK_PAGE_NUMBER` |
### 3. Fix `parse_into_bboxes()` missing parameters
Added `from_page`/`to_page` parameters to `parse_into_bboxes()` so that
the `rag/flow/parser/parser.py` DeepDOC path no longer falls back to the
restrictive default.
## Files Changed (22)
- `common/constants.py`
- `deepdoc/parser/pdf_parser.py`
- `deepdoc/parser/mineru_parser.py`
- `deepdoc/parser/docling_parser.py`
- `deepdoc/parser/opendataloader_parser.py`
- `deepdoc/parser/paddleocr_parser.py`
- `deepdoc/parser/docx_parser.py`
- `rag/app/naive.py`
- `rag/app/book.py`
- `rag/app/qa.py`
- `rag/app/one.py`
- `rag/app/manual.py`
- `rag/app/paper.py`
- `rag/app/presentation.py`
- `rag/app/laws.py`
- `rag/app/resume.py`
- `rag/app/email.py`
- `rag/app/table.py`
- `api/db/db_models.py`
- `api/db/services/task_service.py`
- `api/db/services/document_service.py`
- `api/db/services/file_service.py`
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- [x] Refactoring
---------
Signed-off-by: noob <yixiao121314@outlook.com>
2026-04-27 06:57:20 +00:00
|
|
|
from common.constants import ParserType, MAXIMUM_PAGE_NUMBER
|
2024-09-29 12:47:09 +08:00
|
|
|
from deepdoc.parser.utils import get_text
|
2026-01-09 17:48:45 +08:00
|
|
|
from rag.nlp import bullets_category, remove_contents_table, make_colon_as_title, tokenize_chunks, docx_question_level, tree_merge
|
2025-09-22 16:33:21 +08:00
|
|
|
from rag.nlp import rag_tokenizer, Node
|
2025-11-05 13:00:42 +08:00
|
|
|
from deepdoc.parser import PdfParser, DocxParser, HtmlParser
|
2025-11-06 15:20:35 +08:00
|
|
|
from rag.app.naive import by_plaintext, PARSERS
|
2025-12-17 19:48:24 +08:00
|
|
|
from common.parser_config_utils import normalize_layout_recognizer
|
2024-08-15 09:17:36 +08:00
|
|
|
|
2025-09-22 16:33:21 +08:00
|
|
|
|
2024-08-15 09:17:36 +08:00
|
|
|
class Docx(DocxParser):
|
|
|
|
|
def __init__(self):
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
def __clean(self, line):
|
|
|
|
|
line = re.sub(r"\u3000", " ", line).strip()
|
|
|
|
|
return line
|
|
|
|
|
|
Fix: Remove hardcoded page limits causing parsing failures on large PDFs (>300 pages) (#14382)
### What problem does this PR solve?
Fixes #14196
## Problem
When using DeepDOC to parse large PDFs (over 1000 pages), the parser
silently truncated processing at 300 pages due to a hardcoded default
`page_to=299` in `RAGFlowPdfParser.__images__()`. This caused:
- **Errors** on pages beyond the limit
- **Poor image quality** as the parser attempted to compensate with
missing page data
- **Inconsistent chunk splitting** between full PDF imports and partial
imports
Additionally, the codebase scattered magic numbers (`299`, `600`,
`10000`, `100000`, `100000000`, `10000000000`, `10**9`) across 22 files
as sentinel values for "parse all pages", making future maintenance
error-prone.
## Root Cause
```python
# deepdoc/parser/pdf_parser.py (before)
def __images__(self, fnm, zoomin=3, page_from=0, page_to=299, callback=None):
# Only the first 300 pages were rendered; everything beyond was silently dropped
```
While most callers in `rag/app/*.py` correctly passed `to_page=100000`,
the base class `RAGFlowPdfParser.__call__()` and `parse_into_bboxes()`
invoked `__images__` **without** forwarding `page_from`/`page_to`,
falling back to the restrictive default of 299.
## Solution
### 1. Define constants in `common/constants.py`
```python
MAXIMUM_PAGE_NUMBER = 100000 # Used by the parsing layer
MAXIMUM_TASK_PAGE_NUMBER = MAXIMUM_PAGE_NUMBER * 1000 # Used by the task/DB layer
```
### 2. Replace all hardcoded sentinel values
| Layer | Files Changed | Old Values | New Value |
|---|---|---|---|
| **Deepdoc parsers** | `pdf_parser.py`, `mineru_parser.py`,
`docling_parser.py`, `opendataloader_parser.py`, `paddleocr_parser.py`,
`docx_parser.py` | `299`, `600`, `10**9`, `100000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Chunk parsers** | `naive.py`, `book.py`, `qa.py`, `one.py`,
`manual.py`, `paper.py`, `presentation.py`, `laws.py`, `resume.py`,
`email.py`, `table.py` | `100000`, `10000`, `10000000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Task/DB layer** | `db_models.py`, `task_service.py`,
`document_service.py`, `file_service.py` | `100000000` |
`MAXIMUM_TASK_PAGE_NUMBER` |
### 3. Fix `parse_into_bboxes()` missing parameters
Added `from_page`/`to_page` parameters to `parse_into_bboxes()` so that
the `rag/flow/parser/parser.py` DeepDOC path no longer falls back to the
restrictive default.
## Files Changed (22)
- `common/constants.py`
- `deepdoc/parser/pdf_parser.py`
- `deepdoc/parser/mineru_parser.py`
- `deepdoc/parser/docling_parser.py`
- `deepdoc/parser/opendataloader_parser.py`
- `deepdoc/parser/paddleocr_parser.py`
- `deepdoc/parser/docx_parser.py`
- `rag/app/naive.py`
- `rag/app/book.py`
- `rag/app/qa.py`
- `rag/app/one.py`
- `rag/app/manual.py`
- `rag/app/paper.py`
- `rag/app/presentation.py`
- `rag/app/laws.py`
- `rag/app/resume.py`
- `rag/app/email.py`
- `rag/app/table.py`
- `api/db/db_models.py`
- `api/db/services/task_service.py`
- `api/db/services/document_service.py`
- `api/db/services/file_service.py`
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- [x] Refactoring
---------
Signed-off-by: noob <yixiao121314@outlook.com>
2026-04-27 06:57:20 +00:00
|
|
|
def old_call(self, filename, binary=None, from_page=0, to_page=MAXIMUM_PAGE_NUMBER):
|
2026-01-09 17:48:45 +08:00
|
|
|
self.doc = Document(filename) if not binary else Document(BytesIO(binary))
|
2024-08-15 09:17:36 +08:00
|
|
|
pn = 0
|
|
|
|
|
lines = []
|
|
|
|
|
for p in self.doc.paragraphs:
|
|
|
|
|
if pn > to_page:
|
|
|
|
|
break
|
|
|
|
|
if from_page <= pn < to_page and p.text.strip():
|
|
|
|
|
lines.append(self.__clean(p.text))
|
|
|
|
|
for run in p.runs:
|
2026-01-09 17:48:45 +08:00
|
|
|
if "lastRenderedPageBreak" in run._element.xml:
|
2024-08-15 09:17:36 +08:00
|
|
|
pn += 1
|
|
|
|
|
continue
|
2026-01-09 17:48:45 +08:00
|
|
|
if "w:br" in run._element.xml and 'type="page"' in run._element.xml:
|
2024-08-15 09:17:36 +08:00
|
|
|
pn += 1
|
2024-12-08 14:21:12 +08:00
|
|
|
return [line for line in lines if line]
|
2024-08-15 09:17:36 +08:00
|
|
|
|
2026-06-22 07:16:44 +05:30
|
|
|
def __table_to_html(self, tb):
|
|
|
|
|
html = "<table>"
|
|
|
|
|
for r in tb.rows:
|
|
|
|
|
html += "<tr>"
|
|
|
|
|
col_idx = 0
|
|
|
|
|
try:
|
|
|
|
|
while col_idx < len(r.cells):
|
|
|
|
|
span = 1
|
|
|
|
|
c = r.cells[col_idx]
|
|
|
|
|
for j in range(col_idx + 1, len(r.cells)):
|
|
|
|
|
if c.text == r.cells[j].text:
|
|
|
|
|
span += 1
|
|
|
|
|
col_idx = j
|
|
|
|
|
else:
|
|
|
|
|
break
|
|
|
|
|
col_idx += 1
|
|
|
|
|
cell = html_escape(c.text)
|
|
|
|
|
html += f"<td>{cell}</td>" if span == 1 else f"<td colspan='{span}'>{cell}</td>"
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logging.warning(f"Error parsing table, ignore: {e}")
|
|
|
|
|
html += "</tr>"
|
|
|
|
|
html += "</table>"
|
|
|
|
|
return html
|
|
|
|
|
|
Fix: Remove hardcoded page limits causing parsing failures on large PDFs (>300 pages) (#14382)
### What problem does this PR solve?
Fixes #14196
## Problem
When using DeepDOC to parse large PDFs (over 1000 pages), the parser
silently truncated processing at 300 pages due to a hardcoded default
`page_to=299` in `RAGFlowPdfParser.__images__()`. This caused:
- **Errors** on pages beyond the limit
- **Poor image quality** as the parser attempted to compensate with
missing page data
- **Inconsistent chunk splitting** between full PDF imports and partial
imports
Additionally, the codebase scattered magic numbers (`299`, `600`,
`10000`, `100000`, `100000000`, `10000000000`, `10**9`) across 22 files
as sentinel values for "parse all pages", making future maintenance
error-prone.
## Root Cause
```python
# deepdoc/parser/pdf_parser.py (before)
def __images__(self, fnm, zoomin=3, page_from=0, page_to=299, callback=None):
# Only the first 300 pages were rendered; everything beyond was silently dropped
```
While most callers in `rag/app/*.py` correctly passed `to_page=100000`,
the base class `RAGFlowPdfParser.__call__()` and `parse_into_bboxes()`
invoked `__images__` **without** forwarding `page_from`/`page_to`,
falling back to the restrictive default of 299.
## Solution
### 1. Define constants in `common/constants.py`
```python
MAXIMUM_PAGE_NUMBER = 100000 # Used by the parsing layer
MAXIMUM_TASK_PAGE_NUMBER = MAXIMUM_PAGE_NUMBER * 1000 # Used by the task/DB layer
```
### 2. Replace all hardcoded sentinel values
| Layer | Files Changed | Old Values | New Value |
|---|---|---|---|
| **Deepdoc parsers** | `pdf_parser.py`, `mineru_parser.py`,
`docling_parser.py`, `opendataloader_parser.py`, `paddleocr_parser.py`,
`docx_parser.py` | `299`, `600`, `10**9`, `100000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Chunk parsers** | `naive.py`, `book.py`, `qa.py`, `one.py`,
`manual.py`, `paper.py`, `presentation.py`, `laws.py`, `resume.py`,
`email.py`, `table.py` | `100000`, `10000`, `10000000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Task/DB layer** | `db_models.py`, `task_service.py`,
`document_service.py`, `file_service.py` | `100000000` |
`MAXIMUM_TASK_PAGE_NUMBER` |
### 3. Fix `parse_into_bboxes()` missing parameters
Added `from_page`/`to_page` parameters to `parse_into_bboxes()` so that
the `rag/flow/parser/parser.py` DeepDOC path no longer falls back to the
restrictive default.
## Files Changed (22)
- `common/constants.py`
- `deepdoc/parser/pdf_parser.py`
- `deepdoc/parser/mineru_parser.py`
- `deepdoc/parser/docling_parser.py`
- `deepdoc/parser/opendataloader_parser.py`
- `deepdoc/parser/paddleocr_parser.py`
- `deepdoc/parser/docx_parser.py`
- `rag/app/naive.py`
- `rag/app/book.py`
- `rag/app/qa.py`
- `rag/app/one.py`
- `rag/app/manual.py`
- `rag/app/paper.py`
- `rag/app/presentation.py`
- `rag/app/laws.py`
- `rag/app/resume.py`
- `rag/app/email.py`
- `rag/app/table.py`
- `api/db/db_models.py`
- `api/db/services/task_service.py`
- `api/db/services/document_service.py`
- `api/db/services/file_service.py`
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- [x] Refactoring
---------
Signed-off-by: noob <yixiao121314@outlook.com>
2026-04-27 06:57:20 +00:00
|
|
|
def __call__(self, filename, binary=None, from_page=0, to_page=MAXIMUM_PAGE_NUMBER):
|
2026-01-09 17:48:45 +08:00
|
|
|
self.doc = Document(filename) if not binary else Document(BytesIO(binary))
|
2025-12-29 12:01:18 +08:00
|
|
|
pn = 0
|
|
|
|
|
lines = []
|
|
|
|
|
level_set = set()
|
|
|
|
|
bull = bullets_category([p.text for p in self.doc.paragraphs])
|
2026-06-22 07:16:44 +05:30
|
|
|
# Tables carry no heading level; assign a sentinel deeper than any heading so
|
|
|
|
|
# build_tree merges them into the enclosing section as leaf content (keeping the
|
|
|
|
|
# section's title path as retrieval context) instead of dropping them.
|
|
|
|
|
table_level = 10**6
|
|
|
|
|
# Iterate over the document body so tables are visited in order alongside
|
|
|
|
|
# paragraphs (self.doc.paragraphs only yields paragraph elements, skipping tables).
|
|
|
|
|
for block in self.doc._element.body:
|
2025-12-29 12:01:18 +08:00
|
|
|
if pn > to_page:
|
|
|
|
|
break
|
2026-06-22 07:16:44 +05:30
|
|
|
|
|
|
|
|
if block.tag.endswith("tbl"):
|
|
|
|
|
html = self.__table_to_html(DocxTable(block, self.doc))
|
|
|
|
|
if html:
|
|
|
|
|
lines.append((table_level, html))
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
if not block.tag.endswith("p"):
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
p = Paragraph(block, self.doc)
|
2025-12-29 12:01:18 +08:00
|
|
|
question_level, p_text = docx_question_level(p, bull)
|
|
|
|
|
if not p_text.strip("\n"):
|
|
|
|
|
continue
|
|
|
|
|
lines.append((question_level, p_text))
|
|
|
|
|
level_set.add(question_level)
|
|
|
|
|
for run in p.runs:
|
2026-01-09 17:48:45 +08:00
|
|
|
if "lastRenderedPageBreak" in run._element.xml:
|
2025-12-29 12:01:18 +08:00
|
|
|
pn += 1
|
2025-09-22 16:33:21 +08:00
|
|
|
continue
|
2026-01-09 17:48:45 +08:00
|
|
|
if "w:br" in run._element.xml and 'type="page"' in run._element.xml:
|
2025-12-29 12:01:18 +08:00
|
|
|
pn += 1
|
2025-09-22 16:33:21 +08:00
|
|
|
|
2025-12-29 12:01:18 +08:00
|
|
|
sorted_levels = sorted(level_set)
|
2025-09-22 16:33:21 +08:00
|
|
|
|
2026-06-22 07:16:44 +05:30
|
|
|
if not sorted_levels:
|
|
|
|
|
h2_level = 1
|
|
|
|
|
else:
|
|
|
|
|
h2_level = sorted_levels[1] if len(sorted_levels) > 1 else 1
|
|
|
|
|
h2_level = sorted_levels[-2] if h2_level == sorted_levels[-1] and len(sorted_levels) > 2 else h2_level
|
2025-09-22 16:33:21 +08:00
|
|
|
|
2025-12-29 12:01:18 +08:00
|
|
|
root = Node(level=0, depth=h2_level, texts=[])
|
|
|
|
|
root.build_tree(lines)
|
2024-08-15 09:17:36 +08:00
|
|
|
|
2025-12-29 12:01:18 +08:00
|
|
|
return [element for element in root.get_tree() if element]
|
2024-08-15 09:17:36 +08:00
|
|
|
|
|
|
|
|
def __str__(self) -> str:
|
2026-01-09 17:48:45 +08:00
|
|
|
return f"""
|
2024-08-15 09:17:36 +08:00
|
|
|
question:{self.question},
|
|
|
|
|
answer:{self.answer},
|
|
|
|
|
level:{self.level},
|
|
|
|
|
childs:{self.childs}
|
2026-01-09 17:48:45 +08:00
|
|
|
"""
|
2024-08-15 09:17:36 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
class Pdf(PdfParser):
|
|
|
|
|
def __init__(self):
|
2026-05-15 14:19:41 +08:00
|
|
|
self.model_species = ParserType.LAWS.value
|
2024-08-15 09:17:36 +08:00
|
|
|
super().__init__()
|
|
|
|
|
|
Fix: Remove hardcoded page limits causing parsing failures on large PDFs (>300 pages) (#14382)
### What problem does this PR solve?
Fixes #14196
## Problem
When using DeepDOC to parse large PDFs (over 1000 pages), the parser
silently truncated processing at 300 pages due to a hardcoded default
`page_to=299` in `RAGFlowPdfParser.__images__()`. This caused:
- **Errors** on pages beyond the limit
- **Poor image quality** as the parser attempted to compensate with
missing page data
- **Inconsistent chunk splitting** between full PDF imports and partial
imports
Additionally, the codebase scattered magic numbers (`299`, `600`,
`10000`, `100000`, `100000000`, `10000000000`, `10**9`) across 22 files
as sentinel values for "parse all pages", making future maintenance
error-prone.
## Root Cause
```python
# deepdoc/parser/pdf_parser.py (before)
def __images__(self, fnm, zoomin=3, page_from=0, page_to=299, callback=None):
# Only the first 300 pages were rendered; everything beyond was silently dropped
```
While most callers in `rag/app/*.py` correctly passed `to_page=100000`,
the base class `RAGFlowPdfParser.__call__()` and `parse_into_bboxes()`
invoked `__images__` **without** forwarding `page_from`/`page_to`,
falling back to the restrictive default of 299.
## Solution
### 1. Define constants in `common/constants.py`
```python
MAXIMUM_PAGE_NUMBER = 100000 # Used by the parsing layer
MAXIMUM_TASK_PAGE_NUMBER = MAXIMUM_PAGE_NUMBER * 1000 # Used by the task/DB layer
```
### 2. Replace all hardcoded sentinel values
| Layer | Files Changed | Old Values | New Value |
|---|---|---|---|
| **Deepdoc parsers** | `pdf_parser.py`, `mineru_parser.py`,
`docling_parser.py`, `opendataloader_parser.py`, `paddleocr_parser.py`,
`docx_parser.py` | `299`, `600`, `10**9`, `100000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Chunk parsers** | `naive.py`, `book.py`, `qa.py`, `one.py`,
`manual.py`, `paper.py`, `presentation.py`, `laws.py`, `resume.py`,
`email.py`, `table.py` | `100000`, `10000`, `10000000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Task/DB layer** | `db_models.py`, `task_service.py`,
`document_service.py`, `file_service.py` | `100000000` |
`MAXIMUM_TASK_PAGE_NUMBER` |
### 3. Fix `parse_into_bboxes()` missing parameters
Added `from_page`/`to_page` parameters to `parse_into_bboxes()` so that
the `rag/flow/parser/parser.py` DeepDOC path no longer falls back to the
restrictive default.
## Files Changed (22)
- `common/constants.py`
- `deepdoc/parser/pdf_parser.py`
- `deepdoc/parser/mineru_parser.py`
- `deepdoc/parser/docling_parser.py`
- `deepdoc/parser/opendataloader_parser.py`
- `deepdoc/parser/paddleocr_parser.py`
- `deepdoc/parser/docx_parser.py`
- `rag/app/naive.py`
- `rag/app/book.py`
- `rag/app/qa.py`
- `rag/app/one.py`
- `rag/app/manual.py`
- `rag/app/paper.py`
- `rag/app/presentation.py`
- `rag/app/laws.py`
- `rag/app/resume.py`
- `rag/app/email.py`
- `rag/app/table.py`
- `api/db/db_models.py`
- `api/db/services/task_service.py`
- `api/db/services/document_service.py`
- `api/db/services/file_service.py`
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- [x] Refactoring
---------
Signed-off-by: noob <yixiao121314@outlook.com>
2026-04-27 06:57:20 +00:00
|
|
|
def __call__(self, filename, binary=None, from_page=0, to_page=MAXIMUM_PAGE_NUMBER, zoomin=3, callback=None):
|
2024-11-30 18:48:06 +08:00
|
|
|
from timeit import default_timer as timer
|
2026-01-09 17:48:45 +08:00
|
|
|
|
2024-11-30 18:48:06 +08:00
|
|
|
start = timer()
|
|
|
|
|
callback(msg="OCR started")
|
2026-01-09 17:48:45 +08:00
|
|
|
self.__images__(filename if not binary else binary, zoomin, from_page, to_page, callback)
|
2024-11-30 18:48:06 +08:00
|
|
|
callback(msg="OCR finished ({:.2f}s)".format(timer() - start))
|
2024-08-15 09:17:36 +08:00
|
|
|
|
|
|
|
|
start = timer()
|
|
|
|
|
self._layouts_rec(zoomin)
|
2024-11-30 18:48:06 +08:00
|
|
|
callback(0.67, "Layout analysis ({:.2f}s)".format(timer() - start))
|
2025-12-29 12:01:18 +08:00
|
|
|
logging.debug("layouts: {}".format((timer() - start)))
|
2024-08-15 09:17:36 +08:00
|
|
|
self._naive_vertical_merge()
|
|
|
|
|
|
2024-11-30 18:48:06 +08:00
|
|
|
callback(0.8, "Text extraction ({:.2f}s)".format(timer() - start))
|
2024-08-15 09:17:36 +08:00
|
|
|
|
2026-01-09 17:48:45 +08:00
|
|
|
return [(b["text"], self._line_tag(b, zoomin)) for b in self.boxes], None
|
2024-08-15 09:17:36 +08:00
|
|
|
|
|
|
|
|
|
Fix: Remove hardcoded page limits causing parsing failures on large PDFs (>300 pages) (#14382)
### What problem does this PR solve?
Fixes #14196
## Problem
When using DeepDOC to parse large PDFs (over 1000 pages), the parser
silently truncated processing at 300 pages due to a hardcoded default
`page_to=299` in `RAGFlowPdfParser.__images__()`. This caused:
- **Errors** on pages beyond the limit
- **Poor image quality** as the parser attempted to compensate with
missing page data
- **Inconsistent chunk splitting** between full PDF imports and partial
imports
Additionally, the codebase scattered magic numbers (`299`, `600`,
`10000`, `100000`, `100000000`, `10000000000`, `10**9`) across 22 files
as sentinel values for "parse all pages", making future maintenance
error-prone.
## Root Cause
```python
# deepdoc/parser/pdf_parser.py (before)
def __images__(self, fnm, zoomin=3, page_from=0, page_to=299, callback=None):
# Only the first 300 pages were rendered; everything beyond was silently dropped
```
While most callers in `rag/app/*.py` correctly passed `to_page=100000`,
the base class `RAGFlowPdfParser.__call__()` and `parse_into_bboxes()`
invoked `__images__` **without** forwarding `page_from`/`page_to`,
falling back to the restrictive default of 299.
## Solution
### 1. Define constants in `common/constants.py`
```python
MAXIMUM_PAGE_NUMBER = 100000 # Used by the parsing layer
MAXIMUM_TASK_PAGE_NUMBER = MAXIMUM_PAGE_NUMBER * 1000 # Used by the task/DB layer
```
### 2. Replace all hardcoded sentinel values
| Layer | Files Changed | Old Values | New Value |
|---|---|---|---|
| **Deepdoc parsers** | `pdf_parser.py`, `mineru_parser.py`,
`docling_parser.py`, `opendataloader_parser.py`, `paddleocr_parser.py`,
`docx_parser.py` | `299`, `600`, `10**9`, `100000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Chunk parsers** | `naive.py`, `book.py`, `qa.py`, `one.py`,
`manual.py`, `paper.py`, `presentation.py`, `laws.py`, `resume.py`,
`email.py`, `table.py` | `100000`, `10000`, `10000000000` |
`MAXIMUM_PAGE_NUMBER` |
| **Task/DB layer** | `db_models.py`, `task_service.py`,
`document_service.py`, `file_service.py` | `100000000` |
`MAXIMUM_TASK_PAGE_NUMBER` |
### 3. Fix `parse_into_bboxes()` missing parameters
Added `from_page`/`to_page` parameters to `parse_into_bboxes()` so that
the `rag/flow/parser/parser.py` DeepDOC path no longer falls back to the
restrictive default.
## Files Changed (22)
- `common/constants.py`
- `deepdoc/parser/pdf_parser.py`
- `deepdoc/parser/mineru_parser.py`
- `deepdoc/parser/docling_parser.py`
- `deepdoc/parser/opendataloader_parser.py`
- `deepdoc/parser/paddleocr_parser.py`
- `deepdoc/parser/docx_parser.py`
- `rag/app/naive.py`
- `rag/app/book.py`
- `rag/app/qa.py`
- `rag/app/one.py`
- `rag/app/manual.py`
- `rag/app/paper.py`
- `rag/app/presentation.py`
- `rag/app/laws.py`
- `rag/app/resume.py`
- `rag/app/email.py`
- `rag/app/table.py`
- `api/db/db_models.py`
- `api/db/services/task_service.py`
- `api/db/services/document_service.py`
- `api/db/services/file_service.py`
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- [x] Refactoring
---------
Signed-off-by: noob <yixiao121314@outlook.com>
2026-04-27 06:57:20 +00:00
|
|
|
def chunk(filename, binary=None, from_page=0, to_page=MAXIMUM_PAGE_NUMBER, lang="Chinese", callback=None, **kwargs):
|
2024-08-15 09:17:36 +08:00
|
|
|
"""
|
2026-01-09 17:48:45 +08:00
|
|
|
Supported file formats are docx, pdf, txt.
|
2024-08-15 09:17:36 +08:00
|
|
|
"""
|
2026-01-09 17:48:45 +08:00
|
|
|
parser_config = kwargs.get("parser_config", {"chunk_token_num": 512, "delimiter": "\n!?。;!?", "layout_recognize": "DeepDOC"})
|
|
|
|
|
doc = {"docnm_kwd": filename, "title_tks": rag_tokenizer.tokenize(re.sub(r"\.[a-zA-Z]+$", "", filename))}
|
2024-08-15 09:17:36 +08:00
|
|
|
doc["title_sm_tks"] = rag_tokenizer.fine_grained_tokenize(doc["title_tks"])
|
|
|
|
|
pdf_parser = None
|
|
|
|
|
sections = []
|
|
|
|
|
# is it English
|
|
|
|
|
eng = lang.lower() == "english" # is_english(sections)
|
|
|
|
|
|
|
|
|
|
if re.search(r"\.docx$", filename, re.IGNORECASE):
|
|
|
|
|
callback(0.1, "Start to parse.")
|
2024-12-30 18:38:51 +08:00
|
|
|
chunks = Docx()(filename, binary)
|
|
|
|
|
callback(0.7, "Finish parsing.")
|
feat: add native Dutch language support for BM25 tokenization (#14140)
## Summary
- Add language-aware Snowball stemmer to `RagTokenizer` supporting 16
languages (Dutch, German, French, Spanish, etc.)
- Thread the KB `language` parameter through the full tokenization
pipeline (14 parser modules + task executor)
- Add Dutch to the frontend language lists and cross-language form
## Problem
RAGFlow uses the English Porter stemmer + WordNet lemmatizer for **all**
BM25 tokenization, regardless of the knowledge base language setting.
This produces incorrect stems for non-English text. For example:
| Dutch word | Dutch stemmer | English Porter |
|---|---|---|
| documenten | document | documenten (unchanged!) |
| gebruikers | gebruiker | gebruik (over-stemmed) |
| instellingen | instell | instellingen (unchanged!) |
This degrades BM25 recall for any non-English knowledge base.
## Solution
NLTK already ships Snowball stemmers for 16 languages. This PR:
1. **`rag/nlp/rag_tokenizer.py`**: Overrides `tokenize()` with
`set_language()` and `_normalize_token()` that selects the correct NLTK
Snowball stemmer. Falls back to Porter for unmapped languages (Chinese,
Japanese, Korean, etc. — these use character-based tokenization anyway).
2. **`rag/nlp/__init__.py`** + **14 `rag/app/*.py` parsers** +
**`rag/svr/task_executor.py`**: Threads the `language` parameter through
`tokenize()`, `tokenize_chunks()`, `tokenize_table()`, and all callers.
3. **Frontend**: Adds Dutch (`Nederlands`) to `LanguageList`,
`LanguageMap`, `LanguageAbbreviationMap`, `LanguageTranslationMap`,
cross-language form field, and `en.ts` locale.
## Backward Compatibility
- Default language is `"English"`, preserving existing behavior for all
current users
- Languages without a Snowball stemmer mapping fall back to Porter (no
change)
- No new dependencies — NLTK Snowball is already bundled
2026-07-06 17:39:56 +02:00
|
|
|
return tokenize_chunks(chunks, doc, eng, None, language=lang)
|
2025-12-29 12:01:18 +08:00
|
|
|
|
2024-08-15 09:17:36 +08:00
|
|
|
elif re.search(r"\.pdf$", filename, re.IGNORECASE):
|
2026-01-09 17:48:45 +08:00
|
|
|
layout_recognizer, parser_model_name = normalize_layout_recognizer(parser_config.get("layout_recognize", "DeepDOC"))
|
2025-11-05 13:00:42 +08:00
|
|
|
|
|
|
|
|
if isinstance(layout_recognizer, bool):
|
|
|
|
|
layout_recognizer = "DeepDOC" if layout_recognizer else "Plain Text"
|
|
|
|
|
|
|
|
|
|
name = layout_recognizer.strip().lower()
|
2025-11-06 15:20:35 +08:00
|
|
|
parser = PARSERS.get(name, by_plaintext)
|
2025-11-05 13:00:42 +08:00
|
|
|
callback(0.1, "Start to parse.")
|
|
|
|
|
|
2025-11-06 15:20:35 +08:00
|
|
|
raw_sections, tables, pdf_parser = parser(
|
2025-12-29 12:01:18 +08:00
|
|
|
filename=filename,
|
|
|
|
|
binary=binary,
|
|
|
|
|
from_page=from_page,
|
|
|
|
|
to_page=to_page,
|
|
|
|
|
lang=lang,
|
|
|
|
|
callback=callback,
|
|
|
|
|
pdf_cls=Pdf,
|
|
|
|
|
layout_recognizer=layout_recognizer,
|
2025-12-17 19:48:24 +08:00
|
|
|
mineru_llm_name=parser_model_name,
|
2026-01-09 17:48:45 +08:00
|
|
|
paddleocr_llm_name=parser_model_name,
|
|
|
|
|
**kwargs,
|
2025-11-05 13:00:42 +08:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if not raw_sections and not tables:
|
|
|
|
|
return []
|
|
|
|
|
|
2026-01-09 17:48:45 +08:00
|
|
|
if name in ["tcadp", "docling", "mineru", "paddleocr"]:
|
2025-11-05 13:00:42 +08:00
|
|
|
parser_config["chunk_token_num"] = 0
|
2025-12-29 12:01:18 +08:00
|
|
|
|
2025-11-05 13:00:42 +08:00
|
|
|
for txt, poss in raw_sections:
|
2024-08-15 09:17:36 +08:00
|
|
|
sections.append(txt + poss)
|
|
|
|
|
|
2025-11-05 13:00:42 +08:00
|
|
|
callback(0.8, "Finish parsing.")
|
2025-09-22 16:33:21 +08:00
|
|
|
elif re.search(r"\.(txt|md|markdown|mdx)$", filename, re.IGNORECASE):
|
2024-08-15 09:17:36 +08:00
|
|
|
callback(0.1, "Start to parse.")
|
2024-09-29 12:47:09 +08:00
|
|
|
txt = get_text(filename, binary)
|
2024-08-15 09:17:36 +08:00
|
|
|
sections = txt.split("\n")
|
2024-12-08 14:21:12 +08:00
|
|
|
sections = [s for s in sections if s]
|
2024-08-15 09:17:36 +08:00
|
|
|
callback(0.8, "Finish parsing.")
|
|
|
|
|
|
|
|
|
|
elif re.search(r"\.(htm|html)$", filename, re.IGNORECASE):
|
|
|
|
|
callback(0.1, "Start to parse.")
|
|
|
|
|
sections = HtmlParser()(filename, binary)
|
2024-12-08 14:21:12 +08:00
|
|
|
sections = [s for s in sections if s]
|
2024-08-15 09:17:36 +08:00
|
|
|
callback(0.8, "Finish parsing.")
|
|
|
|
|
|
|
|
|
|
elif re.search(r"\.doc$", filename, re.IGNORECASE):
|
|
|
|
|
callback(0.1, "Start to parse.")
|
2025-12-08 14:28:23 +08:00
|
|
|
try:
|
|
|
|
|
from tika import parser as tika_parser
|
|
|
|
|
except Exception as e:
|
|
|
|
|
callback(0.8, f"tika not available: {e}. Unsupported .doc parsing.")
|
|
|
|
|
logging.warning(f"tika not available: {e}. Unsupported .doc parsing for {filename}.")
|
|
|
|
|
return []
|
2024-08-15 09:17:36 +08:00
|
|
|
|
2025-12-08 14:28:23 +08:00
|
|
|
binary = BytesIO(binary)
|
|
|
|
|
doc_parsed = tika_parser.from_buffer(binary)
|
2026-01-09 17:48:45 +08:00
|
|
|
if doc_parsed.get("content", None) is not None:
|
|
|
|
|
sections = doc_parsed["content"].split("\n")
|
2025-12-08 14:28:23 +08:00
|
|
|
sections = [s for s in sections if s]
|
|
|
|
|
callback(0.8, "Finish parsing.")
|
|
|
|
|
else:
|
|
|
|
|
callback(0.8, f"tika.parser got empty content from {filename}.")
|
|
|
|
|
logging.warning(f"tika.parser got empty content from {filename}.")
|
|
|
|
|
return []
|
2024-08-15 09:17:36 +08:00
|
|
|
else:
|
2026-01-09 17:48:45 +08:00
|
|
|
raise NotImplementedError("file type not supported yet(doc, docx, pdf, txt supported)")
|
2024-08-15 09:17:36 +08:00
|
|
|
|
|
|
|
|
# Remove 'Contents' part
|
|
|
|
|
remove_contents_table(sections, eng)
|
|
|
|
|
|
|
|
|
|
make_colon_as_title(sections)
|
|
|
|
|
bull = bullets_category(sections)
|
2025-09-22 16:33:21 +08:00
|
|
|
res = tree_merge(bull, sections, 2)
|
|
|
|
|
|
|
|
|
|
if not res:
|
2024-08-15 09:17:36 +08:00
|
|
|
callback(0.99, "No chunk parsed out.")
|
|
|
|
|
|
feat: add native Dutch language support for BM25 tokenization (#14140)
## Summary
- Add language-aware Snowball stemmer to `RagTokenizer` supporting 16
languages (Dutch, German, French, Spanish, etc.)
- Thread the KB `language` parameter through the full tokenization
pipeline (14 parser modules + task executor)
- Add Dutch to the frontend language lists and cross-language form
## Problem
RAGFlow uses the English Porter stemmer + WordNet lemmatizer for **all**
BM25 tokenization, regardless of the knowledge base language setting.
This produces incorrect stems for non-English text. For example:
| Dutch word | Dutch stemmer | English Porter |
|---|---|---|
| documenten | document | documenten (unchanged!) |
| gebruikers | gebruiker | gebruik (over-stemmed) |
| instellingen | instell | instellingen (unchanged!) |
This degrades BM25 recall for any non-English knowledge base.
## Solution
NLTK already ships Snowball stemmers for 16 languages. This PR:
1. **`rag/nlp/rag_tokenizer.py`**: Overrides `tokenize()` with
`set_language()` and `_normalize_token()` that selects the correct NLTK
Snowball stemmer. Falls back to Porter for unmapped languages (Chinese,
Japanese, Korean, etc. — these use character-based tokenization anyway).
2. **`rag/nlp/__init__.py`** + **14 `rag/app/*.py` parsers** +
**`rag/svr/task_executor.py`**: Threads the `language` parameter through
`tokenize()`, `tokenize_chunks()`, `tokenize_table()`, and all callers.
3. **Frontend**: Adds Dutch (`Nederlands`) to `LanguageList`,
`LanguageMap`, `LanguageAbbreviationMap`, `LanguageTranslationMap`,
cross-language form field, and `en.ts` locale.
## Backward Compatibility
- Default language is `"English"`, preserving existing behavior for all
current users
- Languages without a Snowball stemmer mapping fall back to Porter (no
change)
- No new dependencies — NLTK Snowball is already bundled
2026-07-06 17:39:56 +02:00
|
|
|
return tokenize_chunks(res, doc, eng, pdf_parser, language=lang)
|
2024-08-15 09:17:36 +08:00
|
|
|
|
2025-09-22 16:33:21 +08:00
|
|
|
# chunks = hierarchical_merge(bull, sections, 5)
|
|
|
|
|
# return tokenize_chunks(["\n".join(ck)for ck in chunks], doc, eng, pdf_parser)
|
2024-08-15 09:17:36 +08:00
|
|
|
|
2025-12-29 12:01:18 +08:00
|
|
|
|
2024-08-15 09:17:36 +08:00
|
|
|
if __name__ == "__main__":
|
|
|
|
|
import sys
|
|
|
|
|
|
|
|
|
|
def dummy(prog=None, msg=""):
|
|
|
|
|
pass
|
2025-12-29 12:01:18 +08:00
|
|
|
|
2024-08-15 09:17:36 +08:00
|
|
|
chunk(sys.argv[1], callback=dummy)
|