mirror of
https://github.com/tiennm99/DocsGPT.git
synced 2026-10-04 12:13:05 +00:00
Follow-up review pass over the embeddings branch. - Fold an oversized header back into the body, and drop header duplication when it would leave under a quarter of the chunk budget. A header at or over max_tokens collapsed the body budget to one token, so a document became one chunk per body token, each still over the cap: a 95 KB file produced 20k chunks of 2563 tokens against a 1250 cap. Also clamp max_tokens to at least 1, as the strategy chunkers already do. - Emit a header-only document as its own chunk. With no body piece to attach it to, splitting returned nothing and the document was dropped from the index with no error and no log line. - Skip add_custom_model for a repository FastEmbed already ships. It rejects a name it knows, so configuring any of its ~30 built-ins (MiniLM, bge, e5, gte, ...) failed every embed call and every query. - Decide "the user chose this model" by comparing against the field default rather than model_fields_set, which is true for anything read from .env. Every setup script has always written EMBEDDINGS_NAME, so an upgraded remote-embeddings install inherited mpnet's 384-token window and silently clipped ~80% off every chunk. - Cut tiktoken splits at character offsets instead of decoding each token window. A multi-byte character straddling a boundary decoded to U+FFFD on both sides, destroying one character at roughly one boundary in five on CJK text -- including at the default max_tokens of 2000. - Let the re-embed script open a FAISS index whose width does not match the configured model. That mismatch is the main reason to run it, and the error recommending the script was raised by the script itself, so the advice failed on every source. - Re-embed graph_nodes.name_embedding when GraphRAG is enabled. Those vectors seed every traversal and share the chunk vectors' width, so a same-width model swap left the graph retrieving from the old space with nothing to report it. - Prefetch the models before copying the application source, so editing any file no longer re-downloads ~780 MB of artifacts on every build. - Mirror the setup.sh embedding menu into setup.ps1: granite default, legacy mpnet as an explicit option, and both engine flows updated. Windows users were otherwise stranded on mpnet with no granite path. - Drop the unused EmbeddingsWrapper.tokenizer property.
158 lines
6.2 KiB
Python
158 lines
6.2 KiB
Python
import re
|
|
from typing import List, Tuple
|
|
import logging
|
|
from application.parser.chunking_creator import ChunkerCreator
|
|
from application.parser.schema.base import Document
|
|
from application.parser.tokenization import get_token_counter
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Smallest share of ``max_tokens`` a chunk must keep for body text when the
|
|
# header is duplicated onto every chunk. A header that leaves less than this
|
|
# makes each chunk mostly repeated header and multiplies the chunk count -- at
|
|
# a budget of 32 out of 1250 a document splits into 39x more chunks than it
|
|
# needs -- so duplication is dropped rather than honoured.
|
|
_MIN_BODY_BUDGET_RATIO = 0.25
|
|
|
|
|
|
class Chunker:
|
|
"""Classic token-window chunker (registered as ``classic_chunk``).
|
|
|
|
Strategy dispatch lives in ``ChunkerCreator``; this class is one
|
|
registered implementation. The ``chunking_strategy`` arg is retained for
|
|
backward-compatible construction and is not used for dispatch here.
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
chunking_strategy: str = "classic_chunk",
|
|
max_tokens: int = 2000,
|
|
min_tokens: int = 150,
|
|
duplicate_headers: bool = False,
|
|
):
|
|
self.chunking_strategy = chunking_strategy
|
|
# A budget below 1 would ask for a chunk per token; the strategy
|
|
# chunkers clamp the same way.
|
|
self.max_tokens = max(1, int(max_tokens))
|
|
self.min_tokens = min_tokens
|
|
self.duplicate_headers = duplicate_headers
|
|
# Counted in the embedding model's tokenizer, not cl100k: ``max_tokens``
|
|
# is compared against a limit the embedding server enforces in its own
|
|
# units, so counting in any other unit is a guess.
|
|
self.counter = get_token_counter()
|
|
|
|
def separate_header_and_body(self, text: str) -> Tuple[str, str]:
|
|
header_pattern = r"^(.*?\n){3}"
|
|
match = re.match(header_pattern, text)
|
|
if match:
|
|
header = match.group(0)
|
|
body = text[len(header):]
|
|
else:
|
|
header, body = "", text # No header, treat entire text as body
|
|
return header, body
|
|
|
|
|
|
|
|
def split_document(self, doc: Document) -> List[Document]:
|
|
"""Split one oversized document into ``max_tokens``-sized chunks.
|
|
|
|
Pieces are sliced out of the original text rather than decoded back
|
|
from token ids. WordPiece tokenizers normalise as they decode --
|
|
all-mpnet-base-v2 lowercases -- so a decode round-trip would rewrite
|
|
every stored document.
|
|
"""
|
|
header, body = self.separate_header_and_body(doc.text)
|
|
header_tokens = self.counter.count(header) if header else 0
|
|
|
|
if header and header_tokens >= self.max_tokens:
|
|
# The header alone fills the budget, so no cut of the body can keep
|
|
# a chunk within it and duplicating it would leave a one-token body
|
|
# budget -- a chunk per body token. It is only the first three
|
|
# lines, not something worth preserving at that cost, so it goes
|
|
# back to being ordinary text and the document splits evenly.
|
|
logger.warning(
|
|
"Header of %s is %d token(s), at or over the %d-token chunk "
|
|
"budget; treating it as body text.",
|
|
doc.doc_id,
|
|
header_tokens,
|
|
self.max_tokens,
|
|
)
|
|
body = f"{header}{body}"
|
|
header, header_tokens = "", 0
|
|
|
|
# A chunk carrying the header has that much less room for body text.
|
|
with_header_budget = max(1, self.max_tokens - header_tokens)
|
|
duplicate_headers = self.duplicate_headers
|
|
if duplicate_headers and with_header_budget < self.max_tokens * _MIN_BODY_BUDGET_RATIO:
|
|
logger.warning(
|
|
"Header of %s leaves only %d of %d tokens for body text; "
|
|
"carrying it on the first chunk only.",
|
|
doc.doc_id,
|
|
with_header_budget,
|
|
self.max_tokens,
|
|
)
|
|
duplicate_headers = False
|
|
|
|
if duplicate_headers:
|
|
body_pieces = self.counter.split(body, with_header_budget)
|
|
else:
|
|
body_pieces = self.counter.split(
|
|
body, self.max_tokens, first_max_tokens=with_header_budget
|
|
)
|
|
|
|
if not body_pieces and header:
|
|
# Nothing but a header: the loop below only ever emits the header
|
|
# attached to a body piece, so without this the document is dropped
|
|
# from the index entirely.
|
|
body_pieces = [""]
|
|
|
|
split_docs = []
|
|
for part_index, piece in enumerate(body_pieces):
|
|
include_header = bool(header) and (duplicate_headers or part_index == 0)
|
|
chunk_text = f"{header}{piece}" if include_header else piece
|
|
split_docs.append(
|
|
Document(
|
|
text=chunk_text,
|
|
doc_id=f"{doc.doc_id}-{part_index}",
|
|
embedding=doc.embedding,
|
|
extra_info={
|
|
**(doc.extra_info or {}),
|
|
"token_count": self.counter.count(chunk_text),
|
|
},
|
|
)
|
|
)
|
|
return split_docs
|
|
|
|
def classic_chunk(self, documents: List[Document]) -> List[Document]:
|
|
processed_docs = []
|
|
i = 0
|
|
while i < len(documents):
|
|
doc = documents[i]
|
|
token_count = self.counter.count(doc.text)
|
|
|
|
if self.min_tokens <= token_count <= self.max_tokens:
|
|
doc.extra_info = doc.extra_info or {}
|
|
doc.extra_info["token_count"] = token_count
|
|
processed_docs.append(doc)
|
|
i += 1
|
|
elif token_count < self.min_tokens:
|
|
|
|
doc.extra_info = doc.extra_info or {}
|
|
doc.extra_info["token_count"] = token_count
|
|
processed_docs.append(doc)
|
|
i += 1
|
|
else:
|
|
# Split large documents
|
|
processed_docs.extend(self.split_document(doc))
|
|
i += 1
|
|
return processed_docs
|
|
|
|
def chunk(
|
|
self,
|
|
documents: List[Document]
|
|
) -> List[Document]:
|
|
return self.classic_chunk(documents)
|
|
|
|
|
|
ChunkerCreator.register("classic_chunk", Chunker)
|