new app — cleaned-up RAG pipeline (Qdrant retrieval + GPT), ported from Rag_backend
Self-contained app; wired into settings/urls in the next commit. Data
stays in the parallel team's live Qdrant — nothing is copied into our DB.
apps.py
- RagConfig.
models.py
- LessonChunk: DB-of-record for one summarized lesson chunk
(original_text + summary + embedding_vector) mirrored as a single
Qdrant point; loose lesson_id/grade_id ints, no cross-app FK.
LessonChunkImage for future multimodal lessons.
migrations/0001_initial.py
- initial tables for the two models.
services/clients.py
- lazy, lru_cache'd OpenAI + Qdrant clients (Rag_backend builds them at
import time and crashes without keys). RagNotConfigured raised when a
key/lib is missing; Qdrant client uses check_compatibility=False for
the 1.19-client / 1.17-server minor version gap.
services/config.py
- rag_is_configured(), collection-name template, grade-title resolution
(RAG_GRADE_TITLE_OVERRIDES -> content.Grade.title), retrieval top-k.
services/known_collections.py
- exact live Qdrant catalog: 6 collection names, math chapter-number ->
exact "فصل N: ..." string tables per (subject, grade), and the
علوم/اجتماعی lesson-number -> title maps. filter_key_for_subject()
picks `chapter` for math, `lesson_number` otherwise;
resolve_math_chapter() maps a plain chapter number (Persian or Latin
digits) to the stored string.
services/embedding.py
- embed_text() pinned to OPENAI_EMBEDDING_MODEL (text-embedding-3-small,
1536d) so vectors match the other team's existing collections.
services/chunking.py
- split_text_into_chunks(), summarize_chunk() (gpt-4o-mini, JSON out);
plain exceptions instead of ninja HttpError.
services/qdrant_store.py
- ensure_collection(), upsert_points(), search(): the lesson filter
matches the value both as str and native, since Qdrant stores
lesson_number as int and chapter as string.
services/retrieval.py
- resolve_target() -> (collection, filter_key, filter_value), reused by
the cache key and debug block.
- retrieve_context() -> (chunks, meta): embed -> Qdrant search scoped to
one lesson/chapter -> top-k. Math payloads (no `summary`) fall back to
generalSolution/problem/solution; a 404 collection returns empty.
services/generation.py
- generate_answer() and stream_answer() (token iterator for SSE);
context-grounded Persian prompt that explains from retrieved text
rather than refusing.
services/pdf.py
- textbook PDF -> page images -> gpt-4o vision problem-type extraction
(adapted from Rag_backend mathapp); returns dicts, no on-disk JSON.
pymupdf/pdf2image optional — missing libs raise RagNotConfigured.
services/ingest.py
- ingest_text() / ingest_pdf(): chunk -> summarize -> embed -> persist
LessonChunk + upsert Qdrant, in one transaction.
services/answer_cache.py
- short-TTL cache of the final answer keyed by
sha1(collection | filter_value | normalized-question).
services/tutor.py
- thin answer_question() (retrieve -> generate) for direct callers.
serializers.py, urls.py, views.py
- POST /api/rag/ingest/text, POST /api/rag/ingest/pdf (HasInternalServiceKey,
throttle scope rag_ingest), GET /api/rag/chunks review list.
RagProviderUnavailable -> clean 503.
admin.py
- LessonChunk admin with an inline for its images.
management/commands/rag_catalog.py
- read-only live Qdrant listing (--values, --json); never writes.
tests.py
- mocked-client tests: ask-with-retrieval, ingest, SSE stream, answer
cache, and rag_is_configured() gating.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
129
rag/services/retrieval.py
Normal file
129
rag/services/retrieval.py
Normal file
@@ -0,0 +1,129 @@
|
||||
"""
|
||||
مرحلهی retrieval: پرسشِ کاربر → embedding → جستجوی Qdrant → چند خلاصهی
|
||||
مرتبط بهعنوانِ context.
|
||||
|
||||
از UnexpectedResponseِ Qdrant (مثلاً collection موجود نیست چون این درس
|
||||
هنوز آپلود نشده) بهجای crash، لیستِ خالی برمیگردونیم تا لایهی بالا
|
||||
بتونه پاسخِ «این درس هنوز پوشش داده نشده» بده.
|
||||
"""
|
||||
import logging
|
||||
|
||||
from .config import build_collection_name, resolve_grade_title, retrieval_top_k
|
||||
from .embedding import embed_text
|
||||
from .known_collections import filter_key_for_subject, is_math_subject, resolve_math_chapter
|
||||
from .qdrant_store import search
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def resolve_target(subject: str, grade_title: str, grade_id, lesson_number):
|
||||
"""
|
||||
(collection, filter_key, filter_value) — مقصدِ دقیقِ retrieval در Qdrant.
|
||||
|
||||
ریاضی با کلیدِ payloadِ `chapter` (رشتهی کاملِ فصل) فیلتر میشه و شمارهی
|
||||
سادهی فصل به همون رشته تبدیل میشه؛ بقیه با `lesson_number` (که در Qdrant
|
||||
عددِ int ذخیره شده). فقط برای دیباگ/نمایشِ داخلی هم استفاده میشه.
|
||||
"""
|
||||
grade_title = grade_title or resolve_grade_title(grade_id)
|
||||
if not subject or not grade_title:
|
||||
return None, None, None
|
||||
|
||||
collection = build_collection_name(subject, grade_title)
|
||||
filter_key = filter_key_for_subject(subject)
|
||||
if is_math_subject(subject):
|
||||
filter_value = resolve_math_chapter(subject, grade_title, lesson_number)
|
||||
else:
|
||||
filter_value = lesson_number
|
||||
return collection, filter_key, filter_value
|
||||
|
||||
|
||||
def retrieve_context(question: str, *, subject: str, grade_id=None, grade_title: str = '',
|
||||
lesson_number=None, limit: int | None = None) -> tuple[list[dict], dict]:
|
||||
"""
|
||||
خروجی: (chunks, meta)
|
||||
chunks = [{title, summary, score}, ...] (ممکنه خالی باشه، بدونِ خطا)
|
||||
meta = {collection, filterKey, filterValue, gradeTitle, chunkCount}
|
||||
فقط برای نمایشِ داخلی/دیباگ (نه برای کاربرِ نهایی).
|
||||
"""
|
||||
grade_title = grade_title or resolve_grade_title(grade_id)
|
||||
collection, filter_key, filter_value = resolve_target(subject, grade_title, grade_id, lesson_number)
|
||||
meta = {
|
||||
'collection': collection,
|
||||
'filterKey': filter_key if filter_value is not None else None,
|
||||
'filterValue': filter_value,
|
||||
'gradeTitle': grade_title,
|
||||
'chunkCount': 0,
|
||||
}
|
||||
|
||||
if collection is None:
|
||||
logger.info('rag.retrieve: subject/grade ناقص (subject=%r grade=%r) — رد شد', subject, grade_title)
|
||||
return [], meta
|
||||
|
||||
limit = limit or retrieval_top_k()
|
||||
|
||||
try:
|
||||
query_vector = embed_text(question)
|
||||
except Exception:
|
||||
logger.exception('rag.retrieve: embedding شکست خورد')
|
||||
raise
|
||||
|
||||
try:
|
||||
from qdrant_client.http.exceptions import UnexpectedResponse
|
||||
except ModuleNotFoundError:
|
||||
UnexpectedResponse = () # type: ignore
|
||||
|
||||
try:
|
||||
hits = search(
|
||||
collection,
|
||||
query_vector,
|
||||
lesson_filter_value=filter_value,
|
||||
lesson_filter_key=filter_key if filter_value is not None else None,
|
||||
limit=limit,
|
||||
)
|
||||
except Exception as exc: # noqa: BLE001
|
||||
if UnexpectedResponse and isinstance(exc, UnexpectedResponse) and getattr(exc, 'status_code', None) == 404:
|
||||
logger.info('rag.retrieve: collection %r موجود نیست', collection)
|
||||
return [], meta
|
||||
logger.exception('rag.retrieve: جستجوی Qdrant در collection %r شکست خورد', collection)
|
||||
raise
|
||||
|
||||
context = []
|
||||
for hit in hits:
|
||||
payload = hit['payload']
|
||||
summary = _payload_text(payload)
|
||||
if not summary:
|
||||
continue
|
||||
context.append({
|
||||
'title': _payload_title(payload),
|
||||
'summary': summary,
|
||||
'score': hit.get('score'),
|
||||
})
|
||||
meta['chunkCount'] = len(context)
|
||||
return context, meta
|
||||
|
||||
|
||||
def _payload_text(payload: dict) -> str:
|
||||
"""
|
||||
دو شکلِ payload در دادهٔ تیمِ دیگه هست:
|
||||
- درسهای متنی (علوم/اجتماعی): کلیدِ `summary`
|
||||
- ریاضی: کلیدِ `generalSolution` (+ problem/solution) و بدونِ `summary`
|
||||
"""
|
||||
if payload.get('summary'):
|
||||
return payload['summary']
|
||||
parts = [
|
||||
payload.get('generalSolution', ''),
|
||||
payload.get('problem', ''),
|
||||
payload.get('solution', ''),
|
||||
]
|
||||
joined = '\n'.join(p for p in parts if p).strip()
|
||||
return joined or payload.get('text', '')
|
||||
|
||||
|
||||
def _payload_title(payload: dict) -> str:
|
||||
return (
|
||||
payload.get('lesson_title')
|
||||
or payload.get('title')
|
||||
or payload.get('type')
|
||||
or payload.get('chapter')
|
||||
or ''
|
||||
)
|
||||
Reference in New Issue
Block a user