v1.9: courses alimentees automatiquement depuis la categorie Tunis (un fil = une course, supprime = jamais recree)
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
9db68e70f3
commit
32f0348d9c
5 files changed
+104
-4
No files matched your search
@@ -495,11 +495,45 @@ def update_course(course_id: int, demande: Optional[str] = None, sens: Optional[
|
|||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
|
def _vues_pret(conn: sqlite3.Connection) -> None:
|
||||||
|
conn.execute("CREATE TABLE IF NOT EXISTS courses_vues (cle TEXT PRIMARY KEY, le TEXT NOT NULL)")
|
||||||
|
|
||||||
|
|
||||||
|
def cles_courses_vues(db_path: Optional[str] = None) -> set:
|
||||||
|
"""Fils deja importes ou supprimes : la synchronisation ne les recree pas."""
|
||||||
|
conn = get_connection(db_path)
|
||||||
|
try:
|
||||||
|
_vues_pret(conn)
|
||||||
|
return {r[0] for r in conn.execute("SELECT cle FROM courses_vues")}
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
|
def marquer_courses_vues(cles, db_path: Optional[str] = None) -> None:
|
||||||
|
conn = get_connection(db_path)
|
||||||
|
try:
|
||||||
|
_vues_pret(conn)
|
||||||
|
with conn:
|
||||||
|
for c in cles:
|
||||||
|
if c:
|
||||||
|
conn.execute("INSERT OR IGNORE INTO courses_vues (cle, le) VALUES (?, ?)", (c, get_tunis_now_iso()))
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
def delete_course(course_id: int, db_path: Optional[str] = None) -> bool:
|
def delete_course(course_id: int, db_path: Optional[str] = None) -> bool:
|
||||||
|
from app.suivi import sujet_normalise
|
||||||
conn = get_connection(db_path)
|
conn = get_connection(db_path)
|
||||||
try:
|
try:
|
||||||
_courses_pret(conn)
|
_courses_pret(conn)
|
||||||
|
_vues_pret(conn)
|
||||||
with conn:
|
with conn:
|
||||||
|
r = conn.execute("SELECT demande, objet_mail FROM courses WHERE id = ?", (course_id,)).fetchone()
|
||||||
|
if r is None:
|
||||||
|
return False
|
||||||
|
cle = sujet_normalise(r["objet_mail"] or r["demande"])
|
||||||
|
if cle:
|
||||||
|
conn.execute("INSERT OR IGNORE INTO courses_vues (cle, le) VALUES (?, ?)", (cle, get_tunis_now_iso()))
|
||||||
return conn.execute("DELETE FROM courses WHERE id = ?", (course_id,)).rowcount > 0
|
return conn.execute("DELETE FROM courses WHERE id = ?", (course_id,)).rowcount > 0
|
||||||
finally:
|
finally:
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|||||||
+35
@@ -26,6 +26,8 @@ from app.db import (
|
|||||||
list_classements,
|
list_classements,
|
||||||
set_traite,
|
set_traite,
|
||||||
list_courses,
|
list_courses,
|
||||||
|
cles_courses_vues,
|
||||||
|
marquer_courses_vues,
|
||||||
get_course,
|
get_course,
|
||||||
add_course,
|
add_course,
|
||||||
update_course,
|
update_course,
|
||||||
@@ -423,6 +425,39 @@ def exporter_courses(statut: Optional[str] = Query(None, pattern="^(a_faire|fait
|
|||||||
headers={"Content-Disposition": f'attachment; filename="{nom}"', "Cache-Control": "no-store"})
|
headers={"Content-Disposition": f'attachment; filename="{nom}"', "Cache-Control": "no-store"})
|
||||||
|
|
||||||
|
|
||||||
|
@api.post("/courses/synchroniser")
|
||||||
|
def synchroniser_courses(jours: int = Query(14, ge=1, le=30)):
|
||||||
|
"""Cree une course par fil de discussion classe Tunis. Un fil supprime ou deja importe n'est pas recree."""
|
||||||
|
from datetime import date as _date, timedelta
|
||||||
|
from app.suivi import sujet_normalise
|
||||||
|
fin = _date.fromisoformat(get_tunis_now_iso()[:10])
|
||||||
|
debut = (fin - timedelta(days=jours - 1)).isoformat()
|
||||||
|
try:
|
||||||
|
mails = mirror_client.get_mails_since(debut, max_items=min(150 * jours, 800))
|
||||||
|
except Exception:
|
||||||
|
raise HTTPException(status_code=502, detail="Miroir indisponible.")
|
||||||
|
classes = {c["message_id"]: c for c in classify_batch(mails)}
|
||||||
|
existantes = list_courses(None)
|
||||||
|
ids = {k["message_id"] for k in existantes if k.get("message_id")}
|
||||||
|
cles = cles_courses_vues() | {sujet_normalise(k.get("objet_mail") or k["demande"]) for k in existantes}
|
||||||
|
ajoutees = []
|
||||||
|
for m in sorted(mails, key=lambda x: x.get("date") or ""):
|
||||||
|
mid = m.get("message_id")
|
||||||
|
c = classes.get(mid)
|
||||||
|
if not mid or c is None or c.get("categorie") != "Tunis" or mid in ids:
|
||||||
|
continue
|
||||||
|
objet = (m.get("objet") or "").strip()
|
||||||
|
cle = sujet_normalise(objet)
|
||||||
|
if not cle or cle in cles:
|
||||||
|
continue
|
||||||
|
sens = "sfax_tunis" if re.search(r"sfax\s*(?:vers|->|\u2192|/)\s*tunis", objet, re.IGNORECASE) else "tunis_sfax"
|
||||||
|
demande = re.sub(r"\s+", " ", re.sub(r"^((re|tr|fw|fwd)\s*:\s*)+", "", objet, flags=re.IGNORECASE)).strip()[:300] or objet[:300]
|
||||||
|
ajoutees.append(add_course(demande, sens, mid, objet[:500], (m.get("expediteur") or "")[:300], (m.get("date") or "")[:40]))
|
||||||
|
cles.add(cle)
|
||||||
|
marquer_courses_vues(cles)
|
||||||
|
return {"ajoutees": len(ajoutees), "courses": ajoutees}
|
||||||
|
|
||||||
|
|
||||||
@api.post("/courses", status_code=201)
|
@api.post("/courses", status_code=201)
|
||||||
def creer_course(c: CourseIn):
|
def creer_course(c: CourseIn):
|
||||||
_verifier_course(c.sens)
|
_verifier_course(c.sens)
|
||||||
|
|||||||
+2
-2
@@ -642,7 +642,7 @@
|
|||||||
var SENS = { tunis_sfax: 'Tunis vers Sfax', sfax_tunis: 'Sfax vers Tunis' };
|
var SENS = { tunis_sfax: 'Tunis vers Sfax', sfax_tunis: 'Sfax vers Tunis' };
|
||||||
function chargerCourses() {
|
function chargerCourses() {
|
||||||
var C = S.courses; C.etat = 'chargement'; rendre();
|
var C = S.courses; C.etat = 'chargement'; rendre();
|
||||||
return api('/courses?statut=toutes').then(function (r) { C.liste = r.courses || []; C.etat = 'ok'; rendre(); })
|
return api('/courses/synchroniser', { method: 'POST' }).catch(function (e) { if (e.message === 'session') throw e; return null; }).then(function (sy) { return api('/courses?statut=toutes').then(function (r) { C.liste = r.courses || []; C.etat = 'ok'; rendre(); if (sy && sy.ajoutees) flash(sy.ajoutees === 1 ? '1 course ajoutée depuis vos mails Tunis.' : sy.ajoutees + ' courses ajoutées depuis vos mails Tunis.'); }); })
|
||||||
.catch(function (e) { if (e.message === 'session') return; C.etat = 'erreur'; rendre(); });
|
.catch(function (e) { if (e.message === 'session') return; C.etat = 'erreur'; rendre(); });
|
||||||
}
|
}
|
||||||
function exporterCourses() {
|
function exporterCourses() {
|
||||||
@@ -711,7 +711,7 @@
|
|||||||
var vis = C.liste.filter(function (k) { return C.filtre === 'toutes' || k.statut === C.filtre; });
|
var vis = C.liste.filter(function (k) { return C.filtre === 'toutes' || k.statut === C.filtre; });
|
||||||
if (!vis.length) {
|
if (!vis.length) {
|
||||||
frag.appendChild(h('section', { class: 'carte' }, h('div', { class: 'etat' }, icone('courses', 28), h('h2', null, C.liste.length ? 'Rien dans cette liste' : 'Aucune course pour le moment'),
|
frag.appendChild(h('section', { class: 'carte' }, h('div', { class: 'etat' }, icone('courses', 28), h('h2', null, C.liste.length ? 'Rien dans cette liste' : 'Aucune course pour le moment'),
|
||||||
h('p', null, C.liste.length ? 'Changez de filtre pour voir les autres courses.' : 'Ouvrez un mail et touchez « Ajouter aux courses », ou ajoutez une course ici.'))));
|
h('p', null, C.liste.length ? 'Changez de filtre pour voir les autres courses.' : 'Les mails classés Tunis des 14 derniers jours s\'ajoutent ici automatiquement. Vous pouvez aussi ajouter une course à la main.'))));
|
||||||
return frag;
|
return frag;
|
||||||
}
|
}
|
||||||
var carte = h('section', { class: 'carte', 'aria-label': 'Courses' }), liste = h('div', { role: 'list' });
|
var carte = h('section', { class: 'carte', 'aria-label': 'Courses' }), liste = h('div', { role: 'list' });
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
|
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
|
||||||
<link rel="stylesheet" href="/static/fonts.css">
|
<link rel="stylesheet" href="/static/fonts.css">
|
||||||
<link rel="stylesheet" href="/static/nyora.css">
|
<link rel="stylesheet" href="/static/nyora.css">
|
||||||
<link rel="stylesheet" href="/static/app.css?v=20261118e">
|
<link rel="stylesheet" href="/static/app.css?v=20261118f">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app" class="coque">
|
<div id="app" class="coque">
|
||||||
@@ -20,6 +20,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="calque"></div>
|
<div id="calque"></div>
|
||||||
<div id="annonce" class="sr" role="status" aria-live="polite"></div>
|
<div id="annonce" class="sr" role="status" aria-live="polite"></div>
|
||||||
<script src="/static/app.js?v=20261118e"></script>
|
<script src="/static/app.js?v=20261118f"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
from app.main import app, mirror_client
|
||||||
|
|
||||||
|
|
||||||
|
def _m(i, objet, date="2026-11-17T09:00:00+01:00"):
|
||||||
|
return {"message_id": i, "objet": objet, "expediteur": "a@b.tn", "date": date, "etiquettes": ["tunis"], "resume": ""}
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_cree_une_course_par_fil_tunis(client, monkeypatch):
|
||||||
|
mails = [_m("a1", "Cartes SIM pour Tunis"), _m("a2", "RE: Cartes SIM pour Tunis", "2026-11-17T10:00:00+01:00"),
|
||||||
|
_m("a3", "Colis Sfax vers Tunis urgent"), {**_m("a4", "Facture quelconque"), "etiquettes": []}]
|
||||||
|
monkeypatch.setattr(mirror_client, "get_mails_since", lambda debut, max_items=800: mails)
|
||||||
|
r = client.post("/api/v1/courses/synchroniser").json()
|
||||||
|
assert r["ajoutees"] == 2
|
||||||
|
sens = {k["demande"]: k["sens"] for k in client.get("/api/v1/courses").json()["courses"]}
|
||||||
|
assert sens == {"Cartes SIM pour Tunis": "tunis_sfax", "Colis Sfax vers Tunis urgent": "sfax_tunis"}
|
||||||
|
assert client.post("/api/v1/courses/synchroniser").json()["ajoutees"] == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_course_supprimee_n_est_pas_recreee(client, monkeypatch):
|
||||||
|
monkeypatch.setattr(mirror_client, "get_mails_since", lambda debut, max_items=800: [_m("b1", "Dossier pour Tunis")])
|
||||||
|
k = client.post("/api/v1/courses/synchroniser").json()["courses"][0]
|
||||||
|
assert client.delete(f"/api/v1/courses/{k['id']}").status_code == 200
|
||||||
|
assert client.post("/api/v1/courses/synchroniser").json()["ajoutees"] == 0
|
||||||
|
assert client.get("/api/v1/courses").json()["courses"] == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_miroir_indisponible_et_jeton(client, monkeypatch):
|
||||||
|
def casse(*a, **k):
|
||||||
|
raise RuntimeError("x")
|
||||||
|
monkeypatch.setattr(mirror_client, "get_mails_since", casse)
|
||||||
|
assert client.post("/api/v1/courses/synchroniser").status_code == 502
|
||||||
Reference in new issue
Block a user