bug fix
This commit is contained in:
1 parent
5aae33f578
commit
fd47a954bd
2 files changed
+56
-147
No files matched your search
+17
-49
@@ -1,20 +1,19 @@
|
||||
"""
|
||||
app/routers/ingest.py
|
||||
API-Endpunkte für WP-11 (Discovery & Persistence).
|
||||
Fixed Async/Await Issues.
|
||||
Fixed Async/Await Integration with Discovery Service.
|
||||
"""
|
||||
import os
|
||||
import time
|
||||
import logging
|
||||
from fastapi import APIRouter, HTTPException
|
||||
from pydantic import BaseModel
|
||||
from typing import Optional, List, Dict, Any
|
||||
from typing import Optional, Dict, Any
|
||||
|
||||
from app.core.ingestion import IngestionService
|
||||
from app.core.retriever import Retriever
|
||||
from app.models.dto import QueryRequest
|
||||
# WICHTIG: Wir nutzen wieder den spezialisierten DiscoveryService
|
||||
from app.services.discovery import DiscoveryService
|
||||
|
||||
# Logger Konfiguration
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
router = APIRouter()
|
||||
@@ -36,51 +35,20 @@ class SaveResponse(BaseModel):
|
||||
note_id: str
|
||||
stats: Dict[str, Any]
|
||||
|
||||
# --- Services ---
|
||||
discovery_service = DiscoveryService()
|
||||
|
||||
# --- Endpoints ---
|
||||
|
||||
@router.post("/analyze")
|
||||
async def analyze_draft(req: AnalyzeRequest):
|
||||
"""
|
||||
WP-11 Intelligence: Liefert Link-Vorschläge via Retriever.
|
||||
WP-11 Intelligence: Liefert Link-Vorschläge (Exact + Semantic).
|
||||
"""
|
||||
try:
|
||||
# Wir nutzen den Retriever direkt, statt eines extra DiscoveryServices
|
||||
retriever = Retriever()
|
||||
suggestions = []
|
||||
|
||||
# 1. Suche nach ähnlichen Inhalten (Semantic)
|
||||
query_text = req.text[:400]
|
||||
if not query_text.strip():
|
||||
return {"suggestions": []}
|
||||
|
||||
# Check ob Retriever async ist (in v2.3 oft ja)
|
||||
if hasattr(retriever.search, '__await__'):
|
||||
hits_result = await retriever.search(QueryRequest(query=query_text, top_k=5, mode="hybrid"))
|
||||
else:
|
||||
# Fallback sync
|
||||
hits_result = await retriever.search(QueryRequest(query=query_text, top_k=5, mode="hybrid"))
|
||||
|
||||
seen_titles = set()
|
||||
for hit in hits_result.results:
|
||||
title = hit.payload.get("note_id") or hit.node_id
|
||||
if not title or title in seen_titles: continue
|
||||
seen_titles.add(title)
|
||||
|
||||
# Simple Edge Logic
|
||||
edge_kind = "related_to"
|
||||
if req.type == "project": edge_kind = "depends_on"
|
||||
if req.type == "decision": edge_kind = "references"
|
||||
|
||||
if hit.total_score > 0.65:
|
||||
suggestions.append({
|
||||
"target_title": title,
|
||||
"target_id": hit.node_id,
|
||||
"suggested_markdown": f"[[rel:{edge_kind} {title}]]",
|
||||
"reason": f"Semantisch ähnlich ({hit.total_score:.2f})",
|
||||
"type": "semantic"
|
||||
})
|
||||
|
||||
return {"suggestions": suggestions}
|
||||
# Wir delegieren an den Service, der Exact Matching, Config und Semantik beherrscht
|
||||
result = await discovery_service.analyze_draft(req.text, req.type)
|
||||
return result
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Analyze failed: {e}", exc_info=True)
|
||||
@@ -97,21 +65,22 @@ async def save_note(req: SaveRequest):
|
||||
abs_vault_root = os.path.abspath(vault_root)
|
||||
|
||||
if not os.path.exists(abs_vault_root):
|
||||
# Versuche ihn zu erstellen, falls er fehlt
|
||||
os.makedirs(abs_vault_root, exist_ok=True)
|
||||
try:
|
||||
os.makedirs(abs_vault_root, exist_ok=True)
|
||||
except Exception:
|
||||
raise HTTPException(status_code=500, detail=f"Vault root missing and cannot create: {abs_vault_root}")
|
||||
|
||||
# 2. Filename
|
||||
final_filename = req.filename
|
||||
if not final_filename:
|
||||
final_filename = f"draft_{int(time.time())}.md"
|
||||
|
||||
# 3. Ingestion Service
|
||||
# 3. Ingestion Service (Async)
|
||||
ingest_service = IngestionService()
|
||||
|
||||
logger.info(f"Saving {final_filename} to {req.folder}")
|
||||
|
||||
# --- DER FIX: AWAIT HINZUFÜGEN ---
|
||||
# Da ingestion.py auf async umgestellt wurde, MÜSSEN wir hier warten.
|
||||
# Async Call zum Ingestion Service
|
||||
result = await ingest_service.create_from_text(
|
||||
markdown_content=req.markdown_content,
|
||||
filename=final_filename,
|
||||
@@ -119,7 +88,6 @@ async def save_note(req: SaveRequest):
|
||||
folder=req.folder
|
||||
)
|
||||
|
||||
# Fehlerprüfung auf dem Dictionary
|
||||
if result.get("status") == "error":
|
||||
raise HTTPException(status_code=500, detail=result.get("error"))
|
||||
|
||||
|
||||
Reference in new issue
Block a user