Compare commits

..

2 Commits

Author SHA1 Message Date
admin 2bdbf50111 Merge branch 'main' into all_in_one
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-01 21:00:03 +02:00
admin 38a43407b3 Merge branch 'main' into all_in_one
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-26 11:47:00 +02:00
2 changed files with 19 additions and 15 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
[project]
name = "weather2oag"
version = "1.1.1"
version = "1.1.0"
description = "Monatlicher Wetterbericht der Sternwarte Welzheim"
requires-python = ">=3.12"
+18 -14
View File
@@ -4,7 +4,7 @@
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
@@ -49,7 +49,7 @@ def last_month_range() -> tuple[datetime, datetime, str]:
today = datetime.now(timezone.utc)
first_of_this = today.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
end = first_of_this # exklusives Ende: < Juni 1 = komplett Mai
label = f"{MONTHS_DE[start.month - 1]} {start.year}"
return start, end, label
@@ -85,19 +85,23 @@ def _data_temp_hourly(start: datetime, end: datetime):
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 = []
data = fetch("/weather/range", {
"start": start.isoformat(), "end": end.isoformat(), "limit": 50000,
})
by_day: dict[str, list[float]] = defaultdict(list)
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)
if d.get("rain") is not None:
by_day[parse_dt(d["datetime"]).strftime("%Y-%m-%d")].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:
daily = max(vals)
dates.append(datetime.fromisoformat(day_key).replace(tzinfo=timezone.utc))
rain.append(round(daily, 1))
return dates, rain
def create_combined_chart(start: datetime, end: datetime, label: str) -> bytes: