Relecture : relance en échec, verrou, liste blanche, réponse invérifiable, étiquettes du contrat, clé hors LibreDesk, test d'instance local seulement
tests / tests (push) Failing after 1m5s
tests / tests (push) Failing after 1m5s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
b48d756883
commit
d65e9b49d0
6 files changed
+77
-17
No files matched your search
@@ -16,6 +16,7 @@ from typing import Mapping
|
||||
from .libredesk import Garde, LibreDesk
|
||||
|
||||
TRI, EN_COURS, RELANCER = "tri:diagnostic", "diag:en-cours", "diag:relancer"
|
||||
ETIQUETTES = [TRI, EN_COURS, "diag:fait", "diag:erreur", "diag:ignore", RELANCER] # le contrat (README)
|
||||
ENTETE = "<p><strong>🤖 BROUILLON IA — à relire, ne pas envoyer tel quel</strong></p>"
|
||||
TYPES_IMAGE = {"image/png", "image/jpeg", "image/gif", "image/webp"}
|
||||
TAILLE_MIN = 10_000 # ponytail: octets, écarte les logos des signatures (comme Support-Agent)
|
||||
@@ -28,7 +29,7 @@ class Config:
|
||||
cle: str
|
||||
secret: str
|
||||
ecrire: bool
|
||||
autorisees: set[str] | None # None : toutes (« * »)
|
||||
autorisees: set[str] | None # None : toutes (« * ») ; vide (simulation sans liste) : aucune
|
||||
plafond: int
|
||||
conversation: str # "" : toutes les éligibles
|
||||
donnees: Path
|
||||
@@ -41,9 +42,9 @@ class Config:
|
||||
return None
|
||||
ecrire = env.get("DRY_RUN", "true").strip() == "false"
|
||||
liste = env.get("ALLOWED_CONVERSATION_IDS", "").strip()
|
||||
if ecrire and not liste:
|
||||
autorisees = None if liste == "*" else {u.strip() for u in liste.split(",") if u.strip()}
|
||||
if ecrire and autorisees is not None and not autorisees: # « , » ne vaut pas « * »
|
||||
raise ValueError("DRY_RUN=false exige ALLOWED_CONVERSATION_IDS (des uuid séparés par des virgules, ou *)")
|
||||
autorisees = None if liste == "*" else {u.strip() for u in liste.split(",") if u.strip()} or None
|
||||
return Config(env["LIBREDESK_URL"], env["LIBREDESK_API_KEY"], env["LIBREDESK_API_SECRET"], ecrire, autorisees,
|
||||
int(env.get("MAX_CONVERSATIONS_PER_RUN") or 3), env.get("CONVERSATION", "").strip(),
|
||||
Path(env.get("AIMSIGHT_DATA") or "data"),
|
||||
@@ -52,7 +53,7 @@ class Config:
|
||||
|
||||
def eligible(etiquettes: list[str]) -> bool:
|
||||
diag = [t for t in etiquettes if t.startswith("diag:")]
|
||||
return TRI in etiquettes and (not diag or RELANCER in diag)
|
||||
return TRI in etiquettes and EN_COURS not in diag and (not diag or RELANCER in diag)
|
||||
|
||||
|
||||
def _objet(s: str | None) -> str:
|
||||
@@ -130,10 +131,13 @@ def traiter(ld, cfg: Config, diag=None) -> dict[str, str]:
|
||||
if diag is None:
|
||||
from .diagnostic import diagnostiquer as diag
|
||||
debut, execution, statuts, couts = time.monotonic(), _execution(), {}, {}
|
||||
ids = ld.ids_etiquettes()
|
||||
if cfg.ecrire and (manque := [t for t in ETIQUETTES if t not in ids]):
|
||||
raise RuntimeError(f"étiquettes absentes de LibreDesk, à créer par un admin : {manque}")
|
||||
if cfg.conversation:
|
||||
candidates = [cfg.conversation]
|
||||
else:
|
||||
candidates = [c["uuid"] for c in ld.conversations(ld.ids_etiquettes()[TRI])]
|
||||
candidates = [c["uuid"] for c in ld.conversations(ids[TRI])]
|
||||
for uuid in candidates:
|
||||
if len(statuts) >= cfg.plafond:
|
||||
break
|
||||
@@ -145,15 +149,16 @@ def traiter(ld, cfg: Config, diag=None) -> dict[str, str]:
|
||||
statuts[uuid], couts[uuid] = r.statut, r.cout
|
||||
except Garde:
|
||||
try:
|
||||
ld.etiqueter(uuid, ["diag:erreur"], [EN_COURS])
|
||||
finally:
|
||||
raise
|
||||
ld.etiqueter(uuid, ["diag:erreur"], [EN_COURS, RELANCER])
|
||||
except Exception as e2: # noqa: BLE001 — c'est le Garde qui doit remonter
|
||||
print(f"[erreur] {uuid} : {type(e2).__name__}: {e2}", flush=True)
|
||||
raise
|
||||
except Exception as e: # noqa: BLE001 — une conversation en échec n'arrête pas les autres
|
||||
print(f"[erreur] {uuid} : {type(e).__name__}: {e}", flush=True)
|
||||
statuts[uuid], couts[uuid] = "erreur", 0.0
|
||||
for essai in (lambda: ld.note_privee(uuid, f"{ENTETE}<p>Diagnostic en échec : {html.escape(type(e).__name__)}."
|
||||
f"</p><hr><p><small>Exécution {html.escape(execution)}</small></p>"),
|
||||
lambda: ld.etiqueter(uuid, ["diag:erreur"], [EN_COURS])):
|
||||
lambda: ld.etiqueter(uuid, ["diag:erreur"], [EN_COURS, RELANCER])):
|
||||
try:
|
||||
essai()
|
||||
except Garde:
|
||||
|
||||
Reference in new issue
Block a user