feat(calendar): timezone argument for events/tasks (IANA, default Europe/Berlin) for travel/foreign timezones

This commit is contained in:
Stefan Lohmaier committed 2026-10-01 09:29:31 +02:00
1 parent a73dbe8fdc
commit 5131f77a5c
4 files changed
+83 -21

No files matched your search

+1 -1
View File
@@ -94,7 +94,7 @@ Access tokens are stored in a shared file `.active_tokens.json` so all 5 service
- `common.py` — OAuth (authorize/token/metadata), Bearer middleware, user resolution (contextvars), config loader
- `mail/server.py` — Maildir reader; tools: list_accounts, list_folders, search_mail, read_mail (lists attachments), read_attachment, create_draft
- `calendar/server.py` — CalDAV REPORT + vobject; events/tasks CRUD, travel time, geocoding, reminders. Timed events/tasks werden mit TZID=Europe/Berlin (pytz) geschrieben (naive Eingaben lokalisiert, Offsets/Z konvertiert; Bugfix 2026-09-30, vorher floating -> Baikal las +2h). Delete/Update loesen den echten Ressourcenpfad per UID auf (`_find_href`), da der Dateiname nicht die UID sein muss (Importe wie medatixx).
- `calendar/server.py` — CalDAV REPORT + vobject; events/tasks CRUD, travel time, geocoding, reminders. Timed events/tasks werden mit TZID=Europe/Berlin (pytz) geschrieben (naive Eingaben lokalisiert, Offsets/Z konvertiert; Bugfix 2026-09-30, vorher floating -> Baikal las +2h). `create/update_event`+`create/update_task` haben ein `timezone`-Argument (IANA, Default Europe/Berlin; z.B. `Asia/Hong_Kong` fuer Auslands-Termine, lokale Ortszeit eintragen); Ausgabe behaelt die benannte Zone, UTC-Importe werden nach Berlin normalisiert. Delete/Update loesen den echten Ressourcenpfad per UID auf (`_find_href`), da der Dateiname nicht die UID sein muss (Importe wie medatixx).
- `contacts/server.py` — CardDAV; search/get/create, contact photos
- `files/server.py` — WebDAV; list/read/write/delete/move/search, images + documents
- `notes/server.py` — Joplin Data API; list/search/read/create notes, list_note_resources, read_resource, add/update/delete_attachment
+1
View File
@@ -28,6 +28,7 @@ Self-hosted [MCP](https://modelcontextprotocol.io) servers for Claude. Gives Cla
`mailindex.py.bak-newdir-*`, `server.py.bak-newdir-*`, `kati.sqlite.bak-newdir-*`.
- **Calendar + Tasks** — `list_calendars`, `get_events`, `search_events`, `list_task_lists`, `get_tasks`, `create_event` (travel time + geocoding + reminders), `create_task`
- **Zeitzonen-Fix (2026-09-30):** Timed-Events/Tasks wurden ohne TZID (floating) geschrieben; Baikal las sie als UTC, in der CalDAV-Suite +2h verschoben. Jetzt: naive Eingaben werden als `Europe/Berlin` lokalisiert (pytz), explizite Offsets/`Z` konvertiert. Betroffen waren alle per MCP angelegten Timed-Termine; per Einmal-Skript (alle stefan/kati-Kalender) auf TZID umgeschrieben. Anzeige normalisiert aware Zeiten nach Berlin. `delete_event`/`update_event`/`delete_task`/`update_task` loesen den echten Ressourcenpfad per UID auf (`_find_href`), da der `.ics`-Dateiname bei Importen (medatixx) nicht die UID ist (Delete lief sonst ins Leere, Update erzeugte Duplikate).
- **Auslands-Zeitzonen (2026-10-01):** `create/update_event` + `create/update_task` haben ein `timezone`-Argument (IANA, Default `Europe/Berlin`). Fuer Termine im Ausland (z.B. Hongkong) `timezone="Asia/Hong_Kong"` setzen und die lokale Ortszeit eintragen; gespeichert wird `TZID=Asia/Hong_Kong`, die Ausgabe zeigt den passenden Offset (`+08:00`). Ungueltige Zonen liefern einen klaren Fehler. Naive Zeiten ohne `timezone` bleiben Europe/Berlin.
- **Contacts** — `search_contacts`, `get_contact` (with photo), `create_contact`, `set_contact_photo`
- **Files** — `list_files`, `read_file` (image/document/text), `file_info`, `search_files`, `write_file`, `create_folder`, `delete_file`, `move_file`
- **URL-Pfad-Encoding-Fix (2026-09-11):** `_dav()` setzte User-Pfade roh in die WebDAV-URL. httpx encodiert Leerzeichen/Umlaute automatisch, aber `#` (wurde Fragment) und `?` (wurde Query-Start) im Dateinamen zerlegten die URL; ein literales `%` erzeugte Ambiguitaet mit bereits-encodierten `%XX`-Sequenzen (oCIS liefert hrefs wie `Entw%C3%BCrfe` zurueck). Fix: `_enc_path()` in `server.py` encodiert `#`->`%23`, `?`->`%3F` und `%` nur ausserhalb gueltiger `%XX`-Folgen (roundtrip-sicher). Anwendung zentral in `_dav()` -> wirkt auf alle 7 Datei-Tools. Verifiziert ueber mcptest-Account (Dateien mit `#`/`%`/`?`/Umlaut/Leerzeichen anlegen/lesen/loeschen) + neuer Edge-Test `test_url_special_chars_roundtrip`. Backup: `files/server.py.bak-20260911-113635`.
+48 -20
View File
@@ -27,11 +27,22 @@ CAL_PATHS = _cfg['calendar_paths'] # Baikal-Basen (aktiv)
BERLIN = pytz.timezone('Europe/Berlin')
def _local(dt):
"""Naive -> Europe/Berlin lokalisieren; aware -> nach Europe/Berlin konvertieren."""
def _local(dt, z=None):
"""Naive -> in Zone z lokalisieren; aware -> nach z konvertieren (Default Europe/Berlin)."""
z = z or BERLIN
if dt.tzinfo is None:
return BERLIN.localize(dt)
return dt.astimezone(BERLIN)
return z.localize(dt)
return dt.astimezone(z)
def _zone(tz):
"""IANA-Zeitzone aufloesen. Leer/None -> Europe/Berlin. Ungueltig -> None."""
if not tz:
return BERLIN
try:
return pytz.timezone(tz)
except Exception:
return None
mcp = FastMCP("Calendar", stateless_http=True,
transport_security={"enable_dns_rebinding_protection": False})
@@ -126,9 +137,15 @@ def _parse(xml, comp="VEVENT", t0=None, cap=None):
return objs
def _fmt_dt(v):
"""Datetime einheitlich in Europe/Berlin darstellen (naive = lokale Wanduhrzeit)."""
"""Datetime mit explizitem Offset darstellen. Benannte IANA-Zone (Europe/Berlin,
Asia/Hong_Kong, ...) wird beibehalten; floating (naiv) = Berlin; feste Offset-/UTC-
Werte (z.B. Importe) werden nach Berlin normalisiert."""
if isinstance(v, datetime):
return _local(v).isoformat()
if v.tzinfo is None:
return _local(v).isoformat()
if getattr(v.tzinfo, "zone", None) or getattr(v.tzinfo, "key", None):
return v.isoformat()
return v.astimezone(BERLIN).isoformat()
return v.isoformat() if hasattr(v, 'isoformat') else str(v)
@@ -297,15 +314,15 @@ TRAVEL_MODES = ("walking", "driving", "transit", "biking")
def _build_vevent_fields(ev, title, start, end, location, description, allday,
travel_minutes, travel_mode, travel_advisory, reminder_minutes):
travel_minutes, travel_mode, travel_advisory, reminder_minutes, z=None):
"""Setzt VEVENT-Felder auf ein vobject-Element (wiederverwendet von create/update)."""
ev.add("summary").value = title
if allday:
ev.add("dtstart").value = datetime.strptime(start, "%Y-%m-%d").date()
ev.add("dtend").value = datetime.strptime(end, "%Y-%m-%d").date()
else:
ev.add("dtstart").value = _local(datetime.fromisoformat(start))
ev.add("dtend").value = _local(datetime.fromisoformat(end))
ev.add("dtstart").value = _local(datetime.fromisoformat(start), z)
ev.add("dtend").value = _local(datetime.fromisoformat(end), z)
if location:
ev.add("location").value = location
geo = _geocode(location)
@@ -339,7 +356,10 @@ def _build_vevent_fields(ev, title, start, end, location, description, allday,
def _write_event(user, cals, title, start, end, location, description, allday,
travel_minutes, travel_mode, travel_advisory, reminder_minutes,
uid=None, verb="Termin erstellt"):
uid=None, verb="Termin erstellt", timezone="Europe/Berlin"):
z = _zone(timezone)
if z is None:
return f"Fehler: unbekannte Zeitzone '{timezone}' (IANA-Name, z.B. Europe/Berlin, Asia/Hong_Kong)"
cal = vobject.iCalendar()
ev = cal.add("vevent")
if uid:
@@ -349,7 +369,7 @@ def _write_event(user, cals, title, start, end, location, description, allday,
target = cals[0]["href"] + uid + ".ics"
ev.add("uid").value = uid
_build_vevent_fields(ev, title, start, end, location, description, allday,
travel_minutes, travel_mode, travel_advisory, reminder_minutes)
travel_minutes, travel_mode, travel_advisory, reminder_minutes, z)
r = httpx.put(_serve(user)[0] + target,
content=cal.serialize(), auth=_auth(user),
headers={"Content-Type": "text/calendar"}, timeout=15)
@@ -359,6 +379,7 @@ def _write_event(user, cals, title, start, end, location, description, allday,
if travel_mode: extras.append(f"Verkehrsmittel {travel_mode}")
if travel_advisory: extras.append("Reisezeit aus Route")
if reminder_minutes: extras.append(f"Erinnerung {reminder_minutes} Min. vorher")
if timezone and timezone != "Europe/Berlin": extras.append(f"Zeitzone {timezone}")
extra_str = f" ({', '.join(extras)})" if extras else ""
if r.status_code in (201, 204):
return f"{verb}: {title} am {start}{extra_str}"
@@ -371,8 +392,8 @@ def _write_event(user, cals, title, start, end, location, description, allday,
def create_event(
calendar: Annotated[str, Field(description="Calendar name, e.g. 'Stefan', 'Arbeit', 'Familie'")],
title: Annotated[str, Field(description="Event title")],
start: Annotated[str, Field(description="Start: YYYY-MM-DD for all-day, or YYYY-MM-DDTHH:MM for timed events, e.g. '2026-06-15T14:00'. Lokale Zeit Europe/Berlin; explizite Offsets/Z werden konvertiert.")],
end: Annotated[str, Field(description="End: YYYY-MM-DD for all-day, or YYYY-MM-DDTHH:MM, e.g. '2026-06-15T15:30'. Lokale Zeit Europe/Berlin.")],
start: Annotated[str, Field(description="Start: YYYY-MM-DD for all-day, or YYYY-MM-DDTHH:MM for timed events, e.g. '2026-06-15T14:00'. Lokale Zeit in der Zone aus 'timezone' (Default Europe/Berlin); explizite Offsets/Z werden in diese Zone konvertiert.")],
end: Annotated[str, Field(description="End: YYYY-MM-DD for all-day, or YYYY-MM-DDTHH:MM, e.g. '2026-06-15T15:30'. Lokale Zeit in der Zone aus 'timezone'.")],
location: Annotated[str, Field(description="Location/Ziel als Text oder POI, e.g. 'Marienplatz 1, Muenchen'. Gets geocoded for map / POI.")] = "",
description: Annotated[str, Field(description="Event description or notes")] = "",
allday: Annotated[bool, Field(description="True for all-day events (then use YYYY-MM-DD for start/end)")] = False,
@@ -380,15 +401,16 @@ def create_event(
travel_mode: Annotated[str, Field(description="Optional. Verkehrsmittel fuer die Reise: walking, driving, transit, biking. Leer lassen, wenn nicht relevant.")] = "",
travel_advisory: Annotated[bool, Field(description="True: Apple Kalender berechnet die Reise-Erinnerungszeit selbst dynamisch aus der aktuellen Route anhand des Ziels (location). Empfohlen fuer Termine mit Zieladresse.")] = False,
reminder_minutes: Annotated[int, Field(description="Reminder alert X minutes before the event (0=none, e.g. 15, 30, 60)")] = 0,
timezone: Annotated[str, Field(description="IANA-Zeitzone fuer start/end. Default 'Europe/Berlin'. Fuer Termine im Ausland die Zonen-Zeit nehmen, z.B. 'Asia/Hong_Kong' (dann start/end dort lokal, z.B. 18:00).")] = "Europe/Berlin",
) -> str:
"""Create a new calendar event. For all-day events, end date is exclusive (June 15 only → start=2026-06-15, end=2026-06-16). Timed events werden als Europe/Berlin (TZID) gespeichert. Location/Ziel wird geocoded (POI/Karte). Mit travel_advisory=true + Ziel berechnet Apple die Reise-Erinnerung dynamisch aus der Route."""
"""Create a new calendar event. For all-day events, end date is exclusive (June 15 only → start=2026-06-15, end=2026-06-16). Timed events werden mit TZID der angegebenen 'timezone' gespeichert (Default Europe/Berlin). Location/Ziel wird geocoded (POI/Karte). Mit travel_advisory=true + Ziel berechnet Apple die Reise-Erinnerung dynamisch aus der Route."""
user = get_current_user()
if not user: return "Error: not authenticated"
cals = _match_cols(_discover(user, "VEVENT"), calendar)
if not cals: return f"Kalender '{calendar}' nicht gefunden"
return _write_event(user, cals, title, start, end, location, description, allday,
travel_minutes, travel_mode, travel_advisory, reminder_minutes,
verb="Termin erstellt")
verb="Termin erstellt", timezone=timezone)
@mcp.tool()
@@ -405,6 +427,7 @@ def update_event(
travel_mode: Annotated[str, Field(description="Optional. Verkehrsmittel: walking, driving, transit, biking.")] = "",
travel_advisory: Annotated[bool, Field(description="True: Apple berechnet die Reise-Erinnerungszeit dynamisch aus der Route anhand des Ziels.")] = False,
reminder_minutes: Annotated[int, Field(description="Reminder alert X minutes before the event (0=none)")] = 0,
timezone: Annotated[str, Field(description="IANA-Zeitzone fuer start/end. Default 'Europe/Berlin'. Fuer Termine im Ausland die Zonen-Zeit nehmen, z.B. 'Asia/Hong_Kong'.")] = "Europe/Berlin",
) -> str:
"""Update an existing calendar event (full overwrite of its fields). All optional fields default to clearing the previous value."""
user = get_current_user()
@@ -413,10 +436,13 @@ def update_event(
if not cals: return f"Kalender '{calendar}' nicht gefunden"
return _write_event(user, cals, title, start, end, location, description, allday,
travel_minutes, travel_mode, travel_advisory, reminder_minutes,
uid=uid, verb="Termin aktualisiert")
uid=uid, verb="Termin aktualisiert", timezone=timezone)
def _write_task(user, lists, title, due, priority, description, uid=None, verb="Aufgabe erstellt"):
def _write_task(user, lists, title, due, priority, description, uid=None, verb="Aufgabe erstellt", timezone="Europe/Berlin"):
z = _zone(timezone)
if z is None:
return f"Fehler: unbekannte Zeitzone '{timezone}' (IANA-Name, z.B. Europe/Berlin, Asia/Hong_Kong)"
cal = vobject.iCalendar()
todo = cal.add("vtodo")
if uid:
@@ -427,7 +453,7 @@ def _write_task(user, lists, title, due, priority, description, uid=None, verb="
todo.add("uid").value = uid
todo.add("summary").value = title
todo.add("status").value = "NEEDS-ACTION"
if due: todo.add("due").value = _local(datetime.fromisoformat(due)) if "T" in due else datetime.strptime(due, "%Y-%m-%d").date()
if due: todo.add("due").value = _local(datetime.fromisoformat(due), z) if "T" in due else datetime.strptime(due, "%Y-%m-%d").date()
if priority: todo.add("priority").value = str(priority)
if description: todo.add("description").value = description
todo.add("dtstamp").value = datetime.utcnow()
@@ -446,13 +472,14 @@ def create_task(
due: Annotated[str, Field(description="Due date: YYYY-MM-DD or YYYY-MM-DDTHH:MM. Leave empty for no due date.")] = "",
priority: Annotated[int, Field(description="Priority 1-9 (1=highest, 9=lowest, 0=none)")] = 0,
description: Annotated[str, Field(description="Task notes")] = "",
timezone: Annotated[str, Field(description="IANA-Zeitzone fuer due (nur bei HH:MM). Default 'Europe/Berlin', z.B. 'Asia/Hong_Kong' im Ausland.")] = "Europe/Berlin",
) -> str:
"""Create a new task/reminder in the specified list."""
user = get_current_user()
if not user: return "Error: not authenticated"
lists = _match_cols(_discover(user, "VTODO"), task_list)
if not lists: return f"Liste '{task_list}' nicht gefunden"
return _write_task(user, lists, title, due, priority, description, verb="Aufgabe erstellt")
return _write_task(user, lists, title, due, priority, description, verb="Aufgabe erstellt", timezone=timezone)
@mcp.tool()
@@ -463,13 +490,14 @@ def update_task(
due: Annotated[str, Field(description="Due date: YYYY-MM-DD or YYYY-MM-DDTHH:MM. Leave empty for no due date.")] = "",
priority: Annotated[int, Field(description="Priority 1-9 (1=highest, 9=lowest, 0=none)")] = 0,
description: Annotated[str, Field(description="Task notes")] = "",
timezone: Annotated[str, Field(description="IANA-Zeitzone fuer due (nur bei HH:MM). Default 'Europe/Berlin'.")] = "Europe/Berlin",
) -> str:
"""Update an existing task/reminder (full overwrite of its fields) in the specified list."""
user = get_current_user()
if not user: return "Error: not authenticated"
lists = _match_cols(_discover(user, "VTODO"), task_list)
if not lists: return f"Liste '{task_list}' nicht gefunden"
return _write_task(user, lists, title, due, priority, description, uid=uid, verb="Aufgabe aktualisiert")
return _write_task(user, lists, title, due, priority, description, uid=uid, verb="Aufgabe aktualisiert", timezone=timezone)
@mcp.tool()
+33
View File
@@ -329,6 +329,39 @@ class TestCalendar:
except Exception:
pass
def test_event_timezone_hong_kong(self):
"""Auslands-Termin: timezone-Parameter verankert das Event in Asia/Hong_Kong (TZID + Offset)."""
token = get_token(self.PORT)
tag = f"McpHk-{int(time.time())}"
created = []
try:
r = tool_call(self.PORT, token, "create_event", {
"calendar": self.CAL1, "title": tag,
"start": "2026-11-05T18:00", "end": "2026-11-05T19:00",
"timezone": "Asia/Hong_Kong",
})
assert "erstellt" in r.lower() or "created" in r.lower(), f"create_event failed: {r}"
found = tool_call(self.PORT, token, "search_events",
{"query": tag, "date_from": "2026-11-01", "date_to": "2026-11-10"})
uids = _extract_uids(found)
assert uids, f"Keine UID: {found[:300]}"
created.append((self.CAL1, uids[0]))
assert re.search(r"T18:00:00\+08:00", found), (
f"HK-Termin nicht in +08:00 gespeichert: {found[:300]}")
# ungueltige Zeitzone -> sauberer Fehler statt Exception
bad = tool_call(self.PORT, token, "create_event", {
"calendar": self.CAL1, "title": f"{tag}-bad",
"start": "2026-11-05T18:00", "end": "2026-11-05T19:00",
"timezone": "Hongkong/Nope",
})
assert "unbekannte Zeitzone" in bad, f"ungueltige TZ nicht abgefangen: {bad}"
finally:
for cal, uid in created:
try:
tool_call(self.PORT, token, "delete_event", {"calendar": cal, "uid": uid})
except Exception:
pass
def test_create_event_second_calendar(self):
"""Event in zweitem Kalender anlegen (Wechsel/Mehrfach-Test)."""
token = get_token(self.PORT)