Courrier v1.2.1 (tt-2026-11-065) : classement groupe, miroir prechauffe, onglet Tri du jour reouvert sans rechargement
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XGaEeWkqZYNP6Wn3mGQsrL
This commit is contained in:
1 parent
cdb78c3e04
commit
60842e69e0
6 files changed
+188
-12
No files matched your search
@@ -214,3 +214,67 @@ def confirm_and_apply_rule(regle_id: int, db_path: Optional[str] = None) -> Opti
|
||||
|
||||
reclassify_all_non_manual(db_path=db_path)
|
||||
return rule
|
||||
|
||||
|
||||
def classify_batch(mails: List[Dict[str, Any]], db_path: Optional[str] = None) -> List[Dict[str, Any]]:
|
||||
"""Classe un lot de mails en une seule connexion : règles lues une fois, classements existants lus en une
|
||||
requête, écriture seulement quand un classement change (nouveau mail ou règle modifiée), le tout en une
|
||||
transaction. Un classement manuel n'est jamais écrasé. Même résultat que classify_mail, mail par mail."""
|
||||
from app.db import get_connection
|
||||
from app.config import get_tunis_now_iso
|
||||
|
||||
mails = [m for m in mails if m.get("message_id")]
|
||||
if not mails:
|
||||
return []
|
||||
rules = list_regles(statut="active", db_path=db_path)
|
||||
conn = get_connection(db_path)
|
||||
try:
|
||||
ids = [m["message_id"] for m in mails]
|
||||
existants: Dict[str, Dict[str, Any]] = {}
|
||||
for i in range(0, len(ids), 400):
|
||||
lot = ids[i:i + 400]
|
||||
req = ("SELECT message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail, etiquettes "
|
||||
"FROM classements WHERE message_id IN (%s)" % ",".join("?" * len(lot)))
|
||||
for r in conn.execute(req, lot):
|
||||
d = dict(r)
|
||||
d["traite"] = bool(d["traite"])
|
||||
existants[d["message_id"]] = d
|
||||
|
||||
maintenant = get_tunis_now_iso()
|
||||
sortie: List[Dict[str, Any]] = []
|
||||
ecritures = []
|
||||
for m in mails:
|
||||
mid = m["message_id"]
|
||||
ex = existants.get(mid)
|
||||
if ex and ex.get("source") == "manuel":
|
||||
sortie.append(ex)
|
||||
continue
|
||||
categorie = match_mail_to_rules(m, rules)
|
||||
tags = m.get("etiquettes") or m.get("tags") or []
|
||||
tags_json = json.dumps(tags) if isinstance(tags, list) else str(tags)
|
||||
exp = (m.get("expediteur") or m.get("from") or "") or (ex["expediteur"] if ex else "")
|
||||
obj = (m.get("objet") or m.get("subject") or "") or (ex["objet"] if ex else "")
|
||||
date_mail = (m.get("date") or "") or (ex["date_mail"] if ex else "")
|
||||
etiq = tags_json if tags_json != "[]" else ((ex.get("etiquettes") if ex else None) or "[]")
|
||||
if ex and (ex["categorie"], ex["expediteur"], ex["objet"], ex["date_mail"], ex.get("etiquettes") or "[]") == (categorie, exp, obj, date_mail, etiq):
|
||||
sortie.append(ex) # inchangé : aucune écriture
|
||||
continue
|
||||
traite = ex["traite"] if ex else False
|
||||
ecritures.append((mid, categorie, maintenant, 1 if traite else 0, exp, obj, date_mail, etiq))
|
||||
sortie.append({"message_id": mid, "categorie": categorie, "source": "regle", "horodatage": maintenant,
|
||||
"traite": traite, "expediteur": exp, "objet": obj, "date_mail": date_mail, "etiquettes": etiq})
|
||||
if ecritures:
|
||||
with conn:
|
||||
conn.executemany(
|
||||
"""
|
||||
INSERT INTO classements (message_id, categorie, source, horodatage, traite, expediteur, objet, date_mail, etiquettes)
|
||||
VALUES (?, ?, 'regle', ?, ?, ?, ?, ?, ?)
|
||||
ON CONFLICT(message_id) DO UPDATE SET
|
||||
categorie = excluded.categorie, source = 'regle', horodatage = excluded.horodatage,
|
||||
expediteur = excluded.expediteur, objet = excluded.objet, date_mail = excluded.date_mail,
|
||||
etiquettes = CASE WHEN excluded.etiquettes != '[]' THEN excluded.etiquettes ELSE classements.etiquettes END
|
||||
WHERE classements.source != 'manuel'
|
||||
""", ecritures)
|
||||
return sortie
|
||||
finally:
|
||||
conn.close()
|
||||
Reference in new issue
Block a user