- Remove _ProviderConfigStub from services/ai_config.py (replaced by real ProviderConfig) - Add module-level import: from ai.provider_config import ProviderConfig, PROVIDER_DEFAULTS - load_provider_config() now returns ProviderConfig (no lazy import inside function body) - classifier.py: replace inline _settings dict with load_provider_config(session) call (D-06) - Per-user override path builds ProviderConfig from PROVIDER_DEFAULTS (no api_key — T-07-06) - Fallback to app_settings defaults when load_provider_config returns None (D-15) - Truncation delegated to provider._truncate() — no more text slices in classifier (D-12/D-13) - Promote test_api_key_encrypt_decrypt to passing (round-trip + domain salt isolation) - Update test_classifier.py: test_per_user_provider + test_default_provider_fallback use ProviderConfig assertions
182 lines
8.2 KiB
Python
182 lines
8.2 KiB
Python
"""
|
|
Classification orchestrator.
|
|
Loads settings, selects AI provider, classifies document, auto-creates suggested topics.
|
|
|
|
Updated in Plan 05: classify_document and suggest_topics_for_document now accept
|
|
an AsyncSession as their first argument so they can be called from the Celery task
|
|
wrapper and from API route handlers that already hold a session.
|
|
|
|
Updated in Plan 03-03: classify_document uses load_topics_for_user (D-17) to scope
|
|
topic lookup to the document owner's namespace, and creates AI-suggested topics in
|
|
the user's namespace via create_topic(user_id=doc.user_id) (D-11).
|
|
|
|
Updated in Plan 03-04: classify_document and suggest_topics_for_document now accept
|
|
ai_provider and ai_model kwargs. No longer calls storage.load_settings(). Provider
|
|
resolved via get_provider() using per-user settings from DB (D-14, D-15).
|
|
|
|
Updated in Plan 07-03: Provider resolved via load_provider_config(session) reading
|
|
from the system_settings DB table (D-04/D-06). Per-user override still honoured:
|
|
when ai_provider is non-None, a ProviderConfig is constructed from PROVIDER_DEFAULTS
|
|
for that provider (note: per-user override does not carry an api_key — admin must
|
|
configure each provider's key in system_settings). Truncation delegated to provider
|
|
_truncate() — no more inline text slicing in the classifier (D-12/D-13).
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import uuid as _uuid
|
|
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from config import settings as app_settings
|
|
from db.models import Document
|
|
from services import storage
|
|
from services.ai_config import load_provider_config
|
|
from ai import get_provider
|
|
from ai.provider_config import ProviderConfig, PROVIDER_DEFAULTS
|
|
|
|
_DEFAULT_SYSTEM_PROMPT = """You are a document classification assistant. When given a document's text content and a list of existing topics, you must:
|
|
1. Assign the document to one or more relevant topics from the list.
|
|
2. If no existing topics fit well, suggest new topic names.
|
|
Return ONLY valid JSON in this exact format, with no additional text or explanation:
|
|
{"assigned_topics": ["topic1"], "new_topic_suggestions": ["new topic name"]}
|
|
If the document fits no topics and you have no suggestions, return: {"assigned_topics": [], "new_topic_suggestions": []}"""
|
|
|
|
|
|
async def classify_document(
|
|
session: AsyncSession,
|
|
doc_id: str,
|
|
topic_names: list[str] | None = None,
|
|
ai_provider: str | None = None,
|
|
ai_model: str | None = None,
|
|
) -> list[str]:
|
|
"""
|
|
Classify a document by its ID. Returns the list of assigned topic names.
|
|
If topic_names is provided, restrict classification to those topics.
|
|
Auto-creates any newly suggested topics in the document owner's namespace (D-11).
|
|
|
|
ai_provider and ai_model come from the document owner's User record (D-14).
|
|
Falls back to app_settings.default_ai_provider / default_ai_model when None (D-15).
|
|
Provider config loaded from system_settings DB table via load_provider_config() (D-04).
|
|
"""
|
|
meta = await storage.get_metadata(session, doc_id)
|
|
if meta is None:
|
|
raise ValueError(f"Document {doc_id} not found")
|
|
|
|
system_prompt = app_settings.system_prompt or _DEFAULT_SYSTEM_PROMPT
|
|
|
|
# ── Provider resolution (D-04/D-06) ─────────────────────────────────────
|
|
if ai_provider is not None:
|
|
# Per-user override path: build a ProviderConfig from PROVIDER_DEFAULTS.
|
|
# per-user override does not carry an api_key — admin must configure each
|
|
# provider's key in system_settings. When the per-user override selects a
|
|
# different provider than the active system provider, api_key stays empty
|
|
# and get_provider() normalises it to "not-needed".
|
|
config = ProviderConfig(
|
|
provider_id=ai_provider,
|
|
model=ai_model or PROVIDER_DEFAULTS.get(ai_provider, {}).get("model", ""),
|
|
api_key="",
|
|
base_url=None,
|
|
context_chars=PROVIDER_DEFAULTS.get(ai_provider, {}).get("context_chars", 8000),
|
|
)
|
|
else:
|
|
# System provider path: load from DB (D-04)
|
|
config = await load_provider_config(session)
|
|
if config is None:
|
|
# No active row in system_settings — fall back to env-var defaults (D-15)
|
|
fallback_provider = app_settings.default_ai_provider
|
|
config = ProviderConfig(
|
|
provider_id=fallback_provider,
|
|
model=app_settings.default_ai_model,
|
|
api_key="",
|
|
base_url=None,
|
|
context_chars=PROVIDER_DEFAULTS.get(fallback_provider, {}).get(
|
|
"context_chars", 8000
|
|
),
|
|
)
|
|
|
|
provider = get_provider(config)
|
|
|
|
# Load the Document ORM object to get the owner's user_id (D-11, D-17)
|
|
try:
|
|
uid = _uuid.UUID(doc_id)
|
|
except ValueError:
|
|
uid = None
|
|
|
|
doc = await session.get(Document, uid) if uid is not None else None
|
|
doc_user_id = doc.user_id if doc is not None else None
|
|
|
|
# Use namespace-scoped topic list if not specified (D-17)
|
|
if topic_names is None:
|
|
if doc_user_id is not None:
|
|
all_topics = await storage.load_topics_for_user(session, user_id=doc_user_id)
|
|
else:
|
|
# Fallback for documents without a user (legacy / test data)
|
|
all_topics = await storage.load_topics(session)
|
|
topic_names = [t["name"] for t in all_topics]
|
|
|
|
text = meta.get("extracted_text", "")
|
|
# Truncation is performed inside provider.classify() via provider._truncate(). (D-12/D-13)
|
|
result = await provider.classify(text, topic_names, system_prompt)
|
|
|
|
# Collect all topic names to persist (assigned + suggested)
|
|
all_new_names = set(result.suggested_new_topics) | set(result.topics)
|
|
|
|
# Auto-create any topic not already in the registry — in the user's namespace (D-11)
|
|
existing_names = {t.lower() for t in topic_names}
|
|
for name in all_new_names:
|
|
if name.strip() and name.lower() not in existing_names:
|
|
await storage.create_topic(session, name.strip(), user_id=doc_user_id)
|
|
|
|
# Final list: everything the AI assigned or suggested
|
|
final_topics = [t for t in list(set(result.topics + result.suggested_new_topics)) if t.strip()]
|
|
|
|
await storage.update_document_topics(session, doc_id, final_topics)
|
|
return final_topics
|
|
|
|
|
|
async def suggest_topics_for_document(
|
|
session: AsyncSession,
|
|
doc_id: str,
|
|
ai_provider: str | None = None,
|
|
ai_model: str | None = None,
|
|
) -> list[str]:
|
|
"""Return AI-suggested topic names without modifying the document.
|
|
|
|
ai_provider and ai_model come from the document owner's User record (D-14).
|
|
Falls back to app_settings.default_ai_provider / default_ai_model when None (D-15).
|
|
Provider config loaded from system_settings DB table via load_provider_config() (D-04).
|
|
"""
|
|
meta = await storage.get_metadata(session, doc_id)
|
|
if meta is None:
|
|
raise ValueError(f"Document {doc_id} not found")
|
|
|
|
system_prompt = app_settings.system_prompt or _DEFAULT_SYSTEM_PROMPT
|
|
|
|
# ── Provider resolution (D-04/D-06) ─────────────────────────────────────
|
|
if ai_provider is not None:
|
|
config = ProviderConfig(
|
|
provider_id=ai_provider,
|
|
model=ai_model or PROVIDER_DEFAULTS.get(ai_provider, {}).get("model", ""),
|
|
api_key="",
|
|
base_url=None,
|
|
context_chars=PROVIDER_DEFAULTS.get(ai_provider, {}).get("context_chars", 8000),
|
|
)
|
|
else:
|
|
config = await load_provider_config(session)
|
|
if config is None:
|
|
fallback_provider = app_settings.default_ai_provider
|
|
config = ProviderConfig(
|
|
provider_id=fallback_provider,
|
|
model=app_settings.default_ai_model,
|
|
api_key="",
|
|
base_url=None,
|
|
context_chars=PROVIDER_DEFAULTS.get(fallback_provider, {}).get(
|
|
"context_chars", 8000
|
|
),
|
|
)
|
|
|
|
provider = get_provider(config)
|
|
text = meta.get("extracted_text", "")
|
|
# Truncation is performed inside provider.suggest_topics() via provider._truncate(). (D-12/D-13)
|
|
return await provider.suggest_topics(text, system_prompt)
|