Merge branch 'main' into all_in_one

- Regenberechnung nutzt neuen API-Endpunkt statt kumulativem Rohzähler
- days-Parameter relativ zu heute: funktioniert korrekt auch bei
  Aufruf mitten im Monat (z.B. 5.6. → zeigt trotzdem Mai komplett)
- Erster Tag des Folgemonats weiterhin im Chart sichtbar

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Dockerfile

@@ -5,6 +5,9 @@ WORKDIR /app
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
+ARG VERSION=unknown
+ENV APP_VERSION=${VERSION}
+
 COPY weather_report.py .
 
 RUN mkdir -p images

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
 name = "weather2oag"
-version = "1.0.0"
+version = "1.1.1"
 description = "Monatlicher Wetterbericht der Sternwarte Welzheim"
 requires-python = ">=3.12"

weather_report.py

@@ -1,22 +1,25 @@
 #!/usr/bin/env python3
-"""Erstellt Wetterdiagramme für den letzten Kalendermonat und verschickt sie per Mail."""
+"""Erstellt einen kombinierten Wetterbericht für den letzten Kalendermonat."""
 
 import os
 import smtplib
 import tempfile
-from collections import defaultdict
+
 from datetime import datetime, timedelta, timezone
 from email.mime.image import MIMEImage
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 
 import matplotlib.dates as mdates
+import matplotlib.patches as mpatches
 import matplotlib.pyplot as plt
 import requests
 from dotenv import load_dotenv
 
 load_dotenv()
 
+VERSION = os.getenv("APP_VERSION", "?")
+
 API_BASE_URL = os.getenv("API_BASE_URL", "https://stwwetter.fuerst-stuttgart.de/api")
 MAIL_SERVER = os.getenv("MAIL_SERVER")
 MAIL_PORT = int(os.getenv("MAIL_PORT", "587"))
