mirror of
https://github.com/tiennm99/DocsGPT.git
synced 2026-10-04 22:13:08 +00:00
Source access control --------------------- `active_docs` is client-supplied and reached the retriever unchecked, and the retriever queries `WHERE source_id = <id>` with no owner predicate — so any caller could pass any source id to /stream or /api/answer and have another tenant's documents quoted back, while /api/sources/<id>/search correctly refused the same id. Gate it through `can_access`, the helper the guarded endpoints already use, and filter `self.source` down to the authorized set. Fails closed: no principal, or a check that errors, drops the source. Three sibling paths had the same gap: - workflow agent nodes: `AgentNodeConfig.sources` is written verbatim from client JSON at save time and nothing validated it, so a node could name any tenant's source. Gate against the workflow owner, so shared workflows keep reading their owner's sources like shared agents do. - /api/share: `_resolve_source_pg_id` resolved any id with no ownership predicate and baked it into the agent the share creates; /api/search then searched it. Authorize before attaching. - search_service: re-resolve the ids stored on an agent row instead of trusting them, so a row written by any future path with the same gap cannot be read back. Team grantees previously lost their source's retrieval config: the post-check read was still owner-scoped, so it missed and fell back to defaults (an `agentic_tool` source was bulk-prefetched for every grantee). Read unscoped after `can_access` passes. Retrieval --------- `PGVectorStore._ensure_table_exists` created an IVFFlat index on the empty table it had just created. IVFFlat computes centroids at build time, so those centroids were random, and combined with the `source_id` post-filter a source with hundreds of embedded chunks returned zero rows — retrieval reported no documents, the model answered from memory, and nothing was logged. Stop creating the index (exact search is correct and fast well past the sizes most deployments reach); raise `ivfflat.probes` to sqrt(lists) where an index still exists; and re-run a short indexed search exactly, since post-filtering means no index setting can guarantee a full result. `graphrag` had the same empty-table index with no fallback at all. Also: bound `chunks` to 0-500 on both the request and agent paths (0 still means "skip retrieval"), let a source's configured `retrieval.chunks` outrank the request body, and cap ClassicRAG's per-source floor at max(top_k, n_sources) so attaching sources cannot inflate the result set. Silent failures --------------- An empty retrieval was invisible to both the model and the client: the `source` event was suppressed when the list was empty, so "searched and found nothing" looked identical to "no source attached", and the prompt said nothing at all. Emit the event always, and tell the model when a search ran and returned nothing. A file that parses to nothing now fails ingest with a message naming the cause instead of storing an embedding of the empty string. `score_threshold` returns warnings when the active store or retriever cannot honour it. Prompt structure ---------------- Retrieved documents move from the system prompt into the user turn, with the injection guard restated next to them: they change every turn (defeating prefix caching), they are third-party text that should not carry system authority, and routing them through the query budget makes them truncatable rather than silently crowding it out. Documents are shed lowest-ranked-first before the question is touched. The six chat presets (3 tones x 2 retrieval modes) differed only in their Answering section; they are now composed from single-source fragments at load time, not through Jinja inheritance, which would have opened a file-read surface in the template sandbox and broken the tool-prefetch parser. Per-tool guidance moves out of the prompt into tool schemas, so it travels with the tool and cannot render when the tool is absent. A plain-text custom prompt is staged as a persona value inside the skeleton instead of replacing it wholesale — it used to silently lose the injection guard, platform block, memory and attachments, and its braces are now inert. Other fixes ----------- - agents/base: an oversized system prompt drove the query budget negative and dispatched a full-price request with an empty question; raise instead. - llm/anthropic: migrate off the retired Text Completions API. It flattened history to first+last message and ignored tools entirely. Adds the missing Anthropic handler, without which every tool call was silently dropped. - sources/upload: `sitemap` had no branch, so every sitemap ingest died on a TypeError; `validate_url` now rejects a falsy URL cleanly. - workflow nodes: retrieved documents never reached the node agent, so a classic node with a source and an ordinary prompt answered "I have no documents" while the run reported completed. - parser/bulk: copy the metadata dict, or every chunk reports the last chunk's token_count. - crawler_loader: carry the page title, or citations render the whole chunk body as the label.
350 lines
14 KiB
Python
Executable File
350 lines
14 KiB
Python
Executable File
import os
|
|
import logging
|
|
from typing import Any, List, Optional
|
|
from retry import retry
|
|
from tqdm import tqdm
|
|
from application.core.settings import settings
|
|
from application.events.publisher import publish_user_event
|
|
from application.storage.db.repositories.ingest_chunk_progress import (
|
|
IngestChunkProgressRepository,
|
|
)
|
|
from application.storage.db.session import db_session
|
|
from application.vectorstore.vector_creator import VectorCreator
|
|
|
|
|
|
class EmbeddingPipelineError(Exception):
|
|
"""Raised when the per-chunk embed loop produces a partial index.
|
|
|
|
Escapes into Celery's ``autoretry_for`` so a transient cause (rate
|
|
limit, network blip) gets another shot. The chunk-progress
|
|
checkpoint makes retries cheap — only the failed-and-after chunks
|
|
re-run. After ``MAX_TASK_ATTEMPTS`` the poison-loop guard in
|
|
``with_idempotency`` finalises the row as ``failed``.
|
|
"""
|
|
|
|
|
|
def sanitize_content(content: str) -> str:
|
|
"""
|
|
Remove NUL characters that can cause vector store ingestion to fail.
|
|
|
|
Args:
|
|
content (str): Raw content that may contain NUL characters
|
|
|
|
Returns:
|
|
str: Sanitized content with NUL characters removed
|
|
"""
|
|
if not content:
|
|
return content
|
|
return content.replace('\x00', '')
|
|
|
|
|
|
# Per-chunk inline retry. Aggressive defaults (tries=10, delay=60) blocked
|
|
# the loop for up to 9 min per chunk and wedged the heartbeat: lower the
|
|
# tail so a transient failure fails-fast and the chunk-progress checkpoint
|
|
# resumes cleanly on next dispatch.
|
|
@retry(tries=3, delay=5, backoff=2)
|
|
def add_text_to_store_with_retry(store: Any, doc: Any, source_id: str) -> None:
|
|
"""Add a document's text and metadata to the vector store with retry logic.
|
|
|
|
Args:
|
|
store: The vector store object.
|
|
doc: The document to be added.
|
|
source_id: Unique identifier for the source.
|
|
|
|
Raises:
|
|
Exception: If document addition fails after all retry attempts.
|
|
"""
|
|
try:
|
|
# Sanitize content to remove NUL characters that cause ingestion failures
|
|
doc.page_content = sanitize_content(doc.page_content)
|
|
|
|
doc.metadata["source_id"] = str(source_id)
|
|
store.add_texts([doc.page_content], metadatas=[doc.metadata])
|
|
except Exception as e:
|
|
logging.error(f"Failed to add document with retry: {e}", exc_info=True)
|
|
raise
|
|
|
|
|
|
def _init_progress_and_resume_index(
|
|
source_id: str, total_chunks: int, attempt_id: Optional[str],
|
|
) -> int:
|
|
"""Upsert the progress row and return the next chunk index to embed.
|
|
|
|
The repository's upsert preserves ``last_index`` only when the
|
|
incoming ``attempt_id`` matches the stored one (a Celery autoretry
|
|
of the same task). On a fresh attempt — including any caller that
|
|
doesn't pass an ``attempt_id``, e.g. legacy code or tests — the
|
|
row's checkpoint is reset so the loop starts from chunk 0. This
|
|
is what prevents a completed checkpoint from any prior run
|
|
silently no-op'ing the next sync/reingest.
|
|
|
|
Best-effort: a DB outage falls back to ``0`` (fresh run from
|
|
chunk 0). The embed loop's own re-raise still ensures partial
|
|
runs don't get cached as complete.
|
|
"""
|
|
try:
|
|
with db_session() as conn:
|
|
progress = IngestChunkProgressRepository(conn).init_progress(
|
|
source_id, total_chunks, attempt_id,
|
|
)
|
|
except Exception as e:
|
|
logging.warning(
|
|
f"Could not init ingest progress for {source_id}: {e}",
|
|
exc_info=True,
|
|
)
|
|
return 0
|
|
if not progress:
|
|
return 0
|
|
last_index = progress.get("last_index", -1)
|
|
if last_index is None or last_index < 0:
|
|
return 0
|
|
return int(last_index) + 1
|
|
|
|
|
|
def _record_progress(source_id: str, last_index: int, embedded_chunks: int) -> None:
|
|
"""Best-effort checkpoint after each chunk; logged but never raised."""
|
|
try:
|
|
with db_session() as conn:
|
|
IngestChunkProgressRepository(conn).record_chunk(
|
|
source_id, last_index=last_index, embedded_chunks=embedded_chunks
|
|
)
|
|
except Exception as e:
|
|
logging.warning(
|
|
f"Could not record ingest progress for {source_id}: {e}", exc_info=True
|
|
)
|
|
|
|
|
|
def assert_index_complete(source_id: str) -> None:
|
|
"""Raise ``EmbeddingPipelineError`` if ``ingest_chunk_progress``
|
|
shows a partial embed for ``source_id``.
|
|
|
|
Defense-in-depth tripwire that workers run after
|
|
``embed_and_store_documents`` to catch any future swallow path
|
|
that bypasses the function's own re-raise — the chunk-progress
|
|
row is the authoritative record of how many chunks landed.
|
|
No-op when no row exists (zero-doc validation raised before init,
|
|
or progress repo was unreachable).
|
|
"""
|
|
try:
|
|
with db_session() as conn:
|
|
progress = IngestChunkProgressRepository(conn).get_progress(source_id)
|
|
except Exception as e:
|
|
logging.warning(
|
|
f"assert_index_complete: progress lookup failed for "
|
|
f"{source_id}: {e}",
|
|
exc_info=True,
|
|
)
|
|
return
|
|
if not progress:
|
|
return
|
|
embedded = int(progress.get("embedded_chunks") or 0)
|
|
total = int(progress.get("total_chunks") or 0)
|
|
if embedded < total:
|
|
raise EmbeddingPipelineError(
|
|
f"partial index for source {source_id}: "
|
|
f"{embedded}/{total} chunks embedded"
|
|
)
|
|
|
|
|
|
def embed_and_store_documents(
|
|
docs: List[Any],
|
|
folder_name: str,
|
|
source_id: str,
|
|
task_status: Any,
|
|
*,
|
|
attempt_id: Optional[str] = None,
|
|
user_id: Optional[str] = None,
|
|
progress_start: int = 0,
|
|
progress_end: int = 100,
|
|
) -> None:
|
|
"""Embeds documents and stores them in a vector store.
|
|
|
|
Resumable across Celery autoretries of the *same* task: when
|
|
``attempt_id`` matches the stored checkpoint's ``attempt_id``,
|
|
the loop resumes from ``last_index + 1``. A different
|
|
``attempt_id`` (a fresh sync / reingest invocation) resets the
|
|
checkpoint so the index is rebuilt from chunk 0 — this is what
|
|
keeps a completed checkpoint from poisoning the next sync.
|
|
|
|
Args:
|
|
docs: List of documents to be embedded and stored.
|
|
folder_name: Directory to save the vector store.
|
|
source_id: Unique identifier for the source.
|
|
task_status: Task state manager for progress updates.
|
|
attempt_id: Stable id of the current task invocation,
|
|
typically ``self.request.id`` from the Celery task body.
|
|
``None`` is treated as a fresh attempt every time.
|
|
user_id: When provided, per-percent SSE progress events are
|
|
published to ``user:{user_id}`` for the in-app upload toast.
|
|
``None`` is the safe default — workers without a user
|
|
context (e.g. background syncs) skip the publish.
|
|
progress_start: Percent the reported progress maps to at chunk 0.
|
|
Lets a caller reserve the lower band for an earlier stage
|
|
(e.g. parsing). Defaults to ``0`` (embed owns the whole bar).
|
|
progress_end: Percent the reported progress maps to at the final
|
|
chunk. Defaults to ``100``.
|
|
|
|
Returns:
|
|
None
|
|
|
|
Raises:
|
|
OSError: If unable to create folder or save vector store.
|
|
EmbeddingPipelineError: If a chunk fails after retries.
|
|
"""
|
|
# Ensure the folder exists
|
|
if not os.path.exists(folder_name):
|
|
os.makedirs(folder_name)
|
|
|
|
# Drop blank documents before validating. A file that parses to nothing
|
|
# (empty upload, whitespace-only, an image-only PDF with no OCR) used to
|
|
# reach here as a one-element list of "" and ingest as a healthy source,
|
|
# putting an embedding of the empty string into the index.
|
|
docs = [
|
|
d for d in docs
|
|
if str(getattr(d, "text", getattr(d, "page_content", d)) or "").strip()
|
|
]
|
|
if not docs:
|
|
raise ValueError(
|
|
"No text could be extracted from this file. It may be empty, "
|
|
"image-only, or in an unsupported format."
|
|
)
|
|
|
|
total_docs = len(docs)
|
|
# Atomic upsert that preserves checkpoint state on attempt-id match
|
|
# (autoretry of same task) and resets it on mismatch (fresh sync /
|
|
# reingest). Returns the new resume index — 0 means "start fresh".
|
|
resume_index = _init_progress_and_resume_index(
|
|
source_id, total_docs, attempt_id,
|
|
)
|
|
is_resume = resume_index > 0
|
|
|
|
# Initialize vector store
|
|
if settings.VECTOR_STORE == "faiss":
|
|
if is_resume:
|
|
# Load the existing FAISS index from storage so chunks
|
|
# already embedded by the prior attempt survive the
|
|
# save_local rewrite at the end of this run.
|
|
store = VectorCreator.create_vectorstore(
|
|
settings.VECTOR_STORE,
|
|
source_id=source_id,
|
|
embeddings_key=os.getenv("EMBEDDINGS_KEY"),
|
|
)
|
|
loop_start = resume_index
|
|
else:
|
|
# FAISS requires at least one doc to construct the store;
|
|
# seed with ``docs[0]`` and let the loop pick up at index 1.
|
|
store = VectorCreator.create_vectorstore(
|
|
settings.VECTOR_STORE,
|
|
docs_init=[docs[0]],
|
|
source_id=source_id,
|
|
embeddings_key=os.getenv("EMBEDDINGS_KEY"),
|
|
)
|
|
# Record the seeded chunk so single-doc ingests don't fail
|
|
# ``assert_index_complete`` — the loop never runs for
|
|
# ``total_docs == 1`` and would otherwise leave
|
|
# ``embedded_chunks`` at 0 / ``last_index`` at -1. The loop
|
|
# body's per-iteration ``_record_progress`` overshoots
|
|
# correctly for multi-chunk runs (counts seed + iterations),
|
|
# so writing this checkpoint up-front is a no-op for those.
|
|
_record_progress(source_id, last_index=0, embedded_chunks=1)
|
|
loop_start = 1
|
|
else:
|
|
store = VectorCreator.create_vectorstore(
|
|
settings.VECTOR_STORE,
|
|
source_id=source_id,
|
|
embeddings_key=os.getenv("EMBEDDINGS_KEY"),
|
|
)
|
|
# Only wipe the index on a fresh run — a resume must keep the
|
|
# chunks that earlier attempts already embedded.
|
|
if not is_resume:
|
|
store.delete_index()
|
|
loop_start = resume_index
|
|
|
|
if is_resume and loop_start >= total_docs:
|
|
# Nothing left to do; the loop runs zero iterations and
|
|
# downstream finalize logic still executes. This is only
|
|
# reachable on a same-attempt retry of a task whose previous
|
|
# attempt finished — typically a Celery acks_late redelivery
|
|
# after the task already returned. The ``assert_index_complete``
|
|
# tripwire still validates ``embedded == total`` afterwards.
|
|
loop_start = total_docs
|
|
|
|
# Process and embed documents
|
|
chunk_error: Exception | None = None
|
|
failed_idx: int | None = None
|
|
last_published_pct = -1
|
|
source_id_str = str(source_id)
|
|
progress_span = progress_end - progress_start
|
|
for idx in tqdm(
|
|
range(loop_start, total_docs),
|
|
desc="Embedding 🦖",
|
|
unit="docs",
|
|
total=total_docs - loop_start,
|
|
bar_format="{l_bar}{bar}| Time Left: {remaining}",
|
|
):
|
|
doc = docs[idx]
|
|
try:
|
|
# Map the embed loop into [progress_start, progress_end].
|
|
progress = progress_start + int(
|
|
((idx + 1) / total_docs) * progress_span
|
|
)
|
|
task_status.update_state(state="PROGRESS", meta={"current": progress})
|
|
|
|
# SSE push for sub-second upload-toast updates. Throttled to one
|
|
# event per percent so a 10k-chunk ingest emits ~100 events,
|
|
# not 10k. The Celery update_state above stays the source of
|
|
# truth for the polling-fallback path.
|
|
if user_id and progress > last_published_pct:
|
|
publish_user_event(
|
|
user_id,
|
|
"source.ingest.progress",
|
|
{
|
|
"current": progress,
|
|
"total": total_docs,
|
|
"embedded_chunks": idx + 1,
|
|
"stage": "embedding",
|
|
},
|
|
scope={"kind": "source", "id": source_id_str},
|
|
)
|
|
last_published_pct = progress
|
|
|
|
# Add document to vector store
|
|
add_text_to_store_with_retry(store, doc, source_id)
|
|
_record_progress(source_id, last_index=idx, embedded_chunks=idx + 1)
|
|
except Exception as e:
|
|
chunk_error = e
|
|
failed_idx = idx
|
|
logging.error(f"Error embedding document {idx}: {e}", exc_info=True)
|
|
logging.info(f"Saving progress at document {idx} out of {total_docs}")
|
|
try:
|
|
store.save_local(folder_name)
|
|
logging.info("Progress saved successfully")
|
|
except Exception as save_error:
|
|
logging.error(f"CRITICAL: Failed to save progress: {save_error}", exc_info=True)
|
|
# Continue without breaking to attempt final save
|
|
break
|
|
|
|
# Save the vector store
|
|
if settings.VECTOR_STORE == "faiss":
|
|
try:
|
|
store.save_local(folder_name)
|
|
logging.info("Vector store saved successfully.")
|
|
except Exception as e:
|
|
logging.error(f"CRITICAL: Failed to save final vector store: {e}", exc_info=True)
|
|
raise OSError(f"Unable to save vector store to {folder_name}: {e}") from e
|
|
else:
|
|
logging.info("Vector store saved successfully.")
|
|
|
|
# Re-raise after the partial save: the chunks that *did* embed are
|
|
# flushed to disk and recorded in ``ingest_chunk_progress``, so a
|
|
# Celery autoretry resumes via ``_read_resume_index`` and only
|
|
# re-runs the failed-and-after chunks. Without the raise, the
|
|
# task body returns success and ``with_idempotency`` finalises
|
|
# ``task_dedup`` as ``completed`` for a partial index — poisoning
|
|
# the cache for 24h.
|
|
if chunk_error is not None:
|
|
raise EmbeddingPipelineError(
|
|
f"embed failure at chunk {failed_idx}/{total_docs} "
|
|
f"for source {source_id}"
|
|
) from chunk_error
|