Count sends without link and add NORDEND to the cellular working set

DAILY_LINK_STATE falls back on last_sync for exports without link,
treats the start of history as unknown, and records D-032. Document
the hourly counting flaws, the observed 15-minute cadence, and the
open questions for the specialist.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
maximeandClaude Opus 5.5 committed 2026-10-13 11:50:07 +02:00
1 parent f6d94148aa
commit f803a7d596
9 files changed
+153 -55

No files matched your search

+9 -9
View File
@@ -1,6 +1,6 @@
"""Les analyses Cellular ensemble, pour les comparer (D-016) : les panneaux des analyses, puis un graphique par série.
Usage : python3 src/cellular/all_analyses.py [CSV ou dossiers...] (défaut : data/WEISSHORN/)
Usage : python3 src/cellular/all_analyses.py [CSV ou dossiers...] (défaut : data/WEISSHORN/ et data/NORDEND/)
Écrit out/<STATION>_cellular.html et l'ouvre. Documentation : docs/cellular/analyses/ (une fiche par analyse)
"""
import sys
@@ -56,10 +56,10 @@ def floors_panel(fig, result, row, y_key, class_key, floors, unit):
def figure(station, series, link, signal):
titles = [f"Analyse {ls.RULE['id']}", f"Analyse {ss.RULE['id']} : RSRP", f"Analyse {ss.RULE['id']} : RSRQ"]
fig = make_subplots(rows=len(titles) + len(METRICS) + 1, cols=1, shared_xaxes=True, vertical_spacing=0.03,
subplot_titles=titles + METRICS + ["link : instantanés « up » par heure"])
subplot_titles=titles + METRICS + ["envois reçus par heure (last_sync, sinon link)"])
group = dict(legendgroup=ls.RULE["id"], legendgrouptitle_text=f"Analyse {ls.RULE['id']}")
state_markers(fig, link["points"], "up_percent", "state", LINK_STYLE, 1, group)
fig.update_yaxes(title_text="envois reçus avec link = up [%]", row=1, col=1)
state_markers(fig, link["points"], "received_percent", "state", LINK_STYLE, 1, group)
fig.update_yaxes(title_text="envois reçus [%]", row=1, col=1)
floors_panel(fig, signal, 2, "rsrp_median_dbm", "rsrp_class", ss.RSRP_FLOORS_DBM, "dBm")
floors_panel(fig, signal, 3, "rsrq_median_db", "rsrq_class", ss.RSRQ_FLOORS_DB, "dB")
@@ -71,8 +71,8 @@ def figure(station, series, link, signal):
**mesures)
for a, b in gaps(s):
fig.add_vrect(x0=a, x1=b, fillcolor="gray", opacity=0.3, line_width=0, row=row, col=1)
s = series["link"]
fig.add_bar(x=sorted(s), y=[(s[t] or []).count("up") for t in sorted(s)], name="link up / heure",
s = series.get("last_sync") or series["link"]
fig.add_bar(x=sorted(s), y=[len(s[t] or []) for t in sorted(s)], name="envois / heure",
marker_color="#52514e", row=row + 1, col=1, **mesures)
fig.update_xaxes(showticklabels=True) # dates sous chaque graphique, pas seulement le dernier
fig.update_yaxes(fixedrange=True) # zoom horizontal seulement : l'ordonnée est recalée par AUTOSCALE_Y_JS
@@ -86,8 +86,8 @@ def main(paths):
(ROOT / "out").mkdir(exist_ok=True)
written = []
for station, series in sorted(load_stations(paths).items()):
if "link" not in series or "rsrp_dBm" not in series:
print(f"{station} : ignorée, pas de mesures du modem (link, rsrp_dBm)")
if "rsrp_dBm" not in series or not {"link", "last_sync"} & series.keys():
print(f"{station} : ignorée, pas de mesures du modem (rsrp_dBm, et link ou last_sync)")
continue
path = ROOT / "out" / f"{station}_cellular.html"
figure(station, series, ls.run(series), ss.run(series)).write_html(
@@ -98,5 +98,5 @@ def main(paths):
if __name__ == "__main__":
for p in main(sys.argv[1:] or [str(ROOT / "data" / "WEISSHORN")]):
for p in main(sys.argv[1:] or [str(ROOT / "data" / s) for s in ("WEISSHORN", "NORDEND")]):
open_html(p)
+36 -19
View File
@@ -17,18 +17,20 @@ RULE = {
}
def day_facts(hours, sync=None):
"""Échantillons d'un jour, {heure UTC: liste ou None}, de `link` et de `last_sync` (None si la série manque)
-> faits et état (fiche, « Principe »)."""
samples = [x for v in hours.values() if v for x in v]
n_up, n_down = samples.count("up"), samples.count("down")
expected = SAMPLES_PER_HOUR * HOURS_PER_DAY
def day_facts(link, sync):
"""Échantillons d'un jour, {heure UTC: liste ou None}, de `link` et de `last_sync`. L'une des deux séries peut manquer
(None) : les exports d'avant `link` n'ont que `last_sync`. -> faits et état (fiche, « Principe »)."""
hours = (link or {}).keys() | (sync or {}).keys()
# Par heure, (messages link, messages last_sync) : les deux partent à chaque envoi, quel que soit l'état du modem.
counts = [(len(hours.get(h) or []), len((sync or {}).get(h) or [])) for h in hours.keys() | (sync or {}).keys()]
counts = [(len((link or {}).get(h) or []), len((sync or {}).get(h) or [])) for h in hours]
# Un envoi est arrivé si l'un de ses deux messages est arrivé ; par heure : un doublon ne bouche pas un trou.
missing = sum(max(0, SAMPLES_PER_HOUR - max(c)) for c in counts)
lost = None if sync is None else sum(abs(a - b) for a, b in counts) # messages perdus dans un envoi arrivé
if len(hours) < HOURS_PER_DAY:
lost = None if link is None or sync is None else sum(abs(a - b) for a, b in counts) # perdus dans un envoi arrivé
samples = [x for v in (link or {}).values() if v for x in v]
n_up, n_down = (None, None) if link is None else (samples.count("up"), samples.count("down"))
expected = SAMPLES_PER_HOUR * HOURS_PER_DAY
full = len(hours) == HOURS_PER_DAY
if not full:
state = None # UNKNOWN : jour coupé par l'export
elif n_down:
state = "DOWN"
@@ -36,22 +38,37 @@ def day_facts(hours, sync=None):
state = "MISSING"
else:
state = "UP"
return {"state": state, "up_percent": round(100 * n_up / expected, 1), "n_up": n_up, "n_down": n_down,
return {"state": state, "received_percent": round(100 * (expected - missing) / expected, 1) if full else None,
"up_percent": round(100 * n_up / expected, 1) if full and n_up is not None else None,
"n_sends": sum(max(c) for c in counts), "n_up": n_up, "n_down": n_down,
"n_missing": missing, "n_messages_lost": lost, "hours": len(hours)}
def by_day(series):
"""{t: échantillons} -> {jour: {heure: échantillons}} ; None si la série manque."""
if series is None:
return None
days = defaultdict(dict)
for t, v in series.items():
days[t.date()][t.hour] = v
return days
def run(series):
"""Analyse DAILY_LINK_STATE, causale : le jour d n'utilise que les heures de d. Un point par jour UTC."""
link, sync = series["link"], series.get("last_sync")
days, sync_days, last = defaultdict(dict), defaultdict(dict), {}
for t in sorted(link):
link, sync = by_day(series.get("link")), by_day(series.get("last_sync"))
if link is None and sync is None:
raise KeyError("DAILY_LINK_STATE : il faut la série link ou last_sync")
ref = series["link"] if link is not None else series["last_sync"]
last = {}
for t in sorted(ref):
last[t.date()] = t
days[t.date()][t.hour] = link[t]
for t in sync or {}:
sync_days[t.date()][t.hour] = sync[t]
points = []
points, started = [], False
for d in sorted(last):
facts = day_facts(days[d], None if sync is None else sync_days[d])
value = facts["up_percent"] if facts["state"] else None
facts = day_facts(None if link is None else link[d], None if sync is None else sync[d])
if not started: # début d'historique : jusqu'au jour du premier envoi reçu, compris, le jour est coupé
started = facts["n_sends"] > 0
facts["state"] = None
value = facts["received_percent"] if facts["state"] else None
points.append({"t": last[d], "value": value, "anomaly": None, "facts": facts})
return {"analysis": RULE["id"], "rule": RULE, "points": points}