@@ -43,11 +46,10 @@ plt.rcParams.update({
 
 
 def last_month_range() -> tuple[datetime, datetime, str]:
-    """Gibt (start, end, Monatsname) für den letzten Kalendermonat zurück."""
     today = datetime.now(timezone.utc)
     first_of_this = today.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
-    end = first_of_this - timedelta(seconds=1)          # letzter Moment des Vormonats
-    start = end.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
+    start = (first_of_this - timedelta(days=1)).replace(day=1, hour=0, minute=0, second=0, microsecond=0)
+    end = first_of_this + timedelta(days=1)  # inkl. 1. Folgemonat
     label = f"{MONTHS_DE[start.month - 1]} {start.year}"
     return start, end, label
 
@@ -63,109 +65,112 @@ def parse_dt(s: str) -> datetime:
     return datetime.fromisoformat(s.replace("Z", "+00:00"))
 
 
-
-def chart_temp_minmax(start: datetime, end: datetime, label: str) -> bytes:
+def _data_temp_minmax(start: datetime, end: datetime):
     data = fetch("/weather/daily-aggregated-range", {
-        "start": start.isoformat(),
-        "end": end.isoformat(),
+        "start": start.isoformat(), "end": end.isoformat(),
     })
     dates = [parse_dt(d["datetime"]) for d in data]
     t_min = [d["min_temperature"] for d in data]
     t_max = [d["max_temperature"] for d in data]
-
-    fig, ax = plt.subplots(figsize=(12, 5))
-    ax.plot(dates, t_max, color="#e05c2a", linewidth=2, marker="o", markersize=4,
-            label="Tages-Maximum")
-    ax.plot(dates, t_min, color="#2a7be0", linewidth=2, marker="o", markersize=4,
-            label="Tages-Minimum")
-    ax.fill_between(dates, t_min, t_max, alpha=0.12, color="#888888")
-
-    ax.set_title(f"Temperaturverlauf (Tages-Min / Tages-Max) – {label}",
-                 fontweight="bold", pad=14)
-    ax.set_ylabel("Temperatur (°C)")
-    ax.set_xlim(start, end)
-    ax.xaxis.set_major_formatter(mdates.DateFormatter("%d.%m."))
-    ax.xaxis.set_major_locator(mdates.DayLocator(interval=3))
-    fig.autofmt_xdate(rotation=0, ha="center")
-    ax.legend(framealpha=0.8)
-    fig.tight_layout()
-
-    return _fig_to_bytes(fig)
+    return dates, t_min, t_max
 
 
-def chart_temp_hourly(start: datetime, end: datetime, label: str) -> bytes:
+def _data_temp_hourly(start: datetime, end: datetime):
     data = fetch("/weather/hourly-aggregated-range", {
-        "start": start.isoformat(),
-        "end": end.isoformat(),
+        "start": start.isoformat(), "end": end.isoformat(),
     })
     dates = [parse_dt(d["datetime"]) for d in data]
     temps = [d["temperature"] for d in data]
+    return dates, temps
 
-    fig, ax = plt.subplots(figsize=(12, 5))
-    ax.plot(dates, temps, color="#2a7be0", linewidth=1.5, label="Stundenmittel")
 
-    ax.set_title(f"Temperaturverlauf (Stundenmittel) – {label}",
-                 fontweight="bold", pad=14)
+def _data_rain_daily(start: datetime, end: datetime):
+    today = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
+    days = min((today - start).days + 2, 365)
+    data = fetch("/weather/rain-daily", {"days": days})
+    pairs = []
+    for d in data:
+        day_dt = parse_dt(d["date"]).replace(hour=0, minute=0, second=0, microsecond=0)
+        if start <= day_dt < end:
+            pairs.append((day_dt, round(d["total_rain"], 1)))
+    pairs.sort()
+    if not pairs:
+        return [], []
+    dates, rain = zip(*pairs)
+    return list(dates), list(rain)
+
+
+def create_combined_chart(start: datetime, end: datetime, label: str) -> bytes:
+    dates_mm, t_min, t_max = _data_temp_minmax(start, end)
+    dates_h, temps = _data_temp_hourly(start, end)
+    dates_r, rain = _data_rain_daily(start, end)
+
+    fig, axes = plt.subplots(3, 1, figsize=(13, 16))
+    fig.suptitle(f"Wetterbericht – {label}", fontsize=15, fontweight="bold", y=0.985)
+
+    # --- Chart 1: Tages-Min / Tages-Max ---
+    ax = axes[0]
+    ax.plot(dates_mm, t_max, color="#e05c2a", linewidth=2, marker="o",
+            markersize=4, label="Tages-Maximum")
+    ax.plot(dates_mm, t_min, color="#2a7be0", linewidth=2, marker="o",
+            markersize=4, label="Tages-Minimum")
+    ax.fill_between(dates_mm, t_min, t_max, alpha=0.12, color="#888888")
+    ax.set_title("Temperaturverlauf (Tages-Min / Tages-Max)", fontweight="bold", pad=10)
     ax.set_ylabel("Temperatur (°C)")
-    ax.set_xlim(start, end)
+    ax.set_xlim(start - timedelta(hours=12), end + timedelta(hours=12))
     ax.xaxis.set_major_formatter(mdates.DateFormatter("%d.%m."))
     ax.xaxis.set_major_locator(mdates.DayLocator(interval=3))
-    fig.autofmt_xdate(rotation=0, ha="center")
+    plt.setp(ax.get_xticklabels(), rotation=0, ha="center")
     ax.legend(framealpha=0.8)
-    fig.tight_layout()
 
-    return _fig_to_bytes(fig)
+    # --- Chart 2: Stundenmittel ---
+    ax = axes[1]
+    ax.plot(dates_h, temps, color="#2a7be0", linewidth=1.5, label="Stundenmittel")
+    ax.set_title("Temperaturverlauf (Stundenmittel)", fontweight="bold", pad=10)
+    ax.set_ylabel("Temperatur (°C)")
+    ax.set_xlim(start - timedelta(hours=12), end + timedelta(hours=12))
+    ax.xaxis.set_major_formatter(mdates.DateFormatter("%d.%m."))
+    ax.xaxis.set_major_locator(mdates.DayLocator(interval=3))
+    plt.setp(ax.get_xticklabels(), rotation=0, ha="center")
+    ax.legend(framealpha=0.8)
 
-
-def chart_rain_daily(start: datetime, end: datetime, label: str) -> bytes:
-    # Das rain-Feld ist ein kumulativer Zähler; Tagessumme = max - min je Tag
-    data = fetch("/weather/range", {
-        "start": start.isoformat(),
-        "end": end.isoformat(),
-        "limit": 50000,
-    })
-
-    by_day: dict[str, list[float]] = defaultdict(list)
-    for d in data:
-        if d.get("rain") is not None:
-            day_key = parse_dt(d["datetime"]).strftime("%Y-%m-%d")
-            by_day[day_key].append(d["rain"])
-
-    dates = []
-    rain = []
-    for day_key in sorted(by_day):
-        vals = by_day[day_key]
-        daily = max(vals) - min(vals)
-        if daily < 0:   # Zählerreset → nehme max als Tagessumme
-            daily = max(vals)
-        dates.append(datetime.fromisoformat(day_key).replace(tzinfo=timezone.utc))
-        rain.append(round(daily, 1))
-
-    fig, ax = plt.subplots(figsize=(12, 5))
+    # --- Chart 3: Niederschlag ---
+    ax = axes[2]
     colors = ["#2a7be0" if r > 0 else "#ccddee" for r in rain]
-    ax.bar(dates, rain, color=colors, width=0.7, label="Niederschlag")
-
+    ax.bar(dates_r, rain, color=colors, width=0.7, label="Niederschlag")
     total = sum(rain)
-    ax.set_title(
-        f"Niederschlag pro Tag – {label}  (Summe: {total:.1f} mm)",
-        fontweight="bold", pad=14,
-    )
+    ax.set_title(f"Niederschlag pro Tag  (Summe: {total:.1f} mm)",
+                 fontweight="bold", pad=10)
     ax.set_ylabel("Niederschlag (mm)")
     ax.set_xlim(start - timedelta(hours=12), end + timedelta(hours=12))
     ax.xaxis.set_major_formatter(mdates.DateFormatter("%d.%m."))
     ax.xaxis.set_major_locator(mdates.DayLocator(interval=3))
-    fig.autofmt_xdate(rotation=0, ha="center")
+    plt.setp(ax.get_xticklabels(), rotation=0, ha="center")
     ax.legend(framealpha=0.8)
-    fig.tight_layout()
 
-    return _fig_to_bytes(fig)
+    fig.tight_layout(rect=[0.015, 0.055, 0.985, 0.975])
 
+    # Rahmen um die gesamte Figure
+    border = mpatches.FancyBboxPatch(
+        (0.008, 0.008), 0.984, 0.984,
+        boxstyle="square,pad=0",
+        linewidth=2, edgecolor="#999999", facecolor="none",
+        transform=fig.transFigure, clip_on=False,
+    )
+    fig.add_artist(border)
+
+    # Footer: links E-Mail, Mitte Watermark, rechts Version + Datum
+    footer_y = 0.030
+    footer_kw = dict(va="center", fontsize=9, color="#999999",
+                     transform=fig.transFigure)
+    build_date = datetime.now(timezone.utc).strftime("%d.%m.%Y")
+    fig.text(0.022, footer_y, "mailto:rexfue@gmail.com",
+             ha="left", **footer_kw)
+    fig.text(0.5, footer_y, "Wetterstation der Sternwarte Welzheim",
+             ha="center", **footer_kw)
+    fig.text(0.978, footer_y, f"V {VERSION}  ·  {build_date}",
+             ha="right", **footer_kw)
 
-def _fig_to_bytes(fig: plt.Figure) -> bytes:
-    ax = fig.axes[0]
-    ax.text(0.99, 0.03, "Wetterstation der Sternwarte Welzheim",
-            ha="right", va="bottom", fontsize=9, color="#bbbbbb",
-            transform=ax.transAxes)
     with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as f:
         fig.savefig(f.name, dpi=150, bbox_inches="tight")
         path = f.name
@@ -176,47 +181,33 @@ def _fig_to_bytes(fig: plt.Figure) -> bytes:
     return data
 
 
-def send_email(charts: dict[str, bytes], label: str) -> None:
+def send_email(png: bytes, label: str) -> None:
     if not all([MAIL_SERVER, MAIL_USER, MAIL_PASSWORD, MAIL_FROM, MAIL_TO]):
         print("E-Mail-Konfiguration unvollständig – Mail wird nicht gesendet.")
         return
 
+    # multipart/related: HTML + CID-Bild werden als Einheit behandelt
+    related = MIMEMultipart("related")
+
     msg = MIMEMultipart("mixed")
     msg["Subject"] = f"{MAIL_SUBJECT} – {label}"
     msg["From"] = MAIL_FROM
     msg["To"] = ", ".join(MAIL_TO)
+    msg.attach(related)
 
     body = MIMEText(
         f"<html><body>"
         f"<h2>Wetterbericht – {label}</h2>"
-        f"<p>Anbei die Wetterdiagramme für {label}.</p>"
-        + "".join(
-            f'<p><strong>{name}</strong><br>'
-            f'<img src="cid:{cid}" style="max-width:100%;"/></p>'
-            for (name, _), cid in zip(
-                charts.items(),
-                ["chart1@weather", "chart2@weather", "chart3@weather"],
-            )
-        )
-        + "</body></html>",
+        f'<img src="cid:chart@weather" style="max-width:100%;"/>'
+        f"</body></html>",
         "html",
     )
-    msg.attach(body)
+    related.attach(body)
 
-    filenames = [
-        "temperatur_minmax.png",
-        "temperatur_stundenmittel.png",
-        "niederschlag_taglich.png",
-    ]
-    for (name, png), cid, fname in zip(
-        charts.items(),
-        ["chart1@weather", "chart2@weather", "chart3@weather"],
-        filenames,
-    ):
-        img = MIMEImage(png, name=fname)
-        img.add_header("Content-ID", f"<{cid}>")
-        img.add_header("Content-Disposition", "inline", filename=fname)
-        msg.attach(img)
+    img = MIMEImage(png, name="wetterbericht.png")
+    img.add_header("Content-ID", "<chart@weather>")
+    img.add_header("Content-Disposition", "inline", filename="wetterbericht.png")
+    related.attach(img)
 
     with smtplib.SMTP(MAIL_SERVER, MAIL_PORT) as smtp:
         smtp.ehlo()
@@ -231,25 +222,15 @@ def main() -> None:
     start, end, label = last_month_range()
     print(f"Hole Wetterdaten für {label} ({start.date()} – {end.date()}) …")
 
-    charts = {
-        "Tages-Min / Tages-Max Temperatur": chart_temp_minmax(start, end, label),
-        "Temperatur Stundenmittel": chart_temp_hourly(start, end, label),
-        "Niederschlag pro Tag": chart_rain_daily(start, end, label),
-    }
-
-    print("Diagramme erstellt.")
+    png = create_combined_chart(start, end, label)
 
     os.makedirs("images", exist_ok=True)
-    for fname, (_, png) in zip(
-        ["temperatur_minmax.png", "temperatur_stundenmittel.png", "niederschlag_taglich.png"],
-        charts.items(),
-    ):
-        path = os.path.join("images", fname)
-        with open(path, "wb") as f:
-            f.write(png)
-        print(f"  → {path}")
+    path = os.path.join("images", "wetterbericht.png")
+    with open(path, "wb") as f:
+        f.write(png)
+    print(f"Diagramm erstellt → {path}")
 
-    send_email(charts, label)
+    send_email(png, label)
 
 
 if __name__ == "__main__":