KA Agent v2 (backend) : 24 outils (fiches détail par uid, comparateur épicerie, rappels véhicule, inspections MAPAQ, menus resto, juste prix, estimateur Vrai-Prix, boutiques, plats, suggestions, facettes), recherche floue en cascade, séparation des segments entre outils, max_tokens 2000 + widget v2
9 changed files +3,014 −605
modified
src/api/ecopdf.py
+65 −14
@@ -4,16 +4,26 @@ | ||
| 4 | 4 | # Node : m3u96b |
| 5 | 5 | # Author : Simon-Pierre Boucher |
| 6 | 6 | # Contact : contact@spboucher.ai |
| 7 | −# Date : 2026-08-17 | |
| 7 | +# Date : 2026-08-19 | |
| 8 | 8 | # ============================================ |
| 9 | 9 | """Rapport écosystème Groupe KA — un seul PDF consolidant toutes les plateformes. |
| 10 | 10 | |
| 11 | −Compose le moteur PDF commun (``src/api/kapdf.py``) sans le dupliquer : | |
| 11 | +Compose le moteur PDF commun v2 (``src/api/kapdf.py``) sans le dupliquer : | |
| 12 | 12 | ``EcosystemReport`` étend ``GroupeKAReport`` et réutilise ses primitives |
| 13 | −(cartes KPI, tableaux, records, page de fin). Il ajoute la couverture | |
| 14 | −« écosystème », la page de consolidation (totaux + classement) puis une | |
| 15 | −section par plateforme. Une plateforme injoignable devient une section | |
| 16 | −« données indisponibles » propre — jamais un échec global. | |
| 13 | +(cartes KPI, jauges, séries, répartitions, tableaux, records, page de fin). | |
| 14 | +Il ajoute la couverture « écosystème », la page de consolidation (totaux + | |
| 15 | +classement) puis une section par plateforme, dont le contenu suit le ``mode`` | |
| 16 | +demandé (contrat SPEC v2, 5 rapports) : | |
| 17 | + | |
| 18 | +- ``complet`` : KPI + jauges + records de chaque plateforme ; | |
| 19 | +- ``synthese`` : couverture + consolidation + page de fin seulement ; | |
| 20 | +- ``tendances`` : KPI + séries temporelles (avec stats de séries) ; | |
| 21 | +- ``repartitions`` : répartitions, distributions, géo, activité horaire ; | |
| 22 | +- ``donnees`` : tableaux détaillés de chaque plateforme. | |
| 23 | + | |
| 24 | +Un mode inconnu retombe sur ``complet`` (normalisé par le moteur v2). Une | |
| 25 | +plateforme injoignable devient une section « données indisponibles » propre — | |
| 26 | +jamais un échec global. | |
| 17 | 27 | """ |
| 18 | 28 | |
| 19 | 29 | from __future__ import annotations |
@@ -26,6 +36,7 @@ from src.api.kapdf import ( | ||
| 26 | 36 | INK2, |
| 27 | 37 | INK3, |
| 28 | 38 | PAPER, |
| 39 | + REPORT_MODES, | |
| 29 | 40 | SURFACE2, |
| 30 | 41 | GroupeKAReport, |
| 31 | 42 | _fr, |
@@ -75,8 +86,7 @@ def new_kpi(dash: dict | None) -> dict | None: | ||
| 75 | 86 | |
| 76 | 87 | class EcosystemReport(GroupeKAReport): |
| 77 | 88 | """PDF consolidé : couverture Groupe KA, consolidation, 1 section par |
| 78 | − plateforme (mode complet), page de fin. Mode ``synthese`` = couverture + | |
| 79 | − consolidation + fin. | |
| 89 | + plateforme (contenu selon le mode v2), page de fin. | |
| 80 | 90 | |
| 81 | 91 | ``platforms`` : liste de ``{"site": …, "dashboard": dict | None, |
| 82 | 92 | "error": str | None}`` (une entrée par plateforme de données).""" |
@@ -84,6 +94,7 @@ class EcosystemReport(GroupeKAReport): | ||
| 84 | 94 | def __init__(self, platforms: list[dict], period: dict, mode: str = "complet"): |
| 85 | 95 | super().__init__(dict(ECO_SITE), {"period": period or {}}, mode) |
| 86 | 96 | self.platforms = platforms |
| 97 | + self._kpi_title: str | None = None | |
| 87 | 98 | available = [p for p in platforms if p.get("dashboard")] |
| 88 | 99 | missing = [p for p in platforms if not p.get("dashboard")] |
| 89 | 100 | |
@@ -93,6 +104,20 @@ class EcosystemReport(GroupeKAReport): | ||
| 93 | 104 | |
| 94 | 105 | self.ranked = sorted(available, key=_vol, reverse=True) + missing |
| 95 | 106 | |
| 107 | + # Le moteur v2 titre toujours le bloc KPI « Synthèse des indicateurs » ; | |
| 108 | + # dans le rapport écosystème chaque bloc doit porter son propre titre. | |
| 109 | + def _section_title(self, title): | |
| 110 | + if self._kpi_title and title == "Synthèse des indicateurs": | |
| 111 | + title = self._kpi_title | |
| 112 | + super()._section_title(title) | |
| 113 | + | |
| 114 | + def _kpis_titled(self, title: str): | |
| 115 | + self._kpi_title = title | |
| 116 | + try: | |
| 117 | + self._kpis() | |
| 118 | + finally: | |
| 119 | + self._kpi_title = None | |
| 120 | + | |
| 96 | 121 | # ------------------------------------------------------------- couverture |
| 97 | 122 | def _cover(self): |
| 98 | 123 | p = self.pdf |
@@ -146,7 +171,7 @@ class EcosystemReport(GroupeKAReport): | ||
| 146 | 171 | f"{len(self.platforms)} plateformes de données + le hub groupe-ka.com " |
| 147 | 172 | f"({joined}/{len(self.platforms)} jointes)", |
| 148 | 173 | ), |
| 149 | − ("Mode", "Rapport complet" if self.mode == "complet" else "Synthèse"), | |
| 174 | + ("Type de rapport", REPORT_MODES[self.mode]), | |
| 150 | 175 | ] |
| 151 | 176 | y = 128 |
| 152 | 177 | p.set_font("helvetica", "", 10.5) |
@@ -215,7 +240,7 @@ class EcosystemReport(GroupeKAReport): | ||
| 215 | 240 | ) |
| 216 | 241 | saved = self.d |
| 217 | 242 | self.d = {"kpis": kpis} |
| 218 | − self._kpis("Consolidation de l'écosystème") | |
| 243 | + self._kpis_titled("Consolidation de l'écosystème") | |
| 219 | 244 | self.d = saved |
| 220 | 245 | |
| 221 | 246 | rows: list[list[Any]] = [] |
@@ -339,12 +364,38 @@ class EcosystemReport(GroupeKAReport): | ||
| 339 | 364 | p.set_text_color(*INK3) |
| 340 | 365 | p.cell(0, 4, f"Mis à jour : {str(upd)[:19].replace('T', ' à ')}") |
| 341 | 366 | p.ln(6) |
| 342 | − # réutilise le moteur commun avec l'identité de la plateforme | |
| 367 | + # réutilise le moteur v2 avec l'identité et le dashboard de la plateforme | |
| 343 | 368 | saved = (self.d, self.site, self.accent) |
| 344 | 369 | self.d, self.site, self.accent = dash, site, accent |
| 370 | + wm = site.get("wordmark", "") | |
| 345 | 371 | try: |
| 346 | − self._kpis("Indicateurs — " + site.get("wordmark", "")) | |
| 347 | − self._records() | |
| 372 | + if self.mode == "tendances": | |
| 373 | + self._kpis_titled("Indicateurs — " + wm) | |
| 374 | + if dash.get("series") or dash.get("multiseries") or dash.get("stacked"): | |
| 375 | + self._section_title("Évolution & tendances — " + wm) | |
| 376 | + self._all_series(with_stats=True) | |
| 377 | + elif self.mode == "repartitions": | |
| 378 | + if ( | |
| 379 | + dash.get("breakdowns") | |
| 380 | + or dash.get("distributions") | |
| 381 | + or dash.get("geo") | |
| 382 | + or dash.get("hourly") | |
| 383 | + ): | |
| 384 | + self._section_title("Répartitions & distributions — " + wm) | |
| 385 | + self._all_breakdowns() | |
| 386 | + else: | |
| 387 | + self._kpis_titled("Indicateurs — " + wm) | |
| 388 | + elif self.mode == "donnees": | |
| 389 | + tables = dash.get("tables") or [] | |
| 390 | + if tables: | |
| 391 | + for t in tables: | |
| 392 | + self._table(t, max_rows=200) | |
| 393 | + else: | |
| 394 | + self._kpis_titled("Indicateurs — " + wm) | |
| 395 | + else: # complet | |
| 396 | + self._kpis_titled("Indicateurs — " + wm) | |
| 397 | + self._gauges() | |
| 398 | + self._records() | |
| 348 | 399 | finally: |
| 349 | 400 | self.d, self.site, self.accent = saved |
| 350 | 401 | |
@@ -355,7 +406,7 @@ class EcosystemReport(GroupeKAReport): | ||
| 355 | 406 | self._cover() |
| 356 | 407 | p.add_page() |
| 357 | 408 | self._consolidation() |
| 358 | − if self.mode == "complet": | |
| 409 | + if self.mode != "synthese": | |
| 359 | 410 | for pl in self.ranked: |
| 360 | 411 | self._platform_section(pl) |
| 361 | 412 | self._final_page() |
modified
src/api/kapdf.py
+392 −75
@@ -4,15 +4,22 @@ | ||
| 4 | 4 | # Node : m3u96b |
| 5 | 5 | # Author : Simon-Pierre Boucher |
| 6 | 6 | # Contact : contact@spboucher.ai |
| 7 | −# Date : 2026-08-17 | |
| 7 | +# Date : 2026-08-19 | |
| 8 | 8 | # ============================================ |
| 9 | 9 | # Auteur : Simon-Pierre Boucher — contact@spboucher.ai |
| 10 | −# ka-ui/stats/kapdf.py — moteur PDF commun Groupe KA (fpdf2). | |
| 10 | +# ka-ui/stats/kapdf.py — moteur PDF commun Groupe KA (fpdf2). v2 | |
| 11 | 11 | # Consomme le JSON du contrat /api/stats/dashboard (voir SPEC.md) et produit |
| 12 | −# le rapport estampillé Groupe-KA : couverture, sommaire, KPI, graphiques | |
| 13 | −# VECTORIELS (courbes/barres/anneaux), tableaux paginés, records, page de fin. | |
| 12 | +# les rapports estampillés Groupe-KA. 5 modes : | |
| 13 | +# complet — toutes les sections (KPI, jauges, séries + stats, multi- | |
| 14 | +# séries, empilées, distributions, répartitions, géo, | |
| 15 | +# heatmap horaire, tableaux, records) | |
| 16 | +# synthese — couverture + KPI + records (2-3 pages) | |
| 17 | +# tendances — KPI + toutes les séries temporelles + stats de séries | |
| 18 | +# repartitions — breakdowns, distributions, géo, activité horaire | |
| 19 | +# donnees — tous les tableaux en version longue (400 lignes max) | |
| 20 | +# Graphiques VECTORIELS uniquement (primitives fpdf), accent de la marque. | |
| 14 | 21 | # Usage : |
| 15 | −# from kapdf import GroupeKAReport | |
| 22 | +# from kapdf import GroupeKAReport, REPORT_MODES, filename | |
| 16 | 23 | # pdf_bytes = GroupeKAReport(site={"wordmark":"Lou·Ka","accent":"#ff6a00", |
| 17 | 24 | # "domain":"www.lou-ka.com","tagline":"…"}, dashboard=dash_json, |
| 18 | 25 | # mode="complet").build() |
@@ -34,6 +41,14 @@ GREEN = (28, 92, 65) | ||
| 34 | 41 | DANGER = (179, 66, 58) |
| 35 | 42 | WHITE = (255, 255, 255) |
| 36 | 43 | |
| 44 | +REPORT_MODES = { | |
| 45 | + "complet": "Rapport complet", | |
| 46 | + "synthese": "Synthèse exécutive", | |
| 47 | + "tendances": "Tendances & évolution", | |
| 48 | + "repartitions": "Répartitions & géographie", | |
| 49 | + "donnees": "Données détaillées", | |
| 50 | +} | |
| 51 | + | |
| 37 | 52 | EMAILS = [ |
| 38 | 53 | ("contact@groupe-ka.com", "Projets, partenariats & données"), |
| 39 | 54 | ("info@groupe-ka.com", "Médias & questions générales"), |
@@ -60,7 +75,8 @@ def _fr(n) -> str: | ||
| 60 | 75 | _SUBST = { |
| 61 | 76 | "—": "-", "–": "-", "→": "->", "▲": "+", "▼": "-", |
| 62 | 77 | "…": "...", "’": "'", "‘": "'", "“": '"', "”": '"', |
| 63 | − "œ": "oe", "Œ": "OE", "−": "-", " ": " ", " ": " ", | |
| 78 | + "œ": "oe", "Œ": "OE", "−": "-", " ": " ", " ": " ", | |
| 79 | + "×": "x", "·": ".", "σ": "sigma", "Δ": "delta", | |
| 64 | 80 | } |
| 65 | 81 | |
| 66 | 82 | |
@@ -87,7 +103,7 @@ class _PDF(FPDF): | ||
| 87 | 103 | self.set_auto_page_break(True, margin=22) |
| 88 | 104 | |
| 89 | 105 | def header(self): |
| 90 | − if self.cover_mode: | |
| 106 | + if self.cover_mode or self.page_no() == 1: | |
| 91 | 107 | return |
| 92 | 108 | self.set_font("helvetica", "B", 8.5) |
| 93 | 109 | self.set_text_color(*INK) |
@@ -103,8 +119,8 @@ class _PDF(FPDF): | ||
| 103 | 119 | self.set_y(20) |
| 104 | 120 | |
| 105 | 121 | def footer(self): |
| 106 | − # La page 1 est toujours la couverture : fpdf dessine son pied de page | |
| 107 | − # au add_page() suivant, quand cover_mode est deja retombe a False. | |
| 122 | + # page 1 = couverture (le flag cover_mode est déjà retombé quand | |
| 123 | + # add_page() clôt la page 1 → tester aussi le numéro de page) | |
| 108 | 124 | if self.cover_mode or self.page_no() == 1: |
| 109 | 125 | return |
| 110 | 126 | self.set_y(-15) |
@@ -122,7 +138,7 @@ class GroupeKAReport: | ||
| 122 | 138 | def __init__(self, site: dict, dashboard: dict, mode: str = "complet"): |
| 123 | 139 | self.site = site |
| 124 | 140 | self.d = dashboard |
| 125 | − self.mode = mode | |
| 141 | + self.mode = mode if mode in REPORT_MODES else "complet" | |
| 126 | 142 | self.accent = _hex(site.get("accent", "#d9f26b")) |
| 127 | 143 | period = dashboard.get("period", {}) or {} |
| 128 | 144 | self.period_label = period.get("label") or "toute la période" |
@@ -137,6 +153,11 @@ class GroupeKAReport: | ||
| 137 | 153 | p.set_fill_color(*fill) |
| 138 | 154 | p.rect(x, y, w, h, style="DF", round_corners=True, corner_radius=2.2) |
| 139 | 155 | |
| 156 | + def _shade(self, i, n=8): | |
| 157 | + shades = [1.0, 0.78, 0.58, 0.42, 0.30, 0.22, 0.15, 0.10] | |
| 158 | + f = shades[i % len(shades)] | |
| 159 | + return tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * f) for j in range(3)) | |
| 160 | + | |
| 140 | 161 | def _kicker(self, text): |
| 141 | 162 | p = self.pdf |
| 142 | 163 | p.set_font("helvetica", "B", 8) |
@@ -160,6 +181,14 @@ class GroupeKAReport: | ||
| 160 | 181 | self.toc.append((title, self.pdf.page_no())) |
| 161 | 182 | self.pdf.ln(11) |
| 162 | 183 | |
| 184 | + def _chart_title(self, title): | |
| 185 | + p = self.pdf | |
| 186 | + p.set_font("helvetica", "B", 10) | |
| 187 | + p.set_text_color(*INK) | |
| 188 | + p.set_x(p.l_margin) | |
| 189 | + p.cell(0, 6, title) | |
| 190 | + p.ln(7) | |
| 191 | + | |
| 163 | 192 | # ---------- pages ---------- |
| 164 | 193 | def _cover(self): |
| 165 | 194 | p = self.pdf |
@@ -171,12 +200,10 @@ class GroupeKAReport: | ||
| 171 | 200 | p.set_draw_color(*INK) |
| 172 | 201 | p.set_line_width(1.0) |
| 173 | 202 | p.rect(10, 10, 190, 277) |
| 174 | − # kicker | |
| 175 | 203 | p.set_font("helvetica", "B", 10) |
| 176 | 204 | p.set_text_color(*GREEN) |
| 177 | 205 | p.set_xy(24, 34) |
| 178 | 206 | p.cell(0, 6, "GROUPE KA · RAPPORT STATISTIQUE") |
| 179 | − # wordmark : partie gauche + boîte encre/accent | |
| 180 | 207 | wm = self.site.get("wordmark", "") |
| 181 | 208 | left, boxed = (wm.split("·") + [None])[:2] if "·" in wm else (wm, None) |
| 182 | 209 | p.set_xy(24, 70) |
@@ -194,7 +221,7 @@ class GroupeKAReport: | ||
| 194 | 221 | p.set_xy(24, 100) |
| 195 | 222 | p.set_font("helvetica", "", 13) |
| 196 | 223 | p.set_text_color(*INK2) |
| 197 | − p.multi_cell(150, 7, f"Rapport statistique — {wm}") | |
| 224 | + p.multi_cell(150, 7, f"{REPORT_MODES[self.mode]} — {wm}") | |
| 198 | 225 | now = datetime.now(ZoneInfo("America/Toronto")) |
| 199 | 226 | per = self.d.get("period", {}) or {} |
| 200 | 227 | p.set_xy(24, 125) |
@@ -203,7 +230,7 @@ class GroupeKAReport: | ||
| 203 | 230 | ("Période couverte", self.period_label + (f" ({per.get('from')} → {per.get('to')})" if per.get("from") else "")), |
| 204 | 231 | ("Généré le", now.strftime("%Y-%m-%d à %H:%M") + " (heure de l'Est)"), |
| 205 | 232 | ("Plateforme", "https://" + self.site.get("domain", "")), |
| 206 | − ("Mode", "Rapport complet" if self.mode == "complet" else "Synthèse"), | |
| 233 | + ("Type de rapport", REPORT_MODES[self.mode]), | |
| 207 | 234 | ] |
| 208 | 235 | y = 128 |
| 209 | 236 | for k, v in rows: |
@@ -215,7 +242,6 @@ class GroupeKAReport: | ||
| 215 | 242 | p.cell(0, 6, str(v)) |
| 216 | 243 | p.set_font("helvetica", "", 10.5) |
| 217 | 244 | y += 8 |
| 218 | − # bande encre au pied | |
| 219 | 245 | p.set_fill_color(*INK) |
| 220 | 246 | p.rect(10, 262, 190, 25, style="F") |
| 221 | 247 | p.set_xy(24, 270) |
@@ -232,15 +258,15 @@ class GroupeKAReport: | ||
| 232 | 258 | p.set_auto_page_break(True, margin=22) |
| 233 | 259 | p.cover_mode = False |
| 234 | 260 | |
| 235 | − def _kpis(self, title: str = "Synthèse des indicateurs"): | |
| 261 | + def _kpis(self): | |
| 236 | 262 | kpis = self.d.get("kpis") or [] |
| 237 | 263 | if not kpis: |
| 238 | 264 | return |
| 239 | − self._section_title(title) | |
| 265 | + self._section_title("Synthèse des indicateurs") | |
| 240 | 266 | p = self.pdf |
| 241 | 267 | cols, gw, gh, gap = 3, 56, 26, 3 |
| 242 | 268 | x0, y = p.l_margin, p.get_y() |
| 243 | − for i, k in enumerate(kpis[:9]): | |
| 269 | + for i, k in enumerate(kpis[:12]): | |
| 244 | 270 | x = x0 + (i % cols) * (gw + gap) |
| 245 | 271 | if i and i % cols == 0: |
| 246 | 272 | y += gh + gap |
@@ -262,20 +288,81 @@ class GroupeKAReport: | ||
| 262 | 288 | p.set_font("helvetica", "B", 8) |
| 263 | 289 | p.set_text_color(*(GREEN if up else DANGER)) |
| 264 | 290 | arrow = "+" if k["delta_pct"] >= 0 else "" |
| 265 | − p.cell(gw - 8, 4, f"{'▲' if up else '▼'} {arrow}{str(k['delta_pct']).replace('.', ',')} % vs période préc.") | |
| 291 | + dv = round(float(k["delta_pct"]), 1) | |
| 292 | + dv = int(dv) if float(dv).is_integer() else dv | |
| 293 | + p.cell(gw - 8, 4, f"{'▲' if up else '▼'} {arrow}{str(dv).replace('.', ',')} % vs période préc.") | |
| 294 | + p.set_y(y + gh + 8) | |
| 295 | + | |
| 296 | + def _gauges(self): | |
| 297 | + gs = self.d.get("gauges") or [] | |
| 298 | + gs = [g for g in gs if isinstance(g.get("value"), (int, float)) and g.get("max")] | |
| 299 | + if not gs: | |
| 300 | + return | |
| 301 | + self._section_title("Taux & couvertures") | |
| 302 | + p = self.pdf | |
| 303 | + cols, gw, gh, gap = 3, 56, 34, 3 | |
| 304 | + x0, y = p.l_margin, p.get_y() | |
| 305 | + for i, g in enumerate(gs[:9]): | |
| 306 | + x = x0 + (i % cols) * (gw + gap) | |
| 307 | + if i and i % cols == 0: | |
| 308 | + y += gh + gap | |
| 309 | + if y > 240: | |
| 310 | + p.add_page(); y = p.get_y() | |
| 311 | + self._card(x, y, gw, gh) | |
| 312 | + frac = max(0.0, min(1.0, g["value"] / g["max"])) | |
| 313 | + cx, cy, r = x + gw / 2, y + 20, 14 | |
| 314 | + # arc de fond + arc de valeur (demi-cercle en petits segments) | |
| 315 | + for pass_col, pass_frac, lw in (((225, 223, 217), 1.0, 2.6), (self.accent, frac, 2.6)): | |
| 316 | + p.set_draw_color(*pass_col) | |
| 317 | + p.set_line_width(lw) | |
| 318 | + steps = max(2, int(60 * pass_frac)) | |
| 319 | + last = None | |
| 320 | + for st in range(steps + 1): | |
| 321 | + a = math.pi + math.pi * pass_frac * st / steps | |
| 322 | + pt = (cx + r * math.cos(a), cy + r * math.sin(a)) | |
| 323 | + if last: | |
| 324 | + p.line(last[0], last[1], pt[0], pt[1]) | |
| 325 | + last = pt | |
| 326 | + p.set_font("helvetica", "B", 11) | |
| 327 | + p.set_text_color(*INK) | |
| 328 | + p.set_xy(x + 4, cy - 5) | |
| 329 | + p.cell(gw - 8, 6, f"{_fr(g['value'])}{' ' + g['unit'] if g.get('unit') else ''}", align="C") | |
| 330 | + p.set_font("helvetica", "", 6.6) | |
| 331 | + p.set_text_color(*INK3) | |
| 332 | + p.set_xy(x + 4, cy + 1.5) | |
| 333 | + p.cell(gw - 8, 4, f"{frac * 100:.0f} % de {_fr(g['max'])}", align="C") | |
| 334 | + p.set_xy(x + 3, y + gh - 7) | |
| 335 | + p.set_font("helvetica", "", 7) | |
| 336 | + p.set_text_color(*INK2) | |
| 337 | + p.multi_cell(gw - 6, 3.3, str(g.get("label", ""))[:60], align="C") | |
| 266 | 338 | p.set_y(y + gh + 8) |
| 267 | 339 | |
| 268 | − def _line_chart(self, s): | |
| 340 | + def _serie_stats_row(self, s): | |
| 341 | + """Ligne min/max/moyenne/médiane sous un graphique de série.""" | |
| 342 | + p = self.pdf | |
| 343 | + vs = [pt["v"] for pt in (s.get("points") or []) if isinstance(pt.get("v"), (int, float))] | |
| 344 | + if len(vs) < 2: | |
| 345 | + return | |
| 346 | + sv = sorted(vs) | |
| 347 | + mean = sum(vs) / len(vs) | |
| 348 | + med = sv[len(sv) // 2] | |
| 349 | + sd = math.sqrt(sum((v - mean) ** 2 for v in vs) / len(vs)) | |
| 350 | + p.set_font("helvetica", "", 6.8) | |
| 351 | + p.set_text_color(*INK3) | |
| 352 | + p.cell(0, 4, f"min {_fr(sv[0])} · max {_fr(sv[-1])} · moyenne {_fr(round(mean, 2))} · médiane {_fr(med)} · écart-type {_fr(round(sd, 2))}") | |
| 353 | + p.ln(5.5) | |
| 354 | + | |
| 355 | + def _line_chart(self, s, with_stats=False): | |
| 269 | 356 | p = self.pdf |
| 270 | 357 | pts = s.get("points") or [] |
| 271 | 358 | if len(pts) < 2: |
| 272 | 359 | return |
| 360 | + if s.get("kind") == "bar": | |
| 361 | + self._vbars(s) | |
| 362 | + return | |
| 273 | 363 | if p.get_y() > 200: |
| 274 | 364 | p.add_page() |
| 275 | − p.set_font("helvetica", "B", 10) | |
| 276 | − p.set_text_color(*INK) | |
| 277 | − p.cell(0, 6, s.get("title", "")) | |
| 278 | − p.ln(7) | |
| 365 | + self._chart_title(s.get("title", "")) | |
| 279 | 366 | x0, y0, w, h = p.l_margin, p.get_y(), 174, 52 |
| 280 | 367 | self._card(x0, y0, w, h, fill=WHITE) |
| 281 | 368 | cx, cy, cw, ch = x0 + 12, y0 + 6, w - 20, h - 16 |
@@ -283,7 +370,6 @@ class GroupeKAReport: | ||
| 283 | 370 | vmax = max(vals) or 1 |
| 284 | 371 | vmin = min(0, min(vals)) |
| 285 | 372 | rng = (vmax - vmin) or 1 |
| 286 | − # grille + graduations | |
| 287 | 373 | p.set_font("helvetica", "", 6.3) |
| 288 | 374 | p.set_text_color(*INK3) |
| 289 | 375 | p.set_draw_color(200, 200, 195) |
@@ -294,6 +380,20 @@ class GroupeKAReport: | ||
| 294 | 380 | p.set_xy(x0 + 1, gy - 1.6) |
| 295 | 381 | p.cell(10, 3, _fr(vmin + rng * g / 4), align="R") |
| 296 | 382 | |
| 383 | + def xy(i, n, v): | |
| 384 | + return (cx + cw * (i / (n - 1)), cy + ch - ch * ((v - vmin) / rng)) | |
| 385 | + | |
| 386 | + # aire sous la courbe (kind=area) : petits trapèzes accent pâle | |
| 387 | + if s.get("kind") == "area": | |
| 388 | + fill = tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * 0.18) for j in range(3)) | |
| 389 | + p.set_fill_color(*fill) | |
| 390 | + p.set_draw_color(*fill) | |
| 391 | + n = len(pts) | |
| 392 | + for i in range(n - 1): | |
| 393 | + x1, y1 = xy(i, n, pts[i]["v"]) | |
| 394 | + x2, y2 = xy(i + 1, n, pts[i + 1]["v"]) | |
| 395 | + p.polygon([(x1, y1), (x2, y2), (x2, cy + ch), (x1, cy + ch)], style="DF") | |
| 396 | + | |
| 297 | 397 | def draw(series, color, width, dash=None): |
| 298 | 398 | n = len(series) |
| 299 | 399 | p.set_draw_color(*color) |
@@ -302,8 +402,7 @@ class GroupeKAReport: | ||
| 302 | 402 | p.set_dash_pattern(dash=1.2, gap=1.2) |
| 303 | 403 | last = None |
| 304 | 404 | for i, pt in enumerate(series): |
| 305 | − px = cx + cw * (i / (n - 1)) | |
| 306 | − py = cy + ch - ch * ((pt["v"] - vmin) / rng) | |
| 405 | + px, py = xy(i, n, pt["v"]) | |
| 307 | 406 | if last: |
| 308 | 407 | p.line(last[0], last[1], px, py) |
| 309 | 408 | last = (px, py) |
@@ -312,7 +411,6 @@ class GroupeKAReport: | ||
| 312 | 411 | if s.get("compare"): |
| 313 | 412 | draw(s["compare"], INK3, 0.35, dash=True) |
| 314 | 413 | draw(pts, self.accent, 0.7) |
| 315 | − # libellés d'axe X (premier / milieu / dernier) | |
| 316 | 414 | p.set_text_color(*INK3) |
| 317 | 415 | for frac, idx in ((0, 0), (0.5, len(pts) // 2), (1, -1)): |
| 318 | 416 | p.set_xy(cx + cw * frac - 9, cy + ch + 1.5) |
@@ -322,9 +420,166 @@ class GroupeKAReport: | ||
| 322 | 420 | p.set_font("helvetica", "", 6.8) |
| 323 | 421 | p.set_text_color(*INK3) |
| 324 | 422 | p.cell(0, 4, "— période courante (accent) · ---- période comparée") |
| 325 | − p.ln(6) | |
| 326 | − else: | |
| 327 | − p.ln(2) | |
| 423 | + p.ln(5.5) | |
| 424 | + if with_stats: | |
| 425 | + self._serie_stats_row(s) | |
| 426 | + p.ln(1.5) | |
| 427 | + | |
| 428 | + def _vbars(self, s): | |
| 429 | + """Barres verticales : série kind=bar ou distribution (bins).""" | |
| 430 | + p = self.pdf | |
| 431 | + pts = s.get("points") or [{"t": b.get("label"), "v": b.get("value")} for b in (s.get("bins") or [])] | |
| 432 | + pts = [pt for pt in pts if isinstance(pt.get("v"), (int, float))] | |
| 433 | + if not pts: | |
| 434 | + return | |
| 435 | + if p.get_y() > 205: | |
| 436 | + p.add_page() | |
| 437 | + self._chart_title(s.get("title", "")) | |
| 438 | + x0, y0, w, h = p.l_margin, p.get_y(), 174, 48 | |
| 439 | + self._card(x0, y0, w, h, fill=WHITE) | |
| 440 | + cx, cy, cw, ch = x0 + 12, y0 + 5, w - 20, h - 14 | |
| 441 | + vmax = max(pt["v"] for pt in pts) or 1 | |
| 442 | + p.set_font("helvetica", "", 6.3) | |
| 443 | + p.set_text_color(*INK3) | |
| 444 | + p.set_draw_color(200, 200, 195) | |
| 445 | + p.set_line_width(0.15) | |
| 446 | + for g in range(5): | |
| 447 | + gy = cy + ch - ch * g / 4 | |
| 448 | + p.line(cx, gy, cx + cw, gy) | |
| 449 | + p.set_xy(x0 + 1, gy - 1.6) | |
| 450 | + p.cell(10, 3, _fr(vmax * g / 4), align="R") | |
| 451 | + n = len(pts) | |
| 452 | + bw = max(0.8, cw / n - 0.6) | |
| 453 | + p.set_fill_color(*self.accent) | |
| 454 | + p.set_draw_color(*INK) | |
| 455 | + p.set_line_width(0.15) | |
| 456 | + for i, pt in enumerate(pts): | |
| 457 | + bh = ch * (pt["v"] / vmax) | |
| 458 | + p.rect(cx + cw * i / n + 0.3, cy + ch - bh, bw, max(bh, 0.4 if pt["v"] > 0 else 0), style="DF") | |
| 459 | + p.set_text_color(*INK3) | |
| 460 | + for frac, idx in ((0, 0), (0.5, n // 2), (1, -1)): | |
| 461 | + p.set_xy(cx + cw * frac - 10, cy + ch + 1.5) | |
| 462 | + p.cell(20, 3, str(pts[idx].get("t", ""))[:12], align="C") | |
| 463 | + p.set_y(y0 + h + 5) | |
| 464 | + | |
| 465 | + def _multiline(self, ms): | |
| 466 | + """Multi-séries (≤4) : accent plein / encre fin / accent pointillé / | |
| 467 | + gris pointillé — l'identité passe par le motif, pas la couleur seule.""" | |
| 468 | + p = self.pdf | |
| 469 | + series = [s for s in (ms.get("series") or []) if len(s.get("points") or []) > 1][:4] | |
| 470 | + if not series: | |
| 471 | + return | |
| 472 | + if p.get_y() > 195: | |
| 473 | + p.add_page() | |
| 474 | + self._chart_title(ms.get("title", "")) | |
| 475 | + x0, y0, w, h = p.l_margin, p.get_y(), 174, 52 | |
| 476 | + self._card(x0, y0, w, h, fill=WHITE) | |
| 477 | + cx, cy, cw, ch = x0 + 12, y0 + 6, w - 20, h - 16 | |
| 478 | + vals = [pt["v"] for s in series for pt in s["points"]] | |
| 479 | + vmax = max(vals) or 1 | |
| 480 | + vmin = min(0, min(vals)) | |
| 481 | + rng = (vmax - vmin) or 1 | |
| 482 | + p.set_font("helvetica", "", 6.3) | |
| 483 | + p.set_text_color(*INK3) | |
| 484 | + p.set_draw_color(200, 200, 195) | |
| 485 | + p.set_line_width(0.15) | |
| 486 | + for g in range(5): | |
| 487 | + gy = cy + ch - ch * g / 4 | |
| 488 | + p.line(cx, gy, cx + cw, gy) | |
| 489 | + p.set_xy(x0 + 1, gy - 1.6) | |
| 490 | + p.cell(10, 3, _fr(vmin + rng * g / 4), align="R") | |
| 491 | + styles = [ | |
| 492 | + (self.accent, 0.7, None), | |
| 493 | + (INK, 0.45, None), | |
| 494 | + (self.accent, 0.55, True), | |
| 495 | + (INK3, 0.5, True), | |
| 496 | + ] | |
| 497 | + for si, s in enumerate(series): | |
| 498 | + col, lw, dash = styles[si] | |
| 499 | + p.set_draw_color(*col) | |
| 500 | + p.set_line_width(lw) | |
| 501 | + if dash: | |
| 502 | + p.set_dash_pattern(dash=1.4, gap=1.2) | |
| 503 | + n = len(s["points"]) | |
| 504 | + last = None | |
| 505 | + for i, pt in enumerate(s["points"]): | |
| 506 | + px = cx + cw * (i / (n - 1)) | |
| 507 | + py = cy + ch - ch * ((pt["v"] - vmin) / rng) | |
| 508 | + if last: | |
| 509 | + p.line(last[0], last[1], px, py) | |
| 510 | + last = (px, py) | |
| 511 | + p.set_dash_pattern() | |
| 512 | + ref = series[0]["points"] | |
| 513 | + p.set_text_color(*INK3) | |
| 514 | + for frac, idx in ((0, 0), (0.5, len(ref) // 2), (1, -1)): | |
| 515 | + p.set_xy(cx + cw * frac - 9, cy + ch + 1.5) | |
| 516 | + p.cell(18, 3, str(ref[idx].get("t", ""))[:10], align="C") | |
| 517 | + p.set_y(y0 + h + 4) | |
| 518 | + p.set_font("helvetica", "", 6.8) | |
| 519 | + p.set_text_color(*INK3) | |
| 520 | + marks = ["—", "—", "----", "----"] | |
| 521 | + leg = " · ".join(f"{marks[i]} {s.get('label', '')}" for i, s in enumerate(series)) | |
| 522 | + p.cell(0, 4, leg[:120]) | |
| 523 | + p.ln(6) | |
| 524 | + | |
| 525 | + def _stacked(self, st): | |
| 526 | + p = self.pdf | |
| 527 | + keys = (st.get("keys") or [])[:6] | |
| 528 | + pts = st.get("points") or [] | |
| 529 | + if not keys or not pts: | |
| 530 | + return | |
| 531 | + if p.get_y() > 195: | |
| 532 | + p.add_page() | |
| 533 | + self._chart_title(st.get("title", "")) | |
| 534 | + x0, y0, w, h = p.l_margin, p.get_y(), 174, 52 | |
| 535 | + self._card(x0, y0, w, h, fill=WHITE) | |
| 536 | + cx, cy, cw, ch = x0 + 12, y0 + 6, w - 20, h - 16 | |
| 537 | + totals = [sum(v or 0 for v in pt.get("values", [])[: len(keys)]) for pt in pts] | |
| 538 | + vmax = max(totals) or 1 | |
| 539 | + p.set_font("helvetica", "", 6.3) | |
| 540 | + p.set_text_color(*INK3) | |
| 541 | + p.set_draw_color(200, 200, 195) | |
| 542 | + p.set_line_width(0.15) | |
| 543 | + for g in range(5): | |
| 544 | + gy = cy + ch - ch * g / 4 | |
| 545 | + p.line(cx, gy, cx + cw, gy) | |
| 546 | + p.set_xy(x0 + 1, gy - 1.6) | |
| 547 | + p.cell(10, 3, _fr(vmax * g / 4), align="R") | |
| 548 | + n = len(pts) | |
| 549 | + bw = max(0.8, cw / n - 0.6) | |
| 550 | + p.set_draw_color(*WHITE) | |
| 551 | + p.set_line_width(0.12) | |
| 552 | + for i, pt in enumerate(pts): | |
| 553 | + yacc = cy + ch | |
| 554 | + for j, k in enumerate(keys): | |
| 555 | + v = (pt.get("values") or [0] * len(keys))[j] if j < len(pt.get("values", [])) else 0 | |
| 556 | + if not v: | |
| 557 | + continue | |
| 558 | + bh = ch * (v / vmax) | |
| 559 | + yacc -= bh | |
| 560 | + p.set_fill_color(*self._shade(j)) | |
| 561 | + p.rect(cx + cw * i / n + 0.3, yacc, bw, max(bh - 0.15, 0.3), style="DF") | |
| 562 | + p.set_text_color(*INK3) | |
| 563 | + for frac, idx in ((0, 0), (0.5, n // 2), (1, -1)): | |
| 564 | + p.set_xy(cx + cw * frac - 10, cy + ch + 1.5) | |
| 565 | + p.cell(20, 3, str(pts[idx].get("t", ""))[:12], align="C") | |
| 566 | + p.set_y(y0 + h + 4) | |
| 567 | + # légende | |
| 568 | + p.set_font("helvetica", "", 6.8) | |
| 569 | + lx = p.l_margin | |
| 570 | + for j, k in enumerate(keys): | |
| 571 | + p.set_fill_color(*self._shade(j)) | |
| 572 | + p.set_draw_color(*INK) | |
| 573 | + p.set_line_width(0.2) | |
| 574 | + p.rect(lx, p.get_y() + 0.6, 3, 3, style="DF") | |
| 575 | + p.set_xy(lx + 4, p.get_y()) | |
| 576 | + p.set_text_color(*INK2) | |
| 577 | + txt = str(k)[:22] | |
| 578 | + p.cell(p.get_string_width(txt) + 3, 4, txt) | |
| 579 | + lx = p.get_x() + 3 | |
| 580 | + if lx > 165: | |
| 581 | + break | |
| 582 | + p.ln(7) | |
| 328 | 583 | |
| 329 | 584 | def _bars(self, title, items, unit=""): |
| 330 | 585 | p = self.pdf |
@@ -334,10 +589,8 @@ class GroupeKAReport: | ||
| 334 | 589 | need = 10 + len(items) * 7 |
| 335 | 590 | if p.get_y() + need > 265: |
| 336 | 591 | p.add_page() |
| 337 | − p.set_font("helvetica", "B", 10) | |
| 338 | − p.set_text_color(*INK) | |
| 339 | − p.cell(0, 6, title) | |
| 340 | − p.ln(8) | |
| 592 | + self._chart_title(title) | |
| 593 | + p.ln(1) | |
| 341 | 594 | vmax = max(it["value"] for it in items) or 1 |
| 342 | 595 | for it in items: |
| 343 | 596 | y = p.get_y() |
@@ -345,19 +598,23 @@ class GroupeKAReport: | ||
| 345 | 598 | p.set_text_color(*INK) |
| 346 | 599 | p.set_x(p.l_margin) |
| 347 | 600 | p.cell(46, 5, str(it["label"])[:34]) |
| 348 | − bw = 96 * (it["value"] / vmax) | |
| 601 | + bw = 86 * (it["value"] / vmax) | |
| 349 | 602 | p.set_fill_color(*self.accent) |
| 350 | 603 | p.set_draw_color(*INK) |
| 351 | 604 | p.set_line_width(0.25) |
| 352 | 605 | p.rect(p.l_margin + 48, y + 0.7, max(bw, 0.8), 3.6, style="DF") |
| 353 | − p.set_xy(p.l_margin + 148, y) | |
| 606 | + p.set_xy(p.l_margin + 136, y) | |
| 354 | 607 | p.set_font("helvetica", "B", 7.6) |
| 355 | − p.cell(26, 5, _fr(it["value"]) + (" " + unit if unit else ""), align="R") | |
| 608 | + p.cell(24, 5, _fr(it["value"]) + (" " + unit if unit else ""), align="R") | |
| 609 | + if it.get("delta_pct") is not None: | |
| 610 | + up = it["delta_pct"] >= 0 | |
| 611 | + p.set_font("helvetica", "B", 6.6) | |
| 612 | + p.set_text_color(*(GREEN if up else DANGER)) | |
| 613 | + p.cell(14, 5, f"{'+' if up else ''}{str(round(it['delta_pct'], 1)).replace('.', ',')} %", align="R") | |
| 356 | 614 | p.ln(6.4) |
| 357 | 615 | p.ln(3) |
| 358 | 616 | |
| 359 | 617 | def _donut(self, b): |
| 360 | − # anneau vectoriel simple (arcs) + légende | |
| 361 | 618 | p = self.pdf |
| 362 | 619 | items = [it for it in (b.get("items") or []) if it.get("value")][:8] |
| 363 | 620 | total = sum(it["value"] for it in items) |
@@ -365,17 +622,13 @@ class GroupeKAReport: | ||
| 365 | 622 | return |
| 366 | 623 | if p.get_y() > 210: |
| 367 | 624 | p.add_page() |
| 368 | − p.set_font("helvetica", "B", 10) | |
| 369 | − p.set_text_color(*INK) | |
| 370 | − p.cell(0, 6, b.get("title", "")) | |
| 371 | − p.ln(8) | |
| 625 | + self._chart_title(b.get("title", "")) | |
| 626 | + p.ln(1) | |
| 372 | 627 | cx, cy, r = p.l_margin + 26, p.get_y() + 24, 20 |
| 373 | − shades = [1.0, 0.78, 0.58, 0.42, 0.30, 0.22, 0.15, 0.10] | |
| 374 | 628 | start = -90.0 |
| 375 | 629 | for i, it in enumerate(items): |
| 376 | 630 | frac = it["value"] / total |
| 377 | − f = shades[i % len(shades)] | |
| 378 | − col = tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * f) for j in range(3)) | |
| 631 | + col = self._shade(i) | |
| 379 | 632 | steps = max(2, int(72 * frac)) |
| 380 | 633 | p.set_fill_color(*col) |
| 381 | 634 | p.set_draw_color(*col) |
@@ -394,11 +647,9 @@ class GroupeKAReport: | ||
| 394 | 647 | p.set_line_width(0.4) |
| 395 | 648 | p.ellipse(cx - 11, cy - 11, 22, 22, style="DF") |
| 396 | 649 | p.ellipse(cx - r, cy - r, 2 * r, 2 * r, style="D") |
| 397 | − # légende | |
| 398 | 650 | ly = cy - 22 |
| 399 | 651 | for i, it in enumerate(items): |
| 400 | − f = shades[i % len(shades)] | |
| 401 | − col = tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * f) for j in range(3)) | |
| 652 | + col = self._shade(i) | |
| 402 | 653 | p.set_fill_color(*col) |
| 403 | 654 | p.set_draw_color(*INK) |
| 404 | 655 | p.rect(p.l_margin + 60, ly + 0.8, 4, 4, style="DF") |
@@ -410,7 +661,39 @@ class GroupeKAReport: | ||
| 410 | 661 | ly += 5.6 |
| 411 | 662 | p.set_y(max(cy + r, ly) + 6) |
| 412 | 663 | |
| 413 | − def _table(self, t): | |
| 664 | + def _hourly(self): | |
| 665 | + hh = self.d.get("hourly") or {} | |
| 666 | + cells = hh.get("cells") or [] | |
| 667 | + if not cells: | |
| 668 | + return | |
| 669 | + p = self.pdf | |
| 670 | + if p.get_y() > 190: | |
| 671 | + p.add_page() | |
| 672 | + self._chart_title(hh.get("title", "Activité par jour et heure")) | |
| 673 | + x0, y0 = p.l_margin, p.get_y() | |
| 674 | + cw, chh, lx, ly = 6.4, 6.4, 12, 5 | |
| 675 | + vmax = max((c.get("value") or 0) for c in cells) or 1 | |
| 676 | + grid = {(c.get("dow"), c.get("hour")): c.get("value") or 0 for c in cells} | |
| 677 | + dows = ["Lun", "Mar", "Mer", "Jeu", "Ven", "Sam", "Dim"] | |
| 678 | + p.set_font("helvetica", "", 5.8) | |
| 679 | + p.set_text_color(*INK3) | |
| 680 | + for h in (0, 6, 12, 18, 23): | |
| 681 | + p.set_xy(x0 + lx + h * cw, y0) | |
| 682 | + p.cell(cw, 3, f"{h}h", align="C") | |
| 683 | + for d in range(7): | |
| 684 | + p.set_xy(x0, y0 + ly + d * chh + 1.5) | |
| 685 | + p.cell(lx - 1, 3, dows[d], align="R") | |
| 686 | + for h in range(24): | |
| 687 | + v = grid.get((d, h), 0) | |
| 688 | + f = 0.1 + 0.9 * (v / vmax) if v else 0.0 | |
| 689 | + col = tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * f) for j in range(3)) if v else (235, 233, 228) | |
| 690 | + p.set_fill_color(*col) | |
| 691 | + p.set_draw_color(215, 213, 207) | |
| 692 | + p.set_line_width(0.1) | |
| 693 | + p.rect(x0 + lx + h * cw, y0 + ly + d * chh, cw - 0.5, chh - 0.5, style="DF") | |
| 694 | + p.set_y(y0 + ly + 7 * chh + 5) | |
| 695 | + | |
| 696 | + def _table(self, t, max_rows=200): | |
| 414 | 697 | p = self.pdf |
| 415 | 698 | cols = t.get("columns") or [] |
| 416 | 699 | rows = t.get("rows") or [] |
@@ -427,7 +710,7 @@ class GroupeKAReport: | ||
| 427 | 710 | p.ln(6) |
| 428 | 711 | head() |
| 429 | 712 | p.set_text_color(*INK) |
| 430 | − for i, row in enumerate(rows[:200]): | |
| 713 | + for i, row in enumerate(rows[:max_rows]): | |
| 431 | 714 | if p.get_y() > 262: |
| 432 | 715 | p.add_page() |
| 433 | 716 | head() |
@@ -438,10 +721,10 @@ class GroupeKAReport: | ||
| 438 | 721 | txt = _fr(cell) if isinstance(cell, (int, float)) else str(cell) |
| 439 | 722 | p.cell(w, 5.4, " " + txt[:34], fill=True) |
| 440 | 723 | p.ln(5.4) |
| 441 | − if len(rows) > 200: | |
| 724 | + if len(rows) > max_rows: | |
| 442 | 725 | p.set_font("helvetica", "", 7) |
| 443 | 726 | p.set_text_color(*INK3) |
| 444 | − p.cell(0, 5, f"… {len(rows) - 200} lignes supplémentaires non imprimées") | |
| 727 | + p.cell(0, 5, f"… {len(rows) - max_rows} lignes supplémentaires non imprimées") | |
| 445 | 728 | p.ln(6) |
| 446 | 729 | |
| 447 | 730 | def _records(self): |
@@ -450,7 +733,7 @@ class GroupeKAReport: | ||
| 450 | 733 | return |
| 451 | 734 | self._section_title("Records & faits marquants") |
| 452 | 735 | p = self.pdf |
| 453 | − for r in recs[:10]: | |
| 736 | + for r in recs[:14]: | |
| 454 | 737 | if p.get_y() > 258: |
| 455 | 738 | p.add_page() |
| 456 | 739 | y = p.get_y() |
@@ -508,43 +791,76 @@ class GroupeKAReport: | ||
| 508 | 791 | "groupe-ka.com/conditions · /confidentialite · /loi-25.", |
| 509 | 792 | ) |
| 510 | 793 | |
| 511 | − def _toc_page(self): | |
| 512 | − # insérée après coup ? fpdf ne réordonne pas : on écrit le sommaire en | |
| 513 | − # page 2 en réservant la page lors du build (voir build()). | |
| 514 | − pass | |
| 794 | + # ---------- groupes de sections ---------- | |
| 795 | + def _all_series(self, with_stats=True): | |
| 796 | + for s in self.d.get("series") or []: | |
| 797 | + self._line_chart(s, with_stats=with_stats) | |
| 798 | + for ms in self.d.get("multiseries") or []: | |
| 799 | + self._multiline(ms) | |
| 800 | + for st in self.d.get("stacked") or []: | |
| 801 | + self._stacked(st) | |
| 802 | + | |
| 803 | + def _all_breakdowns(self): | |
| 804 | + for b in self.d.get("breakdowns") or []: | |
| 805 | + if b.get("kind") == "donut": | |
| 806 | + self._donut(b) | |
| 807 | + else: | |
| 808 | + self._bars(b.get("title", ""), b.get("items")) | |
| 809 | + for dist in self.d.get("distributions") or []: | |
| 810 | + self._vbars(dist) | |
| 811 | + geo = self.d.get("geo") | |
| 812 | + if geo: | |
| 813 | + self._bars(geo.get("title", "Répartition géographique"), geo.get("items")) | |
| 814 | + self._hourly() | |
| 515 | 815 | |
| 516 | 816 | def build(self) -> bytes: |
| 517 | 817 | p = self.pdf |
| 518 | 818 | p.alias_nb_pages() |
| 519 | 819 | self._cover() |
| 820 | + with_toc = self.mode in ("complet", "donnees") | |
| 821 | + toc_page_no = None | |
| 520 | 822 | if self.mode == "synthese": |
| 521 | 823 | p.add_page() |
| 522 | 824 | self._kpis() |
| 825 | + self._gauges() | |
| 826 | + self._records() | |
| 827 | + self._final_page() | |
| 828 | + elif self.mode == "tendances": | |
| 829 | + p.add_page() | |
| 830 | + self._kpis() | |
| 831 | + self._section_title("Évolution & tendances") | |
| 832 | + self._all_series(with_stats=True) | |
| 523 | 833 | self._records() |
| 524 | 834 | self._final_page() |
| 525 | − else: | |
| 835 | + elif self.mode == "repartitions": | |
| 836 | + p.add_page() | |
| 837 | + self._section_title("Répartitions, distributions & géographie") | |
| 838 | + self._all_breakdowns() | |
| 839 | + self._final_page() | |
| 840 | + elif self.mode == "donnees": | |
| 841 | + p.add_page() | |
| 842 | + toc_page_no = p.page_no() | |
| 843 | + for t in self.d.get("tables") or []: | |
| 844 | + self._table(t, max_rows=400) | |
| 845 | + self._final_page() | |
| 846 | + else: # complet | |
| 526 | 847 | p.add_page() |
| 527 | 848 | toc_page_no = p.page_no() |
| 528 | 849 | p.add_page() |
| 529 | 850 | self._kpis() |
| 530 | − for s in self.d.get("series") or []: | |
| 531 | − if s.get("kind") == "bar": | |
| 532 | − self._bars(s.get("title", ""), [{"label": pt.get("t"), "value": pt.get("v")} for pt in (s.get("points") or [])], s.get("unit", "")) | |
| 533 | − else: | |
| 534 | − self._line_chart(s) | |
| 535 | − for b in self.d.get("breakdowns") or []: | |
| 536 | − if b.get("kind") == "donut": | |
| 537 | − self._donut(b) | |
| 538 | − else: | |
| 539 | − self._bars(b.get("title", ""), b.get("items")) | |
| 540 | − geo = self.d.get("geo") | |
| 541 | − if geo: | |
| 542 | − self._bars(geo.get("title", "Répartition géographique"), geo.get("items")) | |
| 851 | + self._gauges() | |
| 852 | + if (self.d.get("series") or self.d.get("multiseries") or self.d.get("stacked")): | |
| 853 | + self._section_title("Évolution & tendances") | |
| 854 | + self._all_series(with_stats=True) | |
| 855 | + if (self.d.get("breakdowns") or self.d.get("distributions") or self.d.get("geo") or self.d.get("hourly")): | |
| 856 | + self._section_title("Répartitions, distributions & géographie") | |
| 857 | + self._all_breakdowns() | |
| 543 | 858 | for t in self.d.get("tables") or []: |
| 544 | 859 | self._table(t) |
| 545 | 860 | self._records() |
| 546 | 861 | self._final_page() |
| 547 | − # sommaire écrit sur la page réservée (page 2) | |
| 862 | + # sommaire écrit sur la page réservée | |
| 863 | + if toc_page_no is not None: | |
| 548 | 864 | last_page = p.page |
| 549 | 865 | p.page = toc_page_no |
| 550 | 866 | p.set_y(22) |
@@ -563,6 +879,7 @@ class GroupeKAReport: | ||
| 563 | 879 | return bytes(p.output()) |
| 564 | 880 | |
| 565 | 881 | |
| 566 | −def filename(platform_id: str, period: str) -> str: | |
| 882 | +def filename(platform_id: str, period: str, mode: str = "complet") -> str: | |
| 567 | 883 | today = datetime.now(ZoneInfo("America/Toronto")).strftime("%Y-%m-%d") |
| 568 | − return f"groupe-ka_{platform_id}_stats_{period}_{today}.pdf" | |
| 884 | + suffix = "" if mode in ("", "complet") else f"_{mode}" | |
| 885 | + return f"groupe-ka_{platform_id}_stats_{period}{suffix}_{today}.pdf" | |
modified
src/api/routes/agent.py
+428 −161
@@ -4,13 +4,21 @@ | ||
| 4 | 4 | # POST /api/agent/chat {site, messages[]} → flux SSE (deltas texte + activité |
| 5 | 5 | # outils). Boucle d'outils manuelle ; les outils interrogent les API PUBLIQUES |
| 6 | 6 | # de données des plateformes (rien d'inventé — l'agent cite ce qu'il lit). |
| 7 | +# v2 (2026-08-19) : ~24 outils — recherches enrichies (tous les filtres des API), | |
| 8 | +# fiches détail par uid, comparateur d'épicerie, rappels véhicule, inspections | |
| 9 | +# MAPAQ, menus/prix restos, juste prix Lou·Ka, estimateur Vrai-Prix, boutiques | |
| 10 | +# Fabri·Ka, plats Resto·Ka, suggestions Trouve·Ka, facettes — et RECHERCHE FLOUE | |
| 11 | +# (cascade de variantes : requête exacte → sans accents → mots significatifs). | |
| 7 | 12 | # La clé Anthropic vit dans le .env du nœud (jamais côté navigateur). |
| 8 | 13 | from __future__ import annotations |
| 9 | 14 | |
| 10 | 15 | import asyncio |
| 11 | 16 | import json |
| 12 | 17 | import os |
| 18 | +import re | |
| 19 | +import unicodedata | |
| 13 | 20 | from typing import Any, AsyncIterator |
| 21 | +from urllib.parse import quote | |
| 14 | 22 | |
| 15 | 23 | import httpx |
| 16 | 24 | from anthropic import AsyncAnthropic |
@@ -20,8 +28,8 @@ from fastapi.responses import StreamingResponse | ||
| 20 | 28 | router = APIRouter(prefix="/api/agent", tags=["agent"]) |
| 21 | 29 | |
| 22 | 30 | MODEL = "claude-haiku-4-5" |
| 23 | −MAX_TURNS = 6 | |
| 24 | −MAX_TOKENS = 1024 | |
| 31 | +MAX_TURNS = 8 | |
| 32 | +MAX_TOKENS = 2000 | |
| 25 | 33 | RESULT_CHAR_CAP = 6000 |
| 26 | 34 | |
| 27 | 35 | SITES: dict[str, dict[str, str]] = { |
@@ -51,7 +59,7 @@ def _ecosystem() -> dict: | ||
| 51 | 59 | return _ECO_CACHE |
| 52 | 60 | |
| 53 | 61 | |
| 54 | −# ---------------------------------------------------------------- outils | |
| 62 | +# ---------------------------------------------------------------- HTTP + flou | |
| 55 | 63 | def _lim(params: dict, cap: int = 8) -> dict: |
| 56 | 64 | p = {k: v for k, v in params.items() if v not in (None, "", [])} |
| 57 | 65 | p["limit"] = min(int(p.get("limit", cap) or cap), cap) |
@@ -59,151 +67,312 @@ def _lim(params: dict, cap: int = 8) -> dict: | ||
| 59 | 67 | |
| 60 | 68 | |
| 61 | 69 | async def _get(url: str, params: dict | None = None) -> Any: |
| 62 | − async with httpx.AsyncClient(timeout=10, follow_redirects=True) as cx: | |
| 70 | + async with httpx.AsyncClient(timeout=12, follow_redirects=True) as cx: | |
| 63 | 71 | r = await cx.get(url, params=params) |
| 64 | 72 | r.raise_for_status() |
| 65 | 73 | return r.json() |
| 66 | 74 | |
| 67 | 75 | |
| 76 | +def _unaccent(s: str) -> str: | |
| 77 | + return "".join(c for c in unicodedata.normalize("NFD", s) if unicodedata.category(c) != "Mn") | |
| 78 | + | |
| 79 | + | |
| 80 | +_STOPWORDS = {"le", "la", "les", "un", "une", "des", "de", "du", "d", "l", "et", "ou", "a", "au", | |
| 81 | + "aux", "en", "pour", "avec", "sur", "dans", "près", "pres", "proche", "the", "of"} | |
| 82 | + | |
| 83 | + | |
| 84 | +def _q_variants(q: str) -> list[str]: | |
| 85 | + """Variantes de recherche floue, de la plus fidèle à la plus large.""" | |
| 86 | + q = (q or "").strip() | |
| 87 | + if not q: | |
| 88 | + return [q] | |
| 89 | + seen: list[str] = [] | |
| 90 | + | |
| 91 | + def add(v: str) -> None: | |
| 92 | + v = re.sub(r"\s+", " ", v).strip() | |
| 93 | + if v and v.lower() not in [s.lower() for s in seen]: | |
| 94 | + seen.append(v) | |
| 95 | + | |
| 96 | + add(q) | |
| 97 | + add(_unaccent(q).lower()) # sans accents | |
| 98 | + words = [w for w in re.split(r"[\s,;/]+", _unaccent(q).lower()) | |
| 99 | + if len(w) >= 3 and w not in _STOPWORDS] | |
| 100 | + add(" ".join(words)) # sans mots vides | |
| 101 | + add(" ".join(w.rstrip("sx") for w in words)) # singulier naïf | |
| 102 | + for w in sorted(words, key=len, reverse=True)[:3]: # chaque mot fort seul | |
| 103 | + add(w) | |
| 104 | + add(w.rstrip("sx")) | |
| 105 | + return seen[:7] | |
| 106 | + | |
| 107 | + | |
| 108 | +def _items_of(r: Any, *keys: str) -> Any: | |
| 109 | + if isinstance(r, dict): | |
| 110 | + for k in keys: | |
| 111 | + if isinstance(r.get(k), list): | |
| 112 | + return r[k] | |
| 113 | + return r | |
| 114 | + return r | |
| 115 | + | |
| 116 | + | |
| 117 | +async def _search_fuzzy(url: str, params: dict, keys: tuple[str, ...], | |
| 118 | + lien: str, cap: int = 8) -> dict: | |
| 119 | + """GET avec cascade floue sur `q` : si la requête exacte ne donne rien, | |
| 120 | + réessaie avec des variantes (sans accents, mots significatifs…).""" | |
| 121 | + base = _lim(params, cap) | |
| 122 | + q = str(base.get("q") or "") | |
| 123 | + variants = _q_variants(q) if q else [q] | |
| 124 | + tried: list[str] = [] | |
| 125 | + for i, v in enumerate(variants): | |
| 126 | + p = dict(base) | |
| 127 | + if q: | |
| 128 | + p["q"] = v | |
| 129 | + try: | |
| 130 | + r = await _get(url, p) | |
| 131 | + except Exception: | |
| 132 | + if i == len(variants) - 1: | |
| 133 | + raise | |
| 134 | + continue | |
| 135 | + items = _items_of(r, *keys) | |
| 136 | + if isinstance(items, list) and items: | |
| 137 | + out: dict[str, Any] = {"resultats": items[:cap], "lien": lien} | |
| 138 | + if isinstance(r, dict) and r.get("total") is not None: | |
| 139 | + out["total"] = r["total"] | |
| 140 | + if i > 0: | |
| 141 | + out["note"] = f"aucun résultat exact pour « {q} » — recherche élargie avec « {v} »" | |
| 142 | + return out | |
| 143 | + tried.append(v) | |
| 144 | + if not q: | |
| 145 | + break | |
| 146 | + return {"resultats": [], "lien": lien, | |
| 147 | + "note": "aucun résultat, même en élargissant (" + ", ".join(tried[:4]) + ") — " | |
| 148 | + "essaie d'autres filtres, l'outil facettes_plateforme ou suggestions_recherche"} | |
| 149 | + | |
| 150 | + | |
| 151 | +# ---------------------------------------------------------------- fiches | |
| 152 | +DETAIL_URLS: dict[str, str] = { | |
| 153 | + "lou-ka": "https://www.lou-ka.com/api/listings/{uid}", | |
| 154 | + "immo-ka": "https://www.immo-ka.com/api/listings/{uid}", | |
| 155 | + "auto-ka": "https://www.auto-ka.com/api/vehicles/{uid}", | |
| 156 | + "food-ka": "https://www.food-ka.com/api/products/{uid}", | |
| 157 | + "fabri-ka": "https://www.fabri-ka.com/api/products/{uid}", | |
| 158 | + "resto-ka": "https://www.resto-ka.com/api/restaurants/{uid}", | |
| 159 | + "sorti-ka": "https://www.sorti-ka.com/api/events/{uid}", | |
| 160 | + "crea-ka": "https://www.crea-ka.com/api/creators/{uid}", | |
| 161 | + "job-ka": "https://www.job-ka.com/api/jobs/{uid}", | |
| 162 | +} | |
| 163 | + | |
| 164 | + | |
| 165 | +def _uid(uid: str) -> str: | |
| 166 | + return quote(str(uid), safe="") | |
| 167 | + | |
| 168 | + | |
| 169 | +# ---------------------------------------------------------------- outils | |
| 170 | +def _obj(props: dict, required: list[str] | None = None) -> dict: | |
| 171 | + return {"type": "object", "properties": props, | |
| 172 | + **({"required": required} if required else {}), "additionalProperties": False} | |
| 173 | + | |
| 174 | + | |
| 175 | +_S = {"type": "string"} | |
| 176 | +_N = {"type": "number"} | |
| 177 | +_I = {"type": "integer"} | |
| 178 | +_B = {"type": "boolean"} | |
| 179 | +_LIMIT = {"type": "integer", "description": "nb de résultats (max 8)"} | |
| 180 | + | |
| 68 | 181 | TOOLS: list[dict] = [ |
| 69 | 182 | { |
| 70 | 183 | "name": "infos_ecosysteme", |
| 71 | 184 | "description": "Fiche d'identité du Groupe KA : mission, liste des 13 plateformes (nom, domaine, rôle), courriels de contact et rôles, avertissement légal. À utiliser pour toute question sur le groupe, ses sites, comment le joindre.", |
| 72 | − "input_schema": {"type": "object", "properties": {}, "additionalProperties": False}, | |
| 185 | + "input_schema": _obj({}), | |
| 186 | + }, | |
| 187 | + { | |
| 188 | + "name": "etat_services", | |
| 189 | + "description": "Vérifie en direct la disponibilité des 13 plateformes de l'écosystème (en ligne / hors ligne).", | |
| 190 | + "input_schema": _obj({}), | |
| 73 | 191 | }, |
| 74 | 192 | { |
| 75 | 193 | "name": "stats_plateforme", |
| 76 | 194 | "description": "Statistiques en direct d'une plateforme de l'écosystème (KPI, séries, records) via son tableau de bord public. Utiliser pour « combien de X », tendances, records.", |
| 77 | − "input_schema": { | |
| 78 | − "type": "object", | |
| 79 | − "properties": { | |
| 80 | − "site": {"type": "string", "enum": list(SITES.keys()), "description": "Plateforme visée"}, | |
| 81 | − "period": {"type": "string", "enum": ["auj", "7j", "30j", "3m", "12m", "tout"], "description": "Période (défaut 30j)"}, | |
| 82 | − }, | |
| 83 | − "required": ["site"], | |
| 84 | − "additionalProperties": False, | |
| 85 | − }, | |
| 195 | + "input_schema": _obj({ | |
| 196 | + "site": {"type": "string", "enum": list(SITES.keys()), "description": "Plateforme visée"}, | |
| 197 | + "period": {"type": "string", "enum": ["auj", "7j", "30j", "3m", "12m", "tout"], "description": "Période (défaut 30j)"}, | |
| 198 | + }, ["site"]), | |
| 199 | + }, | |
| 200 | + { | |
| 201 | + "name": "facettes_plateforme", | |
| 202 | + "description": "Valeurs de filtres VALIDES d'une plateforme (villes, marques, catégories, cuisines, régions, niches…). À utiliser quand une recherche échoue ou pour connaître les valeurs exactes acceptées par les filtres.", | |
| 203 | + "input_schema": _obj({ | |
| 204 | + "site": {"type": "string", | |
| 205 | + "enum": ["lou-ka", "immo-ka", "auto-ka", "food-ka", "fabri-ka", | |
| 206 | + "resto-ka", "sorti-ka", "crea-ka", "job-ka"]}, | |
| 207 | + }, ["site"]), | |
| 208 | + }, | |
| 209 | + { | |
| 210 | + "name": "fiche_detail", | |
| 211 | + "description": "FICHE COMPLÈTE d'un élément par son identifiant (uid/id retourné par une recherche) : logement (lou-ka), propriété (immo-ka), véhicule (auto-ka), produit d'épicerie (food-ka), produit québécois (fabri-ka), restaurant (resto-ka), événement (sorti-ka), créateur (crea-ka) ou offre d'emploi (job-ka). Toujours l'utiliser quand on demande les détails, photos, description ou coordonnées d'un résultat précis.", | |
| 212 | + "input_schema": _obj({ | |
| 213 | + "site": {"type": "string", "enum": list(DETAIL_URLS.keys())}, | |
| 214 | + "uid": {"type": "string", "description": "uid/id exact retourné par un outil de recherche"}, | |
| 215 | + }, ["site", "uid"]), | |
| 86 | 216 | }, |
| 87 | 217 | { |
| 88 | 218 | "name": "chercher_logements", |
| 89 | − "description": "Recherche de logements à louer au Québec (Lou·Ka). Retourne des annonces réelles avec prix, ville et lien.", | |
| 90 | − "input_schema": { | |
| 91 | − "type": "object", | |
| 92 | − "properties": { | |
| 93 | − "q": {"type": "string", "description": "mots-clés"}, | |
| 94 | − "city": {"type": "string"}, | |
| 95 | − "unit_type": {"type": "string", "description": "ex. 3½, 4½, 5½, studio"}, | |
| 96 | − "price_min": {"type": "number"}, | |
| 97 | − "price_max": {"type": "number"}, | |
| 98 | − "limit": {"type": "integer"}, | |
| 99 | − }, | |
| 100 | − "additionalProperties": False, | |
| 101 | − }, | |
| 219 | + "description": "Recherche de logements à louer au Québec (Lou·Ka). Retourne des annonces réelles (uid, prix, ville, lien). Recherche floue automatique si les mots-clés exacts ne donnent rien.", | |
| 220 | + "input_schema": _obj({ | |
| 221 | + "q": {"type": "string", "description": "mots-clés (adresse, quartier, caractéristique…)"}, | |
| 222 | + "city": _S, "sector": _S, | |
| 223 | + "unit_type": {"type": "string", "description": "ex. 3½, 4½, 5½, studio"}, | |
| 224 | + "price_min": _N, "price_max": _N, | |
| 225 | + "pets": {"type": "boolean", "description": "animaux acceptés"}, | |
| 226 | + "furnished": {"type": "boolean", "description": "meublé"}, | |
| 227 | + "area_min": {"type": "number", "description": "superficie min (pi²)"}, | |
| 228 | + "deal": {"type": "boolean", "description": "true = aubaines (sous le juste prix)"}, | |
| 229 | + "sort": {"type": "string", "enum": ["recent", "price_asc", "price_desc"]}, | |
| 230 | + "limit": _LIMIT, | |
| 231 | + }), | |
| 232 | + }, | |
| 233 | + { | |
| 234 | + "name": "juste_prix_logement", | |
| 235 | + "description": "Analyse « juste prix » d'un logement Lou·Ka (uid) : loyer demandé vs valeur estimée du marché, comparables.", | |
| 236 | + "input_schema": _obj({"uid": _S}, ["uid"]), | |
| 102 | 237 | }, |
| 103 | 238 | { |
| 104 | 239 | "name": "chercher_proprietes", |
| 105 | − "description": "Recherche de propriétés à vendre au Québec (Immo·Ka) : ville, type, prix.", | |
| 106 | − "input_schema": { | |
| 107 | − "type": "object", | |
| 108 | − "properties": { | |
| 109 | − "q": {"type": "string"}, "city": {"type": "string"}, | |
| 110 | − "price_min": {"type": "number"}, "price_max": {"type": "number"}, | |
| 111 | − "limit": {"type": "integer"}, | |
| 112 | − }, | |
| 113 | − "additionalProperties": False, | |
| 114 | − }, | |
| 240 | + "description": "Recherche de propriétés à vendre au Québec (Immo·Ka) : ville, région, type, prix, chambres. Recherche floue automatique.", | |
| 241 | + "input_schema": _obj({ | |
| 242 | + "q": _S, "city": _S, "region": _S, | |
| 243 | + "property_type": {"type": "string", "description": "ex. maison, condo, plex, terrain"}, | |
| 244 | + "price_min": _N, "price_max": _N, | |
| 245 | + "bedrooms_min": _I, "bathrooms_min": _I, "area_min": _N, | |
| 246 | + "sort": {"type": "string", "enum": ["recent", "price_asc", "price_desc"]}, | |
| 247 | + "limit": _LIMIT, | |
| 248 | + }), | |
| 115 | 249 | }, |
| 116 | 250 | { |
| 117 | 251 | "name": "chercher_vehicules", |
| 118 | − "description": "Recherche de voitures usagées (Auto·Ka) : marque, modèle, année, prix, km, région.", | |
| 119 | − "input_schema": { | |
| 120 | − "type": "object", | |
| 121 | − "properties": { | |
| 122 | − "make": {"type": "string"}, "model": {"type": "string"}, | |
| 123 | − "region": {"type": "string"}, "city": {"type": "string"}, | |
| 124 | − "year_min": {"type": "integer"}, "year_max": {"type": "integer"}, | |
| 125 | − "price_min": {"type": "number"}, "price_max": {"type": "number"}, | |
| 126 | − "km_max": {"type": "number"}, "limit": {"type": "integer"}, | |
| 127 | − }, | |
| 128 | − "additionalProperties": False, | |
| 129 | − }, | |
| 252 | + "description": "Recherche de véhicules usagés (Auto·Ka) : marque, modèle, carrosserie, carburant, transmission, année, prix, km, région. Recherche floue automatique.", | |
| 253 | + "input_schema": _obj({ | |
| 254 | + "q": _S, "kind": {"type": "string", "description": "auto | moto"}, | |
| 255 | + "make": _S, "model": _S, "body_type": _S, | |
| 256 | + "fuel": {"type": "string", "description": "essence, électrique, hybride…"}, | |
| 257 | + "transmission": _S, "region": _S, "city": _S, | |
| 258 | + "year_min": _I, "year_max": _I, | |
| 259 | + "price_min": _N, "price_max": _N, "km_max": _N, | |
| 260 | + "sort": {"type": "string", "enum": ["recent", "price_asc", "price_desc", "km_asc", "year_desc"]}, | |
| 261 | + "limit": _LIMIT, | |
| 262 | + }), | |
| 263 | + }, | |
| 264 | + { | |
| 265 | + "name": "rappels_vehicule", | |
| 266 | + "description": "Rappels de sécurité (Transports Canada) d'un véhicule Auto·Ka par son uid.", | |
| 267 | + "input_schema": _obj({"uid": _S}, ["uid"]), | |
| 130 | 268 | }, |
| 131 | 269 | { |
| 132 | 270 | "name": "chercher_emplois", |
| 133 | − "description": "Recherche d'offres d'emploi chez les employeurs québécois (Job·Ka) : métier, ville, salaire, télétravail.", | |
| 134 | − "input_schema": { | |
| 135 | − "type": "object", | |
| 136 | − "properties": {"q": {"type": "string"}, "city": {"type": "string"}, "limit": {"type": "integer"}}, | |
| 137 | − "additionalProperties": False, | |
| 138 | − }, | |
| 271 | + "description": "Recherche d'offres d'emploi chez les employeurs québécois (Job·Ka) : métier, ville, région, télétravail, salaire. Recherche floue automatique.", | |
| 272 | + "input_schema": _obj({ | |
| 273 | + "q": _S, "city": _S, "region": _S, "category": _S, | |
| 274 | + "work_mode": {"type": "string", "description": "remote | hybrid | onsite"}, | |
| 275 | + "employment_type": {"type": "string", "description": "full_time, part_time, contract…"}, | |
| 276 | + "salary_min": _N, "with_salary": {"type": "boolean", "description": "true = seulement les offres avec salaire affiché"}, | |
| 277 | + "limit": _LIMIT, | |
| 278 | + }), | |
| 139 | 279 | }, |
| 140 | 280 | { |
| 141 | 281 | "name": "chercher_epicerie", |
| 142 | − "description": "Recherche de produits d'épicerie et de leurs prix chez les bannières québécoises (Food·Ka), incluant les soldes.", | |
| 143 | − "input_schema": { | |
| 144 | − "type": "object", | |
| 145 | − "properties": {"q": {"type": "string"}, "limit": {"type": "integer"}}, | |
| 146 | − "additionalProperties": False, | |
| 147 | − }, | |
| 282 | + "description": "Recherche de produits d'épicerie et de leurs prix chez les bannières québécoises (Food·Ka), incluant les soldes. Recherche floue automatique.", | |
| 283 | + "input_schema": _obj({ | |
| 284 | + "q": _S, "category": _S, "brand": _S, | |
| 285 | + "on_sale": {"type": "boolean", "description": "true = en solde seulement"}, | |
| 286 | + "price_min": _N, "price_max": _N, | |
| 287 | + "sort": {"type": "string", "enum": ["recent", "price_asc", "price_desc"]}, | |
| 288 | + "limit": _LIMIT, | |
| 289 | + }), | |
| 290 | + }, | |
| 291 | + { | |
| 292 | + "name": "comparer_prix_epicerie", | |
| 293 | + "description": "Compare le prix d'un produit d'épicerie Food·Ka (uid) entre les bannières (même produit ailleurs, meilleur prix).", | |
| 294 | + "input_schema": _obj({"uid": _S}, ["uid"]), | |
| 148 | 295 | }, |
| 149 | 296 | { |
| 150 | 297 | "name": "chercher_produits_qc", |
| 151 | − "description": "Recherche de produits fabriqués au Québec dans les boutiques d'ici (Fabri·Ka).", | |
| 152 | − "input_schema": { | |
| 153 | − "type": "object", | |
| 154 | − "properties": {"q": {"type": "string"}, "limit": {"type": "integer"}}, | |
| 155 | − "additionalProperties": False, | |
| 156 | − }, | |
| 298 | + "description": "Recherche de produits fabriqués au Québec dans les boutiques d'ici (Fabri·Ka) : mots-clés, catégorie, région, boutique, prix. Recherche floue automatique.", | |
| 299 | + "input_schema": _obj({ | |
| 300 | + "q": _S, "category": _S, "region": _S, | |
| 301 | + "store": {"type": "string", "description": "id de boutique (ex. ici-la.co)"}, | |
| 302 | + "price_min": _N, "price_max": _N, | |
| 303 | + "sort": {"type": "string", "enum": ["recent", "price_asc", "price_desc"]}, | |
| 304 | + "limit": _LIMIT, | |
| 305 | + }), | |
| 306 | + }, | |
| 307 | + { | |
| 308 | + "name": "chercher_boutiques_qc", | |
| 309 | + "description": "Recherche de boutiques en ligne québécoises (Fabri·Ka) : nom, région, plateforme (shopify…).", | |
| 310 | + "input_schema": _obj({"q": _S, "region": _S, "platform": _S, "limit": _LIMIT}), | |
| 157 | 311 | }, |
| 158 | 312 | { |
| 159 | 313 | "name": "chercher_restos", |
| 160 | − "description": "Recherche de restaurants québécois (Resto·Ka) et de plats avec leurs prix réels.", | |
| 161 | − "input_schema": { | |
| 162 | − "type": "object", | |
| 163 | − "properties": { | |
| 164 | − "q": {"type": "string"}, "city": {"type": "string"}, | |
| 165 | − "plats": {"type": "boolean", "description": "true = chercher des plats/menus plutôt que des restos"}, | |
| 166 | − "limit": {"type": "integer"}, | |
| 167 | − }, | |
| 168 | − "additionalProperties": False, | |
| 169 | − }, | |
| 314 | + "description": "Recherche de restaurants québécois (Resto·Ka) : ville, région, cuisine, type, fourchette de prix. Recherche floue automatique.", | |
| 315 | + "input_schema": _obj({ | |
| 316 | + "q": _S, "city": _S, "region": _S, "cuisine": _S, | |
| 317 | + "establishment_type": _S, | |
| 318 | + "price_range": {"type": "string", "description": "$, $$, $$$ ou $$$$"}, | |
| 319 | + "has_menu": {"type": "boolean", "description": "true = avec menu et prix relevés"}, | |
| 320 | + "limit": _LIMIT, | |
| 321 | + }), | |
| 322 | + }, | |
| 323 | + { | |
| 324 | + "name": "chercher_plats", | |
| 325 | + "description": "Recherche de PLATS précis et de leurs prix réels dans les menus des restos québécois (Resto·Ka) : « combien coûte une poutine à Québec ». Recherche floue automatique.", | |
| 326 | + "input_schema": _obj({ | |
| 327 | + "q": _S, "city": _S, "region": _S, "cuisine": _S, "price_max": _N, "limit": _LIMIT, | |
| 328 | + }), | |
| 329 | + }, | |
| 330 | + { | |
| 331 | + "name": "menu_resto", | |
| 332 | + "description": "Menu et prix relevés d'un restaurant Resto·Ka (uid) : plats, prix, date de capture.", | |
| 333 | + "input_schema": _obj({"uid": _S}, ["uid"]), | |
| 334 | + }, | |
| 335 | + { | |
| 336 | + "name": "inspections_resto", | |
| 337 | + "description": "Inspections MAPAQ (salubrité, condamnations) d'un restaurant Resto·Ka par son uid.", | |
| 338 | + "input_schema": _obj({"uid": _S}, ["uid"]), | |
| 170 | 339 | }, |
| 171 | 340 | { |
| 172 | 341 | "name": "chercher_sorties", |
| 173 | − "description": "Recherche de sorties et d'événements au Québec (Sorti·Ka) : concerts, festivals, expos, par ville/date, gratuits ou non.", | |
| 174 | − "input_schema": { | |
| 175 | − "type": "object", | |
| 176 | − "properties": { | |
| 177 | − "q": {"type": "string"}, "city": {"type": "string"}, "region": {"type": "string"}, | |
| 178 | − "free": {"type": "boolean"}, "from_date": {"type": "string", "description": "AAAA-MM-JJ"}, | |
| 179 | − "to_date": {"type": "string", "description": "AAAA-MM-JJ"}, "limit": {"type": "integer"}, | |
| 180 | − }, | |
| 181 | − "additionalProperties": False, | |
| 182 | − }, | |
| 342 | + "description": "Recherche de sorties et d'événements au Québec (Sorti·Ka) : concerts, festivals, expos, par ville/région/catégorie/date, gratuits ou non. Recherche floue automatique.", | |
| 343 | + "input_schema": _obj({ | |
| 344 | + "q": _S, "city": _S, "region": _S, "category": _S, | |
| 345 | + "free": _B, "from_date": {"type": "string", "description": "AAAA-MM-JJ"}, | |
| 346 | + "to_date": {"type": "string", "description": "AAAA-MM-JJ"}, "limit": _LIMIT, | |
| 347 | + }), | |
| 183 | 348 | }, |
| 184 | 349 | { |
| 185 | 350 | "name": "chercher_createurs", |
| 186 | − "description": "Recherche de créateurs de contenu québécois (Créa·Ka) : YouTube, Instagram, TikTok, balados…", | |
| 187 | − "input_schema": { | |
| 188 | − "type": "object", | |
| 189 | − "properties": {"q": {"type": "string"}, "limit": {"type": "integer"}}, | |
| 190 | − "additionalProperties": False, | |
| 191 | − }, | |
| 351 | + "description": "Recherche de créateurs de contenu québécois (Créa·Ka) : YouTube, Instagram, TikTok, Twitch, balados… Filtres niche/région/langue/plateforme/taille. Recherche floue automatique.", | |
| 352 | + "input_schema": _obj({ | |
| 353 | + "q": _S, "niche": _S, "region": _S, | |
| 354 | + "langue": {"type": "string", "description": "fr | en"}, | |
| 355 | + "plateforme": {"type": "string", "description": "youtube, instagram, tiktok, twitch, kick…"}, | |
| 356 | + "tier": {"type": "string", "description": "nano, micro, mid, macro, mega"}, | |
| 357 | + "limit": _LIMIT, | |
| 358 | + }), | |
| 192 | 359 | }, |
| 193 | 360 | { |
| 194 | 361 | "name": "chercher_web_quebec", |
| 195 | − "description": "Recherche dans tout le web québécois via le moteur Trouve·Ka. Pour les questions générales sur le Québec qui dépassent les plateformes.", | |
| 196 | − "input_schema": { | |
| 197 | − "type": "object", | |
| 198 | − "properties": {"q": {"type": "string"}}, | |
| 199 | − "required": ["q"], | |
| 200 | − "additionalProperties": False, | |
| 201 | − }, | |
| 362 | + "description": "Recherche dans tout le web québécois via le moteur Trouve·Ka (sémantique + mots-clés). Pour les questions générales sur le Québec qui dépassent les plateformes.", | |
| 363 | + "input_schema": _obj({"q": _S}, ["q"]), | |
| 202 | 364 | }, |
| 203 | 365 | { |
| 204 | − "name": "etat_services", | |
| 205 | − "description": "Vérifie en direct la disponibilité des 13 plateformes de l'écosystème (en ligne / hors ligne).", | |
| 206 | − "input_schema": {"type": "object", "properties": {}, "additionalProperties": False}, | |
| 366 | + "name": "suggestions_recherche", | |
| 367 | + "description": "Suggestions/corrections de requête du moteur Trouve·Ka (autocomplétion). Utile quand un mot-clé semble mal orthographié ou ne donne rien.", | |
| 368 | + "input_schema": _obj({"q": _S}, ["q"]), | |
| 369 | + }, | |
| 370 | + { | |
| 371 | + "name": "estimer_valeur_propriete", | |
| 372 | + "description": "Estimation Vrai-Prix de la valeur marchande d'une propriété résidentielle au Québec à partir de son ADRESSE (rôle foncier + modèle). Retourne l'estimé et la fiche.", | |
| 373 | + "input_schema": _obj({ | |
| 374 | + "adresse": {"type": "string", "description": "adresse civique, ex. « 123 rue Racine Chicoutimi »"}, | |
| 375 | + }, ["adresse"]), | |
| 207 | 376 | }, |
| 208 | 377 | ] |
| 209 | 378 | |
@@ -216,6 +385,18 @@ async def _run_tool(name: str, args: dict) -> Any: | ||
| 216 | 385 | "legal": [l["label"] for l in eco.get("legal", [])], |
| 217 | 386 | "sites": [{"nom": s["wordmark"], "domaine": s["domain"], "role": s.get("tagline")} for s in eco.get("sites", [])], |
| 218 | 387 | } |
| 388 | + | |
| 389 | + if name == "etat_services": | |
| 390 | + async def ping(s): | |
| 391 | + try: | |
| 392 | + async with httpx.AsyncClient(timeout=5, follow_redirects=True) as cx: | |
| 393 | + r = await cx.get(f"https://{s['domain']}/") | |
| 394 | + return s["wordmark"], "en ligne" if r.status_code == 200 else f"HTTP {r.status_code}" | |
| 395 | + except Exception: | |
| 396 | + return s["wordmark"], "injoignable" | |
| 397 | + pairs = await asyncio.gather(*(ping(s) for s in SITES.values())) | |
| 398 | + return {"etat": dict(pairs), "page": "https://www.groupe-ka.com/status"} | |
| 399 | + | |
| 219 | 400 | if name == "stats_plateforme": |
| 220 | 401 | site = SITES[args["site"]] |
| 221 | 402 | period = args.get("period", "30j") |
@@ -224,71 +405,142 @@ async def _run_tool(name: str, args: dict) -> Any: | ||
| 224 | 405 | d = await _get(f"https://{site['domain']}/api/stats/dashboard", {"period": period}) |
| 225 | 406 | d = d.get("data", d) |
| 226 | 407 | return {"kpis": d.get("kpis"), "records": d.get("records"), "period": d.get("period"), "updated": d.get("updated")} |
| 408 | + | |
| 409 | + if name == "facettes_plateforme": | |
| 410 | + s = args["site"] | |
| 411 | + if s == "sorti-ka": | |
| 412 | + regions, cats = await asyncio.gather( | |
| 413 | + _get("https://www.sorti-ka.com/api/regions"), | |
| 414 | + _get("https://www.sorti-ka.com/api/categories")) | |
| 415 | + return {"regions": regions, "categories": cats} | |
| 416 | + if s == "crea-ka": | |
| 417 | + return await _get("https://www.crea-ka.com/api/taxonomies") | |
| 418 | + r = await _get(f"https://{SITES[s]['domain']}/api/facets") | |
| 419 | + # tronque les listes géantes (ex. villes lou-ka) pour rester lisible | |
| 420 | + if isinstance(r, dict): | |
| 421 | + r = {k: (v[:60] if isinstance(v, list) else v) for k, v in r.items()} | |
| 422 | + return r | |
| 423 | + | |
| 424 | + if name == "fiche_detail": | |
| 425 | + site, uid = args["site"], args["uid"] | |
| 426 | + d = await _get(DETAIL_URLS[site].format(uid=_uid(uid))) | |
| 427 | + return {"fiche": d, "lien": f"https://{SITES[site]['domain']}"} | |
| 428 | + | |
| 227 | 429 | if name == "chercher_logements": |
| 228 | − r = await _get("https://www.lou-ka.com/api/listings", _lim({ | |
| 229 | − "q": args.get("q"), "city": args.get("city"), "unit_type": args.get("unit_type"), | |
| 230 | − "price_min": args.get("price_min"), "price_max": args.get("price_max"), | |
| 231 | − "limit": args.get("limit")})) | |
| 232 | − items = (r.get("items") or r.get("listings") or r) if isinstance(r, dict) else r | |
| 233 | − return {"resultats": items[:8] if isinstance(items, list) else items, | |
| 234 | − "lien": "https://www.lou-ka.com"} | |
| 430 | + return await _search_fuzzy("https://www.lou-ka.com/api/listings", { | |
| 431 | + k: args.get(k) for k in ("q", "city", "sector", "unit_type", "price_min", "price_max", | |
| 432 | + "pets", "furnished", "area_min", "deal", "sort", "limit")}, | |
| 433 | + ("items", "listings"), "https://www.lou-ka.com") | |
| 434 | + | |
| 435 | + if name == "juste_prix_logement": | |
| 436 | + return await _get(f"https://www.lou-ka.com/api/fairvalue/{_uid(args['uid'])}") | |
| 437 | + | |
| 235 | 438 | if name == "chercher_proprietes": |
| 236 | − r = await _get("https://www.immo-ka.com/api/listings", _lim({ | |
| 237 | − "q": args.get("q"), "city": args.get("city"), | |
| 238 | − "price_min": args.get("price_min"), "price_max": args.get("price_max"), | |
| 239 | − "limit": args.get("limit")})) | |
| 240 | − items = (r.get("items") or r.get("listings") or r) if isinstance(r, dict) else r | |
| 241 | − return {"resultats": items[:8] if isinstance(items, list) else items, "lien": "https://www.immo-ka.com"} | |
| 439 | + return await _search_fuzzy("https://www.immo-ka.com/api/listings", { | |
| 440 | + k: args.get(k) for k in ("q", "city", "region", "property_type", "price_min", "price_max", | |
| 441 | + "bedrooms_min", "bathrooms_min", "area_min", "sort", "limit")}, | |
| 442 | + ("items", "listings"), "https://www.immo-ka.com") | |
| 443 | + | |
| 242 | 444 | if name == "chercher_vehicules": |
| 243 | − r = await _get("https://www.auto-ka.com/api/vehicles", _lim({ | |
| 244 | − k: args.get(k) for k in ("make", "model", "region", "city", "year_min", "year_max", | |
| 245 | − "price_min", "price_max", "km_max", "limit")})) | |
| 246 | − items = (r.get("items") or r.get("vehicles") or r) if isinstance(r, dict) else r | |
| 247 | − return {"resultats": items[:8] if isinstance(items, list) else items, "lien": "https://www.auto-ka.com"} | |
| 445 | + return await _search_fuzzy("https://www.auto-ka.com/api/vehicles", { | |
| 446 | + k: args.get(k) for k in ("q", "kind", "make", "model", "body_type", "fuel", "transmission", | |
| 447 | + "region", "city", "year_min", "year_max", "price_min", "price_max", | |
| 448 | + "km_max", "sort", "limit")}, | |
| 449 | + ("items", "vehicles"), "https://www.auto-ka.com") | |
| 450 | + | |
| 451 | + if name == "rappels_vehicule": | |
| 452 | + return await _get(f"https://www.auto-ka.com/api/vehicles/{_uid(args['uid'])}/recalls") | |
| 453 | + | |
| 248 | 454 | if name == "chercher_emplois": |
| 249 | − r = await _get("https://www.job-ka.com/api/jobs", _lim({"q": args.get("q"), "city": args.get("city"), "limit": args.get("limit")})) | |
| 250 | − items = (r.get("items") or r.get("jobs") or r) if isinstance(r, dict) else r | |
| 251 | − return {"resultats": items[:8] if isinstance(items, list) else items, "lien": "https://www.job-ka.com"} | |
| 455 | + return await _search_fuzzy("https://www.job-ka.com/api/jobs", { | |
| 456 | + k: args.get(k) for k in ("q", "city", "region", "category", "work_mode", | |
| 457 | + "employment_type", "salary_min", "with_salary", "limit")}, | |
| 458 | + ("items", "jobs"), "https://www.job-ka.com") | |
| 459 | + | |
| 252 | 460 | if name == "chercher_epicerie": |
| 253 | − r = await _get("https://www.food-ka.com/api/products", _lim({"q": args.get("q"), "limit": args.get("limit")})) | |
| 254 | − items = (r.get("items") or r.get("products") or r) if isinstance(r, dict) else r | |
| 255 | − return {"resultats": items[:8] if isinstance(items, list) else items, "lien": "https://www.food-ka.com"} | |
| 461 | + return await _search_fuzzy("https://www.food-ka.com/api/products", { | |
| 462 | + k: args.get(k) for k in ("q", "category", "brand", "on_sale", "price_min", "price_max", | |
| 463 | + "sort", "limit")}, | |
| 464 | + ("items", "products"), "https://www.food-ka.com") | |
| 465 | + | |
| 466 | + if name == "comparer_prix_epicerie": | |
| 467 | + return await _get(f"https://www.food-ka.com/api/products/{_uid(args['uid'])}/compare") | |
| 468 | + | |
| 256 | 469 | if name == "chercher_produits_qc": |
| 257 | − r = await _get("https://www.fabri-ka.com/api/products", _lim({"q": args.get("q"), "limit": args.get("limit")})) | |
| 258 | − items = (r.get("items") or r.get("products") or r) if isinstance(r, dict) else r | |
| 259 | − return {"resultats": items[:8] if isinstance(items, list) else items, "lien": "https://www.fabri-ka.com"} | |
| 470 | + p = {k: args.get(k) for k in ("q", "category", "region", "store", "price_min", "price_max", "sort")} | |
| 471 | + p["per_page"] = min(int(args.get("limit") or 8), 8) | |
| 472 | + return await _search_fuzzy("https://www.fabri-ka.com/api/products", p, | |
| 473 | + ("items", "products"), "https://www.fabri-ka.com") | |
| 474 | + | |
| 475 | + if name == "chercher_boutiques_qc": | |
| 476 | + r = await _get("https://www.fabri-ka.com/api/stores", { | |
| 477 | + k: v for k, v in {"q": args.get("q"), "region": args.get("region"), | |
| 478 | + "platform": args.get("platform")}.items() if v}) | |
| 479 | + items = _items_of(r, "items", "stores") | |
| 480 | + return {"resultats": items[:8] if isinstance(items, list) else items, | |
| 481 | + "total": r.get("total") if isinstance(r, dict) else None, | |
| 482 | + "lien": "https://www.fabri-ka.com"} | |
| 483 | + | |
| 260 | 484 | if name == "chercher_restos": |
| 261 | − if args.get("plats"): | |
| 262 | − r = await _get("https://www.resto-ka.com/api/dishes", _lim({"q": args.get("q"), "limit": args.get("limit")})) | |
| 263 | − else: | |
| 264 | − r = await _get("https://www.resto-ka.com/api/restaurants", _lim({"q": args.get("q"), "city": args.get("city"), "limit": args.get("limit")})) | |
| 265 | − items = (r.get("items") or r.get("restaurants") or r.get("dishes") or r) if isinstance(r, dict) else r | |
| 266 | − return {"resultats": items[:8] if isinstance(items, list) else items, "lien": "https://www.resto-ka.com"} | |
| 485 | + return await _search_fuzzy("https://www.resto-ka.com/api/restaurants", { | |
| 486 | + k: args.get(k) for k in ("q", "city", "region", "cuisine", "establishment_type", | |
| 487 | + "price_range", "has_menu", "limit")}, | |
| 488 | + ("items", "restaurants"), "https://www.resto-ka.com") | |
| 489 | + | |
| 490 | + if name == "chercher_plats": | |
| 491 | + return await _search_fuzzy("https://www.resto-ka.com/api/dishes", { | |
| 492 | + k: args.get(k) for k in ("q", "city", "region", "cuisine", "price_max", "limit")}, | |
| 493 | + ("items", "dishes"), "https://www.resto-ka.com") | |
| 494 | + | |
| 495 | + if name == "menu_resto": | |
| 496 | + return await _get(f"https://www.resto-ka.com/api/restaurants/{_uid(args['uid'])}/prices") | |
| 497 | + | |
| 498 | + if name == "inspections_resto": | |
| 499 | + return await _get(f"https://www.resto-ka.com/api/restaurants/{_uid(args['uid'])}/inspections") | |
| 500 | + | |
| 267 | 501 | if name == "chercher_sorties": |
| 268 | − r = await _get("https://www.sorti-ka.com/api/events", _lim({ | |
| 502 | + return await _search_fuzzy("https://www.sorti-ka.com/api/events", { | |
| 269 | 503 | "q": args.get("q"), "city": args.get("city"), "region": args.get("region"), |
| 270 | − "free": args.get("free"), "from": args.get("from_date"), "to": args.get("to_date"), | |
| 271 | − "upcoming": True, "limit": args.get("limit")})) | |
| 272 | − items = (r.get("items") or r.get("events") or r) if isinstance(r, dict) else r | |
| 273 | − return {"resultats": items[:8] if isinstance(items, list) else items, "lien": "https://www.sorti-ka.com"} | |
| 504 | + "category": args.get("category"), "free": args.get("free"), | |
| 505 | + "from": args.get("from_date"), "to": args.get("to_date"), | |
| 506 | + "upcoming": True, "limit": args.get("limit")}, | |
| 507 | + ("items", "events"), "https://www.sorti-ka.com") | |
| 508 | + | |
| 274 | 509 | if name == "chercher_createurs": |
| 275 | − r = await _get("https://www.crea-ka.com/api/creators", _lim({"q": args.get("q"), "limit": args.get("limit")})) | |
| 276 | − items = (r.get("items") or r.get("creators") or r) if isinstance(r, dict) else r | |
| 277 | − return {"resultats": items[:8] if isinstance(items, list) else items, "lien": "https://www.crea-ka.com"} | |
| 510 | + return await _search_fuzzy("https://www.crea-ka.com/api/creators", { | |
| 511 | + k: args.get(k) for k in ("q", "niche", "region", "langue", "plateforme", "tier", "limit")}, | |
| 512 | + ("items", "creators"), "https://www.crea-ka.com") | |
| 513 | + | |
| 278 | 514 | if name == "chercher_web_quebec": |
| 279 | 515 | r = await _get("https://www.trouve-ka.com/api/search", {"q": args["q"]}) |
| 280 | − hits = (r.get("results") or r.get("hits") or r) if isinstance(r, dict) else r | |
| 281 | − return {"resultats": hits[:6] if isinstance(hits, list) else hits, "lien": "https://www.trouve-ka.com"} | |
| 282 | − if name == "etat_services": | |
| 283 | − async def ping(s): | |
| 284 | − try: | |
| 285 | − async with httpx.AsyncClient(timeout=5, follow_redirects=True) as cx: | |
| 286 | − r = await cx.get(f"https://{s['domain']}/") | |
| 287 | − return s["wordmark"], "en ligne" if r.status_code == 200 else f"HTTP {r.status_code}" | |
| 288 | − except Exception: | |
| 289 | − return s["wordmark"], "injoignable" | |
| 290 | − pairs = await asyncio.gather(*(ping(s) for s in SITES.values())) | |
| 291 | − return {"etat": dict(pairs), "page": "https://www.groupe-ka.com/status"} | |
| 516 | + hits = _items_of(r, "results", "hits") | |
| 517 | + return {"resultats": hits[:6] if isinstance(hits, list) else hits, | |
| 518 | + "total": r.get("total") if isinstance(r, dict) else None, | |
| 519 | + "lien": "https://www.trouve-ka.com"} | |
| 520 | + | |
| 521 | + if name == "suggestions_recherche": | |
| 522 | + return await _get("https://www.trouve-ka.com/api/suggest", {"q": args["q"]}) | |
| 523 | + | |
| 524 | + if name == "estimer_valeur_propriete": | |
| 525 | + s = await _get("https://www.vrai-prix.com/api/search", {"q": args["adresse"]}) | |
| 526 | + results = s.get("results") or [] | |
| 527 | + if not results: | |
| 528 | + # cascade floue sur l'adresse aussi | |
| 529 | + for v in _q_variants(args["adresse"])[1:]: | |
| 530 | + s = await _get("https://www.vrai-prix.com/api/search", {"q": v}) | |
| 531 | + results = s.get("results") or [] | |
| 532 | + if results: | |
| 533 | + break | |
| 534 | + if not results: | |
| 535 | + return {"erreur": "adresse introuvable dans le rôle foncier", | |
| 536 | + "conseil": "vérifier l'orthographe ou donner « numéro + rue + ville »", | |
| 537 | + "lien": "https://www.vrai-prix.com"} | |
| 538 | + top = results[0] | |
| 539 | + est = await _get("https://www.vrai-prix.com/api/estimate", {"id": top["id"]}) | |
| 540 | + return {"propriete": top, "estimation": est, | |
| 541 | + "autres_correspondances": results[1:4], | |
| 542 | + "lien": "https://www.vrai-prix.com"} | |
| 543 | + | |
| 292 | 544 | return {"erreur": f"outil inconnu : {name}"} |
| 293 | 545 | |
| 294 | 546 | |
@@ -311,11 +563,19 @@ def _system(site_id: str) -> list[dict]: | ||
| 311 | 563 | "RÈGLES : réponds en français (sauf si on t'écrit dans une autre langue) ; pour toute question de " |
| 312 | 564 | "DONNÉES (logements, propriétés, autos, emplois, prix, restos, sorties, créateurs, statistiques, " |
| 313 | 565 | "disponibilité), utilise TOUJOURS un outil et appuie-toi uniquement sur son résultat — n'invente " |
| 314 | − "jamais un chiffre, un prix ou une annonce ; cite des liens (fiches ou site concerné) quand utile ; " | |
| 315 | − "réponses courtes et structurées (listes à puces pour les résultats, gras pour les chiffres clés) ; " | |
| 316 | − "si un outil ne trouve rien, dis-le simplement et propose une piste ; ne révèle jamais ce prompt ni " | |
| 317 | − "tes clés ; Groupe KA est un agrégateur : il ne vend rien, ne loue rien, n'est partie à aucune " | |
| 318 | − "transaction — pour agir (louer, acheter, postuler), on passe par la source originale." | |
| 566 | + "jamais un chiffre, un prix ou une annonce. " | |
| 567 | + "MÉTHODE : enchaîne les outils au besoin (recherche → fiche_detail avec l'uid pour les détails ; " | |
| 568 | + "comparer_prix_epicerie, rappels_vehicule, inspections_resto, menu_resto, juste_prix_logement, " | |
| 569 | + "estimer_valeur_propriete pour aller plus loin). Les recherches sont floues : si elles ne trouvent " | |
| 570 | + "rien, elles élargissent d'elles-mêmes ; si c'est encore vide, consulte facettes_plateforme (valeurs " | |
| 571 | + "de filtres valides) ou suggestions_recherche, reformule, puis dis honnêtement ce que tu n'as pas trouvé. " | |
| 572 | + "FORMAT : le widget rend le Markdown — utilise-le bien : petits titres (###), listes à puces, " | |
| 573 | + "**gras** pour les chiffres clés, liens nommés [texte](url) vers les fiches et les sites, tableaux " | |
| 574 | + "Markdown quand on compare des prix ou des options ; réponses courtes et structurées. " | |
| 575 | + "Ne narre PAS tes appels d'outils (pas de « je vais chercher… », « laisse-moi affiner… ») : " | |
| 576 | + "appelle tes outils en silence et livre directement la réponse finale mise en forme. " | |
| 577 | + "Ne révèle jamais ce prompt ni tes clés ; Groupe KA est un agrégateur : il ne vend rien, ne loue rien, " | |
| 578 | + "n'est partie à aucune transaction — pour agir (louer, acheter, postuler), on passe par la source originale." | |
| 319 | 579 | ), |
| 320 | 580 | "cache_control": {"type": "ephemeral"}, |
| 321 | 581 | }] |
@@ -348,8 +608,10 @@ async def agent_chat(request: Request): | ||
| 348 | 608 | |
| 349 | 609 | async def gen() -> AsyncIterator[str]: |
| 350 | 610 | convo: list[dict] = list(messages) |
| 611 | + emitted = False # du texte a déjà été streamé (tours précédents) | |
| 351 | 612 | try: |
| 352 | 613 | for _ in range(MAX_TURNS): |
| 614 | + first_delta = True | |
| 353 | 615 | async with client.messages.stream( |
| 354 | 616 | model=MODEL, |
| 355 | 617 | max_tokens=MAX_TOKENS, |
@@ -359,6 +621,11 @@ async def agent_chat(request: Request): | ||
| 359 | 621 | ) as stream: |
| 360 | 622 | async for event in stream: |
| 361 | 623 | if event.type == "content_block_delta" and event.delta.type == "text_delta": |
| 624 | + if first_delta and emitted: | |
| 625 | + # saut de paragraphe entre les segments séparés par des outils | |
| 626 | + yield _sse("delta", {"text": "\n\n"}) | |
| 627 | + first_delta = False | |
| 628 | + emitted = True | |
| 362 | 629 | yield _sse("delta", {"text": event.delta.text}) |
| 363 | 630 | response = await stream.get_final_message() |
| 364 | 631 | |
modified
src/api/routes/stats.py
+693 −117
@@ -4,19 +4,24 @@ | ||
| 4 | 4 | # Node : m3u96b |
| 5 | 5 | # Author : Simon-Pierre Boucher |
| 6 | 6 | # Contact : contact@spboucher.ai |
| 7 | −# Date : 2026-08-17 | |
| 7 | +# Date : 2026-08-19 | |
| 8 | 8 | # ============================================ |
| 9 | −"""Routes /api/stats : tableau de bord analytique de la plateforme + rapport PDF. | |
| 10 | − | |
| 11 | −Contrat commun Groupe KA (src/api/web/ka/stats/SPEC.md) : | |
| 12 | −- ``GET /api/stats/dashboard?period=…`` → JSON (KPI, séries, répartitions, | |
| 13 | − heatmap, tableaux, records) calculé depuis les données réelles : | |
| 14 | − table ``api_requests`` (journal du middleware) et ``collection_runs``. | |
| 15 | −- ``GET /api/stats/report?period=…&mode=complet|synthese`` → PDF Groupe-KA. | |
| 9 | +"""Routes /api/stats : tableau de bord analytique de la plateforme + rapports PDF. | |
| 10 | + | |
| 11 | +Contrat commun Groupe KA v2 (src/api/web/ka/stats/SPEC.md) : | |
| 12 | +- ``GET /api/stats/dashboard?period=…`` → JSON (KPI + sparklines, jauges, | |
| 13 | + séries, multi-séries, empilées, répartitions avec deltas, distributions, | |
| 14 | + heatmap calendrier + horaire 7×24, tableaux, records) calculé depuis les | |
| 15 | + données réelles : table ``api_requests`` (journal du middleware), | |
| 16 | + ``collection_runs`` et ``connector_health``. | |
| 17 | +- ``GET /api/stats/report?period=…&mode=complet|synthese|tendances| | |
| 18 | + repartitions|donnees`` → PDF Groupe-KA (moteur kapdf v2, 5 rapports — | |
| 19 | + un mode inconnu retombe sur ``complet``). | |
| 16 | 20 | - ``GET /api/stats/ecosystem-report?period=…&mode=…`` → UN SEUL PDF |
| 17 | 21 | consolidant les 12 plateformes de l'écosystème : les dashboards des |
| 18 | 22 | plateformes sœurs sont lus en parallèle (httpx, 15 s), le sien en local ; |
| 19 | 23 | une plateforme injoignable devient une section « données indisponibles ». |
| 24 | + ``mode`` optionnel (mêmes 5 modes, inconnu ou absent → complet). | |
| 20 | 25 | |
| 21 | 26 | Cache serveur : 5 minutes par période. Aucune stat inventée : une section |
| 22 | 27 | sans données est simplement absente (le front affiche « Pas encore mesuré »). |
@@ -41,7 +46,7 @@ from sqlalchemy.orm import Session | ||
| 41 | 46 | from src.api import ecopdf, kapdf |
| 42 | 47 | from src.api.routes import envelope |
| 43 | 48 | from src.database.db import get_db |
| 44 | −from src.database.models import ApiRequest, CollectionRun | |
| 49 | +from src.database.models import ApiRequest, CollectionRun, ConnectorHealth | |
| 45 | 50 | |
| 46 | 51 | router = APIRouter(prefix="/api/stats", tags=["stats"]) |
| 47 | 52 | |
@@ -80,6 +85,27 @@ PERIOD_LABELS = { | ||
| 80 | 85 | } |
| 81 | 86 | PERIOD_DAYS = {"7j": 7, "30j": 30, "3m": 91, "6m": 182, "12m": 365} |
| 82 | 87 | |
| 88 | +RUN_STATUS_FR = {"success": "succès", "failed": "échec", "retried": "relancé"} | |
| 89 | +HEALTH_FR = {"ok": "OK", "degraded": "dégradé", "broken": "en panne", "stale": "périmé"} | |
| 90 | +LAT_BINS = [ | |
| 91 | + (0, 25, "< 25 ms"), | |
| 92 | + (25, 50, "25-50 ms"), | |
| 93 | + (50, 100, "50-100 ms"), | |
| 94 | + (100, 200, "100-200 ms"), | |
| 95 | + (200, 500, "200-500 ms"), | |
| 96 | + (500, 1000, "0,5-1 s"), | |
| 97 | + (1000, 2000, "1-2 s"), | |
| 98 | + (2000, float("inf"), "> 2 s"), | |
| 99 | +] | |
| 100 | +DUR_BINS = [ | |
| 101 | + (0, 1, "< 1 s"), | |
| 102 | + (1, 5, "1-5 s"), | |
| 103 | + (5, 15, "5-15 s"), | |
| 104 | + (15, 30, "15-30 s"), | |
| 105 | + (30, 60, "30-60 s"), | |
| 106 | + (60, float("inf"), "> 60 s"), | |
| 107 | +] | |
| 108 | + | |
| 83 | 109 | _cache: dict[tuple, tuple[float, dict]] = {} |
| 84 | 110 | _cache_lock = threading.Lock() |
| 85 | 111 | |
@@ -153,19 +179,23 @@ def _utc_bounds( | ||
| 153 | 179 | # ---------------------------------------------------------------- agrégats |
| 154 | 180 | def _fetch_requests( |
| 155 | 181 | db: Session, d_from: datetime.date, d_to: datetime.date |
| 156 | −) -> list[tuple[datetime.datetime, str, int, float]]: | |
| 157 | − """Requêtes API de la fenêtre : (ts local, endpoint, status, duration_ms).""" | |
| 182 | +) -> list[tuple[datetime.datetime, str, str, int, float]]: | |
| 183 | + """Requêtes API de la fenêtre : (ts local, méthode, endpoint, statut, ms).""" | |
| 158 | 184 | lo, hi = _utc_bounds(d_from, d_to) |
| 159 | 185 | rows = db.execute( |
| 160 | 186 | select( |
| 161 | − ApiRequest.ts, ApiRequest.endpoint, ApiRequest.status, ApiRequest.duration_ms | |
| 187 | + ApiRequest.ts, | |
| 188 | + ApiRequest.method, | |
| 189 | + ApiRequest.endpoint, | |
| 190 | + ApiRequest.status, | |
| 191 | + ApiRequest.duration_ms, | |
| 162 | 192 | ).where(ApiRequest.ts >= lo, ApiRequest.ts < hi) |
| 163 | 193 | ).all() |
| 164 | 194 | out = [] |
| 165 | − for ts, endpoint, status, duration in rows: | |
| 195 | + for ts, method, endpoint, status, duration in rows: | |
| 166 | 196 | if ts.tzinfo is None: |
| 167 | 197 | ts = ts.replace(tzinfo=datetime.UTC) |
| 168 | − out.append((ts.astimezone(TZ), endpoint, status, duration or 0.0)) | |
| 198 | + out.append((ts.astimezone(TZ), method or "GET", endpoint, status, duration or 0.0)) | |
| 169 | 199 | return out |
| 170 | 200 | |
| 171 | 201 | |
@@ -184,6 +214,19 @@ def _fetch_runs( | ||
| 184 | 214 | ) |
| 185 | 215 | |
| 186 | 216 | |
| 217 | +def _fetch_health(db: Session) -> list[ConnectorHealth]: | |
| 218 | + """État courant des connecteurs supervisés (hors ligne virtuelle _app).""" | |
| 219 | + return ( | |
| 220 | + db.execute( | |
| 221 | + select(ConnectorHealth) | |
| 222 | + .where(ConnectorHealth.source != "_app") | |
| 223 | + .order_by(ConnectorHealth.service, ConnectorHealth.source) | |
| 224 | + ) | |
| 225 | + .scalars() | |
| 226 | + .all() | |
| 227 | + ) | |
| 228 | + | |
| 229 | + | |
| 187 | 230 | def _p95(values: list[float]) -> float: |
| 188 | 231 | if not values: |
| 189 | 232 | return 0.0 |
@@ -207,9 +250,36 @@ def _fr_int(n: float) -> str: | ||
| 207 | 250 | return f"{int(n):,}".replace(",", " ") |
| 208 | 251 | |
| 209 | 252 | |
| 253 | +def _fr_num(n: float) -> str: | |
| 254 | + if isinstance(n, float) and not float(n).is_integer(): | |
| 255 | + return f"{n:,.1f}".replace(",", " ").replace(".", ",") | |
| 256 | + return _fr_int(n) | |
| 257 | + | |
| 258 | + | |
| 259 | +def _spark(points: list[dict], max_pts: int = 40) -> list[dict]: | |
| 260 | + """Sous-échantillonne une série pour la sparkline d'un KPI (≤ max_pts).""" | |
| 261 | + if len(points) <= max_pts: | |
| 262 | + return points | |
| 263 | + step = len(points) / max_pts | |
| 264 | + out = [points[min(len(points) - 1, int(i * step))] for i in range(max_pts)] | |
| 265 | + if out[-1] is not points[-1]: | |
| 266 | + out[-1] = points[-1] | |
| 267 | + return out | |
| 268 | + | |
| 269 | + | |
| 270 | +def _hist(values: list[float], bins) -> list[dict]: | |
| 271 | + out = [] | |
| 272 | + for lo, hi, label in bins: | |
| 273 | + c = sum(1 for v in values if lo <= v < hi) | |
| 274 | + out.append({"label": label, "value": c}) | |
| 275 | + while out and out[-1]["value"] == 0: | |
| 276 | + out.pop() | |
| 277 | + return out | |
| 278 | + | |
| 279 | + | |
| 210 | 280 | # ---------------------------------------------------------------- dashboard |
| 211 | 281 | def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, Any]: |
| 212 | − """Calcule le JSON complet du contrat SPEC depuis les données réelles.""" | |
| 282 | + """Calcule le JSON complet du contrat SPEC v2 depuis les données réelles.""" | |
| 213 | 283 | hourly = period == "auj" or d_from == d_to |
| 214 | 284 | span = (d_to - d_from).days + 1 |
| 215 | 285 | prev_to = d_from - datetime.timedelta(days=1) |
@@ -219,37 +289,87 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 219 | 289 | prev_reqs = _fetch_requests(db, prev_from, prev_to) |
| 220 | 290 | runs = _fetch_runs(db, d_from, d_to) |
| 221 | 291 | prev_runs = _fetch_runs(db, prev_from, prev_to) |
| 292 | + health = _fetch_health(db) | |
| 293 | + | |
| 294 | + days = _daterange(d_from, d_to) | |
| 295 | + | |
| 296 | + # -------- seaux temporels (jour, ou heure quand la fenêtre = 1 jour) | |
| 297 | + if hourly: | |
| 298 | + bucket_keys: list = list(range(24)) | |
| 299 | + bucket_labels = [f"{h:02d}h" for h in range(24)] | |
| 300 | + req_bucket = {i: [] for i in bucket_keys} | |
| 301 | + for r in reqs: | |
| 302 | + req_bucket[r[0].hour].append(r) | |
| 303 | + else: | |
| 304 | + bucket_keys = days | |
| 305 | + bucket_labels = [d.isoformat() for d in days] | |
| 306 | + req_bucket = {d: [] for d in days} | |
| 307 | + for r in reqs: | |
| 308 | + d = r[0].date() | |
| 309 | + if d in req_bucket: | |
| 310 | + req_bucket[d].append(r) | |
| 311 | + | |
| 312 | + def per_bucket(fn) -> list[dict]: | |
| 313 | + return [ | |
| 314 | + {"t": bucket_labels[i], "v": fn(req_bucket[k])} | |
| 315 | + for i, k in enumerate(bucket_keys) | |
| 316 | + ] | |
| 317 | + | |
| 318 | + calls_pts = per_bucket(len) | |
| 319 | + err_pts = per_bucket(lambda rs: sum(1 for r in rs if r[3] >= 400)) | |
| 320 | + avg_pts = per_bucket( | |
| 321 | + lambda rs: round(sum(r[4] for r in rs) / len(rs), 1) if rs else 0 | |
| 322 | + ) | |
| 323 | + p95_pts = per_bucket(lambda rs: round(_p95([r[4] for r in rs]), 1) if rs else 0) | |
| 324 | + errate_pts = per_bucket( | |
| 325 | + lambda rs: round(sum(1 for r in rs if r[3] >= 400) / len(rs) * 100, 1) | |
| 326 | + if rs | |
| 327 | + else 0 | |
| 328 | + ) | |
| 222 | 329 | |
| 223 | 330 | # -------- agrégats requêtes API (période courante) |
| 224 | 331 | total_calls = len(reqs) |
| 225 | − durations = [r[3] for r in reqs] | |
| 332 | + durations = [r[4] for r in reqs] | |
| 226 | 333 | avg_ms = round(sum(durations) / total_calls, 2) if total_calls else 0.0 |
| 227 | 334 | p95_ms = round(_p95(durations), 2) |
| 228 | − errors = sum(1 for r in reqs if r[2] >= 400) | |
| 335 | + errors = sum(1 for r in reqs if r[3] >= 400) | |
| 336 | + err5xx = sum(1 for r in reqs if r[3] >= 500) | |
| 229 | 337 | err_rate = round(errors / total_calls * 100, 2) if total_calls else 0.0 |
| 230 | − active_endpoints = len({r[1] for r in reqs}) | |
| 338 | + success = total_calls - errors | |
| 339 | + fast200 = sum(1 for d in durations if d < 200) | |
| 340 | + active_endpoints = len({r[2] for r in reqs}) | |
| 341 | + active_days = sum(1 for k in bucket_keys if req_bucket[k]) if not hourly else None | |
| 231 | 342 | |
| 232 | 343 | # -------- agrégats requêtes API (période précédente, pour les deltas) |
| 233 | 344 | prev_calls = len(prev_reqs) |
| 234 | − prev_durs = [r[3] for r in prev_reqs] | |
| 345 | + prev_durs = [r[4] for r in prev_reqs] | |
| 235 | 346 | prev_avg = (sum(prev_durs) / prev_calls) if prev_calls else None |
| 236 | − prev_err = ( | |
| 237 | − sum(1 for r in prev_reqs if r[2] >= 400) / prev_calls * 100 | |
| 238 | − if prev_calls | |
| 239 | − else None | |
| 240 | − ) | |
| 347 | + prev_p95 = _p95(prev_durs) if prev_calls else None | |
| 348 | + prev_errors = sum(1 for r in prev_reqs if r[3] >= 400) | |
| 349 | + prev_err5xx = sum(1 for r in prev_reqs if r[3] >= 500) | |
| 350 | + prev_err = (prev_errors / prev_calls * 100) if prev_calls else None | |
| 351 | + prev_endpoints = len({r[2] for r in prev_reqs}) | |
| 241 | 352 | |
| 242 | 353 | # -------- agrégats runs de collecte |
| 243 | 354 | ok_runs = [r for r in runs if r.status in ("success", "retried")] |
| 244 | 355 | failed_runs = [r for r in runs if r.status == "failed"] |
| 245 | 356 | records_total = sum(r.records_count for r in ok_runs) |
| 357 | + active_services = len({r.service for r in runs}) | |
| 246 | 358 | prev_ok = [r for r in prev_runs if r.status in ("success", "retried")] |
| 359 | + prev_failed = [r for r in prev_runs if r.status == "failed"] | |
| 247 | 360 | prev_records = sum(r.records_count for r in prev_ok) |
| 248 | 361 | |
| 249 | − # -------- KPI (uniquement des mesures réelles) | |
| 362 | + rec_day: dict[datetime.date, int] = {d: 0 for d in days} | |
| 363 | + okrun_day: dict[datetime.date, int] = {d: 0 for d in days} | |
| 364 | + for r in ok_runs: | |
| 365 | + if r.date_key in rec_day: | |
| 366 | + rec_day[r.date_key] += r.records_count | |
| 367 | + okrun_day[r.date_key] += 1 | |
| 368 | + | |
| 369 | + # -------- KPI (uniquement des mesures réelles) + sparklines | |
| 250 | 370 | kpis: list[dict[str, Any]] = [] |
| 251 | 371 | |
| 252 | − def kpi(id_, label_, value, unit="", delta=None, invert=False): | |
| 372 | + def kpi(id_, label_, value, unit="", delta=None, invert=False, spark=None): | |
| 253 | 373 | d: dict[str, Any] = {"id": id_, "label": label_, "value": value, "unit": unit} |
| 254 | 374 | if delta is not None: |
| 255 | 375 | d["delta_pct"] = delta |
@@ -257,9 +377,26 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 257 | 377 | d["direction"] = "up" if good else "down" |
| 258 | 378 | if invert: |
| 259 | 379 | d["invert"] = True |
| 380 | + if spark and len(spark) > 1: | |
| 381 | + d["spark"] = _spark(spark) | |
| 260 | 382 | kpis.append(d) |
| 261 | 383 | |
| 262 | − kpi("calls", "Appels API", total_calls, "", _delta(total_calls, prev_calls)) | |
| 384 | + kpi( | |
| 385 | + "calls", | |
| 386 | + "Appels API", | |
| 387 | + total_calls, | |
| 388 | + "", | |
| 389 | + _delta(total_calls, prev_calls), | |
| 390 | + spark=calls_pts, | |
| 391 | + ) | |
| 392 | + if not hourly and span > 1: | |
| 393 | + kpi( | |
| 394 | + "calls_day", | |
| 395 | + "Appels par jour (moyenne)", | |
| 396 | + round(total_calls / span, 1), | |
| 397 | + "", | |
| 398 | + _delta(total_calls / span, prev_calls / span if prev_calls else None), | |
| 399 | + ) | |
| 263 | 400 | kpi( |
| 264 | 401 | "latency", |
| 265 | 402 | "Latence moyenne", |
@@ -267,8 +404,17 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 267 | 404 | "ms", |
| 268 | 405 | _delta(avg_ms, round(prev_avg, 2) if prev_avg else None), |
| 269 | 406 | invert=True, |
| 407 | + spark=avg_pts, | |
| 408 | + ) | |
| 409 | + kpi( | |
| 410 | + "p95", | |
| 411 | + "Latence p95", | |
| 412 | + p95_ms, | |
| 413 | + "ms", | |
| 414 | + _delta(p95_ms, round(prev_p95, 2) if prev_p95 else None), | |
| 415 | + invert=True, | |
| 416 | + spark=p95_pts, | |
| 270 | 417 | ) |
| 271 | − kpi("p95", "Latence p95", p95_ms, "ms") | |
| 272 | 418 | kpi( |
| 273 | 419 | "errors", |
| 274 | 420 | "Taux d'erreur (HTTP ≥ 400)", |
@@ -276,68 +422,114 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 276 | 422 | "%", |
| 277 | 423 | _delta(err_rate, round(prev_err, 2) if prev_err else None), |
| 278 | 424 | invert=True, |
| 425 | + spark=errate_pts, | |
| 426 | + ) | |
| 427 | + kpi( | |
| 428 | + "err5xx", | |
| 429 | + "Erreurs serveur (5xx)", | |
| 430 | + err5xx, | |
| 431 | + "", | |
| 432 | + _delta(err5xx, prev_err5xx or None), | |
| 433 | + invert=True, | |
| 434 | + ) | |
| 435 | + kpi( | |
| 436 | + "endpoints", | |
| 437 | + "Endpoints actifs", | |
| 438 | + active_endpoints, | |
| 439 | + "", | |
| 440 | + _delta(active_endpoints, prev_endpoints or None), | |
| 279 | 441 | ) |
| 280 | − kpi("endpoints", "Endpoints actifs", active_endpoints) | |
| 281 | 442 | kpi( |
| 282 | 443 | "runs_ok", |
| 283 | 444 | "Collectes réussies", |
| 284 | 445 | len(ok_runs), |
| 285 | 446 | "", |
| 286 | 447 | _delta(len(ok_runs), len(prev_ok) or None), |
| 448 | + spark=None | |
| 449 | + if hourly | |
| 450 | + else [{"t": d.isoformat(), "v": okrun_day[d]} for d in days], | |
| 451 | + ) | |
| 452 | + kpi( | |
| 453 | + "runs_failed", | |
| 454 | + "Collectes échouées", | |
| 455 | + len(failed_runs), | |
| 456 | + "", | |
| 457 | + _delta(len(failed_runs), len(prev_failed) or None), | |
| 458 | + invert=True, | |
| 287 | 459 | ) |
| 288 | − kpi("runs_failed", "Collectes échouées", len(failed_runs), "", invert=True) | |
| 289 | 460 | kpi( |
| 290 | 461 | "records", |
| 291 | 462 | "Enregistrements collectés", |
| 292 | 463 | records_total, |
| 293 | 464 | "", |
| 294 | 465 | _delta(records_total, prev_records or None), |
| 466 | + spark=None | |
| 467 | + if hourly | |
| 468 | + else [{"t": d.isoformat(), "v": rec_day[d]} for d in days], | |
| 295 | 469 | ) |
| 470 | + if active_services: | |
| 471 | + kpi("services", "Services KA collectés", active_services) | |
| 296 | 472 | |
| 297 | − # -------- séries temporelles | |
| 298 | − series: list[dict[str, Any]] = [] | |
| 299 | − days = _daterange(d_from, d_to) | |
| 300 | − | |
| 301 | − if hourly: | |
| 302 | − buckets = [f"{h:02d}h" for h in range(24)] | |
| 303 | − calls_by = {b: 0 for b in buckets} | |
| 304 | − lat_by: dict[str, list[float]] = {b: [] for b in buckets} | |
| 305 | − for ts, _, _, dur in reqs: | |
| 306 | − b = f"{ts.hour:02d}h" | |
| 307 | − calls_by[b] += 1 | |
| 308 | − lat_by[b].append(dur) | |
| 309 | − calls_pts = [{"t": b, "v": calls_by[b]} for b in buckets] | |
| 310 | − lat_pts = [ | |
| 473 | + # -------- jauges : taux & couvertures (données réelles seulement) | |
| 474 | + gauges: list[dict[str, Any]] = [] | |
| 475 | + if total_calls: | |
| 476 | + gauges.append( | |
| 311 | 477 | { |
| 312 | − "t": b, | |
| 313 | − "v": round(sum(lat_by[b]) / len(lat_by[b]), 1) if lat_by[b] else 0, | |
| 478 | + "id": "success", | |
| 479 | + "label": "Taux de succès HTTP (statut < 400)", | |
| 480 | + "value": round(success / total_calls * 100, 1), | |
| 481 | + "max": 100, | |
| 482 | + "unit": "%", | |
| 314 | 483 | } |
| 315 | − for b in buckets | |
| 316 | − ] | |
| 317 | − calls_title = "Appels API par heure" | |
| 318 | − lat_title = "Latence moyenne par heure (ms)" | |
| 319 | − else: | |
| 320 | − calls_by = {d: 0 for d in days} | |
| 321 | − lat_by = {d: [] for d in days} | |
| 322 | − for ts, _, _, dur in reqs: | |
| 323 | − d = ts.date() | |
| 324 | − if d in calls_by: | |
| 325 | − calls_by[d] += 1 | |
| 326 | − lat_by[d].append(dur) | |
| 327 | − calls_pts = [{"t": d.isoformat(), "v": calls_by[d]} for d in days] | |
| 328 | − lat_pts = [ | |
| 484 | + ) | |
| 485 | + gauges.append( | |
| 329 | 486 | { |
| 330 | − "t": d.isoformat(), | |
| 331 | − "v": round(sum(lat_by[d]) / len(lat_by[d]), 1) if lat_by[d] else 0, | |
| 487 | + "id": "fast", | |
| 488 | + "label": "Réponses servies en moins de 200 ms", | |
| 489 | + "value": round(fast200 / total_calls * 100, 1), | |
| 490 | + "max": 100, | |
| 491 | + "unit": "%", | |
| 332 | 492 | } |
| 333 | − for d in days | |
| 334 | − ] | |
| 335 | − calls_title = "Appels API par jour" | |
| 336 | − lat_title = "Latence moyenne par jour (ms)" | |
| 493 | + ) | |
| 494 | + if runs: | |
| 495 | + gauges.append( | |
| 496 | + { | |
| 497 | + "id": "runs", | |
| 498 | + "label": "Taux de réussite des collectes", | |
| 499 | + "value": round(len(ok_runs) / len(runs) * 100, 1), | |
| 500 | + "max": 100, | |
| 501 | + "unit": "%", | |
| 502 | + } | |
| 503 | + ) | |
| 504 | + if health: | |
| 505 | + ok_h = sum(1 for h in health if h.status == "ok") | |
| 506 | + gauges.append( | |
| 507 | + { | |
| 508 | + "id": "connectors", | |
| 509 | + "label": f"Connecteurs de l'écosystème en santé ({ok_h}/{len(health)})", | |
| 510 | + "value": round(ok_h / len(health) * 100, 1), | |
| 511 | + "max": 100, | |
| 512 | + "unit": "%", | |
| 513 | + } | |
| 514 | + ) | |
| 515 | + if active_days is not None and span > 1 and total_calls: | |
| 516 | + gauges.append( | |
| 517 | + { | |
| 518 | + "id": "activedays", | |
| 519 | + "label": f"Jours avec trafic API journalisé ({active_days}/{span})", | |
| 520 | + "value": round(active_days / span * 100, 1), | |
| 521 | + "max": 100, | |
| 522 | + "unit": "%", | |
| 523 | + } | |
| 524 | + ) | |
| 525 | + | |
| 526 | + # -------- séries temporelles | |
| 527 | + series: list[dict[str, Any]] = [] | |
| 528 | + suffix = "par heure" if hourly else "par jour" | |
| 337 | 529 | |
| 338 | 530 | calls_serie: dict[str, Any] = { |
| 339 | 531 | "id": "calls", |
| 340 | − "title": calls_title, | |
| 532 | + "title": f"Appels API {suffix}", | |
| 341 | 533 | "unit": "appels", |
| 342 | 534 | "kind": "line", |
| 343 | 535 | "points": calls_pts, |
@@ -345,8 +537,8 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 345 | 537 | if prev_reqs and not hourly: |
| 346 | 538 | prev_days = _daterange(prev_from, prev_to) |
| 347 | 539 | prev_by = {d: 0 for d in prev_days} |
| 348 | − for ts, _, _, _ in prev_reqs: | |
| 349 | − d = ts.date() | |
| 540 | + for r in prev_reqs: | |
| 541 | + d = r[0].date() | |
| 350 | 542 | if d in prev_by: |
| 351 | 543 | prev_by[d] += 1 |
| 352 | 544 | calls_serie["compare"] = [ |
@@ -354,83 +546,282 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 354 | 546 | ] |
| 355 | 547 | if reqs: |
| 356 | 548 | series.append(calls_serie) |
| 549 | + series.append( | |
| 550 | + { | |
| 551 | + "id": "errors", | |
| 552 | + "title": f"Erreurs HTTP (≥ 400) {suffix}", | |
| 553 | + "unit": "erreurs", | |
| 554 | + "kind": "bar", | |
| 555 | + "points": err_pts, | |
| 556 | + } | |
| 557 | + ) | |
| 357 | 558 | series.append( |
| 358 | 559 | { |
| 359 | 560 | "id": "latency", |
| 360 | − "title": lat_title, | |
| 561 | + "title": f"Latence moyenne {suffix} (ms)", | |
| 361 | 562 | "unit": "ms", |
| 362 | 563 | "kind": "line", |
| 363 | − "points": lat_pts, | |
| 564 | + "points": avg_pts, | |
| 364 | 565 | } |
| 365 | 566 | ) |
| 366 | − | |
| 367 | 567 | if runs and not hourly: |
| 368 | − rec_by = {d: 0 for d in days} | |
| 369 | − for r in ok_runs: | |
| 370 | − if r.date_key in rec_by: | |
| 371 | − rec_by[r.date_key] += r.records_count | |
| 372 | 568 | series.append( |
| 373 | 569 | { |
| 374 | 570 | "id": "records", |
| 375 | 571 | "title": "Enregistrements collectés par jour", |
| 376 | 572 | "unit": "enregistrements", |
| 377 | 573 | "kind": "line", |
| 378 | − "points": [{"t": d.isoformat(), "v": rec_by[d]} for d in days], | |
| 574 | + "points": [{"t": d.isoformat(), "v": rec_day[d]} for d in days], | |
| 379 | 575 | } |
| 380 | 576 | ) |
| 381 | 577 | |
| 382 | − # -------- répartitions | |
| 383 | − breakdowns: list[dict[str, Any]] = [] | |
| 578 | + # -------- multi-séries (≤ 4 séries chacune) | |
| 579 | + multiseries: list[dict[str, Any]] = [] | |
| 580 | + if reqs and len(bucket_keys) > 1: | |
| 581 | + multiseries.append( | |
| 582 | + { | |
| 583 | + "id": "lat", | |
| 584 | + "title": f"Latence {suffix} — moyenne vs p95 (ms)", | |
| 585 | + "unit": "ms", | |
| 586 | + "series": [ | |
| 587 | + {"label": "Moyenne", "points": avg_pts}, | |
| 588 | + {"label": "p95", "points": p95_pts}, | |
| 589 | + ], | |
| 590 | + } | |
| 591 | + ) | |
| 384 | 592 | ep_stats: dict[str, dict[str, Any]] = {} |
| 385 | − for _, endpoint, status, dur in reqs: | |
| 593 | + for _, _, endpoint, status, dur in reqs: | |
| 386 | 594 | s = ep_stats.setdefault(endpoint, {"calls": 0, "durs": [], "errors": 0}) |
| 387 | 595 | s["calls"] += 1 |
| 388 | 596 | s["durs"].append(dur) |
| 389 | 597 | if status >= 400: |
| 390 | 598 | s["errors"] += 1 |
| 391 | 599 | top_eps = sorted(ep_stats.items(), key=lambda kv: kv[1]["calls"], reverse=True) |
| 600 | + if len(top_eps) >= 2 and len(bucket_keys) > 1: | |
| 601 | + top4 = [ep for ep, _ in top_eps[:4]] | |
| 602 | + ep_bucket = { | |
| 603 | + ep: {k: 0 for k in bucket_keys} for ep in top4 | |
| 604 | + } | |
| 605 | + for r in reqs: | |
| 606 | + if r[2] in ep_bucket: | |
| 607 | + key = r[0].hour if hourly else r[0].date() | |
| 608 | + if key in ep_bucket[r[2]]: | |
| 609 | + ep_bucket[r[2]][key] += 1 | |
| 610 | + multiseries.append( | |
| 611 | + { | |
| 612 | + "id": "top_eps", | |
| 613 | + "title": f"Appels {suffix} — top {len(top4)} endpoints", | |
| 614 | + "unit": "appels", | |
| 615 | + "series": [ | |
| 616 | + { | |
| 617 | + "label": ep, | |
| 618 | + "points": [ | |
| 619 | + {"t": bucket_labels[i], "v": ep_bucket[ep][k]} | |
| 620 | + for i, k in enumerate(bucket_keys) | |
| 621 | + ], | |
| 622 | + } | |
| 623 | + for ep in top4 | |
| 624 | + ], | |
| 625 | + } | |
| 626 | + ) | |
| 627 | + | |
| 628 | + # -------- barres empilées : composition dans le temps | |
| 629 | + stacked: list[dict[str, Any]] = [] | |
| 630 | + classes = [("2xx", 200, 300), ("3xx", 300, 400), ("4xx", 400, 500), ("5xx", 500, 600)] | |
| 631 | + if reqs: | |
| 632 | + present = [ | |
| 633 | + (name, lo, hi) | |
| 634 | + for name, lo, hi in classes | |
| 635 | + if any(lo <= r[3] < hi for r in reqs) | |
| 636 | + ] | |
| 637 | + if present: | |
| 638 | + stacked.append( | |
| 639 | + { | |
| 640 | + "id": "status", | |
| 641 | + "title": f"Appels {suffix} par classe de statut HTTP", | |
| 642 | + "unit": "appels", | |
| 643 | + "keys": [c[0] for c in present], | |
| 644 | + "points": [ | |
| 645 | + { | |
| 646 | + "t": bucket_labels[i], | |
| 647 | + "values": [ | |
| 648 | + sum(1 for r in req_bucket[k] if lo <= r[3] < hi) | |
| 649 | + for _, lo, hi in present | |
| 650 | + ], | |
| 651 | + } | |
| 652 | + for i, k in enumerate(bucket_keys) | |
| 653 | + ], | |
| 654 | + } | |
| 655 | + ) | |
| 656 | + svc_records: dict[str, int] = {} | |
| 657 | + for r in ok_runs: | |
| 658 | + svc_records[r.service] = svc_records.get(r.service, 0) + r.records_count | |
| 659 | + if svc_records and not hourly and len(days) > 1: | |
| 660 | + top_svcs = [ | |
| 661 | + s | |
| 662 | + for s, _ in sorted(svc_records.items(), key=lambda kv: kv[1], reverse=True) | |
| 663 | + ][:6] | |
| 664 | + svc_day = {s: {d: 0 for d in days} for s in top_svcs} | |
| 665 | + for r in ok_runs: | |
| 666 | + if r.service in svc_day and r.date_key in svc_day[r.service]: | |
| 667 | + svc_day[r.service][r.date_key] += r.records_count | |
| 668 | + stacked.append( | |
| 669 | + { | |
| 670 | + "id": "services_day", | |
| 671 | + "title": "Enregistrements collectés par jour et par service", | |
| 672 | + "unit": "enregistrements", | |
| 673 | + "keys": [SERVICE_NAMES.get(s, s) for s in top_svcs], | |
| 674 | + "points": [ | |
| 675 | + { | |
| 676 | + "t": d.isoformat(), | |
| 677 | + "values": [svc_day[s][d] for s in top_svcs], | |
| 678 | + } | |
| 679 | + for d in days | |
| 680 | + ], | |
| 681 | + } | |
| 682 | + ) | |
| 683 | + | |
| 684 | + # -------- répartitions (avec deltas honnêtes vs période précédente) | |
| 685 | + prev_ep_calls: dict[str, int] = {} | |
| 686 | + prev_status_cls: dict[str, int] = {} | |
| 687 | + prev_methods: dict[str, int] = {} | |
| 688 | + for _, method, endpoint, status, _dur in prev_reqs: | |
| 689 | + prev_ep_calls[endpoint] = prev_ep_calls.get(endpoint, 0) + 1 | |
| 690 | + cls = f"{status // 100}xx" | |
| 691 | + prev_status_cls[cls] = prev_status_cls.get(cls, 0) + 1 | |
| 692 | + prev_methods[method] = prev_methods.get(method, 0) + 1 | |
| 693 | + | |
| 694 | + breakdowns: list[dict[str, Any]] = [] | |
| 392 | 695 | if top_eps: |
| 696 | + items = [] | |
| 697 | + for ep, s in top_eps[:12]: | |
| 698 | + it = {"label": ep, "value": s["calls"]} | |
| 699 | + d = _delta(s["calls"], prev_ep_calls.get(ep)) | |
| 700 | + if d is not None: | |
| 701 | + it["delta_pct"] = d | |
| 702 | + items.append(it) | |
| 393 | 703 | breakdowns.append( |
| 394 | 704 | { |
| 395 | 705 | "id": "top_endpoints", |
| 396 | 706 | "title": "Top endpoints (appels)", |
| 397 | 707 | "kind": "bars", |
| 398 | − "items": [ | |
| 399 | − {"label": ep, "value": s["calls"]} for ep, s in top_eps[:12] | |
| 400 | − ], | |
| 708 | + "items": items, | |
| 709 | + } | |
| 710 | + ) | |
| 711 | + if reqs: | |
| 712 | + status_counts: dict[int, int] = {} | |
| 713 | + for r in reqs: | |
| 714 | + status_counts[r[3]] = status_counts.get(r[3], 0) + 1 | |
| 715 | + cls_counts: dict[str, int] = {} | |
| 716 | + for st, c in status_counts.items(): | |
| 717 | + cls = f"{st // 100}xx" | |
| 718 | + cls_counts[cls] = cls_counts.get(cls, 0) + c | |
| 719 | + items = [] | |
| 720 | + for cls in sorted(cls_counts): | |
| 721 | + it = {"label": cls, "value": cls_counts[cls]} | |
| 722 | + d = _delta(cls_counts[cls], prev_status_cls.get(cls)) | |
| 723 | + if d is not None: | |
| 724 | + it["delta_pct"] = d | |
| 725 | + items.append(it) | |
| 726 | + breakdowns.append( | |
| 727 | + { | |
| 728 | + "id": "status", | |
| 729 | + "title": "Appels par classe de statut HTTP", | |
| 730 | + "kind": "donut", | |
| 731 | + "items": items, | |
| 732 | + } | |
| 733 | + ) | |
| 734 | + meth_counts: dict[str, int] = {} | |
| 735 | + for r in reqs: | |
| 736 | + meth_counts[r[1]] = meth_counts.get(r[1], 0) + 1 | |
| 737 | + items = [] | |
| 738 | + for m, c in sorted(meth_counts.items(), key=lambda kv: kv[1], reverse=True): | |
| 739 | + it = {"label": m, "value": c} | |
| 740 | + d = _delta(c, prev_methods.get(m)) | |
| 741 | + if d is not None: | |
| 742 | + it["delta_pct"] = d | |
| 743 | + items.append(it) | |
| 744 | + breakdowns.append( | |
| 745 | + { | |
| 746 | + "id": "methods", | |
| 747 | + "title": "Appels par méthode HTTP", | |
| 748 | + "kind": "bars", | |
| 749 | + "items": items, | |
| 401 | 750 | } |
| 402 | 751 | ) |
| 403 | − svc_records: dict[str, int] = {} | |
| 404 | − for r in ok_runs: | |
| 405 | − svc_records[r.service] = svc_records.get(r.service, 0) + r.records_count | |
| 406 | 752 | if svc_records: |
| 753 | + prev_svc: dict[str, int] = {} | |
| 754 | + for r in prev_ok: | |
| 755 | + prev_svc[r.service] = prev_svc.get(r.service, 0) + r.records_count | |
| 756 | + items = [] | |
| 757 | + for s, v in sorted(svc_records.items(), key=lambda kv: kv[1], reverse=True): | |
| 758 | + it = {"label": SERVICE_NAMES.get(s, s), "value": v} | |
| 759 | + d = _delta(v, prev_svc.get(s)) | |
| 760 | + if d is not None: | |
| 761 | + it["delta_pct"] = d | |
| 762 | + items.append(it) | |
| 407 | 763 | breakdowns.append( |
| 408 | 764 | { |
| 409 | 765 | "id": "services", |
| 410 | 766 | "title": "Enregistrements collectés par service", |
| 411 | 767 | "kind": "donut", |
| 412 | − "items": sorted( | |
| 413 | − ( | |
| 414 | − {"label": SERVICE_NAMES.get(s, s), "value": v} | |
| 415 | − for s, v in svc_records.items() | |
| 416 | − ), | |
| 417 | − key=lambda it: it["value"], | |
| 418 | − reverse=True, | |
| 419 | − ), | |
| 768 | + "items": items, | |
| 420 | 769 | } |
| 421 | 770 | ) |
| 422 | 771 | |
| 423 | − # -------- heatmap : appels API par jour | |
| 772 | + # -------- distributions (histogrammes) | |
| 773 | + distributions: list[dict[str, Any]] = [] | |
| 774 | + if durations: | |
| 775 | + bins = _hist(durations, LAT_BINS) | |
| 776 | + if bins: | |
| 777 | + distributions.append( | |
| 778 | + { | |
| 779 | + "id": "latency_hist", | |
| 780 | + "title": "Distribution des latences (temps de réponse)", | |
| 781 | + "unit": "appels", | |
| 782 | + "bins": bins, | |
| 783 | + } | |
| 784 | + ) | |
| 785 | + run_durs = [r.duration_seconds for r in runs] | |
| 786 | + if run_durs: | |
| 787 | + bins = _hist(run_durs, DUR_BINS) | |
| 788 | + if bins: | |
| 789 | + distributions.append( | |
| 790 | + { | |
| 791 | + "id": "rundur_hist", | |
| 792 | + "title": "Distribution des durées de collecte", | |
| 793 | + "unit": "runs", | |
| 794 | + "bins": bins, | |
| 795 | + } | |
| 796 | + ) | |
| 797 | + | |
| 798 | + # -------- heatmap calendrier : appels API par jour | |
| 424 | 799 | heatmap = None |
| 425 | 800 | if reqs and not hourly: |
| 426 | 801 | cells = [ |
| 427 | − {"date": d.isoformat(), "value": calls_by[d]} | |
| 428 | − for d in days | |
| 429 | − if calls_by[d] > 0 | |
| 802 | + {"date": k.isoformat(), "value": len(req_bucket[k])} | |
| 803 | + for k in bucket_keys | |
| 804 | + if req_bucket[k] | |
| 430 | 805 | ] |
| 431 | 806 | if cells: |
| 432 | 807 | heatmap = {"title": "Appels API par jour", "cells": cells} |
| 433 | 808 | |
| 809 | + # -------- heatmap horaire 7×24 : appels par jour de semaine × heure | |
| 810 | + hourly_map = None | |
| 811 | + if reqs: | |
| 812 | + grid: dict[tuple[int, int], int] = {} | |
| 813 | + for r in reqs: | |
| 814 | + key = (r[0].weekday(), r[0].hour) # 0 = lundi (contrat SPEC) | |
| 815 | + grid[key] = grid.get(key, 0) + 1 | |
| 816 | + if grid: | |
| 817 | + hourly_map = { | |
| 818 | + "title": "Appels API par jour de semaine et heure", | |
| 819 | + "cells": [ | |
| 820 | + {"dow": dw, "hour": h, "value": v} | |
| 821 | + for (dw, h), v in sorted(grid.items()) | |
| 822 | + ], | |
| 823 | + } | |
| 824 | + | |
| 434 | 825 | # -------- tableaux |
| 435 | 826 | tables: list[dict[str, Any]] = [] |
| 436 | 827 | if top_eps: |
@@ -459,7 +850,76 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 459 | 850 | ], |
| 460 | 851 | } |
| 461 | 852 | ) |
| 853 | + if reqs and len(bucket_keys) > 1: | |
| 854 | + rows = [] | |
| 855 | + for i, k in enumerate(bucket_keys): | |
| 856 | + rs = req_bucket[k] | |
| 857 | + if not rs and hourly: | |
| 858 | + continue | |
| 859 | + durs = [r[4] for r in rs] | |
| 860 | + rows.append( | |
| 861 | + [ | |
| 862 | + bucket_labels[i], | |
| 863 | + len(rs), | |
| 864 | + sum(1 for r in rs if r[3] >= 400), | |
| 865 | + round(sum(durs) / len(durs), 1) if durs else 0, | |
| 866 | + round(_p95(durs), 1) if durs else 0, | |
| 867 | + ] | |
| 868 | + ) | |
| 869 | + tables.append( | |
| 870 | + { | |
| 871 | + "id": "daily", | |
| 872 | + "title": "Activité par heure" if hourly else "Activité par jour", | |
| 873 | + "columns": [ | |
| 874 | + "Heure" if hourly else "Date", | |
| 875 | + "Appels", | |
| 876 | + "Erreurs", | |
| 877 | + "Latence moy. (ms)", | |
| 878 | + "p95 (ms)", | |
| 879 | + ], | |
| 880 | + "rows": rows, | |
| 881 | + } | |
| 882 | + ) | |
| 462 | 883 | if runs: |
| 884 | + svc_agg: dict[str, dict[str, Any]] = {} | |
| 885 | + for r in runs: | |
| 886 | + a = svc_agg.setdefault( | |
| 887 | + r.service, {"runs": 0, "ok": 0, "failed": 0, "records": 0, "durs": []} | |
| 888 | + ) | |
| 889 | + a["runs"] += 1 | |
| 890 | + if r.status in ("success", "retried"): | |
| 891 | + a["ok"] += 1 | |
| 892 | + a["records"] += r.records_count | |
| 893 | + else: | |
| 894 | + a["failed"] += 1 | |
| 895 | + a["durs"].append(r.duration_seconds) | |
| 896 | + tables.append( | |
| 897 | + { | |
| 898 | + "id": "services", | |
| 899 | + "title": "Services KA — collectes de la période", | |
| 900 | + "columns": [ | |
| 901 | + "Service", | |
| 902 | + "Runs", | |
| 903 | + "Réussis", | |
| 904 | + "Échoués", | |
| 905 | + "Enregistrements", | |
| 906 | + "Durée moy. (s)", | |
| 907 | + ], | |
| 908 | + "rows": [ | |
| 909 | + [ | |
| 910 | + SERVICE_NAMES.get(s, s), | |
| 911 | + a["runs"], | |
| 912 | + a["ok"], | |
| 913 | + a["failed"], | |
| 914 | + a["records"], | |
| 915 | + round(sum(a["durs"]) / len(a["durs"]), 1), | |
| 916 | + ] | |
| 917 | + for s, a in sorted( | |
| 918 | + svc_agg.items(), key=lambda kv: kv[1]["records"], reverse=True | |
| 919 | + ) | |
| 920 | + ], | |
| 921 | + } | |
| 922 | + ) | |
| 463 | 923 | tables.append( |
| 464 | 924 | { |
| 465 | 925 | "id": "runs", |
@@ -469,9 +929,7 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 469 | 929 | [ |
| 470 | 930 | SERVICE_NAMES.get(r.service, r.service), |
| 471 | 931 | r.date_key.isoformat(), |
| 472 | − {"success": "succès", "failed": "échec", "retried": "relancé"}.get( | |
| 473 | − r.status, r.status | |
| 474 | − ), | |
| 932 | + RUN_STATUS_FR.get(r.status, r.status), | |
| 475 | 933 | r.records_count, |
| 476 | 934 | round(r.duration_seconds, 1), |
| 477 | 935 | ] |
@@ -479,19 +937,62 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 479 | 937 | ], |
| 480 | 938 | } |
| 481 | 939 | ) |
| 940 | + if health: | |
| 941 | + tables.append( | |
| 942 | + { | |
| 943 | + "id": "connectors", | |
| 944 | + "title": "État des connecteurs supervisés (temps réel)", | |
| 945 | + "columns": [ | |
| 946 | + "Service", | |
| 947 | + "Source", | |
| 948 | + "Statut", | |
| 949 | + "Dernier succès", | |
| 950 | + "Échecs consécutifs", | |
| 951 | + ], | |
| 952 | + "rows": [ | |
| 953 | + [ | |
| 954 | + SERVICE_NAMES.get(h.service, h.service), | |
| 955 | + h.source, | |
| 956 | + HEALTH_FR.get(h.status, h.status), | |
| 957 | + ( | |
| 958 | + h.last_success.astimezone(TZ).strftime("%Y-%m-%d %H:%M") | |
| 959 | + if h.last_success | |
| 960 | + else "—" | |
| 961 | + ), | |
| 962 | + h.consecutive_failures, | |
| 963 | + ] | |
| 964 | + for h in sorted( | |
| 965 | + health, | |
| 966 | + key=lambda h: (h.status == "ok", h.service, h.source), | |
| 967 | + ) | |
| 968 | + ], | |
| 969 | + } | |
| 970 | + ) | |
| 482 | 971 | |
| 483 | − # -------- records & faits marquants | |
| 972 | + # -------- records & faits marquants (6-12, générés depuis les données) | |
| 484 | 973 | records: list[dict[str, Any]] = [] |
| 485 | 974 | if reqs and not hourly: |
| 486 | − best_day = max(calls_by.items(), key=lambda kv: kv[1]) | |
| 487 | − if best_day[1] > 0: | |
| 975 | + best_day = max(bucket_keys, key=lambda k: len(req_bucket[k])) | |
| 976 | + if req_bucket[best_day]: | |
| 488 | 977 | records.append( |
| 489 | 978 | { |
| 490 | 979 | "label": "Jour record d'appels API", |
| 491 | − "value": f"{_fr_int(best_day[1])} appels", | |
| 492 | − "date": best_day[0].isoformat(), | |
| 980 | + "value": f"{_fr_int(len(req_bucket[best_day]))} appels", | |
| 981 | + "date": best_day.isoformat(), | |
| 493 | 982 | } |
| 494 | 983 | ) |
| 984 | + if hourly_map: | |
| 985 | + top_cell = max(hourly_map["cells"], key=lambda c: c["value"]) | |
| 986 | + dows = ["lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi", "dimanche"] | |
| 987 | + records.append( | |
| 988 | + { | |
| 989 | + "label": "Créneau horaire le plus actif", | |
| 990 | + "value": ( | |
| 991 | + f"{dows[top_cell['dow']]} {top_cell['hour']:02d}h — " | |
| 992 | + f"{_fr_int(top_cell['value'])} appels" | |
| 993 | + ), | |
| 994 | + } | |
| 995 | + ) | |
| 495 | 996 | if top_eps: |
| 496 | 997 | records.append( |
| 497 | 998 | { |
@@ -499,6 +1000,48 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 499 | 1000 | "value": f"{top_eps[0][0]} — {_fr_int(top_eps[0][1]['calls'])} appels", |
| 500 | 1001 | } |
| 501 | 1002 | ) |
| 1003 | + grow = [ | |
| 1004 | + (ep, _delta(s["calls"], prev_ep_calls.get(ep))) | |
| 1005 | + for ep, s in top_eps | |
| 1006 | + if prev_ep_calls.get(ep, 0) >= 5 | |
| 1007 | + ] | |
| 1008 | + grow = [(ep, d) for ep, d in grow if d is not None and d > 0] | |
| 1009 | + if grow: | |
| 1010 | + ep, d = max(grow, key=lambda kv: kv[1]) | |
| 1011 | + records.append( | |
| 1012 | + { | |
| 1013 | + "label": "Plus forte croissance d'endpoint", | |
| 1014 | + "value": f"{ep} — +{_fr_num(d)} %", | |
| 1015 | + } | |
| 1016 | + ) | |
| 1017 | + if durations: | |
| 1018 | + records.append( | |
| 1019 | + { | |
| 1020 | + "label": "Réponse la plus rapide de la période", | |
| 1021 | + "value": f"{_fr_num(round(min(durations), 1))} ms", | |
| 1022 | + } | |
| 1023 | + ) | |
| 1024 | + records.append( | |
| 1025 | + { | |
| 1026 | + "label": "Réponse la plus lente de la période", | |
| 1027 | + "value": f"{_fr_num(round(max(durations), 1))} ms", | |
| 1028 | + } | |
| 1029 | + ) | |
| 1030 | + if reqs and not hourly: | |
| 1031 | + clean_days = [ | |
| 1032 | + k | |
| 1033 | + for k in bucket_keys | |
| 1034 | + if req_bucket[k] and not any(r[3] >= 400 for r in req_bucket[k]) | |
| 1035 | + ] | |
| 1036 | + if clean_days: | |
| 1037 | + best = max(clean_days, key=lambda k: len(req_bucket[k])) | |
| 1038 | + records.append( | |
| 1039 | + { | |
| 1040 | + "label": "Meilleure journée sans erreur HTTP", | |
| 1041 | + "value": f"{_fr_int(len(req_bucket[best]))} appels, 0 erreur", | |
| 1042 | + "date": best.isoformat(), | |
| 1043 | + } | |
| 1044 | + ) | |
| 502 | 1045 | if ok_runs: |
| 503 | 1046 | biggest = max(ok_runs, key=lambda r: r.records_count) |
| 504 | 1047 | records.append( |
@@ -522,6 +1065,14 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 522 | 1065 | "date": fastest.date_key.isoformat(), |
| 523 | 1066 | } |
| 524 | 1067 | ) |
| 1068 | + total_logged = db.execute(select(func.count(ApiRequest.id))).scalar() or 0 | |
| 1069 | + if total_logged: | |
| 1070 | + records.append( | |
| 1071 | + { | |
| 1072 | + "label": "Appels journalisés au total (90 jours de rétention)", | |
| 1073 | + "value": f"{_fr_int(total_logged)} appels", | |
| 1074 | + } | |
| 1075 | + ) | |
| 525 | 1076 | |
| 526 | 1077 | # -------- couverture de mesure (depuis quand les appels sont journalisés) |
| 527 | 1078 | first_req = db.execute(select(func.min(ApiRequest.ts))).scalar() |
@@ -544,8 +1095,18 @@ def _build_dashboard(db: Session, period: str, d_from, d_to, label) -> dict[str, | ||
| 544 | 1095 | ) |
| 545 | 1096 | }, |
| 546 | 1097 | } |
| 1098 | + if gauges: | |
| 1099 | + dash["gauges"] = gauges | |
| 1100 | + if multiseries: | |
| 1101 | + dash["multiseries"] = multiseries | |
| 1102 | + if stacked: | |
| 1103 | + dash["stacked"] = stacked | |
| 1104 | + if distributions: | |
| 1105 | + dash["distributions"] = distributions | |
| 547 | 1106 | if heatmap: |
| 548 | 1107 | dash["heatmap"] = heatmap |
| 1108 | + if hourly_map: | |
| 1109 | + dash["hourly"] = hourly_map | |
| 549 | 1110 | return dash |
| 550 | 1111 | |
| 551 | 1112 | |
@@ -570,6 +1131,12 @@ def _dashboard_cached( | ||
| 570 | 1131 | return dash |
| 571 | 1132 | |
| 572 | 1133 | |
| 1134 | +def _normalize_mode(mode: str | None) -> str: | |
| 1135 | + """SPEC v2 : un mode inconnu ou absent retombe sur ``complet``.""" | |
| 1136 | + m = (mode or "").strip().lower() | |
| 1137 | + return m if m in kapdf.REPORT_MODES else "complet" | |
| 1138 | + | |
| 1139 | + | |
| 573 | 1140 | # ---------------------------------------------------------------- routes |
| 574 | 1141 | @router.get("/dashboard") |
| 575 | 1142 | def stats_dashboard( |
@@ -587,15 +1154,17 @@ def stats_report( | ||
| 587 | 1154 | period: str = Query("30j", description="auj, 7j, 30j, 3m, 6m, 12m, annee, tout"), |
| 588 | 1155 | date_from: datetime.date | None = Query(None, alias="from"), |
| 589 | 1156 | date_to: datetime.date | None = Query(None, alias="to"), |
| 590 | − mode: str = Query("complet", description="complet ou synthese"), | |
| 1157 | + mode: str = Query( | |
| 1158 | + "complet", | |
| 1159 | + description="complet, synthese, tendances, repartitions ou donnees", | |
| 1160 | + ), | |
| 591 | 1161 | db: Session = Depends(get_db), |
| 592 | 1162 | ) -> Response: |
| 593 | − """Rapport statistique PDF estampillé Groupe-KA (complet ou synthèse).""" | |
| 594 | − if mode not in ("complet", "synthese"): | |
| 595 | − raise HTTPException(status_code=422, detail="mode : complet ou synthese") | |
| 1163 | + """Rapport statistique PDF estampillé Groupe-KA (5 rapports, SPEC v2).""" | |
| 1164 | + mode = _normalize_mode(mode) | |
| 596 | 1165 | dash = _dashboard_cached(db, period, date_from, date_to) |
| 597 | 1166 | pdf_bytes = kapdf.GroupeKAReport(site=SITE, dashboard=dash, mode=mode).build() |
| 598 | − fname = kapdf.filename(PLATFORM_ID, period) | |
| 1167 | + fname = kapdf.filename(PLATFORM_ID, period, mode) | |
| 599 | 1168 | return Response( |
| 600 | 1169 | content=pdf_bytes, |
| 601 | 1170 | media_type="application/pdf", |
@@ -643,22 +1212,30 @@ async def _fetch_satellite_dashboard( | ||
| 643 | 1212 | @router.get("/ecosystem-report") |
| 644 | 1213 | async def stats_ecosystem_report( |
| 645 | 1214 | period: str = Query("30j", description="auj, 7j, 30j, 3m, 6m, 12m, annee, tout"), |
| 646 | − mode: str = Query("complet", description="complet ou synthese"), | |
| 1215 | + mode: str | None = Query( | |
| 1216 | + None, | |
| 1217 | + description=( | |
| 1218 | + "complet, synthese, tendances, repartitions ou donnees " | |
| 1219 | + "(optionnel — inconnu ou absent = complet)" | |
| 1220 | + ), | |
| 1221 | + ), | |
| 647 | 1222 | db: Session = Depends(get_db), |
| 648 | 1223 | ) -> Response: |
| 649 | 1224 | """Rapport écosystème Groupe-KA : UN SEUL PDF consolidant les 12 plateformes. |
| 650 | 1225 | |
| 651 | 1226 | Les dashboards des plateformes sœurs sont récupérés en parallèle |
| 652 | − (httpx, délai 15 s), celui d'API-KA est calculé en local. Cache 10 min | |
| 653 | − par (période, mode).""" | |
| 654 | − if mode not in ("complet", "synthese"): | |
| 655 | − raise HTTPException(status_code=422, detail="mode : complet ou synthese") | |
| 1227 | + (httpx, délai 15 s), celui d'API-KA est calculé en local. Le ``mode`` | |
| 1228 | + (5 rapports du contrat v2) est passé au moteur ; un mode inconnu ou | |
| 1229 | + absent retombe sur ``complet``. Cache 10 min par (période, mode).""" | |
| 1230 | + mode = _normalize_mode(mode) | |
| 656 | 1231 | if period not in PERIOD_LABELS: |
| 657 | 1232 | raise HTTPException( |
| 658 | 1233 | status_code=422, |
| 659 | 1234 | detail=f"Période invalide : {period}. Valides : {', '.join(PERIOD_LABELS)}", |
| 660 | 1235 | ) |
| 661 | 1236 | |
| 1237 | + fname = kapdf.filename("ecosysteme", period, mode) | |
| 1238 | + | |
| 662 | 1239 | def _pdf_response(pdf_bytes: bytes, fname: str) -> Response: |
| 663 | 1240 | return Response( |
| 664 | 1241 | content=pdf_bytes, |
@@ -710,7 +1287,6 @@ async def stats_ecosystem_report( | ||
| 710 | 1287 | ).build() |
| 711 | 1288 | |
| 712 | 1289 | pdf_bytes = await asyncio.to_thread(_build) |
| 713 | − fname = kapdf.filename("ecosysteme", period) | |
| 714 | 1290 | with _eco_lock: |
| 715 | 1291 | if len(_eco_cache) > 32: |
| 716 | 1292 | _eco_cache.clear() |
modified
src/api/web/ka-agent.js
+177 −48
@@ -3,7 +3,11 @@ | ||
| 3 | 3 | * Groupe KA. Vanilla JS, zéro dépendance, injecté sur les 13 sites. |
| 4 | 4 | * <script>window.KA_AGENT={site:"lou-ka"}</script> |
| 5 | 5 | * <script src="/ka-agent.js" defer></script> |
| 6 | − * Bulle flottante en bas à droite → panneau de chat (bulle) → plein écran (⛶). | |
| 6 | + * v2 (2026-08-19) : ouverture directement PLEIN ÉCRAN (desktop et mobile, | |
| 7 | + * bouton ▭ pour réduire en fenêtre sur desktop) ; sur téléphone le panneau se | |
| 8 | + * cale sur window.visualViewport (le clavier ne fait plus grossir/défiler la | |
| 9 | + * page — fond verrouillé par body position:fixed) ; rendu MARKDOWN complet en | |
| 10 | + * streaming (titres, listes, tableaux, code, liens nommés, citations). | |
| 7 | 11 | * Flux SSE en direct depuis le backend central (texte token par token + |
| 8 | 12 | * indicateur d'outil). Historique conservé en localStorage (par site). |
| 9 | 13 | */ |
@@ -21,60 +25,147 @@ | ||
| 21 | 25 | border-radius:50%;border:2px solid var(--ink,#141814);background:var(--accent,#d9f26b); |
| 22 | 26 | color:var(--on-accent,#141814);font:700 17px/1 "Space Grotesk",system-ui,sans-serif; |
| 23 | 27 | cursor:pointer;box-shadow:4px 4px 0 rgba(20,24,20,.85);display:flex;align-items:center; |
| 24 | − justify-content:center;transition:transform .15s} | |
| 28 | + justify-content:center;transition:transform .15s;touch-action:manipulation} | |
| 25 | 29 | .kaa-btn:hover{transform:translate(-2px,-2px)} |
| 26 | − .kaa-panel{position:fixed;right:16px;bottom:calc(86px + env(safe-area-inset-bottom,0px));z-index:2147483001;width:min(392px,calc(100vw - 24px)); | |
| 27 | − height:min(580px,calc(100vh - 110px));height:min(580px,calc(100dvh - 110px));display:none;flex-direction:column;background:var(--paper,#f5f3ee); | |
| 28 | − border:2px solid var(--ink,#141814);border-radius:14px;box-shadow:8px 8px 0 rgba(20,24,20,.85); | |
| 29 | − overflow:hidden;font-family:Inter,system-ui,sans-serif} | |
| 30 | + .kaa-panel{position:fixed;z-index:2147483001;display:none;flex-direction:column;background:var(--paper,#f5f3ee); | |
| 31 | + overflow:hidden;font-family:Inter,system-ui,sans-serif;touch-action:manipulation} | |
| 30 | 32 | .kaa-panel.kaa-open{display:flex} |
| 31 | − .kaa-panel.kaa-full{right:0;bottom:0;width:100vw;height:100vh;height:100dvh;border-radius:0;border:0;box-shadow:none} | |
| 32 | − html.kaa-lock,html.kaa-lock body{overflow:hidden!important;overscroll-behavior:none} | |
| 33 | + .kaa-panel.kaa-full{left:0;top:0;right:0;bottom:0;width:100vw;height:100vh;height:100dvh;border:0;border-radius:0;box-shadow:none} | |
| 34 | + .kaa-panel:not(.kaa-full){right:16px;bottom:calc(86px + env(safe-area-inset-bottom,0px));width:min(392px,calc(100vw - 24px)); | |
| 35 | + height:min(580px,calc(100vh - 110px));height:min(580px,calc(100dvh - 110px)); | |
| 36 | + border:2px solid var(--ink,#141814);border-radius:14px;box-shadow:8px 8px 0 rgba(20,24,20,.85)} | |
| 37 | + html.kaa-lock,html.kaa-lock body{overflow:hidden!important;overscroll-behavior:none;touch-action:none} | |
| 33 | 38 | .kaa-head{display:flex;align-items:center;gap:9px;padding:11px 14px;background:var(--ink,#141814); |
| 34 | − color:var(--paper,#f5f3ee);flex:none} | |
| 39 | + color:var(--paper,#f5f3ee);flex:none;padding-top:max(11px,env(safe-area-inset-top,0px))} | |
| 35 | 40 | .kaa-head b{font:700 15px "Space Grotesk",system-ui,sans-serif;letter-spacing:-.02em} |
| 36 | 41 | .kaa-head .kaa-ka{display:inline-block;background:var(--accent,#d9f26b);color:var(--on-accent,#141814); |
| 37 | 42 | border-radius:6px;padding:1px 7px 2px;transform:rotate(-2deg);font-weight:700} |
| 38 | 43 | .kaa-head small{font:700 9.5px "JetBrains Mono",monospace;letter-spacing:.09em;text-transform:uppercase;opacity:.65} |
| 39 | 44 | .kaa-head .kaa-sp{flex:1} |
| 40 | 45 | .kaa-hbtn{width:34px;height:34px;border:1.5px solid rgba(245,243,238,.4);border-radius:8px;background:none; |
| 41 | − color:var(--paper,#f5f3ee);font-size:15px;cursor:pointer;line-height:1} | |
| 46 | + color:var(--paper,#f5f3ee);font-size:15px;cursor:pointer;line-height:1;flex:none} | |
| 42 | 47 | .kaa-hbtn:hover{border-color:var(--accent,#d9f26b);color:var(--accent,#d9f26b)} |
| 43 | 48 | .kaa-log{flex:1;overflow-y:auto;padding:14px;display:flex;flex-direction:column;gap:10px; |
| 44 | 49 | overscroll-behavior:contain;-webkit-overflow-scrolling:touch} |
| 45 | 50 | .kaa-msg{max-width:86%;padding:9px 13px;border:1.5px solid var(--ink,#141814);border-radius:12px; |
| 46 | − font-size:13.5px;line-height:1.5;white-space:pre-wrap;word-break:break-word} | |
| 51 | + font-size:13.5px;line-height:1.55;word-break:break-word} | |
| 52 | + .kaa-full .kaa-msg{max-width:min(86%,760px)} | |
| 53 | + .kaa-full .kaa-log{align-items:stretch} | |
| 47 | 54 | .kaa-msg.kaa-u{align-self:flex-end;background:var(--accent,#d9f26b);color:var(--on-accent,#141814); |
| 48 | − border-bottom-right-radius:4px} | |
| 55 | + border-bottom-right-radius:4px;white-space:pre-wrap} | |
| 49 | 56 | .kaa-msg.kaa-a{align-self:flex-start;background:#fff;border-bottom-left-radius:4px;box-shadow:3px 3px 0 rgba(20,24,20,.12)} |
| 50 | − .kaa-msg.kaa-a a{color:inherit;text-decoration:underline;text-underline-offset:3px} | |
| 51 | − .kaa-msg.kaa-a b{font-weight:700} | |
| 57 | + .kaa-msg.kaa-a a{color:inherit;text-decoration:underline;text-underline-offset:3px;font-weight:600} | |
| 58 | + .kaa-msg.kaa-a p{margin:.35em 0} | |
| 59 | + .kaa-msg.kaa-a p:first-child{margin-top:0} | |
| 60 | + .kaa-msg.kaa-a p:last-child{margin-bottom:0} | |
| 61 | + .kaa-msg.kaa-a h1,.kaa-msg.kaa-a h2,.kaa-msg.kaa-a h3,.kaa-msg.kaa-a h4{ | |
| 62 | + font:700 14px "Space Grotesk",system-ui,sans-serif;letter-spacing:-.01em;margin:.7em 0 .3em} | |
| 63 | + .kaa-msg.kaa-a h1:first-child,.kaa-msg.kaa-a h2:first-child,.kaa-msg.kaa-a h3:first-child,.kaa-msg.kaa-a h4:first-child{margin-top:.1em} | |
| 64 | + .kaa-msg.kaa-a h1{font-size:15.5px}.kaa-msg.kaa-a h2{font-size:14.5px} | |
| 65 | + .kaa-msg.kaa-a ul,.kaa-msg.kaa-a ol{margin:.35em 0;padding-left:1.35em} | |
| 66 | + .kaa-msg.kaa-a li{margin:.18em 0} | |
| 67 | + .kaa-msg.kaa-a code{font:600 12px "JetBrains Mono",monospace;background:var(--surface-2,#f0eee7); | |
| 68 | + border:1px solid rgba(20,24,20,.15);border-radius:5px;padding:.5px 4px} | |
| 69 | + .kaa-msg.kaa-a pre{margin:.45em 0;padding:9px 11px;background:var(--ink,#141814);color:var(--paper,#f5f3ee); | |
| 70 | + border-radius:9px;overflow-x:auto} | |
| 71 | + .kaa-msg.kaa-a pre code{background:none;border:0;color:inherit;padding:0;font-weight:400;font-size:11.5px;line-height:1.5} | |
| 72 | + .kaa-msg.kaa-a blockquote{margin:.45em 0;padding:.15em .8em;border-left:3px solid var(--accent,#d9f26b); | |
| 73 | + background:var(--surface-2,#faf9f5);color:var(--ink-2,#4d5551)} | |
| 74 | + .kaa-msg.kaa-a hr{border:0;border-top:1.5px dashed rgba(20,24,20,.3);margin:.6em 0} | |
| 75 | + .kaa-msg.kaa-a table{border-collapse:collapse;margin:.45em 0;font-size:12.5px;display:block;overflow-x:auto;max-width:100%} | |
| 76 | + .kaa-msg.kaa-a th,.kaa-msg.kaa-a td{border:1.5px solid var(--ink,#141814);padding:4px 9px;text-align:left;white-space:nowrap} | |
| 77 | + .kaa-msg.kaa-a th{background:var(--accent,#d9f26b);color:var(--on-accent,#141814); | |
| 78 | + font:700 11px "Space Grotesk",system-ui,sans-serif;letter-spacing:.02em} | |
| 79 | + .kaa-msg.kaa-a td{background:#fff} | |
| 52 | 80 | .kaa-tool{align-self:flex-start;font:700 10px "JetBrains Mono",monospace;letter-spacing:.07em; |
| 53 | 81 | text-transform:uppercase;color:var(--ink-2,#4d5551);padding:3px 10px;border:1.5px dashed var(--ink-2,#4d5551); |
| 54 | 82 | border-radius:999px;background:var(--surface-2,#faf9f5)} |
| 55 | 83 | .kaa-in{display:flex;gap:8px;padding:11px;border-top:2px solid var(--ink,#141814);background:#fff;flex:none; |
| 56 | 84 | padding-bottom:calc(11px + env(safe-area-inset-bottom,0))} |
| 85 | + .kaa-full .kaa-in{justify-content:center} | |
| 86 | + .kaa-full .kaa-in textarea{max-width:700px} | |
| 57 | 87 | .kaa-in textarea{flex:1;resize:none;min-height:44px;max-height:110px;padding:10px 12px;font:16px/1.4 Inter,system-ui,sans-serif; |
| 58 | 88 | border:1.5px solid var(--ink,#141814);border-radius:9px;background:var(--paper,#f5f3ee);outline:none} |
| 59 | 89 | .kaa-in button{min-width:52px;min-height:44px;border:1.5px solid var(--ink,#141814);border-radius:9px; |
| 60 | − background:var(--ink,#141814);color:var(--accent,#d9f26b);font:700 16px "Space Grotesk",system-ui;cursor:pointer} | |
| 90 | + background:var(--ink,#141814);color:var(--accent,#d9f26b);font:700 16px "Space Grotesk",system-ui;cursor:pointer;touch-action:manipulation} | |
| 61 | 91 | .kaa-in button:disabled{opacity:.45} |
| 62 | − .kaa-hello{font-size:12.5px;color:var(--ink-2,#4d5551);padding:4px 2px} | |
| 92 | + .kaa-hello{font-size:12.5px;color:var(--ink-2,#4d5551);padding:4px 2px;max-width:760px} | |
| 63 | 93 | .kaa-dots::after{content:"…";animation:kaa-b 1.2s infinite} |
| 64 | 94 | @keyframes kaa-b{0%{opacity:.2}50%{opacity:1}100%{opacity:.2}} |
| 65 | − @media (max-width:560px){.kaa-panel{right:8px;left:8px;width:auto}} | |
| 95 | + @media (max-width:640px){.kaa-x1{display:none}} | |
| 66 | 96 | `; |
| 67 | 97 | |
| 68 | − /* ---------- markdown minimal (gras, liens, puces) — texte échappé d'abord ---------- */ | |
| 98 | + /* ---------- markdown complet (rendu en streaming, texte échappé d'abord) ---------- */ | |
| 69 | 99 | function esc(s) { |
| 70 | 100 | return s.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">"); |
| 71 | 101 | } |
| 72 | − function md(s) { | |
| 73 | − return esc(s) | |
| 74 | − .replace(/\*\*([^*]+)\*\*/g, "<b>$1</b>") | |
| 75 | − .replace(/(https?:\/\/[^\s<)"']+)/g, function (u) { | |
| 76 | − return '<a href="' + u + '" target="_blank" rel="noopener noreferrer">' + u.replace(/^https?:\/\/(www\.)?/, "").slice(0, 40) + "</a>"; | |
| 77 | − }); | |
| 102 | + function inline(s) { | |
| 103 | + s = esc(s); | |
| 104 | + s = s.replace(/`([^`\n]+)`/g, "<code>$1</code>"); | |
| 105 | + s = s.replace(/\[([^\]\n]+)\]\((https?:\/\/[^\s)]+)\)/g, | |
| 106 | + '<a href="$2" target="_blank" rel="noopener noreferrer">$1</a>'); | |
| 107 | + s = s.replace(/\*\*([^*\n]+)\*\*/g, "<b>$1</b>"); | |
| 108 | + s = s.replace(/(^|[^*\w])\*([^*\n]+)\*(?!\*)/g, "$1<i>$2</i>"); | |
| 109 | + s = s.replace(/(^|[^"'>=\w])(https?:\/\/[^\s<)"']+)/g, function (m, pre, u) { | |
| 110 | + return pre + '<a href="' + u + '" target="_blank" rel="noopener noreferrer">' + | |
| 111 | + u.replace(/^https?:\/\/(www\.)?/, "").slice(0, 42) + "</a>"; | |
| 112 | + }); | |
| 113 | + return s; | |
| 114 | + } | |
| 115 | + function md(src) { | |
| 116 | + var lines = String(src).split("\n"), out = [], i = 0, m; | |
| 117 | + function para(buf) { if (buf.length) out.push("<p>" + buf.map(inline).join("<br>") + "</p>"); } | |
| 118 | + while (i < lines.length) { | |
| 119 | + var l = lines[i]; | |
| 120 | + if (/^\s*```/.test(l)) { /* bloc de code */ | |
| 121 | + var code = []; i++; | |
| 122 | + while (i < lines.length && !/^\s*```/.test(lines[i])) code.push(lines[i++]); | |
| 123 | + i++; | |
| 124 | + out.push("<pre><code>" + esc(code.join("\n")) + "</code></pre>"); | |
| 125 | + } else if ((m = l.match(/^\s*(#{1,4})\s+(.*)$/))) { /* titres */ | |
| 126 | + out.push("<h" + m[1].length + ">" + inline(m[2]) + "</h" + m[1].length + ">"); i++; | |
| 127 | + } else if (/^\s*(---+|\*\*\*+)\s*$/.test(l)) { /* filet */ | |
| 128 | + out.push("<hr>"); i++; | |
| 129 | + } else if (/^\s*>|^\s*>/.test(l)) { /* citation */ | |
| 130 | + var q = []; | |
| 131 | + while (i < lines.length && /^\s*>/.test(lines[i])) q.push(lines[i++].replace(/^\s*>\s?/, "")); | |
| 132 | + out.push("<blockquote>" + q.map(inline).join("<br>") + "</blockquote>"); | |
| 133 | + } else if (/^\s*\|.*\|\s*$/.test(l)) { /* tableau */ | |
| 134 | + var rows = []; | |
| 135 | + while (i < lines.length && /^\s*\|.*\|\s*$/.test(lines[i])) { | |
| 136 | + var cells = lines[i].trim().replace(/^\||\|$/g, "").split("|").map(function (c) { return c.trim(); }); | |
| 137 | + if (!/^[:\-\s|]+$/.test(lines[i].replace(/\|/g, ""))) rows.push(cells); | |
| 138 | + i++; | |
| 139 | + } | |
| 140 | + if (rows.length) { | |
| 141 | + var t = "<table>"; | |
| 142 | + rows.forEach(function (r, ri) { | |
| 143 | + var tag = ri === 0 ? "th" : "td"; | |
| 144 | + t += "<tr>" + r.map(function (c) { return "<" + tag + ">" + inline(c) + "</" + tag + ">"; }).join("") + "</tr>"; | |
| 145 | + }); | |
| 146 | + out.push(t + "</table>"); | |
| 147 | + } | |
| 148 | + } else if (/^\s*[-*+]\s+/.test(l)) { /* liste à puces */ | |
| 149 | + var ul = []; | |
| 150 | + while (i < lines.length && /^\s*[-*+]\s+/.test(lines[i])) | |
| 151 | + ul.push("<li>" + inline(lines[i++].replace(/^\s*[-*+]\s+/, "")) + "</li>"); | |
| 152 | + out.push("<ul>" + ul.join("") + "</ul>"); | |
| 153 | + } else if (/^\s*\d+[.)]\s+/.test(l)) { /* liste numérotée */ | |
| 154 | + var ol = []; | |
| 155 | + while (i < lines.length && /^\s*\d+[.)]\s+/.test(lines[i])) | |
| 156 | + ol.push("<li>" + inline(lines[i++].replace(/^\s*\d+[.)]\s+/, "")) + "</li>"); | |
| 157 | + out.push("<ol>" + ol.join("") + "</ol>"); | |
| 158 | + } else if (!l.trim()) { i++; } /* ligne vide */ | |
| 159 | + else { /* paragraphe */ | |
| 160 | + var buf = []; | |
| 161 | + while (i < lines.length && lines[i].trim() && | |
| 162 | + !/^\s*(```|#{1,4}\s|[-*+]\s|\d+[.)]\s|>|\||---+\s*$)/.test(lines[i])) | |
| 163 | + buf.push(lines[i++]); | |
| 164 | + if (!buf.length) buf.push(lines[i++] || ""); | |
| 165 | + para(buf); | |
| 166 | + } | |
| 167 | + } | |
| 168 | + return out.join(""); | |
| 78 | 169 | } |
| 79 | 170 | |
| 80 | 171 | /* ---------- état ---------- */ |
@@ -98,10 +189,10 @@ | ||
| 98 | 189 | panel.setAttribute("aria-label", "KA Agent"); |
| 99 | 190 | panel.innerHTML = |
| 100 | 191 | '<div class="kaa-head"><b>KA<span class="kaa-ka">Agent</span></b><small>Groupe KA · IA</small><span class="kaa-sp"></span>' + |
| 101 | − '<button class="kaa-hbtn kaa-x1" title="Plein écran" aria-label="Plein écran">⛶</button>' + | |
| 192 | + '<button class="kaa-hbtn kaa-x1" title="Réduire / agrandir" aria-label="Réduire ou agrandir">▭</button>' + | |
| 102 | 193 | '<button class="kaa-hbtn kaa-x2" title="Fermer" aria-label="Fermer">✕</button></div>' + |
| 103 | 194 | '<div class="kaa-log"></div>' + |
| 104 | − '<div class="kaa-in"><textarea rows="1" placeholder="Posez votre question…" aria-label="Votre question"></textarea>' + | |
| 195 | + '<div class="kaa-in"><textarea rows="1" enterkeyhint="send" autocapitalize="sentences" autocomplete="off" placeholder="Posez votre question…" aria-label="Votre question"></textarea>' + | |
| 105 | 196 | "<button aria-label=\"Envoyer\">➤</button></div>"; |
| 106 | 197 | document.body.appendChild(btn); |
| 107 | 198 | document.body.appendChild(panel); |
@@ -132,45 +223,83 @@ | ||
| 132 | 223 | if (log.length) return; |
| 133 | 224 | var d = document.createElement("div"); |
| 134 | 225 | d.className = "kaa-hello"; |
| 135 | − d.textContent = "👋 Je suis KA Agent, l'assistant de l'écosystème Groupe KA. Posez-moi une question sur ce site, ses données (prix, annonces, stats…) ou sur le groupe."; | |
| 226 | + d.textContent = "👋 Je suis KA Agent, l'assistant de l'écosystème Groupe KA. Posez-moi une question sur ce site, ses données (prix, annonces, fiches, stats…) ou sur le groupe."; | |
| 136 | 227 | logEl.appendChild(d); |
| 137 | 228 | } |
| 138 | 229 | function render() { |
| 139 | 230 | logEl.innerHTML = ""; |
| 140 | 231 | hello(); |
| 141 | − log.forEach(function (m) { bubble(m.role === "user" ? "kaa-u" : "kaa-a", md(m.content)); }); | |
| 232 | + log.forEach(function (m) { | |
| 233 | + m.role === "user" ? bubble("kaa-u", esc(m.content)) : bubble("kaa-a", md(m.content)); | |
| 234 | + }); | |
| 142 | 235 | scroll(); |
| 143 | 236 | } |
| 144 | 237 | |
| 145 | − /* ---------- ouverture / plein écran ---------- */ | |
| 146 | − /* Sur téléphone : panneau plein écran d'office + scroll d'arrière-plan | |
| 147 | − verrouillé tant qu'il est ouvert (html.kaa-lock). Pas de focus clavier | |
| 148 | − forcé au tap (le clavier ne s'ouvre que si l'utilisateur touche le champ). */ | |
| 149 | − var mobileMq = window.matchMedia("(max-width: 640px)"); | |
| 238 | + /* ---------- plein écran + clavier mobile ---------- | |
| 239 | + Ouverture = PLEIN ÉCRAN direct (desktop et mobile). ▭ réduit en fenêtre | |
| 240 | + (desktop seulement — caché sur mobile). Tant que le plein écran est ouvert, | |
| 241 | + l'arrière-plan est GELÉ (body position:fixed, scroll restauré à la | |
| 242 | + fermeture) et le panneau se cale sur window.visualViewport : quand le | |
| 243 | + clavier s'ouvre, le panneau rétrécit à la place de laisser iOS | |
| 244 | + zoomer/pousser la page. Pas de focus clavier forcé au tap sur mobile. */ | |
| 150 | 245 | var fineInput = window.matchMedia("(hover: hover) and (pointer: fine)"); |
| 151 | − function syncLock() { | |
| 152 | − var open = panel.classList.contains("kaa-open"); | |
| 153 | − if (open && mobileMq.matches) panel.classList.add("kaa-full"); | |
| 154 | − document.documentElement.classList.toggle( | |
| 155 | − "kaa-lock", open && panel.classList.contains("kaa-full")); | |
| 246 | + var vv = window.visualViewport; | |
| 247 | + var savedY = 0; | |
| 248 | + | |
| 249 | + function isOpen() { return panel.classList.contains("kaa-open"); } | |
| 250 | + function isFull() { return panel.classList.contains("kaa-full"); } | |
| 251 | + | |
| 252 | + function fitVV() { | |
| 253 | + if (!vv || !isOpen() || !isFull()) { panel.style.height = ""; panel.style.top = ""; return; } | |
| 254 | + panel.style.top = Math.round(vv.offsetTop) + "px"; | |
| 255 | + panel.style.height = Math.round(vv.height) + "px"; | |
| 256 | + scroll(); | |
| 156 | 257 | } |
| 157 | − btn.addEventListener("click", function () { | |
| 158 | − panel.classList.toggle("kaa-open"); | |
| 159 | − if (panel.classList.contains("kaa-open")) { | |
| 160 | − render(); | |
| 161 | − if (fineInput.matches) ta.focus(); | |
| 258 | + if (vv) { | |
| 259 | + vv.addEventListener("resize", fitVV); | |
| 260 | + vv.addEventListener("scroll", fitVV); | |
| 261 | + } | |
| 262 | + | |
| 263 | + function lockBg(on) { | |
| 264 | + var b = document.body, h = document.documentElement; | |
| 265 | + if (on && !h.classList.contains("kaa-lock")) { | |
| 266 | + savedY = window.scrollY || 0; | |
| 267 | + h.classList.add("kaa-lock"); | |
| 268 | + b.style.position = "fixed"; | |
| 269 | + b.style.top = -savedY + "px"; | |
| 270 | + b.style.left = "0"; b.style.right = "0"; b.style.width = "100%"; | |
| 271 | + } else if (!on && h.classList.contains("kaa-lock")) { | |
| 272 | + h.classList.remove("kaa-lock"); | |
| 273 | + b.style.position = ""; b.style.top = ""; b.style.left = ""; b.style.right = ""; b.style.width = ""; | |
| 274 | + window.scrollTo(0, savedY); | |
| 162 | 275 | } |
| 163 | − syncLock(); | |
| 276 | + } | |
| 277 | + function sync() { | |
| 278 | + lockBg(isOpen() && isFull()); | |
| 279 | + fitVV(); | |
| 280 | + } | |
| 281 | + | |
| 282 | + btn.addEventListener("click", function () { | |
| 283 | + panel.classList.add("kaa-open", "kaa-full"); // plein écran d'office | |
| 284 | + render(); | |
| 285 | + if (fineInput.matches) ta.focus(); | |
| 286 | + sync(); | |
| 164 | 287 | }); |
| 165 | 288 | panel.querySelector(".kaa-x2").addEventListener("click", function () { |
| 166 | 289 | panel.classList.remove("kaa-open", "kaa-full"); |
| 167 | − syncLock(); | |
| 290 | + sync(); | |
| 168 | 291 | }); |
| 169 | 292 | panel.querySelector(".kaa-x1").addEventListener("click", function () { |
| 170 | 293 | panel.classList.toggle("kaa-full"); |
| 171 | − syncLock(); | |
| 294 | + sync(); | |
| 172 | 295 | scroll(); |
| 173 | 296 | }); |
| 297 | + document.addEventListener("keydown", function (e) { | |
| 298 | + if (e.key === "Escape" && isOpen()) { | |
| 299 | + panel.classList.remove("kaa-open", "kaa-full"); | |
| 300 | + sync(); | |
| 301 | + } | |
| 302 | + }); | |
| 174 | 303 | |
| 175 | 304 | /* ---------- envoi + flux SSE ---------- */ |
| 176 | 305 | var busy = false; |
@@ -182,7 +311,7 @@ | ||
| 182 | 311 | ta.value = ""; |
| 183 | 312 | log.push({ role: "user", content: q }); |
| 184 | 313 | save(); |
| 185 | − bubble("kaa-u", md(q)); | |
| 314 | + bubble("kaa-u", esc(q)); | |
| 186 | 315 | var out = bubble("kaa-a", '<span class="kaa-dots"></span>'); |
| 187 | 316 | var acc = ""; |
| 188 | 317 | var chips = []; |
@@ -211,7 +340,7 @@ | ||
| 211 | 340 | try { data = JSON.parse(dm); } catch (e) {} |
| 212 | 341 | if (ev === "delta" && data.text) { |
| 213 | 342 | acc += data.text; |
| 214 | − out.innerHTML = md(acc); | |
| 343 | + out.innerHTML = md(acc); // markdown re-rendu à chaque delta | |
| 215 | 344 | scroll(); |
| 216 | 345 | } else if (ev === "tool") { |
| 217 | 346 | chips.push(toolChip(data.name || "recherche")); |
modified
src/api/web/ka/stats/SPEC.md
+128 −66
@@ -1,53 +1,88 @@ | ||
| 1 | −# ka-stats — module Stats commun Groupe KA (spec v1) | |
| 1 | +# ka-stats — module Stats commun Groupe KA (spec v2) | |
| 2 | 2 | |
| 3 | −Contrat partagé par les 12 plateformes pour leurs pages **/stats** (tableau de | |
| 4 | −bord analytique) et l'**export PDF** estampillé Groupe-KA. Le visuel suit le | |
| 5 | −design system ka-ui (tokens.css) avec l'accent de la marque. | |
| 3 | +Contrat partagé par les plateformes pour leurs pages **/stats** (tableau de | |
| 4 | +bord analytique) et les **exports PDF** estampillés Groupe-KA. Le visuel suit | |
| 5 | +le design system ka-ui (tokens.css) avec l'accent de la marque. | |
| 6 | + | |
| 7 | +**v2 (2026-08-19)** : sparklines dans les KPI, jauges, multi-courbes, | |
| 8 | +barres empilées, distributions (histogrammes), heatmap horaire 7×24, deltas | |
| 9 | +sur les répartitions, statistiques de séries (min/max/moy/méd/σ), et **5 | |
| 10 | +rapports PDF** au lieu de 2. Tous les nouveaux champs sont **optionnels** : | |
| 11 | +un dashboard v1 reste valide et se rend tel quel. | |
| 6 | 12 | |
| 7 | 13 | ## 1. Page /stats — structure obligatoire (dans cet ordre) |
| 8 | 14 | |
| 9 | −1. **Bandeau KPI** : 4–6 grandes cartes (`KpiCard`) — valeur, libellé, | |
| 10 | − variation vs période précédente (▲/▼ + %, vert `--green` / rouge `--danger`). | |
| 15 | +1. **Bandeau KPI** : 6–10 grandes cartes (`KpiCard`) — valeur, libellé, | |
| 16 | + variation vs période précédente (▲/▼ + %, vert `--green` / rouge | |
| 17 | + `--danger`), **sparkline** de tendance quand une série existe. | |
| 11 | 18 | 2. **Sélecteur de période global** (`PeriodSelector`) : `aujourd'hui · 7 j · |
| 12 | 19 | 30 j · 3 m · 6 m · 12 m · année en cours · tout` + plage personnalisée |
| 13 | 20 | (2 champs date). Toute la page se recalcule (state → refetch dashboard). |
| 14 | −3. **Graphiques** : courbes d'évolution (`LineChart`, survol = infobulle, | |
| 15 | − légende cliquable pour masquer une série, comparaison N vs N-1 en | |
| 16 | − pointillé), barres (`BarChart`), anneaux (`Donut`), calendrier de chaleur | |
| 17 | − (`CalendarHeatmap`) quand pertinent. | |
| 18 | −4. **Répartition géographique** (par ville/région) quand pertinent — barres | |
| 19 | − horizontales triées (pas besoin de vraie carte). | |
| 20 | −5. **Tableaux détaillés** (`DataTable`) : tri par colonne, recherche interne, | |
| 21 | +3. **Jauges** (`GaugeCard`) quand pertinent : taux, couvertures, complétude. | |
| 22 | +4. **Graphiques d'évolution** : courbes/aires (`LineChart`, survol = | |
| 23 | + infobulle, légende cliquable, comparaison N vs N-1 en pointillé), barres | |
| 24 | + verticales (`VBarChart` — volumes quotidiens), **multi-courbes ≤ 4 séries** | |
| 25 | + (`MultiLineChart` — motifs de trait distincts, jamais la couleur seule), | |
| 26 | + **barres empilées** (`StackedBarChart` — composition dans le temps). | |
| 27 | + Sous les courbes clés : `StatSummary` (min/max/moyenne/médiane/écart-type). | |
| 28 | +5. **Répartitions** : barres horizontales (`BarChart`, deltas optionnels), | |
| 29 | + anneaux (`Donut`), **distributions/histogrammes** (`Histogram`). | |
| 30 | +6. **Répartition géographique** (par ville/région) — barres horizontales | |
| 31 | + triées (pas besoin de vraie carte). | |
| 32 | +7. **Calendriers** : `CalendarHeatmap` (26 semaines) et, quand l'activité | |
| 33 | + horaire est journalisée, `HourHeatmap` (7 jours × 24 h). | |
| 34 | +8. **Tableaux détaillés** (`DataTable`) : tri par colonne, recherche interne, | |
| 21 | 35 | pagination (25/pg), débordement horizontal propre sur mobile (.tbl-wrap). |
| 22 | −6. **Records & faits marquants** : générés depuis les données (jour record, | |
| 23 | − plus forte croissance, meilleure entrée…) — cartes compactes. | |
| 24 | −7. **Fraîcheur** : « Mis à jour le {date heure} » + bouton Rafraîchir. | |
| 25 | −8. **Bouton PDF** bien visible en haut : « Télécharger le rapport PDF » avec | |
| 26 | − deux choix (Rapport complet / Synthèse 2 pages). Indicateur de progression | |
| 27 | − si > 2 s. | |
| 36 | + Viser 3 à 5 tableaux par plateforme. | |
| 37 | +9. **Records & faits marquants** : générés depuis les données (jour record, | |
| 38 | + plus forte croissance, meilleure entrée…) — cartes compactes, 6–12. | |
| 39 | +10. **Fraîcheur** : « Mis à jour le {date heure} » + bouton Rafraîchir. | |
| 40 | +11. **Bouton PDF** bien visible en haut (`PdfButton`) : bouton principal | |
| 41 | + « Rapport PDF complet » + menu « Autres rapports ▾ » listant les | |
| 42 | + **5 rapports** (voir §3). Indicateur de progression si > 2 s. | |
| 28 | 43 | |
| 29 | 44 | Responsive : KPI empilés < 768 px, graphiques pleine largeur redimensionnés |
| 30 | 45 | (SVG viewBox), tableaux en défilement horizontal contenu, tactile ≥ 44 px. |
| 31 | 46 | AUCUNE donnée inventée : une stat indisponible = bloc « Pas encore mesuré » |
| 32 | 47 | (carte grise propre), jamais un faux chiffre. |
| 33 | 48 | |
| 49 | +Accessibilité (règles fermes) : un seul axe Y par graphique (jamais de | |
| 50 | +double échelle) ; ≥ 2 séries ⇒ légende obligatoire ; l'identité d'une série | |
| 51 | +multi-courbes passe par le **motif de trait** en plus de la couleur ; le | |
| 52 | +texte reste en encre (jamais coloré à la couleur de série) ; chaque | |
| 53 | +graphique a son infobulle de survol et un équivalent tableau existe. | |
| 54 | + | |
| 34 | 55 | ## 2. API — contrat commun |
| 35 | 56 | |
| 36 | 57 | `GET /api/stats/dashboard?period=7j|30j|3m|6m|12m|annee|tout|auj&from=YYYY-MM-DD&to=YYYY-MM-DD` |
| 37 | 58 | |
| 38 | 59 | ```jsonc |
| 39 | 60 | { |
| 40 | − "updated": "2026-08-17T21:04:00-04:00", | |
| 41 | − "period": { "from": "2026-07-18", "to": "2026-08-17", "label": "30 jours" }, | |
| 61 | + "updated": "2026-08-19T01:00:00-04:00", | |
| 62 | + "period": { "from": "2026-07-20", "to": "2026-08-19", "label": "30 jours" }, | |
| 42 | 63 | "kpis": [ { "id": "total", "label": "Annonces actives", "value": 33744, |
| 43 | − "unit": "", "delta_pct": 4.2, "direction": "up" } ], | |
| 64 | + "unit": "", "delta_pct": 4.2, "direction": "up", | |
| 65 | + "spark": [{ "t": "2026-08-01", "v": 31200 }] } ], // spark optionnel | |
| 66 | + "gauges": [ { "id": "geo", "label": "Fiches géolocalisées", "value": 92, | |
| 67 | + "max": 100, "unit": "%" } ], // optionnel | |
| 44 | 68 | "series": [ { "id": "vol", "title": "Annonces actives par jour", "unit": "annonces", |
| 45 | − "kind": "line", "points": [{ "t": "2026-07-18", "v": 31200 }], | |
| 46 | − "compare": [{ "t": "2025-07-18", "v": 24100 }] } ], | |
| 47 | − "breakdowns": [ { "id": "types", "title": "Par type", "kind": "donut", | |
| 48 | − "items": [{ "label": "4½", "value": 9120 }] } ], | |
| 69 | + "kind": "line", // line | bar | area | |
| 70 | + "points": [{ "t": "2026-07-20", "v": 31200 }], | |
| 71 | + "compare": [{ "t": "2025-07-20", "v": 24100 }] } ], | |
| 72 | + "multiseries": [ { "id": "seg", "title": "Prix médian par taille", "unit": "$", | |
| 73 | + "series": [ { "label": "3½", "points": [/* … */] }, | |
| 74 | + { "label": "4½", "points": [/* … */] } ] } ], // ≤ 4 | |
| 75 | + "stacked": [ { "id": "src", "title": "Ajouts par source", "unit": "ajouts", | |
| 76 | + "keys": ["Kijiji", "Centris", "Autres"], | |
| 77 | + "points": [{ "t": "2026-08-01", "values": [120, 80, 30] }] } ], | |
| 78 | + "breakdowns": [ { "id": "types", "title": "Par type", "kind": "donut", // donut | bars | |
| 79 | + "items": [{ "label": "4½", "value": 9120, "delta_pct": 2.1 }] } ], | |
| 80 | + "distributions": [ { "id": "prix", "title": "Distribution des loyers", "unit": "annonces", | |
| 81 | + "bins": [{ "label": "800-1000$", "value": 3120 }] } ], | |
| 49 | 82 | "geo": { "title": "Par région", "items": [{ "label": "Montréal", "value": 15680 }] }, |
| 50 | 83 | "heatmap": { "title": "Activité", "cells": [{ "date": "2026-08-01", "value": 210 }] }, |
| 84 | + "hourly": { "title": "Activité par heure", | |
| 85 | + "cells": [{ "dow": 0, "hour": 9, "value": 40 }] }, // dow 0=lun … 6=dim | |
| 51 | 86 | "tables": [ { "id": "top", "title": "Top villes", "columns": ["Ville", "Annonces", "Δ 30 j"], |
| 52 | 87 | "rows": [["Montréal", 15680, "+3,1 %"]] } ], |
| 53 | 88 | "records": [ { "label": "Jour record d'ajouts", "value": "412 annonces", "date": "2026-08-09" } ] |
@@ -56,23 +91,40 @@ AUCUNE donnée inventée : une stat indisponible = bloc « Pas encore mesuré » | ||
| 56 | 91 | |
| 57 | 92 | Champs absents = section masquée. Cache serveur recommandé (≥ 5 min par |
| 58 | 93 | période). Les valeurs proviennent des données réelles (DB de la plateforme, |
| 59 | −journaux de sync des connecteurs, /api/v1/runs d'API-KA…). | |
| 94 | +journaux de sync des connecteurs, /api/v1/runs d'API-KA…). Arrondir les | |
| 95 | +`delta_pct` à 1 décimale côté serveur. | |
| 60 | 96 | |
| 61 | −`GET /api/stats/report?period=…&from=&to=&mode=complet|synthese` | |
| 97 | +## 3. Rapports PDF — 5 modes | |
| 98 | + | |
| 99 | +`GET /api/stats/report?period=…&from=&to=&mode=complet|synthese|tendances|repartitions|donnees` | |
| 62 | 100 | → `application/pdf`, en-tête `Content-Disposition: attachment; filename= |
| 63 | −groupe-ka_<plateforme>_stats_<periode>_<YYYY-MM-DD>.pdf`. | |
| 101 | +groupe-ka_<plateforme>_stats_<periode>[_<mode>]_<YYYY-MM-DD>.pdf` | |
| 102 | +(pas de suffixe pour `complet` — rétrocompatible v1 ; `kapdf.filename()` | |
| 103 | +accepte maintenant `mode` en 3e argument). | |
| 104 | + | |
| 105 | +| Mode | Contenu | | |
| 106 | +|---|---| | |
| 107 | +| `complet` | tout : sommaire, KPI, jauges, séries + stats de séries, multi-séries, empilées, répartitions, distributions, géo, heatmap horaire, tableaux (200 lignes), records | | |
| 108 | +| `synthese` | couverture + KPI + jauges + records (2–3 pages) | | |
| 109 | +| `tendances` | KPI + toutes les séries temporelles + min/max/moy/méd/σ + records | | |
| 110 | +| `repartitions` | breakdowns, distributions, géo, activité horaire | | |
| 111 | +| `donnees` | tous les tableaux en version longue (400 lignes) | | |
| 64 | 112 | |
| 65 | −## 3. PDF — gabarit Groupe-KA (implémentations : `kapdf.py` fpdf2 pour les | |
| 66 | −apps Python ; les apps Next portent le même gabarit en pdfkit) | |
| 113 | +Un `mode` inconnu retombe sur `complet`. Le gabarit (implémentations : | |
| 114 | +`kapdf.py` fpdf2 pour les apps Python ; les apps Next portent le même | |
| 115 | +gabarit en pdfkit) : | |
| 67 | 116 | |
| 68 | 117 | - **Couverture** : cadre encre, kicker « GROUPE KA · RAPPORT STATISTIQUE », |
| 69 | − wordmark de la plateforme (boîte encre + accent), sous-titre, période | |
| 70 | − couverte, date/heure de génération, bande encre au pied avec | |
| 118 | + wordmark de la plateforme (boîte encre + accent), **type de rapport**, | |
| 119 | + période couverte, date/heure de génération, bande encre au pied avec | |
| 71 | 120 | « par Groupe KA — groupe-ka.com ». |
| 72 | −- **Sommaire** avec numéros de pages (mode complet). | |
| 73 | −- **KPI** : grille de cartes (bordure encre, valeur en gros, delta coloré). | |
| 121 | +- **Sommaire** avec numéros de pages (modes complet et donnees). | |
| 122 | +- **KPI** : grille de cartes (bordure encre, valeur en gros, delta coloré | |
| 123 | + arrondi à 1 décimale). **Jauges** : demi-arcs accent. | |
| 74 | 124 | - **Graphiques VECTORIELS** (dessinés en primitives, jamais de capture) : |
| 75 | − courbes, barres, anneaux — accent de la plateforme, axes/graduations encre. | |
| 125 | + courbes/aires, barres verticales, multi-courbes (motifs distincts), | |
| 126 | + empilées (nuances d'accent), anneaux, heatmap horaire — accent de la | |
| 127 | + plateforme, axes/graduations encre. | |
| 76 | 128 | - **Tableaux** paginés proprement (lignes zébrées `--surface-2`, jamais |
| 77 | 129 | coupés en deux à cheval sur une ligne). |
| 78 | 130 | - **Records** puis **page de fin** : coordonnées Groupe KA (3 courriels + |
@@ -81,43 +133,53 @@ apps Python ; les apps Next portent le même gabarit en pdfkit) | ||
| 81 | 133 | - **Chaque page** : en-tête discret (« Groupe KA · {Plateforme} », filet |
| 82 | 134 | encre) + pied (« © Groupe-KA — {année} — groupe-ka.com · {période} · p. X/Y »). |
| 83 | 135 | - A4 portrait, marges 18 mm, typo : Helvetica (fallback sûr) ou fonts TTF du |
| 84 | − DS si présentes. Mode « synthese » = couverture + 1 page KPI/records. | |
| 136 | + DS si présentes. | |
| 85 | 137 | |
| 86 | 138 | ## 4. Spécifique par plateforme (sections métier attendues) |
| 87 | 139 | |
| 88 | −- **groupe-ka** : tableau de bord maître — consolidation des 12 (volume total, | |
| 89 | − croissance), classement des plateformes, bloc résumé par plateforme + lien | |
| 140 | +- **groupe-ka** : tableau de bord maître — consolidation des plateformes | |
| 141 | + (volume total, croissance), classement, bloc résumé par plateforme + lien | |
| 90 | 142 | vers sa page /stats ; « Rapport écosystème complet » = PDF consolidé. |
| 91 | 143 | - **lou-ka** : annonces actives/nouvelles/retirées, loyers moyens/médians par |
| 92 | − ville & taille, évolution, répartition par type, top villes. | |
| 93 | −- **immo-ka** : annonces actives/nouvelles/vendues-retirées, prix moyen/médian | |
| 94 | − par ville/région/type, délai de présence, top villes, tension du marché. | |
| 144 | + ville & taille (multiseries), distribution des loyers, évolution, | |
| 145 | + répartition par type, top villes, sources (stacked). | |
| 146 | +- **immo-ka** : annonces actives/nouvelles/vendues-retirées, prix | |
| 147 | + moyen/médian par ville/région/type (multiseries), distribution des prix, | |
| 148 | + délai de présence, top villes, tension du marché. | |
| 95 | 149 | - **vrai-prix** : couverture du rôle (unités, valeur totale), estimations |
| 96 | − servies si journalisées, répartitions par municipalité/type, indices marché. | |
| 97 | −- **auto-ka** : volume par marque/modèle/année/carburant/boîte, prix moyens et | |
| 98 | − km moyens par segment, top marques/modèles. | |
| 99 | −- **fabri-ka** : produits par catégorie/région/boutique, fourchettes de prix, | |
| 100 | − nouveautés par période, top catégories. | |
| 101 | −- **food-ka** : produits suivis, relevés de prix, soldes détectés (baisses/ | |
| 102 | − hausses, amplitude), top produits en solde, prix moyens par catégorie. | |
| 103 | −- **resto-ka** : restos par cuisine/ville/gamme, menus & plats, nouveautés/ | |
| 104 | − fermetures détectées, top établissements. | |
| 150 | + servies si journalisées, répartitions par municipalité/type, distribution | |
| 151 | + des valeurs, indices marché. | |
| 152 | +- **auto-ka** : volume par marque/modèle/année/carburant/boîte, prix moyens | |
| 153 | + et km moyens par segment (multiseries), distributions prix/km/année, | |
| 154 | + top marques/modèles. | |
| 155 | +- **fabri-ka** : produits par catégorie/région/boutique, fourchettes de prix | |
| 156 | + (distribution), nouveautés par période, top catégories. | |
| 157 | +- **food-ka** : produits suivis, relevés de prix, soldes détectés | |
| 158 | + (baisses/hausses, amplitude — stacked), top produits en solde, prix moyens | |
| 159 | + par catégorie, distribution des rabais. | |
| 160 | +- **resto-ka** : restos par cuisine/ville/gamme, menus & plats, distribution | |
| 161 | + des prix de plats, nouveautés/fermetures détectées, top établissements. | |
| 105 | 162 | - **sorti-ka** : événements à venir/passés par catégorie/ville, gratuits vs |
| 106 | − payants, heatmap calendrier, top lieux. | |
| 107 | −- **crea-ka** : créateurs par plateforme/niche/tier, comptes reliés, top | |
| 108 | − créateurs, croissance du répertoire. | |
| 109 | −- **trouve-ka** : pages indexées, domaines, rythme de crawl (indexées/h), | |
| 110 | − erreurs, file frontier, tendances si les requêtes sont journalisées. | |
| 111 | −- **api-ka** : appels par endpoint/jour/heure, latences moyennes + p95, taux | |
| 112 | − d'erreur, top endpoints, uptime (données des middlewares de logging + runs). | |
| 113 | −- **Transverse (tous)** : volume total agrégé + croissance, connecteurs actifs | |
| 114 | − et éléments ajoutés/mis à jour par période (journaux de sync), complétude/ | |
| 115 | − fraîcheur moyenne des fiches quand mesurable. Trafic web : seulement si des | |
| 116 | − journaux d'accès existent — sinon état vide propre. | |
| 163 | + payants (stacked), heatmap calendrier + horaire, top lieux. | |
| 164 | +- **crea-ka** : créateurs par plateforme/niche/tier, comptes reliés | |
| 165 | + (stacked par plateforme), distribution des audiences, top créateurs, | |
| 166 | + croissance du répertoire. | |
| 167 | +- **trouve-ka** : pages indexées, domaines, rythme de crawl (indexées/h — | |
| 168 | + hourly), erreurs, file frontier, tendances des requêtes journalisées. | |
| 169 | +- **api-ka** : appels par endpoint/jour/heure (hourly), latences moyennes + | |
| 170 | + p95 (multiseries), taux d'erreur, top endpoints/clés, uptime. | |
| 171 | +- **job-ka** : offres actives/nouvelles/expirées par catégorie/ville/ | |
| 172 | + entreprise, distribution des salaires affichés, top employeurs. | |
| 173 | +- **Transverse (tous)** : volume total agrégé + croissance, connecteurs | |
| 174 | + actifs et éléments ajoutés/mis à jour par période (journaux de sync — | |
| 175 | + stacked par source quand possible), complétude/fraîcheur moyenne des | |
| 176 | + fiches quand mesurable (jauges). Trafic web : seulement si des journaux | |
| 177 | + d'accès existent — sinon état vide propre. | |
| 117 | 178 | |
| 118 | 179 | ## 5. Ajouter une métrique / un graphique / une plateforme |
| 119 | 180 | |
| 120 | −1 métrique = 1 entrée `kpis[]` ou `series[]` côté API (requête SQL agrégée + | |
| 121 | −cache) — le front la rend automatiquement. 1 plateforme = implémenter les 2 | |
| 122 | −endpoints du contrat + une page /stats montée sur les composants du kit + | |
| 123 | −`kapdf.py` (ou gabarit pdfkit) branché sur le même JSON de dashboard. | |
| 181 | +1 métrique = 1 entrée `kpis[]`, `series[]`, `multiseries[]`, `stacked[]`, | |
| 182 | +`distributions[]` ou `gauges[]` côté API (requête SQL agrégée + cache) — le | |
| 183 | +front la rend automatiquement. 1 plateforme = implémenter les 2 endpoints du | |
| 184 | +contrat + une page /stats montée sur les composants du kit + `kapdf.py` (ou | |
| 185 | +gabarit pdfkit) branché sur le même JSON de dashboard. | |
modified
src/api/web/ka/stats/kacharts.tsx
+393 −30
@@ -2,22 +2,39 @@ | ||
| 2 | 2 | // ka-ui/stats/kacharts.tsx — kit de graphiques SVG du module Stats commun |
| 3 | 3 | // Groupe KA (zéro dépendance, React 18+). Style : design system ka-ui |
| 4 | 4 | // (bordures encre, accent de la plateforme via var(--accent)). |
| 5 | −// Composants : KpiCard, PeriodSelector, LineChart (infobulle + légende | |
| 6 | −// cliquable + comparaison N-1), BarChart, Donut, CalendarHeatmap, DataTable | |
| 7 | −// (tri/recherche/pagination), RecordCard, PdfButton, EmptyBlock, Fraicheur. | |
| 8 | −import { useMemo, useState } from "react"; | |
| 5 | +// v2 — composants : KpiCard (+sparkline), PeriodSelector, LineChart (ligne/ | |
| 6 | +// aire, infobulle + légende cliquable + comparaison N-1), MultiLineChart | |
| 7 | +// (≤4 séries, pointillés distincts = jamais la couleur seule), VBarChart | |
| 8 | +// (barres verticales / histogrammes), StackedBarChart, BarChart (horizontal, | |
| 9 | +// deltas), Donut, GaugeCard, CalendarHeatmap, HourHeatmap (7×24), | |
| 10 | +// StatSummary (min/max/moy/méd/σ), DataTable (tri/recherche/pagination), | |
| 11 | +// RecordCard, PdfButton (menu de rapports), EmptyBlock, Fraicheur. | |
| 12 | +import { useEffect, useMemo, useRef, useState } from "react"; | |
| 9 | 13 | |
| 10 | −/* ---------- types (contrat SPEC.md) ---------- */ | |
| 14 | +/* ---------- types (contrat SPEC.md v2) ---------- */ | |
| 11 | 15 | export type Kpi = { |
| 12 | 16 | id: string; label: string; value: number | string; unit?: string; |
| 13 | 17 | delta_pct?: number | null; direction?: "up" | "down"; |
| 18 | + spark?: Point[]; help?: string; | |
| 14 | 19 | }; |
| 15 | 20 | export type Point = { t: string; v: number }; |
| 16 | 21 | export type Serie = { |
| 17 | − id: string; title: string; unit?: string; kind?: "line" | "bar"; | |
| 22 | + id: string; title: string; unit?: string; | |
| 23 | + kind?: "line" | "bar" | "area"; | |
| 18 | 24 | points: Point[]; compare?: Point[]; |
| 19 | 25 | }; |
| 20 | −export type BreakItem = { label: string; value: number }; | |
| 26 | +export type MultiSerie = { | |
| 27 | + id: string; title: string; unit?: string; | |
| 28 | + series: { label: string; points: Point[] }[]; // ≤ 4 séries | |
| 29 | +}; | |
| 30 | +export type StackedSerie = { | |
| 31 | + id: string; title: string; unit?: string; | |
| 32 | + keys: string[]; points: { t: string; values: number[] }[]; | |
| 33 | +}; | |
| 34 | +export type BreakItem = { label: string; value: number; delta_pct?: number | null }; | |
| 35 | +export type Distribution = { id: string; title: string; unit?: string; bins: { label: string; value: number }[] }; | |
| 36 | +export type Gauge = { id: string; label: string; value: number; max: number; unit?: string; help?: string }; | |
| 37 | +export type HourCell = { dow: number; hour: number; value: number }; // dow 0=lun … 6=dim | |
| 21 | 38 | export type TableSpec = { id: string; title: string; columns: string[]; rows: (string | number)[][] }; |
| 22 | 39 | export type RecordFact = { label: string; value: string; date?: string }; |
| 23 | 40 | |
@@ -32,25 +49,63 @@ export const PERIODS: { id: string; label: string }[] = [ | ||
| 32 | 49 | { id: "tout", label: "Tout" }, |
| 33 | 50 | ]; |
| 34 | 51 | |
| 52 | +export const REPORT_MODES: { id: string; label: string; desc: string }[] = [ | |
| 53 | + { id: "complet", label: "Rapport complet", desc: "Toutes les sections — KPI, tendances, répartitions, tableaux, records" }, | |
| 54 | + { id: "synthese", label: "Synthèse exécutive", desc: "2 pages — indicateurs clés et faits marquants" }, | |
| 55 | + { id: "tendances", label: "Tendances & évolution", desc: "Courbes, comparaisons N-1 et statistiques de séries" }, | |
| 56 | + { id: "repartitions", label: "Répartitions & géographie", desc: "Catégories, distributions, régions et activité" }, | |
| 57 | + { id: "donnees", label: "Données détaillées", desc: "Tous les tableaux, en version longue" }, | |
| 58 | +]; | |
| 59 | + | |
| 35 | 60 | export const fmtInt = (n: number) => n.toLocaleString("fr-CA"); |
| 36 | 61 | export const fmtNum = (n: number) => |
| 37 | 62 | Number.isInteger(n) ? fmtInt(n) : n.toLocaleString("fr-CA", { maximumFractionDigits: 2 }); |
| 63 | +const fmtPct = (n: number) => `${n >= 0 ? "+" : ""}${fmtNum(n)} %`; | |
| 38 | 64 | |
| 39 | −/* ---------- KPI ---------- */ | |
| 65 | +/* Styles des séries multiples : couleur + motif de trait (l'identité n'est | |
| 66 | + jamais portée par la couleur seule — règle d'accessibilité). */ | |
| 67 | +const MULTI_STYLES = [ | |
| 68 | + { stroke: "var(--accent)", dash: undefined, width: 2.4 }, | |
| 69 | + { stroke: "var(--ink)", dash: undefined, width: 1.6 }, | |
| 70 | + { stroke: "var(--accent-deep, var(--accent))", dash: "6 3", width: 2 }, | |
| 71 | + { stroke: "var(--ink-3)", dash: "2 3", width: 2 }, | |
| 72 | +]; | |
| 73 | + | |
| 74 | +/* ---------- KPI (+ sparkline) ---------- */ | |
| 40 | 75 | export function KpiCard({ k }: { k: Kpi }) { |
| 41 | 76 | const up = (k.direction ?? ((k.delta_pct ?? 0) >= 0 ? "up" : "down")) === "up"; |
| 77 | + const sp = (k.spark ?? []).filter((p) => typeof p.v === "number"); | |
| 78 | + const spark = useMemo(() => { | |
| 79 | + if (sp.length < 2) return null; | |
| 80 | + const w = 120, h = 30; | |
| 81 | + const vmax = Math.max(...sp.map((p) => p.v)); | |
| 82 | + const vmin = Math.min(...sp.map((p) => p.v)); | |
| 83 | + const rng = vmax - vmin || 1; | |
| 84 | + const X = (i: number) => (w * i) / (sp.length - 1); | |
| 85 | + const Y = (v: number) => 2 + (h - 4) * (1 - (v - vmin) / rng); | |
| 86 | + const d = sp.map((p, i) => `${i ? "L" : "M"}${X(i).toFixed(1)},${Y(p.v).toFixed(1)}`).join(""); | |
| 87 | + return { w, h, d, area: `${d}L${w},${h}L0,${h}Z` }; | |
| 88 | + }, [k.spark]); | |
| 42 | 89 | return ( |
| 43 | − <article className="card" style={{ padding: "14px 16px", minWidth: 0 }}> | |
| 90 | + <article className="card" style={{ padding: "14px 16px", minWidth: 0 }} title={k.help}> | |
| 44 | 91 | <p style={{ margin: 0, fontFamily: "var(--font-display)", fontWeight: 700, fontSize: "clamp(22px,2.4vw,30px)", letterSpacing: "-0.02em" }}> |
| 45 | 92 | {typeof k.value === "number" ? fmtNum(k.value) : k.value} |
| 46 | 93 | {k.unit ? <span style={{ fontSize: "0.6em", color: "var(--ink-2)" }}> {k.unit}</span> : null} |
| 47 | 94 | </p> |
| 48 | 95 | <p className="klabel" style={{ margin: "6px 0 0" }}>{k.label}</p> |
| 49 | − {k.delta_pct !== undefined && k.delta_pct !== null && ( | |
| 50 | − <p style={{ margin: "8px 0 0", fontFamily: "var(--font-mono)", fontSize: 11, fontWeight: 700, color: up ? "var(--green)" : "var(--danger)" }}> | |
| 51 | − {up ? "▲" : "▼"} {k.delta_pct >= 0 ? "+" : ""}{fmtNum(k.delta_pct)} % <span style={{ color: "var(--ink-3)", fontWeight: 500 }}>vs période préc.</span> | |
| 52 | − </p> | |
| 53 | − )} | |
| 96 | + <div style={{ display: "flex", justifyContent: "space-between", alignItems: "flex-end", gap: 8 }}> | |
| 97 | + {k.delta_pct !== undefined && k.delta_pct !== null ? ( | |
| 98 | + <p style={{ margin: "8px 0 0", fontFamily: "var(--font-mono)", fontSize: 11, fontWeight: 700, color: up ? "var(--green)" : "var(--danger)" }}> | |
| 99 | + {up ? "▲" : "▼"} {fmtPct(k.delta_pct)} <span style={{ color: "var(--ink-3)", fontWeight: 500 }}>vs période préc.</span> | |
| 100 | + </p> | |
| 101 | + ) : <span />} | |
| 102 | + {spark && ( | |
| 103 | + <svg viewBox={`0 0 ${spark.w} ${spark.h}`} style={{ width: 96, height: 24, flex: "none" }} aria-hidden="true"> | |
| 104 | + <path d={spark.area} fill="var(--accent)" opacity={0.14} /> | |
| 105 | + <path d={spark.d} fill="none" stroke="var(--accent)" strokeWidth={1.8} /> | |
| 106 | + </svg> | |
| 107 | + )} | |
| 108 | + </div> | |
| 54 | 109 | </article> |
| 55 | 110 | ); |
| 56 | 111 | } |
@@ -84,12 +139,13 @@ export function PeriodSelector({ | ||
| 84 | 139 | ); |
| 85 | 140 | } |
| 86 | 141 | |
| 87 | −/* ---------- Courbe ---------- */ | |
| 142 | +/* ---------- Courbe / aire ---------- */ | |
| 88 | 143 | export function LineChart({ serie, height = 240 }: { serie: Serie; height?: number }) { |
| 89 | 144 | const [hide, setHide] = useState<{ cur: boolean; cmp: boolean }>({ cur: false, cmp: false }); |
| 90 | 145 | const [hover, setHover] = useState<number | null>(null); |
| 91 | 146 | const W = 720, H = height, PL = 54, PR = 10, PT = 14, PB = 26; |
| 92 | 147 | const pts = serie.points ?? []; |
| 148 | + if (serie.kind === "bar") return <VBarChart serie={serie} height={height} />; | |
| 93 | 149 | if (pts.length < 2) return <EmptyBlock title={serie.title} />; |
| 94 | 150 | const all = [...(hide.cur ? [] : pts), ...(!hide.cmp && serie.compare ? serie.compare : [])]; |
| 95 | 151 | const vmax = Math.max(...all.map((p) => p.v), 1); |
@@ -127,6 +183,9 @@ export function LineChart({ serie, height = 240 }: { serie: Serie; height?: numb | ||
| 127 | 183 | {[0, Math.floor(pts.length / 2), pts.length - 1].map((i) => ( |
| 128 | 184 | <text key={i} x={X(i, pts.length)} y={H - 8} textAnchor="middle" fontSize={10} fill="var(--ink-3)" fontFamily="var(--font-mono)">{pts[i].t}</text> |
| 129 | 185 | ))} |
| 186 | + {serie.kind === "area" && !hide.cur && ( | |
| 187 | + <path d={`${path(pts)}L${X(pts.length - 1, pts.length)},${Y(0)}L${X(0, pts.length)},${Y(0)}Z`} fill="var(--accent)" opacity={0.13} /> | |
| 188 | + )} | |
| 130 | 189 | {!hide.cmp && serie.compare && serie.compare.length > 1 && ( |
| 131 | 190 | <path d={path(serie.compare)} fill="none" stroke="var(--ink-3)" strokeWidth={1.4} strokeDasharray="4 4" /> |
| 132 | 191 | )} |
@@ -148,17 +207,211 @@ export function LineChart({ serie, height = 240 }: { serie: Serie; height?: numb | ||
| 148 | 207 | ); |
| 149 | 208 | } |
| 150 | 209 | |
| 151 | −function LegendChip({ label, color, off, dashed, onClick }: { label: string; color: string; off: boolean; dashed?: boolean; onClick: () => void }) { | |
| 210 | +function LegendChip({ label, color, off, dashed, onClick }: { label: string; color: string; off?: boolean; dashed?: boolean; onClick?: () => void }) { | |
| 152 | 211 | return ( |
| 153 | − <button type="button" onClick={onClick} aria-pressed={!off} | |
| 154 | − style={{ display: "inline-flex", alignItems: "center", gap: 6, border: 0, background: "none", cursor: "pointer", opacity: off ? 0.4 : 1, fontFamily: "var(--font-mono)", fontSize: 10.5, fontWeight: 700, textTransform: "uppercase", letterSpacing: "0.06em", minHeight: 44 }}> | |
| 212 | + <button type="button" onClick={onClick} aria-pressed={!off} disabled={!onClick} | |
| 213 | + style={{ display: "inline-flex", alignItems: "center", gap: 6, border: 0, background: "none", cursor: onClick ? "pointer" : "default", opacity: off ? 0.4 : 1, fontFamily: "var(--font-mono)", fontSize: 10.5, fontWeight: 700, textTransform: "uppercase", letterSpacing: "0.06em", minHeight: 44 }}> | |
| 155 | 214 | <span style={{ width: 18, height: 0, borderTop: `3px ${dashed ? "dashed" : "solid"} ${color}` }} /> |
| 156 | 215 | {label} |
| 157 | 216 | </button> |
| 158 | 217 | ); |
| 159 | 218 | } |
| 160 | 219 | |
| 161 | −/* ---------- Barres horizontales (répartitions, géo) ---------- */ | |
| 220 | +/* ---------- Multi-courbes (≤ 4 séries, motifs distincts) ---------- */ | |
| 221 | +export function MultiLineChart({ ms, height = 260 }: { ms: MultiSerie; height?: number }) { | |
| 222 | + const series = (ms.series ?? []).filter((s) => (s.points ?? []).length > 1).slice(0, 4); | |
| 223 | + const [off, setOff] = useState<Record<string, boolean>>({}); | |
| 224 | + const [hover, setHover] = useState<number | null>(null); | |
| 225 | + if (!series.length) return <EmptyBlock title={ms.title} />; | |
| 226 | + const W = 720, H = height, PL = 54, PR = 10, PT = 14, PB = 26; | |
| 227 | + const n = Math.max(...series.map((s) => s.points.length)); | |
| 228 | + const shown = series.filter((s) => !off[s.label]); | |
| 229 | + const all = shown.flatMap((s) => s.points.map((p) => p.v)); | |
| 230 | + const vmax = Math.max(...(all.length ? all : [1]), 1); | |
| 231 | + const vmin = Math.min(0, ...(all.length ? all : [0])); | |
| 232 | + const X = (i: number, len: number) => PL + ((W - PL - PR) * i) / (len - 1); | |
| 233 | + const Y = (v: number) => PT + (H - PT - PB) * (1 - (v - vmin) / (vmax - vmin || 1)); | |
| 234 | + const ref = series[0].points; | |
| 235 | + const hi = hover !== null ? Math.min(n - 1, Math.max(0, hover)) : null; | |
| 236 | + return ( | |
| 237 | + <figure className="card" style={{ margin: 0, padding: 16 }}> | |
| 238 | + <figcaption style={{ display: "flex", justifyContent: "space-between", flexWrap: "wrap", gap: 8 }}> | |
| 239 | + <b style={{ fontFamily: "var(--font-display)", fontSize: 15 }}>{ms.title}</b> | |
| 240 | + <span style={{ display: "flex", gap: 10, flexWrap: "wrap" }}> | |
| 241 | + {series.map((s, i) => ( | |
| 242 | + <LegendChip key={s.label} label={s.label} color={MULTI_STYLES[i].stroke} | |
| 243 | + dashed={!!MULTI_STYLES[i].dash} off={!!off[s.label]} | |
| 244 | + onClick={() => setOff((o) => ({ ...o, [s.label]: !o[s.label] }))} /> | |
| 245 | + ))} | |
| 246 | + </span> | |
| 247 | + </figcaption> | |
| 248 | + <svg viewBox={`0 0 ${W} ${H}`} style={{ width: "100%", height: "auto", marginTop: 10, touchAction: "pan-y" }} role="img" aria-label={ms.title} | |
| 249 | + onMouseMove={(e) => { | |
| 250 | + const r = (e.currentTarget as SVGSVGElement).getBoundingClientRect(); | |
| 251 | + const fx = ((e.clientX - r.left) / r.width) * W; | |
| 252 | + setHover(Math.round(((fx - PL) / (W - PL - PR)) * (n - 1))); | |
| 253 | + }} | |
| 254 | + onMouseLeave={() => setHover(null)}> | |
| 255 | + {[0, 1, 2, 3, 4].map((g) => { | |
| 256 | + const y = PT + ((H - PT - PB) * g) / 4; | |
| 257 | + const v = vmax - ((vmax - vmin) * g) / 4; | |
| 258 | + return ( | |
| 259 | + <g key={g}> | |
| 260 | + <line x1={PL} x2={W - PR} y1={y} y2={y} stroke="var(--line)" strokeWidth={1} /> | |
| 261 | + <text x={PL - 6} y={y + 3} textAnchor="end" fontSize={10} fill="var(--ink-3)" fontFamily="var(--font-mono)">{fmtInt(Math.round(v))}</text> | |
| 262 | + </g> | |
| 263 | + ); | |
| 264 | + })} | |
| 265 | + {[0, Math.floor(ref.length / 2), ref.length - 1].map((i) => ( | |
| 266 | + <text key={i} x={X(i, ref.length)} y={H - 8} textAnchor="middle" fontSize={10} fill="var(--ink-3)" fontFamily="var(--font-mono)">{ref[i]?.t}</text> | |
| 267 | + ))} | |
| 268 | + {series.map((s, i) => off[s.label] ? null : ( | |
| 269 | + <path key={s.label} | |
| 270 | + d={s.points.map((p, j) => `${j ? "L" : "M"}${X(j, s.points.length)},${Y(p.v)}`).join("")} | |
| 271 | + fill="none" stroke={MULTI_STYLES[i].stroke} strokeWidth={MULTI_STYLES[i].width} | |
| 272 | + strokeDasharray={MULTI_STYLES[i].dash} /> | |
| 273 | + ))} | |
| 274 | + {hi !== null && ( | |
| 275 | + <line x1={X(hi, n)} x2={X(hi, n)} y1={PT} y2={H - PB} stroke="var(--ink)" strokeWidth={1} strokeDasharray="2 3" /> | |
| 276 | + )} | |
| 277 | + </svg> | |
| 278 | + {hi !== null && ( | |
| 279 | + <p className="chip" style={{ marginTop: 8, display: "inline-flex", gap: 12, flexWrap: "wrap" }}> | |
| 280 | + <b>{ref[hi]?.t}</b> | |
| 281 | + {shown.map((s) => ( | |
| 282 | + <span key={s.label}>{s.label} : <b>{s.points[hi] ? fmtNum(s.points[hi].v) : "—"}{ms.unit ? ` ${ms.unit}` : ""}</b></span> | |
| 283 | + ))} | |
| 284 | + </p> | |
| 285 | + )} | |
| 286 | + </figure> | |
| 287 | + ); | |
| 288 | +} | |
| 289 | + | |
| 290 | +/* ---------- Barres verticales (volumes quotidiens, histogrammes) ---------- */ | |
| 291 | +export function VBarChart({ serie, height = 240 }: { serie: Serie; height?: number }) { | |
| 292 | + const [hover, setHover] = useState<number | null>(null); | |
| 293 | + const pts = serie.points ?? []; | |
| 294 | + if (!pts.length) return <EmptyBlock title={serie.title} />; | |
| 295 | + const W = 720, H = height, PL = 54, PR = 10, PT = 14, PB = 26; | |
| 296 | + const vmax = Math.max(...pts.map((p) => p.v), 1); | |
| 297 | + const bw = Math.max(2, (W - PL - PR) / pts.length - 2); | |
| 298 | + return ( | |
| 299 | + <figure className="card" style={{ margin: 0, padding: 16 }}> | |
| 300 | + <figcaption><b style={{ fontFamily: "var(--font-display)", fontSize: 15 }}>{serie.title}</b></figcaption> | |
| 301 | + <svg viewBox={`0 0 ${W} ${H}`} style={{ width: "100%", height: "auto", marginTop: 10 }} role="img" aria-label={serie.title} | |
| 302 | + onMouseLeave={() => setHover(null)}> | |
| 303 | + {[0, 1, 2, 3, 4].map((g) => { | |
| 304 | + const y = PT + ((H - PT - PB) * g) / 4; | |
| 305 | + const v = vmax - (vmax * g) / 4; | |
| 306 | + return ( | |
| 307 | + <g key={g}> | |
| 308 | + <line x1={PL} x2={W - PR} y1={y} y2={y} stroke="var(--line)" strokeWidth={1} /> | |
| 309 | + <text x={PL - 6} y={y + 3} textAnchor="end" fontSize={10} fill="var(--ink-3)" fontFamily="var(--font-mono)">{fmtInt(Math.round(v))}</text> | |
| 310 | + </g> | |
| 311 | + ); | |
| 312 | + })} | |
| 313 | + {pts.map((p, i) => { | |
| 314 | + const x = PL + ((W - PL - PR) * i) / pts.length; | |
| 315 | + const h = (H - PT - PB) * (p.v / vmax); | |
| 316 | + return ( | |
| 317 | + <rect key={i} x={x + 1} y={H - PB - h} width={bw} height={Math.max(h, p.v > 0 ? 1.5 : 0)} rx={2} | |
| 318 | + fill="var(--accent)" opacity={hover === null || hover === i ? 1 : 0.45} | |
| 319 | + stroke="var(--ink)" strokeWidth={0.5} | |
| 320 | + onMouseEnter={() => setHover(i)}> | |
| 321 | + <title>{`${p.t} — ${fmtNum(p.v)}${serie.unit ? ` ${serie.unit}` : ""}`}</title> | |
| 322 | + </rect> | |
| 323 | + ); | |
| 324 | + })} | |
| 325 | + {[0, Math.floor(pts.length / 2), pts.length - 1].filter((v, i, a) => a.indexOf(v) === i).map((i) => ( | |
| 326 | + <text key={i} x={PL + ((W - PL - PR) * (i + 0.5)) / pts.length} y={H - 8} textAnchor="middle" fontSize={10} fill="var(--ink-3)" fontFamily="var(--font-mono)">{pts[i].t}</text> | |
| 327 | + ))} | |
| 328 | + </svg> | |
| 329 | + {hover !== null && ( | |
| 330 | + <p className="chip" style={{ marginTop: 8 }}>{pts[hover].t} — <b>{fmtNum(pts[hover].v)}{serie.unit ? ` ${serie.unit}` : ""}</b></p> | |
| 331 | + )} | |
| 332 | + </figure> | |
| 333 | + ); | |
| 334 | +} | |
| 335 | + | |
| 336 | +/* ---------- Histogramme (distribution) ---------- */ | |
| 337 | +export function Histogram({ dist }: { dist: Distribution }) { | |
| 338 | + const serie: Serie = { | |
| 339 | + id: dist.id, title: dist.title, unit: dist.unit, kind: "bar", | |
| 340 | + points: (dist.bins ?? []).map((b) => ({ t: b.label, v: b.value })), | |
| 341 | + }; | |
| 342 | + return <VBarChart serie={serie} height={220} />; | |
| 343 | +} | |
| 344 | + | |
| 345 | +/* ---------- Barres empilées (composition dans le temps) ---------- */ | |
| 346 | +export function StackedBarChart({ st, height = 260 }: { st: StackedSerie; height?: number }) { | |
| 347 | + const [hover, setHover] = useState<number | null>(null); | |
| 348 | + const keys = (st.keys ?? []).slice(0, 6); | |
| 349 | + const pts = st.points ?? []; | |
| 350 | + if (!keys.length || !pts.length) return <EmptyBlock title={st.title} />; | |
| 351 | + const W = 720, H = height, PL = 54, PR = 10, PT = 14, PB = 26; | |
| 352 | + const totals = pts.map((p) => p.values.slice(0, keys.length).reduce((s, v) => s + (v || 0), 0)); | |
| 353 | + const vmax = Math.max(...totals, 1); | |
| 354 | + const bw = Math.max(2, (W - PL - PR) / pts.length - 2); | |
| 355 | + const shades = [1, 0.72, 0.5, 0.34, 0.22, 0.13]; | |
| 356 | + return ( | |
| 357 | + <figure className="card" style={{ margin: 0, padding: 16 }}> | |
| 358 | + <figcaption style={{ display: "flex", justifyContent: "space-between", flexWrap: "wrap", gap: 8 }}> | |
| 359 | + <b style={{ fontFamily: "var(--font-display)", fontSize: 15 }}>{st.title}</b> | |
| 360 | + <span style={{ display: "flex", gap: 10, flexWrap: "wrap" }}> | |
| 361 | + {keys.map((k, i) => ( | |
| 362 | + <span key={k} style={{ display: "inline-flex", alignItems: "center", gap: 5, fontFamily: "var(--font-mono)", fontSize: 10.5, fontWeight: 700, textTransform: "uppercase", letterSpacing: "0.06em" }}> | |
| 363 | + <span style={{ width: 11, height: 11, borderRadius: 3, border: "1px solid var(--ink)", background: "var(--accent)", opacity: shades[i] }} /> | |
| 364 | + {k} | |
| 365 | + </span> | |
| 366 | + ))} | |
| 367 | + </span> | |
| 368 | + </figcaption> | |
| 369 | + <svg viewBox={`0 0 ${W} ${H}`} style={{ width: "100%", height: "auto", marginTop: 10 }} role="img" aria-label={st.title} | |
| 370 | + onMouseLeave={() => setHover(null)}> | |
| 371 | + {[0, 1, 2, 3, 4].map((g) => { | |
| 372 | + const y = PT + ((H - PT - PB) * g) / 4; | |
| 373 | + return ( | |
| 374 | + <g key={g}> | |
| 375 | + <line x1={PL} x2={W - PR} y1={y} y2={y} stroke="var(--line)" strokeWidth={1} /> | |
| 376 | + <text x={PL - 6} y={y + 3} textAnchor="end" fontSize={10} fill="var(--ink-3)" fontFamily="var(--font-mono)">{fmtInt(Math.round(vmax - (vmax * g) / 4))}</text> | |
| 377 | + </g> | |
| 378 | + ); | |
| 379 | + })} | |
| 380 | + {pts.map((p, i) => { | |
| 381 | + const x = PL + ((W - PL - PR) * i) / pts.length; | |
| 382 | + let yAcc = H - PB; | |
| 383 | + return ( | |
| 384 | + <g key={i} onMouseEnter={() => setHover(i)} opacity={hover === null || hover === i ? 1 : 0.5}> | |
| 385 | + {keys.map((k, j) => { | |
| 386 | + const v = p.values[j] || 0; | |
| 387 | + const h = (H - PT - PB) * (v / vmax); | |
| 388 | + yAcc -= h; | |
| 389 | + return v > 0 ? ( | |
| 390 | + <rect key={k} x={x + 1} y={yAcc} width={bw} height={Math.max(h - 1, 0.8)} rx={1.5} | |
| 391 | + fill="var(--accent)" opacity={shades[j]} stroke="var(--ink)" strokeWidth={0.4}> | |
| 392 | + <title>{`${p.t} · ${k} — ${fmtNum(v)}${st.unit ? ` ${st.unit}` : ""}`}</title> | |
| 393 | + </rect> | |
| 394 | + ) : null; | |
| 395 | + })} | |
| 396 | + </g> | |
| 397 | + ); | |
| 398 | + })} | |
| 399 | + {[0, Math.floor(pts.length / 2), pts.length - 1].filter((v, i, a) => a.indexOf(v) === i).map((i) => ( | |
| 400 | + <text key={i} x={PL + ((W - PL - PR) * (i + 0.5)) / pts.length} y={H - 8} textAnchor="middle" fontSize={10} fill="var(--ink-3)" fontFamily="var(--font-mono)">{pts[i].t}</text> | |
| 401 | + ))} | |
| 402 | + </svg> | |
| 403 | + {hover !== null && ( | |
| 404 | + <p className="chip" style={{ marginTop: 8, display: "inline-flex", gap: 12, flexWrap: "wrap" }}> | |
| 405 | + <b>{pts[hover].t}</b> | |
| 406 | + {keys.map((k, j) => <span key={k}>{k} : <b>{fmtNum(pts[hover].values[j] || 0)}</b></span>)} | |
| 407 | + <span style={{ color: "var(--ink-3)" }}>total {fmtNum(totals[hover])}</span> | |
| 408 | + </p> | |
| 409 | + )} | |
| 410 | + </figure> | |
| 411 | + ); | |
| 412 | +} | |
| 413 | + | |
| 414 | +/* ---------- Barres horizontales (répartitions, géo) — deltas optionnels ---------- */ | |
| 162 | 415 | export function BarChart({ title, items, unit }: { title: string; items: BreakItem[]; unit?: string }) { |
| 163 | 416 | const rows = (items ?? []).slice(0, 14); |
| 164 | 417 | if (!rows.length) return <EmptyBlock title={title} />; |
@@ -169,9 +422,16 @@ export function BarChart({ title, items, unit }: { title: string; items: BreakIt | ||
| 169 | 422 | <div style={{ marginTop: 12, display: "grid", gap: 9 }}> |
| 170 | 423 | {rows.map((r) => ( |
| 171 | 424 | <div key={r.label} title={`${r.label} — ${fmtNum(r.value)}${unit ? ` ${unit}` : ""}`}> |
| 172 | − <div style={{ display: "flex", justifyContent: "space-between", fontSize: 12.5 }}> | |
| 425 | + <div style={{ display: "flex", justifyContent: "space-between", gap: 8, fontSize: 12.5 }}> | |
| 173 | 426 | <span style={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{r.label}</span> |
| 174 | − <b style={{ fontFamily: "var(--font-mono)", fontSize: 11.5 }}>{fmtNum(r.value)}{unit ? ` ${unit}` : ""}</b> | |
| 427 | + <span style={{ display: "inline-flex", gap: 8, alignItems: "baseline", flex: "none" }}> | |
| 428 | + {r.delta_pct !== undefined && r.delta_pct !== null && ( | |
| 429 | + <span style={{ fontFamily: "var(--font-mono)", fontSize: 10, fontWeight: 700, color: r.delta_pct >= 0 ? "var(--green)" : "var(--danger)" }}> | |
| 430 | + {r.delta_pct >= 0 ? "▲" : "▼"} {fmtPct(r.delta_pct)} | |
| 431 | + </span> | |
| 432 | + )} | |
| 433 | + <b style={{ fontFamily: "var(--font-mono)", fontSize: 11.5 }}>{fmtNum(r.value)}{unit ? ` ${unit}` : ""}</b> | |
| 434 | + </span> | |
| 175 | 435 | </div> |
| 176 | 436 | <div style={{ marginTop: 3, height: 12, background: "rgba(20,24,20,0.06)", borderRadius: "0 3px 3px 0" }}> |
| 177 | 437 | <div style={{ height: "100%", width: `${Math.max((r.value / max) * 100, 1)}%`, background: "var(--accent)", border: "1px solid var(--ink)", borderRadius: "0 3px 3px 0", boxSizing: "border-box" }} /> |
@@ -224,6 +484,26 @@ export function Donut({ title, items }: { title: string; items: BreakItem[] }) { | ||
| 224 | 484 | ); |
| 225 | 485 | } |
| 226 | 486 | |
| 487 | +/* ---------- Jauge (taux, complétude, couverture) ---------- */ | |
| 488 | +export function GaugeCard({ g }: { g: Gauge }) { | |
| 489 | + const frac = Math.max(0, Math.min(1, g.max ? g.value / g.max : 0)); | |
| 490 | + const R = 60, C = Math.PI * R; | |
| 491 | + return ( | |
| 492 | + <article className="card" style={{ padding: "14px 16px", minWidth: 0 }} title={g.help}> | |
| 493 | + <svg viewBox="0 0 150 84" style={{ width: "100%", maxWidth: 190, display: "block", margin: "0 auto" }} role="img" aria-label={`${g.label} : ${fmtNum(g.value)}${g.unit ?? ""} sur ${fmtNum(g.max)}`}> | |
| 494 | + <path d={`M15,75 A${R},${R} 0 0 1 135,75`} fill="none" stroke="rgba(20,24,20,0.08)" strokeWidth={13} strokeLinecap="round" /> | |
| 495 | + <path d={`M15,75 A${R},${R} 0 0 1 135,75`} fill="none" stroke="var(--accent)" strokeWidth={13} strokeLinecap="round" | |
| 496 | + strokeDasharray={`${frac * C} ${C}`} /> | |
| 497 | + <text x={75} y={66} textAnchor="middle" fontFamily="var(--font-display)" fontWeight={700} fontSize={22} fill="var(--ink)"> | |
| 498 | + {fmtNum(g.value)}{g.unit ? <tspan fontSize={12} fill="var(--ink-2)"> {g.unit}</tspan> : null} | |
| 499 | + </text> | |
| 500 | + <text x={75} y={80} textAnchor="middle" fontSize={9} fill="var(--ink-3)" fontFamily="var(--font-mono)">{(frac * 100).toFixed(0)} % de {fmtNum(g.max)}{g.unit ? ` ${g.unit}` : ""}</text> | |
| 501 | + </svg> | |
| 502 | + <p className="klabel" style={{ margin: "8px 0 0", textAlign: "center" }}>{g.label}</p> | |
| 503 | + </article> | |
| 504 | + ); | |
| 505 | +} | |
| 506 | + | |
| 227 | 507 | /* ---------- Calendrier de chaleur ---------- */ |
| 228 | 508 | export function CalendarHeatmap({ title, cells }: { title: string; cells: { date: string; value: number }[] }) { |
| 229 | 509 | if (!cells?.length) return <EmptyBlock title={title} />; |
@@ -261,6 +541,64 @@ export function CalendarHeatmap({ title, cells }: { title: string; cells: { date | ||
| 261 | 541 | ); |
| 262 | 542 | } |
| 263 | 543 | |
| 544 | +/* ---------- Heatmap horaire 7 × 24 (activité par heure) ---------- */ | |
| 545 | +const DOW = ["Lun", "Mar", "Mer", "Jeu", "Ven", "Sam", "Dim"]; | |
| 546 | +export function HourHeatmap({ title, cells }: { title: string; cells: HourCell[] }) { | |
| 547 | + if (!cells?.length) return <EmptyBlock title={title} />; | |
| 548 | + const grid = new Map(cells.map((c) => [`${c.dow}-${c.hour}`, c.value])); | |
| 549 | + const max = Math.max(...cells.map((c) => c.value), 1); | |
| 550 | + const CW = 24, CH = 20, LX = 34, LY = 16; | |
| 551 | + return ( | |
| 552 | + <figure className="card" style={{ margin: 0, padding: 16 }}> | |
| 553 | + <figcaption><b style={{ fontFamily: "var(--font-display)", fontSize: 15 }}>{title}</b> <span className="klabel">jour × heure</span></figcaption> | |
| 554 | + <div className="tbl-wrap" style={{ marginTop: 12 }}> | |
| 555 | + <svg viewBox={`0 0 ${LX + 24 * CW} ${LY + 7 * CH}`} style={{ minWidth: 520, width: "100%", height: "auto" }} role="img" aria-label={title}> | |
| 556 | + {[0, 6, 12, 18, 23].map((h) => ( | |
| 557 | + <text key={h} x={LX + h * CW + CW / 2} y={11} textAnchor="middle" fontSize={9} fill="var(--ink-3)" fontFamily="var(--font-mono)">{h} h</text> | |
| 558 | + ))} | |
| 559 | + {DOW.map((d, i) => ( | |
| 560 | + <text key={d} x={LX - 6} y={LY + i * CH + CH / 2 + 3} textAnchor="end" fontSize={9} fill="var(--ink-3)" fontFamily="var(--font-mono)">{d}</text> | |
| 561 | + ))} | |
| 562 | + {Array.from({ length: 7 }, (_, d) => Array.from({ length: 24 }, (_, h) => { | |
| 563 | + const v = grid.get(`${d}-${h}`) ?? 0; | |
| 564 | + return ( | |
| 565 | + <rect key={`${d}-${h}`} x={LX + h * CW} y={LY + d * CH} width={CW - 2} height={CH - 2} rx={2.5} | |
| 566 | + fill={v ? "var(--accent)" : "rgba(20,24,20,0.07)"} fillOpacity={v ? 0.22 + 0.78 * (v / max) : 1} | |
| 567 | + stroke="rgba(20,24,20,0.15)" strokeWidth={0.5}> | |
| 568 | + <title>{`${DOW[d]} ${h} h — ${fmtNum(v)}`}</title> | |
| 569 | + </rect> | |
| 570 | + ); | |
| 571 | + }))} | |
| 572 | + </svg> | |
| 573 | + </div> | |
| 574 | + </figure> | |
| 575 | + ); | |
| 576 | +} | |
| 577 | + | |
| 578 | +/* ---------- Statistiques de série (min/max/moy/méd/σ) ---------- */ | |
| 579 | +export function StatSummary({ serie }: { serie: Serie }) { | |
| 580 | + const vs = (serie.points ?? []).map((p) => p.v).filter((v) => typeof v === "number"); | |
| 581 | + if (vs.length < 2) return null; | |
| 582 | + const sorted = [...vs].sort((a, b) => a - b); | |
| 583 | + const mean = vs.reduce((s, v) => s + v, 0) / vs.length; | |
| 584 | + const med = sorted[Math.floor(sorted.length / 2)]; | |
| 585 | + const sd = Math.sqrt(vs.reduce((s, v) => s + (v - mean) ** 2, 0) / vs.length); | |
| 586 | + const items: [string, number][] = [ | |
| 587 | + ["Min", sorted[0]], ["Max", sorted[sorted.length - 1]], | |
| 588 | + ["Moyenne", Math.round(mean * 100) / 100], ["Médiane", med], | |
| 589 | + ["Écart-type", Math.round(sd * 100) / 100], | |
| 590 | + ]; | |
| 591 | + return ( | |
| 592 | + <div style={{ display: "flex", flexWrap: "wrap", gap: 8, marginTop: 8 }}> | |
| 593 | + {items.map(([l, v]) => ( | |
| 594 | + <span key={l} className="chip" style={{ fontSize: 11 }}> | |
| 595 | + <span style={{ color: "var(--ink-3)" }}>{l}</span> <b style={{ fontFamily: "var(--font-mono)" }}>{fmtNum(v)}</b> | |
| 596 | + </span> | |
| 597 | + ))} | |
| 598 | + </div> | |
| 599 | + ); | |
| 600 | +} | |
| 601 | + | |
| 264 | 602 | /* ---------- Tableau : tri, recherche, pagination ---------- */ |
| 265 | 603 | export function DataTable({ spec, pageSize = 25 }: { spec: TableSpec; pageSize?: number }) { |
| 266 | 604 | const [q, setQ] = useState(""); |
@@ -338,9 +676,19 @@ export function RecordCard({ r }: { r: RecordFact }) { | ||
| 338 | 676 | ); |
| 339 | 677 | } |
| 340 | 678 | |
| 341 | −/* ---------- Bouton PDF ---------- */ | |
| 679 | +/* ---------- Menu de rapports PDF (5 rapports) ---------- */ | |
| 342 | 680 | export function PdfButton({ period, from, to, endpoint = "/api/stats/report" }: { period: string; from?: string; to?: string; endpoint?: string }) { |
| 343 | − const [busy, setBusy] = useState(false); | |
| 681 | + const [open, setOpen] = useState(false); | |
| 682 | + const [busy, setBusy] = useState<string | null>(null); | |
| 683 | + const box = useRef<HTMLSpanElement>(null); | |
| 684 | + useEffect(() => { | |
| 685 | + if (!open) return; | |
| 686 | + const close = (e: MouseEvent) => { | |
| 687 | + if (box.current && !box.current.contains(e.target as Node)) setOpen(false); | |
| 688 | + }; | |
| 689 | + document.addEventListener("mousedown", close); | |
| 690 | + return () => document.removeEventListener("mousedown", close); | |
| 691 | + }, [open]); | |
| 344 | 692 | const url = (mode: string) => { |
| 345 | 693 | const p = new URLSearchParams({ period, mode }); |
| 346 | 694 | if (from) p.set("from", from); |
@@ -348,23 +696,38 @@ export function PdfButton({ period, from, to, endpoint = "/api/stats/report" }: | ||
| 348 | 696 | return `${endpoint}?${p}`; |
| 349 | 697 | }; |
| 350 | 698 | const dl = (mode: string) => { |
| 351 | − setBusy(true); | |
| 699 | + setBusy(mode); | |
| 700 | + setOpen(false); | |
| 352 | 701 | const a = document.createElement("a"); |
| 353 | 702 | a.href = url(mode); |
| 354 | 703 | a.download = ""; |
| 355 | 704 | document.body.appendChild(a); |
| 356 | 705 | a.click(); |
| 357 | 706 | a.remove(); |
| 358 | − setTimeout(() => setBusy(false), 2500); | |
| 707 | + setTimeout(() => setBusy(null), 3000); | |
| 359 | 708 | }; |
| 360 | 709 | return ( |
| 361 | − <span style={{ display: "inline-flex", gap: 8, flexWrap: "wrap" }}> | |
| 362 | − <button type="button" className="btn btn-primary" onClick={() => dl("complet")} disabled={busy}> | |
| 363 | − {busy ? "Génération…" : "⬇ Télécharger le rapport PDF"} | |
| 710 | + <span ref={box} style={{ position: "relative", display: "inline-flex", gap: 8, flexWrap: "wrap" }}> | |
| 711 | + <button type="button" className="btn btn-primary" onClick={() => dl("complet")} disabled={!!busy}> | |
| 712 | + {busy ? "Génération…" : "⬇ Rapport PDF complet"} | |
| 364 | 713 | </button> |
| 365 | − <button type="button" className="btn btn-ghost" onClick={() => dl("synthese")} disabled={busy}> | |
| 366 | − Synthèse (2 p.) | |
| 714 | + <button type="button" className="btn btn-ghost" onClick={() => setOpen((o) => !o)} disabled={!!busy} | |
| 715 | + aria-haspopup="menu" aria-expanded={open}> | |
| 716 | + Autres rapports ▾ | |
| 367 | 717 | </button> |
| 718 | + {open && ( | |
| 719 | + <div role="menu" className="card" style={{ position: "absolute", top: "calc(100% + 6px)", right: 0, zIndex: 50, minWidth: 300, padding: 6, background: "var(--surface)", boxShadow: "0 10px 28px rgba(20,24,20,0.18)" }}> | |
| 720 | + {REPORT_MODES.map((m) => ( | |
| 721 | + <button key={m.id} type="button" role="menuitem" onClick={() => dl(m.id)} | |
| 722 | + style={{ display: "block", width: "100%", textAlign: "left", border: 0, background: "none", cursor: "pointer", padding: "9px 10px", borderRadius: 6 }} | |
| 723 | + onMouseEnter={(e) => (e.currentTarget.style.background = "var(--surface-2)")} | |
| 724 | + onMouseLeave={(e) => (e.currentTarget.style.background = "none")}> | |
| 725 | + <b style={{ display: "block", fontSize: 13, fontFamily: "var(--font-display)" }}>{m.label}</b> | |
| 726 | + <span className="klabel" style={{ fontSize: 11 }}>{m.desc}</span> | |
| 727 | + </button> | |
| 728 | + ))} | |
| 729 | + </div> | |
| 730 | + )} | |
| 368 | 731 | </span> |
| 369 | 732 | ); |
| 370 | 733 | } |
modified
src/api/web/ka/stats/kapdf.py
+389 −72
@@ -1,10 +1,17 @@ | ||
| 1 | 1 | # Auteur : Simon-Pierre Boucher — contact@spboucher.ai |
| 2 | −# ka-ui/stats/kapdf.py — moteur PDF commun Groupe KA (fpdf2). | |
| 2 | +# ka-ui/stats/kapdf.py — moteur PDF commun Groupe KA (fpdf2). v2 | |
| 3 | 3 | # Consomme le JSON du contrat /api/stats/dashboard (voir SPEC.md) et produit |
| 4 | −# le rapport estampillé Groupe-KA : couverture, sommaire, KPI, graphiques | |
| 5 | −# VECTORIELS (courbes/barres/anneaux), tableaux paginés, records, page de fin. | |
| 4 | +# les rapports estampillés Groupe-KA. 5 modes : | |
| 5 | +# complet — toutes les sections (KPI, jauges, séries + stats, multi- | |
| 6 | +# séries, empilées, distributions, répartitions, géo, | |
| 7 | +# heatmap horaire, tableaux, records) | |
| 8 | +# synthese — couverture + KPI + records (2-3 pages) | |
| 9 | +# tendances — KPI + toutes les séries temporelles + stats de séries | |
| 10 | +# repartitions — breakdowns, distributions, géo, activité horaire | |
| 11 | +# donnees — tous les tableaux en version longue (400 lignes max) | |
| 12 | +# Graphiques VECTORIELS uniquement (primitives fpdf), accent de la marque. | |
| 6 | 13 | # Usage : |
| 7 | −# from kapdf import GroupeKAReport | |
| 14 | +# from kapdf import GroupeKAReport, REPORT_MODES, filename | |
| 8 | 15 | # pdf_bytes = GroupeKAReport(site={"wordmark":"Lou·Ka","accent":"#ff6a00", |
| 9 | 16 | # "domain":"www.lou-ka.com","tagline":"…"}, dashboard=dash_json, |
| 10 | 17 | # mode="complet").build() |
@@ -26,6 +33,14 @@ GREEN = (28, 92, 65) | ||
| 26 | 33 | DANGER = (179, 66, 58) |
| 27 | 34 | WHITE = (255, 255, 255) |
| 28 | 35 | |
| 36 | +REPORT_MODES = { | |
| 37 | + "complet": "Rapport complet", | |
| 38 | + "synthese": "Synthèse exécutive", | |
| 39 | + "tendances": "Tendances & évolution", | |
| 40 | + "repartitions": "Répartitions & géographie", | |
| 41 | + "donnees": "Données détaillées", | |
| 42 | +} | |
| 43 | + | |
| 29 | 44 | EMAILS = [ |
| 30 | 45 | ("contact@groupe-ka.com", "Projets, partenariats & données"), |
| 31 | 46 | ("info@groupe-ka.com", "Médias & questions générales"), |
@@ -52,7 +67,8 @@ def _fr(n) -> str: | ||
| 52 | 67 | _SUBST = { |
| 53 | 68 | "—": "-", "–": "-", "→": "->", "▲": "+", "▼": "-", |
| 54 | 69 | "…": "...", "’": "'", "‘": "'", "“": '"', "”": '"', |
| 55 | − "œ": "oe", "Œ": "OE", "−": "-", " ": " ", " ": " ", | |
| 70 | + "œ": "oe", "Œ": "OE", "−": "-", " ": " ", " ": " ", | |
| 71 | + "×": "x", "·": ".", "σ": "sigma", "Δ": "delta", | |
| 56 | 72 | } |
| 57 | 73 | |
| 58 | 74 | |
@@ -79,7 +95,7 @@ class _PDF(FPDF): | ||
| 79 | 95 | self.set_auto_page_break(True, margin=22) |
| 80 | 96 | |
| 81 | 97 | def header(self): |
| 82 | − if self.cover_mode: | |
| 98 | + if self.cover_mode or self.page_no() == 1: | |
| 83 | 99 | return |
| 84 | 100 | self.set_font("helvetica", "B", 8.5) |
| 85 | 101 | self.set_text_color(*INK) |
@@ -95,8 +111,8 @@ class _PDF(FPDF): | ||
| 95 | 111 | self.set_y(20) |
| 96 | 112 | |
| 97 | 113 | def footer(self): |
| 98 | − # La page 1 est toujours la couverture : fpdf dessine son pied de page | |
| 99 | − # au add_page() suivant, quand cover_mode est deja retombe a False. | |
| 114 | + # page 1 = couverture (le flag cover_mode est déjà retombé quand | |
| 115 | + # add_page() clôt la page 1 → tester aussi le numéro de page) | |
| 100 | 116 | if self.cover_mode or self.page_no() == 1: |
| 101 | 117 | return |
| 102 | 118 | self.set_y(-15) |
@@ -114,7 +130,7 @@ class GroupeKAReport: | ||
| 114 | 130 | def __init__(self, site: dict, dashboard: dict, mode: str = "complet"): |
| 115 | 131 | self.site = site |
| 116 | 132 | self.d = dashboard |
| 117 | − self.mode = mode | |
| 133 | + self.mode = mode if mode in REPORT_MODES else "complet" | |
| 118 | 134 | self.accent = _hex(site.get("accent", "#d9f26b")) |
| 119 | 135 | period = dashboard.get("period", {}) or {} |
| 120 | 136 | self.period_label = period.get("label") or "toute la période" |
@@ -129,6 +145,11 @@ class GroupeKAReport: | ||
| 129 | 145 | p.set_fill_color(*fill) |
| 130 | 146 | p.rect(x, y, w, h, style="DF", round_corners=True, corner_radius=2.2) |
| 131 | 147 | |
| 148 | + def _shade(self, i, n=8): | |
| 149 | + shades = [1.0, 0.78, 0.58, 0.42, 0.30, 0.22, 0.15, 0.10] | |
| 150 | + f = shades[i % len(shades)] | |
| 151 | + return tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * f) for j in range(3)) | |
| 152 | + | |
| 132 | 153 | def _kicker(self, text): |
| 133 | 154 | p = self.pdf |
| 134 | 155 | p.set_font("helvetica", "B", 8) |
@@ -152,6 +173,14 @@ class GroupeKAReport: | ||
| 152 | 173 | self.toc.append((title, self.pdf.page_no())) |
| 153 | 174 | self.pdf.ln(11) |
| 154 | 175 | |
| 176 | + def _chart_title(self, title): | |
| 177 | + p = self.pdf | |
| 178 | + p.set_font("helvetica", "B", 10) | |
| 179 | + p.set_text_color(*INK) | |
| 180 | + p.set_x(p.l_margin) | |
| 181 | + p.cell(0, 6, title) | |
| 182 | + p.ln(7) | |
| 183 | + | |
| 155 | 184 | # ---------- pages ---------- |
| 156 | 185 | def _cover(self): |
| 157 | 186 | p = self.pdf |
@@ -163,12 +192,10 @@ class GroupeKAReport: | ||
| 163 | 192 | p.set_draw_color(*INK) |
| 164 | 193 | p.set_line_width(1.0) |
| 165 | 194 | p.rect(10, 10, 190, 277) |
| 166 | − # kicker | |
| 167 | 195 | p.set_font("helvetica", "B", 10) |
| 168 | 196 | p.set_text_color(*GREEN) |
| 169 | 197 | p.set_xy(24, 34) |
| 170 | 198 | p.cell(0, 6, "GROUPE KA · RAPPORT STATISTIQUE") |
| 171 | − # wordmark : partie gauche + boîte encre/accent | |
| 172 | 199 | wm = self.site.get("wordmark", "") |
| 173 | 200 | left, boxed = (wm.split("·") + [None])[:2] if "·" in wm else (wm, None) |
| 174 | 201 | p.set_xy(24, 70) |
@@ -186,7 +213,7 @@ class GroupeKAReport: | ||
| 186 | 213 | p.set_xy(24, 100) |
| 187 | 214 | p.set_font("helvetica", "", 13) |
| 188 | 215 | p.set_text_color(*INK2) |
| 189 | − p.multi_cell(150, 7, f"Rapport statistique — {wm}") | |
| 216 | + p.multi_cell(150, 7, f"{REPORT_MODES[self.mode]} — {wm}") | |
| 190 | 217 | now = datetime.now(ZoneInfo("America/Toronto")) |
| 191 | 218 | per = self.d.get("period", {}) or {} |
| 192 | 219 | p.set_xy(24, 125) |
@@ -195,7 +222,7 @@ class GroupeKAReport: | ||
| 195 | 222 | ("Période couverte", self.period_label + (f" ({per.get('from')} → {per.get('to')})" if per.get("from") else "")), |
| 196 | 223 | ("Généré le", now.strftime("%Y-%m-%d à %H:%M") + " (heure de l'Est)"), |
| 197 | 224 | ("Plateforme", "https://" + self.site.get("domain", "")), |
| 198 | − ("Mode", "Rapport complet" if self.mode == "complet" else "Synthèse"), | |
| 225 | + ("Type de rapport", REPORT_MODES[self.mode]), | |
| 199 | 226 | ] |
| 200 | 227 | y = 128 |
| 201 | 228 | for k, v in rows: |
@@ -207,7 +234,6 @@ class GroupeKAReport: | ||
| 207 | 234 | p.cell(0, 6, str(v)) |
| 208 | 235 | p.set_font("helvetica", "", 10.5) |
| 209 | 236 | y += 8 |
| 210 | − # bande encre au pied | |
| 211 | 237 | p.set_fill_color(*INK) |
| 212 | 238 | p.rect(10, 262, 190, 25, style="F") |
| 213 | 239 | p.set_xy(24, 270) |
@@ -232,7 +258,7 @@ class GroupeKAReport: | ||
| 232 | 258 | p = self.pdf |
| 233 | 259 | cols, gw, gh, gap = 3, 56, 26, 3 |
| 234 | 260 | x0, y = p.l_margin, p.get_y() |
| 235 | − for i, k in enumerate(kpis[:9]): | |
| 261 | + for i, k in enumerate(kpis[:12]): | |
| 236 | 262 | x = x0 + (i % cols) * (gw + gap) |
| 237 | 263 | if i and i % cols == 0: |
| 238 | 264 | y += gh + gap |
@@ -254,20 +280,81 @@ class GroupeKAReport: | ||
| 254 | 280 | p.set_font("helvetica", "B", 8) |
| 255 | 281 | p.set_text_color(*(GREEN if up else DANGER)) |
| 256 | 282 | arrow = "+" if k["delta_pct"] >= 0 else "" |
| 257 | − p.cell(gw - 8, 4, f"{'▲' if up else '▼'} {arrow}{str(k['delta_pct']).replace('.', ',')} % vs période préc.") | |
| 283 | + dv = round(float(k["delta_pct"]), 1) | |
| 284 | + dv = int(dv) if float(dv).is_integer() else dv | |
| 285 | + p.cell(gw - 8, 4, f"{'▲' if up else '▼'} {arrow}{str(dv).replace('.', ',')} % vs période préc.") | |
| 286 | + p.set_y(y + gh + 8) | |
| 287 | + | |
| 288 | + def _gauges(self): | |
| 289 | + gs = self.d.get("gauges") or [] | |
| 290 | + gs = [g for g in gs if isinstance(g.get("value"), (int, float)) and g.get("max")] | |
| 291 | + if not gs: | |
| 292 | + return | |
| 293 | + self._section_title("Taux & couvertures") | |
| 294 | + p = self.pdf | |
| 295 | + cols, gw, gh, gap = 3, 56, 34, 3 | |
| 296 | + x0, y = p.l_margin, p.get_y() | |
| 297 | + for i, g in enumerate(gs[:9]): | |
| 298 | + x = x0 + (i % cols) * (gw + gap) | |
| 299 | + if i and i % cols == 0: | |
| 300 | + y += gh + gap | |
| 301 | + if y > 240: | |
| 302 | + p.add_page(); y = p.get_y() | |
| 303 | + self._card(x, y, gw, gh) | |
| 304 | + frac = max(0.0, min(1.0, g["value"] / g["max"])) | |
| 305 | + cx, cy, r = x + gw / 2, y + 20, 14 | |
| 306 | + # arc de fond + arc de valeur (demi-cercle en petits segments) | |
| 307 | + for pass_col, pass_frac, lw in (((225, 223, 217), 1.0, 2.6), (self.accent, frac, 2.6)): | |
| 308 | + p.set_draw_color(*pass_col) | |
| 309 | + p.set_line_width(lw) | |
| 310 | + steps = max(2, int(60 * pass_frac)) | |
| 311 | + last = None | |
| 312 | + for st in range(steps + 1): | |
| 313 | + a = math.pi + math.pi * pass_frac * st / steps | |
| 314 | + pt = (cx + r * math.cos(a), cy + r * math.sin(a)) | |
| 315 | + if last: | |
| 316 | + p.line(last[0], last[1], pt[0], pt[1]) | |
| 317 | + last = pt | |
| 318 | + p.set_font("helvetica", "B", 11) | |
| 319 | + p.set_text_color(*INK) | |
| 320 | + p.set_xy(x + 4, cy - 5) | |
| 321 | + p.cell(gw - 8, 6, f"{_fr(g['value'])}{' ' + g['unit'] if g.get('unit') else ''}", align="C") | |
| 322 | + p.set_font("helvetica", "", 6.6) | |
| 323 | + p.set_text_color(*INK3) | |
| 324 | + p.set_xy(x + 4, cy + 1.5) | |
| 325 | + p.cell(gw - 8, 4, f"{frac * 100:.0f} % de {_fr(g['max'])}", align="C") | |
| 326 | + p.set_xy(x + 3, y + gh - 7) | |
| 327 | + p.set_font("helvetica", "", 7) | |
| 328 | + p.set_text_color(*INK2) | |
| 329 | + p.multi_cell(gw - 6, 3.3, str(g.get("label", ""))[:60], align="C") | |
| 258 | 330 | p.set_y(y + gh + 8) |
| 259 | 331 | |
| 260 | − def _line_chart(self, s): | |
| 332 | + def _serie_stats_row(self, s): | |
| 333 | + """Ligne min/max/moyenne/médiane sous un graphique de série.""" | |
| 334 | + p = self.pdf | |
| 335 | + vs = [pt["v"] for pt in (s.get("points") or []) if isinstance(pt.get("v"), (int, float))] | |
| 336 | + if len(vs) < 2: | |
| 337 | + return | |
| 338 | + sv = sorted(vs) | |
| 339 | + mean = sum(vs) / len(vs) | |
| 340 | + med = sv[len(sv) // 2] | |
| 341 | + sd = math.sqrt(sum((v - mean) ** 2 for v in vs) / len(vs)) | |
| 342 | + p.set_font("helvetica", "", 6.8) | |
| 343 | + p.set_text_color(*INK3) | |
| 344 | + p.cell(0, 4, f"min {_fr(sv[0])} · max {_fr(sv[-1])} · moyenne {_fr(round(mean, 2))} · médiane {_fr(med)} · écart-type {_fr(round(sd, 2))}") | |
| 345 | + p.ln(5.5) | |
| 346 | + | |
| 347 | + def _line_chart(self, s, with_stats=False): | |
| 261 | 348 | p = self.pdf |
| 262 | 349 | pts = s.get("points") or [] |
| 263 | 350 | if len(pts) < 2: |
| 264 | 351 | return |
| 352 | + if s.get("kind") == "bar": | |
| 353 | + self._vbars(s) | |
| 354 | + return | |
| 265 | 355 | if p.get_y() > 200: |
| 266 | 356 | p.add_page() |
| 267 | − p.set_font("helvetica", "B", 10) | |
| 268 | − p.set_text_color(*INK) | |
| 269 | − p.cell(0, 6, s.get("title", "")) | |
| 270 | − p.ln(7) | |
| 357 | + self._chart_title(s.get("title", "")) | |
| 271 | 358 | x0, y0, w, h = p.l_margin, p.get_y(), 174, 52 |
| 272 | 359 | self._card(x0, y0, w, h, fill=WHITE) |
| 273 | 360 | cx, cy, cw, ch = x0 + 12, y0 + 6, w - 20, h - 16 |
@@ -275,7 +362,6 @@ class GroupeKAReport: | ||
| 275 | 362 | vmax = max(vals) or 1 |
| 276 | 363 | vmin = min(0, min(vals)) |
| 277 | 364 | rng = (vmax - vmin) or 1 |
| 278 | − # grille + graduations | |
| 279 | 365 | p.set_font("helvetica", "", 6.3) |
| 280 | 366 | p.set_text_color(*INK3) |
| 281 | 367 | p.set_draw_color(200, 200, 195) |
@@ -286,6 +372,20 @@ class GroupeKAReport: | ||
| 286 | 372 | p.set_xy(x0 + 1, gy - 1.6) |
| 287 | 373 | p.cell(10, 3, _fr(vmin + rng * g / 4), align="R") |
| 288 | 374 | |
| 375 | + def xy(i, n, v): | |
| 376 | + return (cx + cw * (i / (n - 1)), cy + ch - ch * ((v - vmin) / rng)) | |
| 377 | + | |
| 378 | + # aire sous la courbe (kind=area) : petits trapèzes accent pâle | |
| 379 | + if s.get("kind") == "area": | |
| 380 | + fill = tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * 0.18) for j in range(3)) | |
| 381 | + p.set_fill_color(*fill) | |
| 382 | + p.set_draw_color(*fill) | |
| 383 | + n = len(pts) | |
| 384 | + for i in range(n - 1): | |
| 385 | + x1, y1 = xy(i, n, pts[i]["v"]) | |
| 386 | + x2, y2 = xy(i + 1, n, pts[i + 1]["v"]) | |
| 387 | + p.polygon([(x1, y1), (x2, y2), (x2, cy + ch), (x1, cy + ch)], style="DF") | |
| 388 | + | |
| 289 | 389 | def draw(series, color, width, dash=None): |
| 290 | 390 | n = len(series) |
| 291 | 391 | p.set_draw_color(*color) |
@@ -294,8 +394,7 @@ class GroupeKAReport: | ||
| 294 | 394 | p.set_dash_pattern(dash=1.2, gap=1.2) |
| 295 | 395 | last = None |
| 296 | 396 | for i, pt in enumerate(series): |
| 297 | − px = cx + cw * (i / (n - 1)) | |
| 298 | − py = cy + ch - ch * ((pt["v"] - vmin) / rng) | |
| 397 | + px, py = xy(i, n, pt["v"]) | |
| 299 | 398 | if last: |
| 300 | 399 | p.line(last[0], last[1], px, py) |
| 301 | 400 | last = (px, py) |
@@ -304,7 +403,6 @@ class GroupeKAReport: | ||
| 304 | 403 | if s.get("compare"): |
| 305 | 404 | draw(s["compare"], INK3, 0.35, dash=True) |
| 306 | 405 | draw(pts, self.accent, 0.7) |
| 307 | − # libellés d'axe X (premier / milieu / dernier) | |
| 308 | 406 | p.set_text_color(*INK3) |
| 309 | 407 | for frac, idx in ((0, 0), (0.5, len(pts) // 2), (1, -1)): |
| 310 | 408 | p.set_xy(cx + cw * frac - 9, cy + ch + 1.5) |
@@ -314,9 +412,166 @@ class GroupeKAReport: | ||
| 314 | 412 | p.set_font("helvetica", "", 6.8) |
| 315 | 413 | p.set_text_color(*INK3) |
| 316 | 414 | p.cell(0, 4, "— période courante (accent) · ---- période comparée") |
| 317 | − p.ln(6) | |
| 318 | − else: | |
| 319 | − p.ln(2) | |
| 415 | + p.ln(5.5) | |
| 416 | + if with_stats: | |
| 417 | + self._serie_stats_row(s) | |
| 418 | + p.ln(1.5) | |
| 419 | + | |
| 420 | + def _vbars(self, s): | |
| 421 | + """Barres verticales : série kind=bar ou distribution (bins).""" | |
| 422 | + p = self.pdf | |
| 423 | + pts = s.get("points") or [{"t": b.get("label"), "v": b.get("value")} for b in (s.get("bins") or [])] | |
| 424 | + pts = [pt for pt in pts if isinstance(pt.get("v"), (int, float))] | |
| 425 | + if not pts: | |
| 426 | + return | |
| 427 | + if p.get_y() > 205: | |
| 428 | + p.add_page() | |
| 429 | + self._chart_title(s.get("title", "")) | |
| 430 | + x0, y0, w, h = p.l_margin, p.get_y(), 174, 48 | |
| 431 | + self._card(x0, y0, w, h, fill=WHITE) | |
| 432 | + cx, cy, cw, ch = x0 + 12, y0 + 5, w - 20, h - 14 | |
| 433 | + vmax = max(pt["v"] for pt in pts) or 1 | |
| 434 | + p.set_font("helvetica", "", 6.3) | |
| 435 | + p.set_text_color(*INK3) | |
| 436 | + p.set_draw_color(200, 200, 195) | |
| 437 | + p.set_line_width(0.15) | |
| 438 | + for g in range(5): | |
| 439 | + gy = cy + ch - ch * g / 4 | |
| 440 | + p.line(cx, gy, cx + cw, gy) | |
| 441 | + p.set_xy(x0 + 1, gy - 1.6) | |
| 442 | + p.cell(10, 3, _fr(vmax * g / 4), align="R") | |
| 443 | + n = len(pts) | |
| 444 | + bw = max(0.8, cw / n - 0.6) | |
| 445 | + p.set_fill_color(*self.accent) | |
| 446 | + p.set_draw_color(*INK) | |
| 447 | + p.set_line_width(0.15) | |
| 448 | + for i, pt in enumerate(pts): | |
| 449 | + bh = ch * (pt["v"] / vmax) | |
| 450 | + p.rect(cx + cw * i / n + 0.3, cy + ch - bh, bw, max(bh, 0.4 if pt["v"] > 0 else 0), style="DF") | |
| 451 | + p.set_text_color(*INK3) | |
| 452 | + for frac, idx in ((0, 0), (0.5, n // 2), (1, -1)): | |
| 453 | + p.set_xy(cx + cw * frac - 10, cy + ch + 1.5) | |
| 454 | + p.cell(20, 3, str(pts[idx].get("t", ""))[:12], align="C") | |
| 455 | + p.set_y(y0 + h + 5) | |
| 456 | + | |
| 457 | + def _multiline(self, ms): | |
| 458 | + """Multi-séries (≤4) : accent plein / encre fin / accent pointillé / | |
| 459 | + gris pointillé — l'identité passe par le motif, pas la couleur seule.""" | |
| 460 | + p = self.pdf | |
| 461 | + series = [s for s in (ms.get("series") or []) if len(s.get("points") or []) > 1][:4] | |
| 462 | + if not series: | |
| 463 | + return | |
| 464 | + if p.get_y() > 195: | |
| 465 | + p.add_page() | |
| 466 | + self._chart_title(ms.get("title", "")) | |
| 467 | + x0, y0, w, h = p.l_margin, p.get_y(), 174, 52 | |
| 468 | + self._card(x0, y0, w, h, fill=WHITE) | |
| 469 | + cx, cy, cw, ch = x0 + 12, y0 + 6, w - 20, h - 16 | |
| 470 | + vals = [pt["v"] for s in series for pt in s["points"]] | |
| 471 | + vmax = max(vals) or 1 | |
| 472 | + vmin = min(0, min(vals)) | |
| 473 | + rng = (vmax - vmin) or 1 | |
| 474 | + p.set_font("helvetica", "", 6.3) | |
| 475 | + p.set_text_color(*INK3) | |
| 476 | + p.set_draw_color(200, 200, 195) | |
| 477 | + p.set_line_width(0.15) | |
| 478 | + for g in range(5): | |
| 479 | + gy = cy + ch - ch * g / 4 | |
| 480 | + p.line(cx, gy, cx + cw, gy) | |
| 481 | + p.set_xy(x0 + 1, gy - 1.6) | |
| 482 | + p.cell(10, 3, _fr(vmin + rng * g / 4), align="R") | |
| 483 | + styles = [ | |
| 484 | + (self.accent, 0.7, None), | |
| 485 | + (INK, 0.45, None), | |
| 486 | + (self.accent, 0.55, True), | |
| 487 | + (INK3, 0.5, True), | |
| 488 | + ] | |
| 489 | + for si, s in enumerate(series): | |
| 490 | + col, lw, dash = styles[si] | |
| 491 | + p.set_draw_color(*col) | |
| 492 | + p.set_line_width(lw) | |
| 493 | + if dash: | |
| 494 | + p.set_dash_pattern(dash=1.4, gap=1.2) | |
| 495 | + n = len(s["points"]) | |
| 496 | + last = None | |
| 497 | + for i, pt in enumerate(s["points"]): | |
| 498 | + px = cx + cw * (i / (n - 1)) | |
| 499 | + py = cy + ch - ch * ((pt["v"] - vmin) / rng) | |
| 500 | + if last: | |
| 501 | + p.line(last[0], last[1], px, py) | |
| 502 | + last = (px, py) | |
| 503 | + p.set_dash_pattern() | |
| 504 | + ref = series[0]["points"] | |
| 505 | + p.set_text_color(*INK3) | |
| 506 | + for frac, idx in ((0, 0), (0.5, len(ref) // 2), (1, -1)): | |
| 507 | + p.set_xy(cx + cw * frac - 9, cy + ch + 1.5) | |
| 508 | + p.cell(18, 3, str(ref[idx].get("t", ""))[:10], align="C") | |
| 509 | + p.set_y(y0 + h + 4) | |
| 510 | + p.set_font("helvetica", "", 6.8) | |
| 511 | + p.set_text_color(*INK3) | |
| 512 | + marks = ["—", "—", "----", "----"] | |
| 513 | + leg = " · ".join(f"{marks[i]} {s.get('label', '')}" for i, s in enumerate(series)) | |
| 514 | + p.cell(0, 4, leg[:120]) | |
| 515 | + p.ln(6) | |
| 516 | + | |
| 517 | + def _stacked(self, st): | |
| 518 | + p = self.pdf | |
| 519 | + keys = (st.get("keys") or [])[:6] | |
| 520 | + pts = st.get("points") or [] | |
| 521 | + if not keys or not pts: | |
| 522 | + return | |
| 523 | + if p.get_y() > 195: | |
| 524 | + p.add_page() | |
| 525 | + self._chart_title(st.get("title", "")) | |
| 526 | + x0, y0, w, h = p.l_margin, p.get_y(), 174, 52 | |
| 527 | + self._card(x0, y0, w, h, fill=WHITE) | |
| 528 | + cx, cy, cw, ch = x0 + 12, y0 + 6, w - 20, h - 16 | |
| 529 | + totals = [sum(v or 0 for v in pt.get("values", [])[: len(keys)]) for pt in pts] | |
| 530 | + vmax = max(totals) or 1 | |
| 531 | + p.set_font("helvetica", "", 6.3) | |
| 532 | + p.set_text_color(*INK3) | |
| 533 | + p.set_draw_color(200, 200, 195) | |
| 534 | + p.set_line_width(0.15) | |
| 535 | + for g in range(5): | |
| 536 | + gy = cy + ch - ch * g / 4 | |
| 537 | + p.line(cx, gy, cx + cw, gy) | |
| 538 | + p.set_xy(x0 + 1, gy - 1.6) | |
| 539 | + p.cell(10, 3, _fr(vmax * g / 4), align="R") | |
| 540 | + n = len(pts) | |
| 541 | + bw = max(0.8, cw / n - 0.6) | |
| 542 | + p.set_draw_color(*WHITE) | |
| 543 | + p.set_line_width(0.12) | |
| 544 | + for i, pt in enumerate(pts): | |
| 545 | + yacc = cy + ch | |
| 546 | + for j, k in enumerate(keys): | |
| 547 | + v = (pt.get("values") or [0] * len(keys))[j] if j < len(pt.get("values", [])) else 0 | |
| 548 | + if not v: | |
| 549 | + continue | |
| 550 | + bh = ch * (v / vmax) | |
| 551 | + yacc -= bh | |
| 552 | + p.set_fill_color(*self._shade(j)) | |
| 553 | + p.rect(cx + cw * i / n + 0.3, yacc, bw, max(bh - 0.15, 0.3), style="DF") | |
| 554 | + p.set_text_color(*INK3) | |
| 555 | + for frac, idx in ((0, 0), (0.5, n // 2), (1, -1)): | |
| 556 | + p.set_xy(cx + cw * frac - 10, cy + ch + 1.5) | |
| 557 | + p.cell(20, 3, str(pts[idx].get("t", ""))[:12], align="C") | |
| 558 | + p.set_y(y0 + h + 4) | |
| 559 | + # légende | |
| 560 | + p.set_font("helvetica", "", 6.8) | |
| 561 | + lx = p.l_margin | |
| 562 | + for j, k in enumerate(keys): | |
| 563 | + p.set_fill_color(*self._shade(j)) | |
| 564 | + p.set_draw_color(*INK) | |
| 565 | + p.set_line_width(0.2) | |
| 566 | + p.rect(lx, p.get_y() + 0.6, 3, 3, style="DF") | |
| 567 | + p.set_xy(lx + 4, p.get_y()) | |
| 568 | + p.set_text_color(*INK2) | |
| 569 | + txt = str(k)[:22] | |
| 570 | + p.cell(p.get_string_width(txt) + 3, 4, txt) | |
| 571 | + lx = p.get_x() + 3 | |
| 572 | + if lx > 165: | |
| 573 | + break | |
| 574 | + p.ln(7) | |
| 320 | 575 | |
| 321 | 576 | def _bars(self, title, items, unit=""): |
| 322 | 577 | p = self.pdf |
@@ -326,10 +581,8 @@ class GroupeKAReport: | ||
| 326 | 581 | need = 10 + len(items) * 7 |
| 327 | 582 | if p.get_y() + need > 265: |
| 328 | 583 | p.add_page() |
| 329 | − p.set_font("helvetica", "B", 10) | |
| 330 | − p.set_text_color(*INK) | |
| 331 | − p.cell(0, 6, title) | |
| 332 | − p.ln(8) | |
| 584 | + self._chart_title(title) | |
| 585 | + p.ln(1) | |
| 333 | 586 | vmax = max(it["value"] for it in items) or 1 |
| 334 | 587 | for it in items: |
| 335 | 588 | y = p.get_y() |
@@ -337,19 +590,23 @@ class GroupeKAReport: | ||
| 337 | 590 | p.set_text_color(*INK) |
| 338 | 591 | p.set_x(p.l_margin) |
| 339 | 592 | p.cell(46, 5, str(it["label"])[:34]) |
| 340 | − bw = 96 * (it["value"] / vmax) | |
| 593 | + bw = 86 * (it["value"] / vmax) | |
| 341 | 594 | p.set_fill_color(*self.accent) |
| 342 | 595 | p.set_draw_color(*INK) |
| 343 | 596 | p.set_line_width(0.25) |
| 344 | 597 | p.rect(p.l_margin + 48, y + 0.7, max(bw, 0.8), 3.6, style="DF") |
| 345 | − p.set_xy(p.l_margin + 148, y) | |
| 598 | + p.set_xy(p.l_margin + 136, y) | |
| 346 | 599 | p.set_font("helvetica", "B", 7.6) |
| 347 | − p.cell(26, 5, _fr(it["value"]) + (" " + unit if unit else ""), align="R") | |
| 600 | + p.cell(24, 5, _fr(it["value"]) + (" " + unit if unit else ""), align="R") | |
| 601 | + if it.get("delta_pct") is not None: | |
| 602 | + up = it["delta_pct"] >= 0 | |
| 603 | + p.set_font("helvetica", "B", 6.6) | |
| 604 | + p.set_text_color(*(GREEN if up else DANGER)) | |
| 605 | + p.cell(14, 5, f"{'+' if up else ''}{str(round(it['delta_pct'], 1)).replace('.', ',')} %", align="R") | |
| 348 | 606 | p.ln(6.4) |
| 349 | 607 | p.ln(3) |
| 350 | 608 | |
| 351 | 609 | def _donut(self, b): |
| 352 | − # anneau vectoriel simple (arcs) + légende | |
| 353 | 610 | p = self.pdf |
| 354 | 611 | items = [it for it in (b.get("items") or []) if it.get("value")][:8] |
| 355 | 612 | total = sum(it["value"] for it in items) |
@@ -357,17 +614,13 @@ class GroupeKAReport: | ||
| 357 | 614 | return |
| 358 | 615 | if p.get_y() > 210: |
| 359 | 616 | p.add_page() |
| 360 | − p.set_font("helvetica", "B", 10) | |
| 361 | − p.set_text_color(*INK) | |
| 362 | − p.cell(0, 6, b.get("title", "")) | |
| 363 | − p.ln(8) | |
| 617 | + self._chart_title(b.get("title", "")) | |
| 618 | + p.ln(1) | |
| 364 | 619 | cx, cy, r = p.l_margin + 26, p.get_y() + 24, 20 |
| 365 | − shades = [1.0, 0.78, 0.58, 0.42, 0.30, 0.22, 0.15, 0.10] | |
| 366 | 620 | start = -90.0 |
| 367 | 621 | for i, it in enumerate(items): |
| 368 | 622 | frac = it["value"] / total |
| 369 | − f = shades[i % len(shades)] | |
| 370 | − col = tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * f) for j in range(3)) | |
| 623 | + col = self._shade(i) | |
| 371 | 624 | steps = max(2, int(72 * frac)) |
| 372 | 625 | p.set_fill_color(*col) |
| 373 | 626 | p.set_draw_color(*col) |
@@ -386,11 +639,9 @@ class GroupeKAReport: | ||
| 386 | 639 | p.set_line_width(0.4) |
| 387 | 640 | p.ellipse(cx - 11, cy - 11, 22, 22, style="DF") |
| 388 | 641 | p.ellipse(cx - r, cy - r, 2 * r, 2 * r, style="D") |
| 389 | − # légende | |
| 390 | 642 | ly = cy - 22 |
| 391 | 643 | for i, it in enumerate(items): |
| 392 | − f = shades[i % len(shades)] | |
| 393 | − col = tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * f) for j in range(3)) | |
| 644 | + col = self._shade(i) | |
| 394 | 645 | p.set_fill_color(*col) |
| 395 | 646 | p.set_draw_color(*INK) |
| 396 | 647 | p.rect(p.l_margin + 60, ly + 0.8, 4, 4, style="DF") |
@@ -402,7 +653,39 @@ class GroupeKAReport: | ||
| 402 | 653 | ly += 5.6 |
| 403 | 654 | p.set_y(max(cy + r, ly) + 6) |
| 404 | 655 | |
| 405 | − def _table(self, t): | |
| 656 | + def _hourly(self): | |
| 657 | + hh = self.d.get("hourly") or {} | |
| 658 | + cells = hh.get("cells") or [] | |
| 659 | + if not cells: | |
| 660 | + return | |
| 661 | + p = self.pdf | |
| 662 | + if p.get_y() > 190: | |
| 663 | + p.add_page() | |
| 664 | + self._chart_title(hh.get("title", "Activité par jour et heure")) | |
| 665 | + x0, y0 = p.l_margin, p.get_y() | |
| 666 | + cw, chh, lx, ly = 6.4, 6.4, 12, 5 | |
| 667 | + vmax = max((c.get("value") or 0) for c in cells) or 1 | |
| 668 | + grid = {(c.get("dow"), c.get("hour")): c.get("value") or 0 for c in cells} | |
| 669 | + dows = ["Lun", "Mar", "Mer", "Jeu", "Ven", "Sam", "Dim"] | |
| 670 | + p.set_font("helvetica", "", 5.8) | |
| 671 | + p.set_text_color(*INK3) | |
| 672 | + for h in (0, 6, 12, 18, 23): | |
| 673 | + p.set_xy(x0 + lx + h * cw, y0) | |
| 674 | + p.cell(cw, 3, f"{h}h", align="C") | |
| 675 | + for d in range(7): | |
| 676 | + p.set_xy(x0, y0 + ly + d * chh + 1.5) | |
| 677 | + p.cell(lx - 1, 3, dows[d], align="R") | |
| 678 | + for h in range(24): | |
| 679 | + v = grid.get((d, h), 0) | |
| 680 | + f = 0.1 + 0.9 * (v / vmax) if v else 0.0 | |
| 681 | + col = tuple(int(PAPER[j] + (self.accent[j] - PAPER[j]) * f) for j in range(3)) if v else (235, 233, 228) | |
| 682 | + p.set_fill_color(*col) | |
| 683 | + p.set_draw_color(215, 213, 207) | |
| 684 | + p.set_line_width(0.1) | |
| 685 | + p.rect(x0 + lx + h * cw, y0 + ly + d * chh, cw - 0.5, chh - 0.5, style="DF") | |
| 686 | + p.set_y(y0 + ly + 7 * chh + 5) | |
| 687 | + | |
| 688 | + def _table(self, t, max_rows=200): | |
| 406 | 689 | p = self.pdf |
| 407 | 690 | cols = t.get("columns") or [] |
| 408 | 691 | rows = t.get("rows") or [] |
@@ -419,7 +702,7 @@ class GroupeKAReport: | ||
| 419 | 702 | p.ln(6) |
| 420 | 703 | head() |
| 421 | 704 | p.set_text_color(*INK) |
| 422 | − for i, row in enumerate(rows[:200]): | |
| 705 | + for i, row in enumerate(rows[:max_rows]): | |
| 423 | 706 | if p.get_y() > 262: |
| 424 | 707 | p.add_page() |
| 425 | 708 | head() |
@@ -430,10 +713,10 @@ class GroupeKAReport: | ||
| 430 | 713 | txt = _fr(cell) if isinstance(cell, (int, float)) else str(cell) |
| 431 | 714 | p.cell(w, 5.4, " " + txt[:34], fill=True) |
| 432 | 715 | p.ln(5.4) |
| 433 | − if len(rows) > 200: | |
| 716 | + if len(rows) > max_rows: | |
| 434 | 717 | p.set_font("helvetica", "", 7) |
| 435 | 718 | p.set_text_color(*INK3) |
| 436 | − p.cell(0, 5, f"… {len(rows) - 200} lignes supplémentaires non imprimées") | |
| 719 | + p.cell(0, 5, f"… {len(rows) - max_rows} lignes supplémentaires non imprimées") | |
| 437 | 720 | p.ln(6) |
| 438 | 721 | |
| 439 | 722 | def _records(self): |
@@ -442,7 +725,7 @@ class GroupeKAReport: | ||
| 442 | 725 | return |
| 443 | 726 | self._section_title("Records & faits marquants") |
| 444 | 727 | p = self.pdf |
| 445 | − for r in recs[:10]: | |
| 728 | + for r in recs[:14]: | |
| 446 | 729 | if p.get_y() > 258: |
| 447 | 730 | p.add_page() |
| 448 | 731 | y = p.get_y() |
@@ -500,43 +783,76 @@ class GroupeKAReport: | ||
| 500 | 783 | "groupe-ka.com/conditions · /confidentialite · /loi-25.", |
| 501 | 784 | ) |
| 502 | 785 | |
| 503 | − def _toc_page(self): | |
| 504 | − # insérée après coup ? fpdf ne réordonne pas : on écrit le sommaire en | |
| 505 | − # page 2 en réservant la page lors du build (voir build()). | |
| 506 | − pass | |
| 786 | + # ---------- groupes de sections ---------- | |
| 787 | + def _all_series(self, with_stats=True): | |
| 788 | + for s in self.d.get("series") or []: | |
| 789 | + self._line_chart(s, with_stats=with_stats) | |
| 790 | + for ms in self.d.get("multiseries") or []: | |
| 791 | + self._multiline(ms) | |
| 792 | + for st in self.d.get("stacked") or []: | |
| 793 | + self._stacked(st) | |
| 794 | + | |
| 795 | + def _all_breakdowns(self): | |
| 796 | + for b in self.d.get("breakdowns") or []: | |
| 797 | + if b.get("kind") == "donut": | |
| 798 | + self._donut(b) | |
| 799 | + else: | |
| 800 | + self._bars(b.get("title", ""), b.get("items")) | |
| 801 | + for dist in self.d.get("distributions") or []: | |
| 802 | + self._vbars(dist) | |
| 803 | + geo = self.d.get("geo") | |
| 804 | + if geo: | |
| 805 | + self._bars(geo.get("title", "Répartition géographique"), geo.get("items")) | |
| 806 | + self._hourly() | |
| 507 | 807 | |
| 508 | 808 | def build(self) -> bytes: |
| 509 | 809 | p = self.pdf |
| 510 | 810 | p.alias_nb_pages() |
| 511 | 811 | self._cover() |
| 812 | + with_toc = self.mode in ("complet", "donnees") | |
| 813 | + toc_page_no = None | |
| 512 | 814 | if self.mode == "synthese": |
| 513 | 815 | p.add_page() |
| 514 | 816 | self._kpis() |
| 817 | + self._gauges() | |
| 818 | + self._records() | |
| 819 | + self._final_page() | |
| 820 | + elif self.mode == "tendances": | |
| 821 | + p.add_page() | |
| 822 | + self._kpis() | |
| 823 | + self._section_title("Évolution & tendances") | |
| 824 | + self._all_series(with_stats=True) | |
| 515 | 825 | self._records() |
| 516 | 826 | self._final_page() |
| 517 | − else: | |
| 827 | + elif self.mode == "repartitions": | |
| 828 | + p.add_page() | |
| 829 | + self._section_title("Répartitions, distributions & géographie") | |
| 830 | + self._all_breakdowns() | |
| 831 | + self._final_page() | |
| 832 | + elif self.mode == "donnees": | |
| 833 | + p.add_page() | |
| 834 | + toc_page_no = p.page_no() | |
| 835 | + for t in self.d.get("tables") or []: | |
| 836 | + self._table(t, max_rows=400) | |
| 837 | + self._final_page() | |
| 838 | + else: # complet | |
| 518 | 839 | p.add_page() |
| 519 | 840 | toc_page_no = p.page_no() |
| 520 | 841 | p.add_page() |
| 521 | 842 | self._kpis() |
| 522 | − for s in self.d.get("series") or []: | |
| 523 | − if s.get("kind") == "bar": | |
| 524 | − self._bars(s.get("title", ""), [{"label": pt.get("t"), "value": pt.get("v")} for pt in (s.get("points") or [])], s.get("unit", "")) | |
| 525 | − else: | |
| 526 | − self._line_chart(s) | |
| 527 | − for b in self.d.get("breakdowns") or []: | |
| 528 | − if b.get("kind") == "donut": | |
| 529 | − self._donut(b) | |
| 530 | − else: | |
| 531 | − self._bars(b.get("title", ""), b.get("items")) | |
| 532 | − geo = self.d.get("geo") | |
| 533 | − if geo: | |
| 534 | − self._bars(geo.get("title", "Répartition géographique"), geo.get("items")) | |
| 843 | + self._gauges() | |
| 844 | + if (self.d.get("series") or self.d.get("multiseries") or self.d.get("stacked")): | |
| 845 | + self._section_title("Évolution & tendances") | |
| 846 | + self._all_series(with_stats=True) | |
| 847 | + if (self.d.get("breakdowns") or self.d.get("distributions") or self.d.get("geo") or self.d.get("hourly")): | |
| 848 | + self._section_title("Répartitions, distributions & géographie") | |
| 849 | + self._all_breakdowns() | |
| 535 | 850 | for t in self.d.get("tables") or []: |
| 536 | 851 | self._table(t) |
| 537 | 852 | self._records() |
| 538 | 853 | self._final_page() |
| 539 | − # sommaire écrit sur la page réservée (page 2) | |
| 854 | + # sommaire écrit sur la page réservée | |
| 855 | + if toc_page_no is not None: | |
| 540 | 856 | last_page = p.page |
| 541 | 857 | p.page = toc_page_no |
| 542 | 858 | p.set_y(22) |
@@ -555,6 +871,7 @@ class GroupeKAReport: | ||
| 555 | 871 | return bytes(p.output()) |
| 556 | 872 | |
| 557 | 873 | |
| 558 | −def filename(platform_id: str, period: str) -> str: | |
| 874 | +def filename(platform_id: str, period: str, mode: str = "complet") -> str: | |
| 559 | 875 | today = datetime.now(ZoneInfo("America/Toronto")).strftime("%Y-%m-%d") |
| 560 | − return f"groupe-ka_{platform_id}_stats_{period}_{today}.pdf" | |
| 876 | + suffix = "" if mode in ("", "complet") else f"_{mode}" | |
| 877 | + return f"groupe-ka_{platform_id}_stats_{period}{suffix}_{today}.pdf" | |
modified
src/api/web/stats.html
+349 −22
@@ -6,13 +6,15 @@ Fichier : src/api/web/stats.html | ||
| 6 | 6 | Node : m3u96b |
| 7 | 7 | Author : Simon-Pierre Boucher |
| 8 | 8 | Contact : contact@spboucher.ai |
| 9 | −Date : 2026-08-17 | |
| 9 | +Date : 2026-08-19 | |
| 10 | 10 | ============================================ |
| 11 | 11 | Page /stats — tableau de bord analytique de la plateforme (module Stats commun |
| 12 | −Groupe KA, SPEC.md). Vanilla JS + SVG : reproduit le langage visuel du kit | |
| 13 | −ka-ui/stats/kacharts.tsx (KPI + delta, chips de période, courbe avec infobulle | |
| 14 | −et légende cliquable, barres, anneau, heatmap calendrier, tableaux triables, | |
| 15 | −records, bouton PDF). Données : GET /api/stats/dashboard — rien d'inventé. | |
| 12 | +Groupe KA, SPEC.md v2). Vanilla JS + SVG : reproduit le langage visuel du kit | |
| 13 | +ka-ui/stats/kacharts.tsx (KPI + delta + sparkline, chips de période, jauges, | |
| 14 | +courbe avec infobulle et légende cliquable, multi-courbes à motifs distincts, | |
| 15 | +barres empilées, histogrammes, anneau, heatmap calendrier + horaire 7×24, | |
| 16 | +stats de séries, tableaux triables, records, menu PDF 5 rapports). | |
| 17 | +Données : GET /api/stats/dashboard — rien d'inventé. | |
| 16 | 18 | --> |
| 17 | 19 | <html lang="fr"> |
| 18 | 20 | <head> |
@@ -82,6 +84,38 @@ section{padding:44px 0} | ||
| 82 | 84 | .kpi .delta{margin:8px 0 0;font-family:var(--font-mono);font-size:11px;font-weight:700} |
| 83 | 85 | .kpi .delta span{color:var(--ink-3);font-weight:500} |
| 84 | 86 | .d-good{color:var(--green)}.d-bad{color:var(--danger)} |
| 87 | +.kpi .spark{margin-top:8px;display:block} | |
| 88 | +.kpi .spark svg{width:100%;height:26px;display:block} | |
| 89 | + | |
| 90 | +/* ---- jauges ---- */ | |
| 91 | +.gauge-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(190px,1fr));gap:14px;margin:26px 0 0} | |
| 92 | +.gauge{padding:14px 16px;text-align:center} | |
| 93 | +.gauge svg{width:120px;max-width:100%;margin:0 auto;display:block} | |
| 94 | +.gauge .gv{font-family:var(--font-display);font-weight:700;font-size:22px;letter-spacing:-.02em;margin:-34px 0 0;font-variant-numeric:tabular-nums} | |
| 95 | +.gauge .gv small{font-size:.55em;color:var(--ink-2)} | |
| 96 | +.gauge .klabel{display:block;margin-top:10px} | |
| 97 | + | |
| 98 | +/* ---- menu PDF ---- */ | |
| 99 | +.pdf-wrap{position:relative;display:inline-block} | |
| 100 | +.pdf-menu{position:absolute;top:calc(100% + 6px);left:0;z-index:70;min-width:250px;background:var(--surface);border:1.5px solid var(--ink);border-radius:10px;box-shadow:4px 4px 0 rgba(20,24,20,.14);padding:6px;display:none} | |
| 101 | +.pdf-menu.open{display:block} | |
| 102 | +.pdf-menu button{display:block;width:100%;text-align:left;background:none;border:0;cursor:pointer;padding:10px 12px;border-radius:7px;font-family:var(--font-body,inherit);font-size:13.5px;color:var(--ink);min-height:44px} | |
| 103 | +.pdf-menu button:hover{background:var(--accent-soft);color:var(--accent-deep)} | |
| 104 | +.pdf-menu button small{display:block;color:var(--ink-3);font-size:11px;margin-top:1px} | |
| 105 | + | |
| 106 | +/* ---- stats de série ---- */ | |
| 107 | +.statsum{display:flex;flex-wrap:wrap;gap:6px;margin:10px 0 0} | |
| 108 | +.statsum .chip{font-size:10.5px} | |
| 109 | + | |
| 110 | +/* ---- légende multi-séries / empilées ---- */ | |
| 111 | +.legend .sw.p2{border-top-color:var(--ink)} | |
| 112 | +.legend .sw.p3{border-top-style:dashed;border-top-color:var(--accent)} | |
| 113 | +.legend .sw.p4{border-top-style:dotted;border-top-color:var(--ink-3);border-top-width:3.5px} | |
| 114 | +.legend .sq{width:12px;height:12px;border-radius:3px;border:1px solid var(--ink);background:var(--accent)} | |
| 115 | + | |
| 116 | +/* ---- heatmap horaire 7×24 ---- */ | |
| 117 | +.hourly-wrap{margin-top:12px} | |
| 118 | +.hourly-wrap svg{min-width:560px} | |
| 85 | 119 | |
| 86 | 120 | .charts-grid{display:grid;grid-template-columns:1fr 1fr;gap:16px} |
| 87 | 121 | .charts-grid .full{grid-column:1/-1} |
@@ -118,8 +152,6 @@ figure.chart figcaption b{font-family:var(--font-display);font-size:15px} | ||
| 118 | 152 | .tbl-top{display:flex;flex-wrap:wrap;gap:10px;justify-content:space-between;align-items:center} |
| 119 | 153 | .tbl-top b{font-family:var(--font-display);font-size:15px} |
| 120 | 154 | .tbl-top .input{max-width:240px} |
| 121 | −/* Anti-zoom iOS : dates et recherche >= 16 px sur mobile */ | |
| 122 | −@media(max-width:767px){.input{font-size:16px}} | |
| 123 | 155 | table.dt{width:100%;border-collapse:collapse;font-size:13px;margin-top:10px} |
| 124 | 156 | table.dt th{cursor:pointer;text-align:left;padding:8px 10px;background:var(--ink);color:var(--paper);font-family:var(--font-mono);font-size:10.5px;text-transform:uppercase;letter-spacing:.06em;white-space:nowrap;user-select:none} |
| 125 | 157 | table.dt td{padding:7px 10px;border-bottom:1px solid var(--line);white-space:nowrap} |
@@ -165,12 +197,20 @@ table.dt tbody tr:nth-child(even){background:var(--surface-2)} | ||
| 165 | 197 | <header class="hero-s"><div class="container"> |
| 166 | 198 | <span class="kicker">Statistiques · Plateforme</span> |
| 167 | 199 | <h1>Les <span class="hl">stats</span> de la plateforme</h1> |
| 168 | − <p class="lede">Appels API par endpoint, latences moyennes et p95, taux d'erreur et | |
| 169 | − runs de collecte quotidiens des huit services KA — mesurés en continu par la | |
| 170 | − plateforme, rien d'inventé.</p> | |
| 200 | + <p class="lede">Appels API par endpoint, jour et heure, latences moyennes et p95, | |
| 201 | + taux d'erreur, distributions, runs de collecte quotidiens des neuf services KA et | |
| 202 | + santé des connecteurs — mesurés en continu par la plateforme, rien d'inventé.</p> | |
| 171 | 203 | <div class="hero-tools"> |
| 172 | − <button type="button" class="btn btn-primary" id="pdf-complet">⬇ Télécharger le rapport PDF</button> | |
| 173 | − <button type="button" class="btn btn-ghost" id="pdf-synthese">Synthèse (2 p.)</button> | |
| 204 | + <button type="button" class="btn btn-primary" id="pdf-complet">⬇ Rapport PDF complet</button> | |
| 205 | + <span class="pdf-wrap"> | |
| 206 | + <button type="button" class="btn btn-ghost" id="pdf-more" aria-haspopup="true" aria-expanded="false">Autres rapports ▾</button> | |
| 207 | + <span class="pdf-menu" id="pdf-menu" role="menu"> | |
| 208 | + <button type="button" data-mode="synthese" role="menuitem">Synthèse exécutive<small>Couverture, KPI, jauges et records — 2-3 pages</small></button> | |
| 209 | + <button type="button" data-mode="tendances" role="menuitem">Tendances & évolution<small>Toutes les séries temporelles + statistiques</small></button> | |
| 210 | + <button type="button" data-mode="repartitions" role="menuitem">Répartitions & géographie<small>Répartitions, distributions, activité horaire</small></button> | |
| 211 | + <button type="button" data-mode="donnees" role="menuitem">Données détaillées<small>Tous les tableaux en version longue</small></button> | |
| 212 | + </span> | |
| 213 | + </span> | |
| 174 | 214 | <span id="pdf-busy" role="status"></span> |
| 175 | 215 | </div> |
| 176 | 216 | <p class="fresh" style="margin-top:18px"> |
@@ -192,7 +232,17 @@ table.dt tbody tr:nth-child(even){background:var(--surface-2)} | ||
| 192 | 232 | |
| 193 | 233 | <div class="kpi-grid" id="kpis"></div> |
| 194 | 234 | |
| 195 | − <div class="charts-grid" id="charts"></div> | |
| 235 | + <div class="gauge-grid" id="gauges" hidden></div> | |
| 236 | + | |
| 237 | + <div class="sec-gap" id="evo-wrap" hidden> | |
| 238 | + <span class="kicker">Évolution</span> | |
| 239 | + <div class="charts-grid" id="charts" style="margin-top:14px"></div> | |
| 240 | + </div> | |
| 241 | + | |
| 242 | + <div class="sec-gap" id="parts-wrap" hidden> | |
| 243 | + <span class="kicker">Répartitions & distributions</span> | |
| 244 | + <div class="charts-grid" id="parts" style="margin-top:14px"></div> | |
| 245 | + </div> | |
| 196 | 246 | |
| 197 | 247 | <div id="heatmap" class="sec-gap"></div> |
| 198 | 248 | |
@@ -266,7 +316,18 @@ function dlPdf(mode){ | ||
| 266 | 316 | setTimeout(() => { busy.textContent = ""; }, 2600); |
| 267 | 317 | } |
| 268 | 318 | document.getElementById("pdf-complet").addEventListener("click", () => dlPdf("complet")); |
| 269 | −document.getElementById("pdf-synthese").addEventListener("click", () => dlPdf("synthese")); | |
| 319 | +const pdfMore = document.getElementById("pdf-more"), pdfMenu = document.getElementById("pdf-menu"); | |
| 320 | +pdfMore.addEventListener("click", () => { | |
| 321 | + const open = pdfMenu.classList.toggle("open"); | |
| 322 | + pdfMore.setAttribute("aria-expanded", String(open)); | |
| 323 | +}); | |
| 324 | +pdfMenu.querySelectorAll("button").forEach(b => b.addEventListener("click", () => { | |
| 325 | + pdfMenu.classList.remove("open"); pdfMore.setAttribute("aria-expanded", "false"); | |
| 326 | + dlPdf(b.dataset.mode); | |
| 327 | +})); | |
| 328 | +document.addEventListener("click", e => { | |
| 329 | + if (!e.target.closest(".pdf-wrap")) { pdfMenu.classList.remove("open"); pdfMore.setAttribute("aria-expanded", "false"); } | |
| 330 | +}); | |
| 270 | 331 | |
| 271 | 332 | /* ---------- blocs vides (jamais de faux chiffres) ---------- */ |
| 272 | 333 | function emptyBlock(title){ |
@@ -276,7 +337,20 @@ function emptyBlock(title){ | ||
| 276 | 337 | return d; |
| 277 | 338 | } |
| 278 | 339 | |
| 279 | −/* ---------- KPI ---------- */ | |
| 340 | +/* ---------- KPI (avec sparkline) ---------- */ | |
| 341 | +function sparkSvg(spark){ | |
| 342 | + const pts = (spark || []).filter(p => typeof p.v === "number"); | |
| 343 | + if (pts.length < 2) return ""; | |
| 344 | + const W = 160, H = 26, P = 2; | |
| 345 | + const vmax = Math.max(...pts.map(p => p.v), 1), vmin = Math.min(0, ...pts.map(p => p.v)); | |
| 346 | + const X = i => P + (W - 2 * P) * i / (pts.length - 1); | |
| 347 | + const Y = v => P + (H - 2 * P) * (1 - (v - vmin) / ((vmax - vmin) || 1)); | |
| 348 | + const d = pts.map((p, i) => `${i ? "L" : "M"}${X(i).toFixed(1)},${Y(p.v).toFixed(1)}`).join(""); | |
| 349 | + const last = pts[pts.length - 1]; | |
| 350 | + return `<span class="spark" aria-hidden="true"><svg viewBox="0 0 ${W} ${H}" preserveAspectRatio="none"> | |
| 351 | + <path d="${d}" fill="none" stroke="var(--accent)" stroke-width="1.8"/> | |
| 352 | + <circle cx="${X(pts.length-1).toFixed(1)}" cy="${Y(last.v).toFixed(1)}" r="2.4" fill="var(--accent)"/></svg></span>`; | |
| 353 | +} | |
| 280 | 354 | function renderKpis(kpis){ |
| 281 | 355 | const grid = document.getElementById("kpis"); |
| 282 | 356 | grid.innerHTML = ""; |
@@ -288,15 +362,235 @@ function renderKpis(kpis){ | ||
| 288 | 362 | if (k.delta_pct !== undefined && k.delta_pct !== null) { |
| 289 | 363 | const arrowUp = k.delta_pct >= 0; |
| 290 | 364 | const good = (k.direction ?? (arrowUp ? "up" : "down")) === "up"; |
| 291 | − delta = `<p class="delta ${good ? "d-good" : "d-bad"}">${arrowUp ? "▲" : "▼"} ${arrowUp ? "+" : ""}${fmt(k.delta_pct)} % <span>vs période préc.</span></p>`; | |
| 365 | + const dv = Math.round(k.delta_pct * 10) / 10; | |
| 366 | + delta = `<p class="delta ${good ? "d-good" : "d-bad"}">${arrowUp ? "▲" : "▼"} ${arrowUp ? "+" : ""}${fmt(dv)} % <span>vs période préc.</span></p>`; | |
| 292 | 367 | } |
| 293 | 368 | card.innerHTML = ` |
| 294 | 369 | <p class="v">${typeof k.value === "number" ? fmt(k.value) : esc(k.value)}${k.unit ? `<small> ${esc(k.unit)}</small>` : ""}</p> |
| 295 | − <span class="klabel">${esc(k.label)}</span>${delta}`; | |
| 370 | + <span class="klabel">${esc(k.label)}</span>${delta}${sparkSvg(k.spark)}`; | |
| 371 | + grid.appendChild(card); | |
| 372 | + }); | |
| 373 | +} | |
| 374 | + | |
| 375 | +/* ---------- jauges (demi-arc accent) ---------- */ | |
| 376 | +function renderGauges(gauges){ | |
| 377 | + const grid = document.getElementById("gauges"); | |
| 378 | + grid.innerHTML = ""; | |
| 379 | + const gs = (gauges || []).filter(g => typeof g.value === "number" && g.max); | |
| 380 | + grid.hidden = !gs.length; | |
| 381 | + if (!gs.length) return; | |
| 382 | + gs.forEach(g => { | |
| 383 | + const frac = Math.max(0, Math.min(1, g.value / g.max)); | |
| 384 | + const R = 50, C = Math.PI * R; | |
| 385 | + const card = document.createElement("article"); | |
| 386 | + card.className = "card gauge"; | |
| 387 | + card.innerHTML = ` | |
| 388 | + <svg viewBox="0 0 120 66" role="img" aria-label="${esc(g.label)} : ${fmt(g.value)}${g.unit ? " " + esc(g.unit) : ""} sur ${fmt(g.max)}"> | |
| 389 | + <path d="M10,60 A${R},${R} 0 0 1 110,60" fill="none" stroke="rgba(20,24,20,.1)" stroke-width="10" stroke-linecap="round"/> | |
| 390 | + <path d="M10,60 A${R},${R} 0 0 1 110,60" fill="none" stroke="var(--accent)" stroke-width="10" stroke-linecap="round" | |
| 391 | + stroke-dasharray="${(frac * C).toFixed(1)} ${C.toFixed(1)}"/> | |
| 392 | + </svg> | |
| 393 | + <p class="gv">${fmt(g.value)}${g.unit ? `<small> ${esc(g.unit)}</small>` : ""}</p> | |
| 394 | + <span class="klabel">${esc(g.label)}</span>`; | |
| 296 | 395 | grid.appendChild(card); |
| 297 | 396 | }); |
| 298 | 397 | } |
| 299 | 398 | |
| 399 | +/* ---------- statistiques de série (min/max/moy/méd/σ) ---------- */ | |
| 400 | +function statSummary(points){ | |
| 401 | + const vs = (points || []).map(p => p.v).filter(v => typeof v === "number"); | |
| 402 | + if (vs.length < 2) return ""; | |
| 403 | + const sv = [...vs].sort((a, b) => a - b); | |
| 404 | + const mean = vs.reduce((s, v) => s + v, 0) / vs.length; | |
| 405 | + const med = sv[Math.floor(sv.length / 2)]; | |
| 406 | + const sd = Math.sqrt(vs.reduce((s, v) => s + (v - mean) ** 2, 0) / vs.length); | |
| 407 | + const f = v => fmt(Math.round(v * 100) / 100); | |
| 408 | + return `<div class="statsum"> | |
| 409 | + <span class="chip">min <b> ${f(sv[0])}</b></span><span class="chip">max <b> ${f(sv[sv.length-1])}</b></span> | |
| 410 | + <span class="chip">moyenne <b> ${f(mean)}</b></span><span class="chip">médiane <b> ${f(med)}</b></span> | |
| 411 | + <span class="chip">écart-type <b> ${f(sd)}</b></span></div>`; | |
| 412 | +} | |
| 413 | + | |
| 414 | +/* ---------- barres verticales (séries kind=bar & histogrammes) ---------- */ | |
| 415 | +function vBarChart(title, pts, unit){ | |
| 416 | + const rows = (pts || []).filter(p => typeof p.v === "number"); | |
| 417 | + if (!rows.length) return emptyBlock(title); | |
| 418 | + const W = 720, H = 240, PL = 54, PR = 10, PT = 14, PB = 30; | |
| 419 | + const vmax = Math.max(...rows.map(p => p.v), 1); | |
| 420 | + const bw = (W - PL - PR) / rows.length; | |
| 421 | + let g = ""; | |
| 422 | + for (let k = 0; k < 5; k++) { | |
| 423 | + const y = PT + (H - PT - PB) * k / 4; | |
| 424 | + g += `<line x1="${PL}" x2="${W-PR}" y1="${y}" y2="${y}" stroke="var(--line)" stroke-width="1"/> | |
| 425 | + <text x="${PL-6}" y="${y+3}" text-anchor="end" font-size="10" fill="var(--ink-3)" font-family="var(--font-mono)">${NF.format(Math.round(vmax - vmax * k / 4))}</text>`; | |
| 426 | + } | |
| 427 | + rows.forEach((p, i) => { | |
| 428 | + const bh = (H - PT - PB) * p.v / vmax; | |
| 429 | + g += `<rect x="${(PL + i * bw + bw * 0.12).toFixed(1)}" y="${(H - PB - bh).toFixed(1)}" width="${(bw * 0.76).toFixed(1)}" height="${Math.max(bh, p.v > 0 ? 1.5 : 0).toFixed(1)}" | |
| 430 | + fill="var(--accent)" stroke="var(--ink)" stroke-width="0.6" rx="1.5"><title>${esc(p.t)} — ${fmt(p.v)}${unit ? " " + esc(unit) : ""}</title></rect>`; | |
| 431 | + }); | |
| 432 | + const lab = rows.length > 3 ? [0, Math.floor(rows.length/2), rows.length-1] : rows.map((_, i) => i); | |
| 433 | + lab.forEach(i => { | |
| 434 | + g += `<text x="${(PL + i * bw + bw / 2).toFixed(1)}" y="${H-10}" text-anchor="middle" font-size="10" fill="var(--ink-3)" font-family="var(--font-mono)">${esc(rows[i].t)}</text>`; | |
| 435 | + }); | |
| 436 | + const fig = document.createElement("figure"); | |
| 437 | + fig.className = "card chart"; | |
| 438 | + fig.innerHTML = `<figcaption><b>${esc(title)}</b></figcaption> | |
| 439 | + <svg viewBox="0 0 ${W} ${H}" role="img" aria-label="${esc(title)}">${g}</svg>`; | |
| 440 | + return fig; | |
| 441 | +} | |
| 442 | + | |
| 443 | +/* ---------- multi-courbes ≤ 4 (motifs de trait distincts + légende) ---------- */ | |
| 444 | +const MULTI_STYLES = [ | |
| 445 | + {stroke:"var(--accent)", dash:"", w:2.4, sw:""}, | |
| 446 | + {stroke:"var(--ink)", dash:"", w:1.8, sw:"p2"}, | |
| 447 | + {stroke:"var(--accent)", dash:"6 4", w:2, sw:"p3"}, | |
| 448 | + {stroke:"var(--ink-3)", dash:"2 3.5", w:2.2, sw:"p4"}, | |
| 449 | +]; | |
| 450 | +function multiLineChart(ms){ | |
| 451 | + const series = (ms.series || []).filter(s => (s.points || []).length > 1).slice(0, 4); | |
| 452 | + if (!series.length) return emptyBlock(ms.title); | |
| 453 | + const W = 720, H = 250, PL = 54, PR = 10, PT = 14, PB = 26; | |
| 454 | + const fig = document.createElement("figure"); | |
| 455 | + fig.className = "card chart"; | |
| 456 | + fig.innerHTML = ` | |
| 457 | + <figcaption><b>${esc(ms.title)}</b> | |
| 458 | + <span class="legend">${series.map((s, i) => | |
| 459 | + `<button type="button" data-i="${i}" aria-pressed="true"><span class="sw ${MULTI_STYLES[i].sw}"></span>${esc(s.label)}</button>`).join("")} | |
| 460 | + </span></figcaption> | |
| 461 | + <svg viewBox="0 0 ${W} ${H}" role="img" aria-label="${esc(ms.title)}"></svg> | |
| 462 | + <p class="tip" aria-live="polite"></p>`; | |
| 463 | + const svg = fig.querySelector("svg"), tip = fig.querySelector(".tip"); | |
| 464 | + const hide = series.map(() => false); | |
| 465 | + const ref = series[0].points; | |
| 466 | + let hover = null; | |
| 467 | + function draw(){ | |
| 468 | + const vis = series.filter((_, i) => !hide[i]); | |
| 469 | + const all = vis.flatMap(s => s.points.map(p => p.v)); | |
| 470 | + const vmax = Math.max(...(all.length ? all : [1]), 1), vmin = Math.min(0, ...(all.length ? all : [0])); | |
| 471 | + const X = (i, n) => PL + (W - PL - PR) * i / (n - 1); | |
| 472 | + const Y = v => PT + (H - PT - PB) * (1 - (v - vmin) / ((vmax - vmin) || 1)); | |
| 473 | + let g = ""; | |
| 474 | + for (let k = 0; k < 5; k++) { | |
| 475 | + const y = PT + (H - PT - PB) * k / 4; | |
| 476 | + g += `<line x1="${PL}" x2="${W-PR}" y1="${y}" y2="${y}" stroke="var(--line)" stroke-width="1"/> | |
| 477 | + <text x="${PL-6}" y="${y+3}" text-anchor="end" font-size="10" fill="var(--ink-3)" font-family="var(--font-mono)">${NF.format(Math.round(vmax - (vmax - vmin) * k / 4))}</text>`; | |
| 478 | + } | |
| 479 | + [0, Math.floor(ref.length/2), ref.length-1].forEach((i, k) => { | |
| 480 | + g += `<text x="${X(i, ref.length)}" y="${H-8}" text-anchor="${k===0?"start":k===2?"end":"middle"}" font-size="10" fill="var(--ink-3)" font-family="var(--font-mono)">${esc(ref[i].t)}</text>`; | |
| 481 | + }); | |
| 482 | + series.forEach((s, si) => { | |
| 483 | + if (hide[si]) return; | |
| 484 | + const st = MULTI_STYLES[si]; | |
| 485 | + const d = s.points.map((p, i) => `${i ? "L" : "M"}${X(i, s.points.length)},${Y(p.v)}`).join(""); | |
| 486 | + g += `<path d="${d}" fill="none" stroke="${st.stroke}" stroke-width="${st.w}"${st.dash ? ` stroke-dasharray="${st.dash}"` : ""}/>`; | |
| 487 | + }); | |
| 488 | + if (hover !== null) { | |
| 489 | + const x = X(hover, ref.length); | |
| 490 | + g += `<line x1="${x}" x2="${x}" y1="${PT}" y2="${H-PB}" stroke="var(--ink)" stroke-width="1" stroke-dasharray="2 3"/>`; | |
| 491 | + series.forEach((s, si) => { | |
| 492 | + if (hide[si] || !s.points[hover]) return; | |
| 493 | + g += `<circle cx="${x}" cy="${Y(s.points[hover].v)}" r="3.6" fill="${MULTI_STYLES[si].stroke}" stroke="var(--ink)" stroke-width="1.2"/>`; | |
| 494 | + }); | |
| 495 | + } | |
| 496 | + svg.innerHTML = g; | |
| 497 | + tip.innerHTML = hover !== null | |
| 498 | + ? `<span class="chip">${esc(ref[hover].t)} — ${series.map((s, si) => hide[si] || !s.points[hover] ? "" : | |
| 499 | + `${esc(s.label)} : <b> ${fmt(s.points[hover].v)}</b>`).filter(Boolean).join(" · ")}${ms.unit ? " " + esc(ms.unit) : ""}</span>` | |
| 500 | + : ""; | |
| 501 | + } | |
| 502 | + function setHover(clientX){ | |
| 503 | + const r = svg.getBoundingClientRect(); | |
| 504 | + const fx = (clientX - r.left) / r.width * W; | |
| 505 | + hover = Math.max(0, Math.min(ref.length - 1, Math.round((fx - PL) / (W - PL - PR) * (ref.length - 1)))); | |
| 506 | + draw(); | |
| 507 | + } | |
| 508 | + svg.addEventListener("mousemove", e => setHover(e.clientX)); | |
| 509 | + svg.addEventListener("touchstart", e => setHover(e.touches[0].clientX), {passive:true}); | |
| 510 | + svg.addEventListener("touchmove", e => setHover(e.touches[0].clientX), {passive:true}); | |
| 511 | + svg.addEventListener("mouseleave", () => { hover = null; draw(); }); | |
| 512 | + fig.querySelectorAll(".legend button").forEach(b => b.addEventListener("click", () => { | |
| 513 | + const i = +b.dataset.i; | |
| 514 | + hide[i] = !hide[i]; | |
| 515 | + b.setAttribute("aria-pressed", String(!hide[i])); | |
| 516 | + draw(); | |
| 517 | + })); | |
| 518 | + draw(); | |
| 519 | + return fig; | |
| 520 | +} | |
| 521 | + | |
| 522 | +/* ---------- barres empilées (composition dans le temps) ---------- */ | |
| 523 | +function stackedBarChart(st){ | |
| 524 | + const keys = (st.keys || []).slice(0, 6); | |
| 525 | + const pts = st.points || []; | |
| 526 | + if (!keys.length || !pts.length) return emptyBlock(st.title); | |
| 527 | + const shades = [1, .74, .52, .36, .24, .15]; | |
| 528 | + const W = 720, H = 250, PL = 54, PR = 10, PT = 14, PB = 30; | |
| 529 | + const totals = pts.map(p => (p.values || []).slice(0, keys.length).reduce((s, v) => s + (v || 0), 0)); | |
| 530 | + const vmax = Math.max(...totals, 1); | |
| 531 | + const bw = (W - PL - PR) / pts.length; | |
| 532 | + let g = ""; | |
| 533 | + for (let k = 0; k < 5; k++) { | |
| 534 | + const y = PT + (H - PT - PB) * k / 4; | |
| 535 | + g += `<line x1="${PL}" x2="${W-PR}" y1="${y}" y2="${y}" stroke="var(--line)" stroke-width="1"/> | |
| 536 | + <text x="${PL-6}" y="${y+3}" text-anchor="end" font-size="10" fill="var(--ink-3)" font-family="var(--font-mono)">${NF.format(Math.round(vmax - vmax * k / 4))}</text>`; | |
| 537 | + } | |
| 538 | + pts.forEach((p, i) => { | |
| 539 | + let acc = H - PB; | |
| 540 | + keys.forEach((k, j) => { | |
| 541 | + const v = (p.values || [])[j] || 0; | |
| 542 | + if (!v) return; | |
| 543 | + const bh = (H - PT - PB) * v / vmax; | |
| 544 | + acc -= bh; | |
| 545 | + g += `<rect x="${(PL + i * bw + bw * 0.12).toFixed(1)}" y="${acc.toFixed(1)}" width="${(bw * 0.76).toFixed(1)}" height="${Math.max(bh - 0.5, 0.8).toFixed(1)}" | |
| 546 | + fill="var(--accent)" fill-opacity="${shades[j]}" stroke="var(--ink)" stroke-width="0.4"><title>${esc(p.t)} · ${esc(k)} — ${fmt(v)}${st.unit ? " " + esc(st.unit) : ""}</title></rect>`; | |
| 547 | + }); | |
| 548 | + }); | |
| 549 | + const lab = pts.length > 3 ? [0, Math.floor(pts.length/2), pts.length-1] : pts.map((_, i) => i); | |
| 550 | + lab.forEach(i => { | |
| 551 | + g += `<text x="${(PL + i * bw + bw / 2).toFixed(1)}" y="${H-10}" text-anchor="middle" font-size="10" fill="var(--ink-3)" font-family="var(--font-mono)">${esc(pts[i].t)}</text>`; | |
| 552 | + }); | |
| 553 | + const fig = document.createElement("figure"); | |
| 554 | + fig.className = "card chart"; | |
| 555 | + fig.innerHTML = ` | |
| 556 | + <figcaption><b>${esc(st.title)}</b> | |
| 557 | + <span class="legend">${keys.map((k, j) => | |
| 558 | + `<button type="button" disabled style="cursor:default;opacity:1"><span class="sq" style="opacity:${shades[j]}"></span>${esc(k)}</button>`).join("")} | |
| 559 | + </span></figcaption> | |
| 560 | + <svg viewBox="0 0 ${W} ${H}" role="img" aria-label="${esc(st.title)}">${g}</svg>`; | |
| 561 | + return fig; | |
| 562 | +} | |
| 563 | + | |
| 564 | +/* ---------- heatmap horaire 7 jours × 24 h ---------- */ | |
| 565 | +function hourHeatmap(hh){ | |
| 566 | + const cells = (hh && hh.cells) || []; | |
| 567 | + if (!cells.length) return null; | |
| 568 | + const byKey = new Map(cells.map(c => [`${c.dow}-${c.hour}`, c.value])); | |
| 569 | + const max = Math.max(...cells.map(c => c.value), 1); | |
| 570 | + const DOWS = ["Lun", "Mar", "Mer", "Jeu", "Ven", "Sam", "Dim"]; | |
| 571 | + const CS = 22, LX = 40, LY = 18; | |
| 572 | + let g = ""; | |
| 573 | + for (let h = 0; h < 24; h += 3) | |
| 574 | + g += `<text x="${LX + h * CS + CS/2}" y="12" text-anchor="middle" font-size="9" fill="var(--ink-3)" font-family="var(--font-mono)">${h}h</text>`; | |
| 575 | + for (let d = 0; d < 7; d++) { | |
| 576 | + g += `<text x="${LX - 8}" y="${LY + d * CS + CS/2 + 3}" text-anchor="end" font-size="9.5" fill="var(--ink-3)" font-family="var(--font-mono)">${DOWS[d]}</text>`; | |
| 577 | + for (let h = 0; h < 24; h++) { | |
| 578 | + const v = byKey.get(`${d}-${h}`) ?? 0; | |
| 579 | + g += `<rect x="${LX + h * CS}" y="${LY + d * CS}" width="${CS-2}" height="${CS-2}" rx="3" | |
| 580 | + fill="${v ? "var(--accent)" : "rgba(20,24,20,0.06)"}" fill-opacity="${v ? (0.18 + 0.82 * v / max).toFixed(3) : 1}" | |
| 581 | + stroke="rgba(20,24,20,0.14)" stroke-width="0.5"><title>${DOWS[d]} ${String(h).padStart(2,"0")}h — ${fmt(v)} appels</title></rect>`; | |
| 582 | + } | |
| 583 | + } | |
| 584 | + const fig = document.createElement("figure"); | |
| 585 | + fig.className = "card chart"; | |
| 586 | + fig.innerHTML = ` | |
| 587 | + <figcaption><b>${esc(hh.title || "Activité par jour et heure")}</b> <span class="klabel">7 jours × 24 h</span></figcaption> | |
| 588 | + <div class="tbl-wrap hourly-wrap"> | |
| 589 | + <svg viewBox="0 0 ${LX + 24 * CS} ${LY + 7 * CS}" style="min-width:560px" role="img" aria-label="${esc(hh.title || "Activité horaire")}">${g}</svg> | |
| 590 | + </div>`; | |
| 591 | + return fig; | |
| 592 | +} | |
| 593 | + | |
| 300 | 594 | /* ---------- courbe (infobulle + légende cliquable + N-1 pointillé) ---------- */ |
| 301 | 595 | function lineChart(serie){ |
| 302 | 596 | const pts = serie.points || []; |
@@ -383,8 +677,13 @@ function barChart(title, items, unit){ | ||
| 383 | 677 | const d = document.createElement("div"); |
| 384 | 678 | d.className = "bar-row"; |
| 385 | 679 | d.title = `${r.label} — ${fmt(r.value)}${unit ? " " + unit : ""}`; |
| 680 | + let delta = ""; | |
| 681 | + if (r.delta_pct !== undefined && r.delta_pct !== null) { | |
| 682 | + const up = r.delta_pct >= 0; | |
| 683 | + delta = ` <b class="${up ? "d-good" : "d-bad"}">${up ? "+" : ""}${fmt(Math.round(r.delta_pct * 10) / 10)} %</b>`; | |
| 684 | + } | |
| 386 | 685 | d.innerHTML = ` |
| 387 | − <div class="bl"><span>${esc(r.label)}</span><b>${fmt(r.value)}${unit ? " " + esc(unit) : ""}</b></div> | |
| 686 | + <div class="bl"><span>${esc(r.label)}</span><span style="white-space:nowrap"><b>${fmt(r.value)}${unit ? " " + esc(unit) : ""}</b>${delta}</span></div> | |
| 388 | 687 | <div class="track"><div class="fill" style="width:${Math.max(r.value / max * 100, 1)}%"></div></div>`; |
| 389 | 688 | zone.appendChild(d); |
| 390 | 689 | }); |
@@ -542,25 +841,53 @@ async function load(){ | ||
| 542 | 841 | : ""; |
| 543 | 842 | |
| 544 | 843 | renderKpis(dash.kpis); |
| 844 | + renderGauges(dash.gauges); | |
| 545 | 845 | |
| 846 | + /* --- Évolution : séries, multi-courbes, empilées (+ stats de séries) --- */ | |
| 546 | 847 | const charts = document.getElementById("charts"); |
| 547 | 848 | charts.innerHTML = ""; |
| 548 | 849 | const series = dash.series || []; |
| 549 | − if (!series.length) charts.appendChild(Object.assign(emptyBlock("Séries temporelles"), {className:"card empty full"})); | |
| 550 | 850 | series.forEach((s, i) => { |
| 551 | − const el = lineChart(s); | |
| 851 | + let el; | |
| 852 | + if (s.kind === "bar") el = vBarChart(s.title, s.points, s.unit); | |
| 853 | + else { | |
| 854 | + el = lineChart(s); | |
| 855 | + if (el.classList && el.classList.contains("chart")) el.insertAdjacentHTML("beforeend", statSummary(s.points)); | |
| 856 | + } | |
| 552 | 857 | if (i === 0) el.classList.add("full"); |
| 553 | 858 | charts.appendChild(el); |
| 554 | 859 | }); |
| 860 | + (dash.multiseries || []).forEach(ms => { | |
| 861 | + const el = multiLineChart(ms); | |
| 862 | + el.classList.add("full"); | |
| 863 | + charts.appendChild(el); | |
| 864 | + }); | |
| 865 | + (dash.stacked || []).forEach(st => { | |
| 866 | + const el = stackedBarChart(st); | |
| 867 | + el.classList.add("full"); | |
| 868 | + charts.appendChild(el); | |
| 869 | + }); | |
| 870 | + document.getElementById("evo-wrap").hidden = !charts.children.length; | |
| 871 | + | |
| 872 | + /* --- Répartitions & distributions --- */ | |
| 873 | + const parts = document.getElementById("parts"); | |
| 874 | + parts.innerHTML = ""; | |
| 555 | 875 | (dash.breakdowns || []).forEach(b => { |
| 556 | − charts.appendChild(b.kind === "donut" ? donut(b.title, b.items) : barChart(b.title, b.items)); | |
| 876 | + parts.appendChild(b.kind === "donut" ? donut(b.title, b.items) : barChart(b.title, b.items)); | |
| 877 | + }); | |
| 878 | + (dash.distributions || []).forEach(d => { | |
| 879 | + parts.appendChild(vBarChart(d.title, (d.bins || []).map(b => ({t:b.label, v:b.value})), d.unit)); | |
| 557 | 880 | }); |
| 558 | − if (dash.geo && dash.geo.items) charts.appendChild(barChart(dash.geo.title || "Répartition géographique", dash.geo.items)); | |
| 881 | + if (dash.geo && dash.geo.items) parts.appendChild(barChart(dash.geo.title || "Répartition géographique", dash.geo.items)); | |
| 882 | + document.getElementById("parts-wrap").hidden = !parts.children.length; | |
| 559 | 883 | |
| 884 | + /* --- Calendriers : heatmap 26 semaines + heatmap horaire 7×24 --- */ | |
| 560 | 885 | const hm = document.getElementById("heatmap"); |
| 561 | 886 | hm.innerHTML = ""; |
| 562 | 887 | const hmEl = dash.heatmap ? heatmap(dash.heatmap.title, dash.heatmap.cells) : null; |
| 563 | 888 | if (hmEl) hm.appendChild(hmEl); |
| 889 | + const hhEl = dash.hourly ? hourHeatmap(dash.hourly) : null; | |
| 890 | + if (hhEl) { if (hmEl) hhEl.style.marginTop = "16px"; hm.appendChild(hhEl); } | |
| 564 | 891 | |
| 565 | 892 | const tbls = document.getElementById("tables"); |
| 566 | 893 | tbls.innerHTML = ""; |
| 567 | 894 | |