072: file A valider, contexte de fil (Thread-Index), fil dans la lecture, filtre informations dans Suivi
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XGaEeTZLvHXfYPUNWkgYoi
This commit is contained in:
1 parent
5d98d08a8b
commit
c7c28f4079
5 files changed
+337
-16
No files matched your search
+162
-10
@@ -48,6 +48,10 @@ def _pret(conn) -> None:
|
||||
"CREATE TABLE IF NOT EXISTS analyses_ia ("
|
||||
"message_id TEXT PRIMARY KEY, categorie TEXT NOT NULL, confiance TEXT NOT NULL, resume TEXT NOT NULL, "
|
||||
"course TEXT, demande TEXT, objet TEXT, expediteur TEXT, date_mail TEXT, le TEXT NOT NULL, modele TEXT NOT NULL)")
|
||||
cols = {r[1] for r in conn.execute("PRAGMA table_info(analyses_ia)")}
|
||||
if "fil" not in cols:
|
||||
conn.execute("ALTER TABLE analyses_ia ADD COLUMN fil TEXT")
|
||||
conn.execute("CREATE INDEX IF NOT EXISTS idx_analyses_fil ON analyses_ia (fil)")
|
||||
|
||||
|
||||
def _reglage(cle: str, db_path: Optional[str] = None) -> bool:
|
||||
@@ -76,7 +80,7 @@ def auto_actif(db_path: Optional[str] = None) -> bool:
|
||||
return ia.ia_active(db_path) and _reglage("ia_auto", db_path)
|
||||
|
||||
|
||||
def construire_messages(objet: str, expediteur: str, corps: str, categories: List[str]) -> list:
|
||||
def construire_messages(objet: str, expediteur: str, corps: str, categories: List[str], contexte: str = "") -> list:
|
||||
defs = "\n".join("- " + c + " : " + DEFINITIONS.get(c, "categorie de Nabil") for c in categories)
|
||||
consigne = (
|
||||
"Tu aides un responsable de la division Supply Chain de Tunisie Telecom (Sfax) a trier son courrier. "
|
||||
@@ -94,8 +98,14 @@ def construire_messages(objet: str, expediteur: str, corps: str, categories: Lis
|
||||
"entre Sfax et Tunis. Une demande est reelle seulement si quelqu'un attend une action ou une reponse de Nabil. "
|
||||
"N'invente rien : si l'information est absente, laisse vide ou null."
|
||||
)
|
||||
if contexte:
|
||||
consigne += ("\nLe mail fait partie d'une conversation : un contexte (resumes des mails precedents du meme fil, "
|
||||
"et categorie choisie par Nabil quand elle existe) est fourni. Utilise-le : un fil deja range par Nabil "
|
||||
"garde sa categorie, et un mail de suite sans nouvelle demande n'est pas une nouvelle course.")
|
||||
texte = ("Expediteur : " + (expediteur or "(inconnu)") + "\nObjet : " + (objet or "(vide)") + "\n\n"
|
||||
+ (corps or "")[:ia.MAX_TEXTE])
|
||||
if contexte:
|
||||
texte = "Contexte du fil :\n" + contexte + "\n\nMail a analyser :\n" + texte
|
||||
return [{"role": "system", "content": consigne}, {"role": "user", "content": texte}]
|
||||
|
||||
|
||||
@@ -147,30 +157,41 @@ def _categories(db_path: Optional[str] = None) -> List[str]:
|
||||
return [c for c in cats if c and c != ia.A_CLASSER]
|
||||
|
||||
|
||||
def analyser(objet: str, expediteur: str, corps: str, db_path: Optional[str] = None) -> Dict[str, Any]:
|
||||
def analyser(objet: str, expediteur: str, corps: str, db_path: Optional[str] = None, contexte: str = "") -> Dict[str, Any]:
|
||||
"""Appelle PrivAiTe. Leve IAIndisponible si le service ne repond pas (aucun repli)."""
|
||||
cats = _categories(db_path)
|
||||
rep = ia.appeler_privaite(construire_messages(objet, expediteur, corps, cats), max_tokens=450)
|
||||
rep = ia.appeler_privaite(construire_messages(objet, expediteur, corps, cats, contexte), max_tokens=450)
|
||||
return lire_fiche(rep, cats)
|
||||
|
||||
|
||||
def cle_fil(thread_index: str) -> Optional[str]:
|
||||
"""Cle de conversation Exchange : les 22 premiers octets de Thread-Index sont communs a tout le fil,
|
||||
meme quand l'objet change. Vide si l'en-tete est absent ou illisible."""
|
||||
import base64
|
||||
try:
|
||||
brut = base64.b64decode((thread_index or "").strip() + "=" * (-len(thread_index.strip()) % 4))
|
||||
except Exception:
|
||||
return None
|
||||
return brut[:22].hex() if len(brut) >= 22 else None
|
||||
|
||||
|
||||
def enregistrer(message_id: str, fiche: Dict[str, Any], objet: str = "", expediteur: str = "",
|
||||
date_mail: str = "", db_path: Optional[str] = None) -> None:
|
||||
date_mail: str = "", db_path: Optional[str] = None, fil: Optional[str] = None) -> None:
|
||||
conn = _db.get_connection(db_path)
|
||||
try:
|
||||
_pret(conn)
|
||||
with conn:
|
||||
conn.execute(
|
||||
"INSERT INTO analyses_ia (message_id, categorie, confiance, resume, course, demande, objet, "
|
||||
"expediteur, date_mail, le, modele) VALUES (?,?,?,?,?,?,?,?,?,?,?) "
|
||||
"expediteur, date_mail, le, modele, fil) VALUES (?,?,?,?,?,?,?,?,?,?,?,?) "
|
||||
"ON CONFLICT(message_id) DO UPDATE SET categorie=excluded.categorie, confiance=excluded.confiance, "
|
||||
"resume=excluded.resume, course=excluded.course, demande=excluded.demande, le=excluded.le, "
|
||||
"modele=excluded.modele",
|
||||
"modele=excluded.modele, fil=COALESCE(excluded.fil, fil)",
|
||||
(message_id, fiche["categorie"], fiche["confiance"], fiche["resume"],
|
||||
json.dumps(fiche["course"], ensure_ascii=False) if fiche["course"] else None,
|
||||
json.dumps(fiche["demande"], ensure_ascii=False),
|
||||
_court(objet, 200), _court(expediteur, 120), _court(date_mail, 40),
|
||||
get_tunis_now_iso(), ia.IA_MODELE))
|
||||
get_tunis_now_iso(), ia.IA_MODELE, fil))
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
@@ -214,6 +235,36 @@ def lister(jour: Optional[str] = None, depuis: Optional[str] = None, n: int = 10
|
||||
conn.close()
|
||||
|
||||
|
||||
def membres_fil(fil: Optional[str], message_id: str = "", db_path: Optional[str] = None, n: int = 8) -> List[Dict[str, Any]]:
|
||||
"""Autres mails deja analyses du meme fil, du plus ancien au plus recent, avec la categorie choisie par Nabil."""
|
||||
if not fil:
|
||||
return []
|
||||
conn = _db.get_connection(db_path)
|
||||
try:
|
||||
_pret(conn)
|
||||
conn.row_factory = sqlite3.Row
|
||||
lignes = conn.execute("SELECT * FROM analyses_ia WHERE fil=? AND message_id<>? ORDER BY date_mail DESC LIMIT ?",
|
||||
(fil, message_id, max(1, min(n, 20)))).fetchall()
|
||||
sortie = []
|
||||
for r in reversed(lignes):
|
||||
f = _ligne(r)
|
||||
c = conn.execute("SELECT categorie, source FROM classements WHERE message_id=?", (r["message_id"],)).fetchone()
|
||||
f["choix_nabil"] = c[0] if c and c[1] == "manuel" else None
|
||||
sortie.append(f)
|
||||
return sortie
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def contexte_fil(fil: Optional[str], message_id: str, db_path: Optional[str] = None) -> str:
|
||||
lignes = []
|
||||
for f in membres_fil(fil, message_id, db_path, 5):
|
||||
lignes.append("- " + (f["date"] or "")[:10] + " | " + _court(f["objet"], 100) + " | "
|
||||
+ ("categorie choisie par Nabil : " + f["choix_nabil"] if f["choix_nabil"] else "categorie proposee : " + f["categorie"])
|
||||
+ " | " + _court(f["resume"], 220))
|
||||
return "\n".join(lignes)
|
||||
|
||||
|
||||
def _lire_mail(mirror_client, message_id: str):
|
||||
res = mirror_client.get_mail(message_id)
|
||||
d = res.get("donnees") if isinstance(res, dict) else None
|
||||
@@ -228,7 +279,8 @@ def _lire_mail(mirror_client, message_id: str):
|
||||
date = parsedate_to_datetime(date).astimezone(ZoneInfo("Africa/Tunis")).isoformat()
|
||||
except Exception:
|
||||
pass
|
||||
return {"objet": h("Subject"), "de": h("From"), "date": date, "corps": str(d.get("corps_texte") or "")}
|
||||
return {"objet": h("Subject"), "de": h("From"), "date": date, "corps": str(d.get("corps_texte") or ""),
|
||||
"fil": cle_fil(h("Thread-Index"))}
|
||||
|
||||
|
||||
def analyser_mail(mirror_client, message_id: str, db_path: Optional[str] = None,
|
||||
@@ -236,10 +288,10 @@ def analyser_mail(mirror_client, message_id: str, db_path: Optional[str] = None,
|
||||
m = _lire_mail(mirror_client, message_id)
|
||||
if m is None:
|
||||
raise LookupError("mail introuvable")
|
||||
fiche = analyser(m["objet"], m["de"], m["corps"], db_path)
|
||||
fiche = analyser(m["objet"], m["de"], m["corps"], db_path, contexte_fil(m.get("fil"), message_id, db_path))
|
||||
meta = meta or {}
|
||||
enregistrer(message_id, fiche, meta.get("objet") or m["objet"], meta.get("expediteur") or m["de"],
|
||||
meta.get("date") or m["date"], db_path)
|
||||
meta.get("date") or m["date"], db_path, m.get("fil"))
|
||||
return lire(message_id, db_path)
|
||||
|
||||
|
||||
@@ -285,6 +337,81 @@ def demarrer_automatique(mirror_client, intervalle: int = 180) -> None:
|
||||
threading.Thread(target=boucle, daemon=True, name="courrier-ia-auto").start()
|
||||
|
||||
|
||||
|
||||
# ---------- File « A valider » : propositions de l'IA que Nabil accepte ou refuse ----------
|
||||
|
||||
def _pret_decisions(conn) -> None:
|
||||
conn.execute("CREATE TABLE IF NOT EXISTS decisions_ia (message_id TEXT NOT NULL, type TEXT NOT NULL, "
|
||||
"decision TEXT NOT NULL, le TEXT NOT NULL, PRIMARY KEY (message_id, type))")
|
||||
|
||||
|
||||
def a_valider(jours: int = 14, db_path: Optional[str] = None) -> List[Dict[str, Any]]:
|
||||
"""Propositions en attente : une categorie differente du classement actuel (jamais sur un classement
|
||||
manuel), une course possible pas encore creee. Une proposition deja acceptee ou refusee ne revient pas."""
|
||||
depuis = (_date.fromisoformat(get_tunis_now_iso()[:10]) - timedelta(days=max(1, min(jours, 60)))).isoformat()
|
||||
conn = _db.get_connection(db_path)
|
||||
try:
|
||||
_pret(conn); _pret_decisions(conn)
|
||||
conn.row_factory = sqlite3.Row
|
||||
decides = {(r[0], r[1]) for r in conn.execute("SELECT message_id, type FROM decisions_ia")}
|
||||
cl = {r[0]: (r[1], r[2]) for r in conn.execute("SELECT message_id, categorie, source FROM classements")}
|
||||
try:
|
||||
courses = {r[0] for r in conn.execute("SELECT message_id FROM courses WHERE message_id IS NOT NULL")}
|
||||
except sqlite3.OperationalError:
|
||||
courses = set()
|
||||
lignes = conn.execute("SELECT * FROM analyses_ia WHERE date_mail >= ? ORDER BY date_mail DESC LIMIT 300",
|
||||
(depuis,)).fetchall()
|
||||
sortie: List[Dict[str, Any]] = []
|
||||
for r in lignes:
|
||||
f = _ligne(r); mid = f["message_id"]
|
||||
base = {"message_id": mid, "objet": f["objet"], "expediteur": f["expediteur"], "date": f["date"],
|
||||
"resume": f["resume"], "confiance": f["confiance"]}
|
||||
actuelle, source = cl.get(mid, ("À classer", "regle"))
|
||||
if (mid, "categorie") not in decides and source != "manuel" and f["categorie"] not in ("À classer", actuelle):
|
||||
sortie.append(dict(base, type="categorie", actuelle=actuelle, propose=f["categorie"]))
|
||||
c = f["course"]
|
||||
if c and (mid, "course") not in decides and mid not in courses:
|
||||
liste = ", ".join((c.get("objets") or []) + (c.get("documents") or []))
|
||||
if liste:
|
||||
sortie.append(dict(base, type="course", propose=liste, sens=c.get("sens") or "tunis_sfax"))
|
||||
return sortie
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def decider(message_id: str, type_: str, decision: str, db_path: Optional[str] = None) -> Dict[str, Any]:
|
||||
"""Accepter applique la proposition (classement manuel ou course) ; refuser la ferme. Toujours un clic."""
|
||||
if type_ not in ("categorie", "course") or decision not in ("accepter", "refuser"):
|
||||
raise ValueError("decision invalide")
|
||||
f = lire(message_id, db_path)
|
||||
if not f:
|
||||
raise LookupError("analyse introuvable")
|
||||
resultat: Dict[str, Any] = {"ok": True}
|
||||
if decision == "accepter":
|
||||
if type_ == "categorie":
|
||||
from app.classifier import manual_classify_and_propose
|
||||
manual_classify_and_propose(message_id, f["categorie"], {"expediteur": f["expediteur"], "objet": f["objet"],
|
||||
"date": f["date"]}, db_path=db_path)
|
||||
else:
|
||||
c = f["course"] or {}
|
||||
liste = ", ".join((c.get("objets") or []) + (c.get("documents") or []))
|
||||
if not liste:
|
||||
raise LookupError("pas de course proposee")
|
||||
resultat["course"] = _db.add_course(liste[:300], c.get("sens") or "tunis_sfax", message_id,
|
||||
(f["objet"] or "")[:500], (f["expediteur"] or "")[:300],
|
||||
(f["date"] or "")[:40], db_path=db_path)
|
||||
conn = _db.get_connection(db_path)
|
||||
try:
|
||||
_pret_decisions(conn)
|
||||
with conn:
|
||||
conn.execute("INSERT INTO decisions_ia (message_id, type, decision, le) VALUES (?, ?, ?, ?) "
|
||||
"ON CONFLICT(message_id, type) DO UPDATE SET decision=excluded.decision, le=excluded.le",
|
||||
(message_id, type_, decision, get_tunis_now_iso()))
|
||||
finally:
|
||||
conn.close()
|
||||
return resultat
|
||||
|
||||
|
||||
def creer_routeur(mirror_client) -> APIRouter:
|
||||
router = APIRouter(prefix="/ia")
|
||||
|
||||
@@ -344,6 +471,31 @@ def creer_routeur(mirror_client) -> APIRouter:
|
||||
debut = (_date.fromisoformat(get_tunis_now_iso()[:10]) - timedelta(days=jours)).isoformat()
|
||||
return {"analyses": lister(depuis=debut, n=n)}
|
||||
|
||||
@router.get("/fil")
|
||||
def lire_fil(id: str = Query(..., min_length=1, max_length=400)):
|
||||
f = lire(id)
|
||||
conn = _db.get_connection()
|
||||
try:
|
||||
_pret(conn)
|
||||
r = conn.execute("SELECT fil FROM analyses_ia WHERE message_id=?", (id,)).fetchone()
|
||||
finally:
|
||||
conn.close()
|
||||
fil = r[0] if r else None
|
||||
return {"fil": bool(fil), "mails": membres_fil(fil, id, None, 12)}
|
||||
|
||||
@router.get("/a-valider")
|
||||
def liste_a_valider(jours: int = Query(14, ge=1, le=60)):
|
||||
return {"items": a_valider(jours)}
|
||||
|
||||
@router.post("/decision")
|
||||
def decision_ia(corps: Dict[str, Any]):
|
||||
try:
|
||||
return decider(str(corps.get("message_id") or ""), str(corps.get("type") or ""), str(corps.get("decision") or ""))
|
||||
except ValueError:
|
||||
raise HTTPException(status_code=422, detail="Decision invalide.")
|
||||
except LookupError:
|
||||
raise HTTPException(status_code=404, detail="Proposition introuvable.")
|
||||
|
||||
return router
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user