mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-03-07 16:46:03 +08:00
020068dd16
### What problem does this PR solve? When multiple columns are used as content columns in RDBMS connector, the generated document text gets chunked by TxtParser which strips newline delimiters during merge. This causes field names and values from different columns to be concatenated without any separator, making the content unreadable. Changes: - txt_parser.py: restore newline separator when merging adjacent text segments within a chunk, so that split sections are not directly concatenated - rdbms_connector.py: use double newline between fields and place field value on a new line after the field name bracket, giving TxtParser clearer boundaries to work with Closes #13001 ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) Co-authored-by: tunsuytang <tunsuytang@tencent.com>
68 lines
2.3 KiB
Python
68 lines
2.3 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.
|
|
#
|
|
|
|
import re
|
|
|
|
from deepdoc.parser.utils import get_text
|
|
from common.token_utils import num_tokens_from_string
|
|
|
|
|
|
class RAGFlowTxtParser:
|
|
def __call__(self, fnm, binary=None, chunk_token_num=128, delimiter="\n!?;。；！？"):
|
|
txt = get_text(fnm, binary)
|
|
return self.parser_txt(txt, chunk_token_num, delimiter)
|
|
|
|
@classmethod
|
|
def parser_txt(cls, txt, chunk_token_num=128, delimiter="\n!?;。；！？"):
|
|
if not isinstance(txt, str):
|
|
raise TypeError("txt type should be str!")
|
|
cks = [""]
|
|
tk_nums = [0]
|
|
delimiter = delimiter.encode('utf-8').decode('unicode_escape').encode('latin1').decode('utf-8')
|
|
|
|
def add_chunk(t):
|
|
nonlocal cks, tk_nums, delimiter
|
|
tnum = num_tokens_from_string(t)
|
|
if tk_nums[-1] > chunk_token_num:
|
|
cks.append(t)
|
|
tk_nums.append(tnum)
|
|
else:
|
|
if cks[-1]:
|
|
cks[-1] += "\n" + t
|
|
else:
|
|
cks[-1] += t
|
|
tk_nums[-1] += tnum
|
|
|
|
dels = []
|
|
s = 0
|
|
for m in re.finditer(r"`([^`]+)`", delimiter, re.I):
|
|
f, t = m.span()
|
|
dels.append(m.group(1))
|
|
dels.extend(list(delimiter[s: f]))
|
|
s = t
|
|
if s < len(delimiter):
|
|
dels.extend(list(delimiter[s:]))
|
|
dels = [re.escape(d) for d in dels if d]
|
|
dels = [d for d in dels if d]
|
|
dels = "|".join(dels)
|
|
secs = re.split(r"(%s)" % dels, txt)
|
|
for sec in secs:
|
|
if re.match(f"^{dels}$", sec):
|
|
continue
|
|
add_chunk(sec)
|
|
|
|
return [[c, ""] for c in cks]
|