Update core/tools/build_glucose_plot.py

core/tools/build_glucose_plot.py

@@ -3,11 +3,45 @@ from __future__ import annotations
 
 import io
 from datetime import datetime, timedelta
-from typing import List, Dict, Any
+from typing import List, Dict, Any, Optional
+
+import matplotlib
+matplotlib.use("Agg")  # Headless für HF / Server
+import matplotlib.pyplot as plt
 
 from core.tools.nightscout import get_sgv_entries
 
 
+def _safe_get_sgv_entries(hours: int) -> List[Dict[str, Any]]:
+    """
+    Nightscout wrapper: versucht verschiedene Signaturen von get_sgv_entries(),
+    damit wir unabhängig von deiner nightscout.py-Version funktionieren.
+    """
+    # 1) Häufige Varianten (keyword)
+    for kwargs in ({"hours": hours}, {"sinceHours": hours}, {"since_hours": hours}, {"hours_back": hours}):
+        try:
+            entries = get_sgv_entries(**kwargs)  # type: ignore
+            if isinstance(entries, list):
+                return entries
+        except TypeError:
+            pass
+        except Exception:
+            # andere Fehler nicht hier verschlucken -> später sichtbar
+            break
+
+    # 2) Häufige Variante (positional)
+    try:
+        entries = get_sgv_entries(hours)  # type: ignore
+        if isinstance(entries, list):
+            return entries
+    except TypeError:
+        pass
+
+    # 3) Fallback: ohne args (liefert evtl. "letzte N" – wir filtern dann selbst)
+    entries = get_sgv_entries()  # type: ignore
+    return entries if isinstance(entries, list) else []
+
+
 def build_glucose_plot_png(hours: int = 3) -> bytes:
     """
     Baut ein PNG mit dem Glukoseverlauf der letzten `hours`.
@@ -22,24 +56,9 @@ def build_glucose_plot_png(hours: int = 3) -> bytes:
       180–250     -> gelb
       > 250       -> rot
     """
+    since = datetime.utcnow() - timedelta(hours=hours)
 
-    # -------------------------------------------------
-    # LAZY IMPORT (verhindert Crash beim App-Start)
-    # -------------------------------------------------
-    try:
-        import matplotlib
-        matplotlib.use("Agg")  # Headless für HF / Server
-        import matplotlib.pyplot as plt
-    except Exception as e:
-        raise RuntimeError(
-            "matplotlib ist nicht installiert oder nicht ladbar"
-        ) from e
-
-    # -------------------------------------------------
-    # Nightscout Daten
-    # -------------------------------------------------
-    entries: List[Dict[str, Any]] = get_sgv_entries(since_hours=hours)
-
+    entries: List[Dict[str, Any]] = _safe_get_sgv_entries(hours=hours)
     if not entries:
         raise RuntimeError("No Nightscout data available")
 
@@ -47,52 +66,53 @@ def build_glucose_plot_png(hours: int = 3) -> bytes:
     values: List[int] = []
 
     for e in entries:
-        if not e.get("sgv") or not e.get("date"):
+        sgv = e.get("sgv")
+        ts = e.get("date")  # ms epoch
+        if sgv is None or ts is None:
             continue
-        times.append(datetime.utcfromtimestamp(e["date"] / 1000))
-        values.append(int(e["sgv"]))
+        try:
+            t = datetime.utcfromtimestamp(float(ts) / 1000.0)
+            if t < since:
+                continue  # nur gewünschter Zeitraum
+            v = int(float(sgv))
+        except Exception:
+            continue
+
+        times.append(t)
+        values.append(v)
 
     if not times:
-        raise RuntimeError("No valid SGV points")
+        raise RuntimeError("No valid SGV points in selected time window")
+
+    # Sortieren, falls Nightscout rückwärts liefert
+    pairs = sorted(zip(times, values), key=lambda x: x[0])
+    times = [p[0] for p in pairs]
+    values = [p[1] for p in pairs]
 
     # -------------------------------------------------
     # Plot
     # -------------------------------------------------
     fig, ax = plt.subplots(figsize=(8, 4))
 
-    # Zielbereich
-    ax.axhspan(80, 180, color="#C8E6C9", alpha=0.6, label="Zielbereich 80–180")
-
-    # Warnzonen
-    ax.axhspan(0, 80, color="#FFCDD2", alpha=0.6)
-    ax.axhspan(80, 95, color="#FFF9C4", alpha=0.6)
-    ax.axhspan(180, 250, color="#FFF9C4", alpha=0.6)
-    ax.axhspan(250, 400, color="#FFCDD2", alpha=0.6)
+    # Zielbereich + Farbzonen
+    ax.axhspan(80, 180, alpha=0.35)    # grün (default, keine expliziten Farben nötig)
+    ax.axhspan(0, 80, alpha=0.25)      # rot-zone (über alpha sichtbar)
+    ax.axhspan(80, 95, alpha=0.25)     # gelb-zone
+    ax.axhspan(180, 250, alpha=0.25)   # gelb-zone
+    ax.axhspan(250, 450, alpha=0.25)   # rot-zone
 
     # Verlauf
-    ax.plot(
-        times,
-        values,
-        color="#1565C0",
-        linewidth=2,
-        marker="o",
-        markersize=3,
-    )
+    ax.plot(times, values, linewidth=2, marker="o", markersize=3)
 
     ax.set_ylim(40, 300)
     ax.set_ylabel("mg/dL")
     ax.set_title(f"Glukoseverlauf – letzte {hours}h")
-
-    ax.grid(True, alpha=0.3)
+    ax.grid(True, alpha=0.25)
     fig.autofmt_xdate()
 
-    # -------------------------------------------------
-    # Export → PNG Bytes
-    # -------------------------------------------------
     buf = io.BytesIO()
     plt.tight_layout()
     plt.savefig(buf, format="png", dpi=120)
     plt.close(fig)
-
     buf.seek(0)
     return buf.read()