edward/agenda
1
0
Fork 0
Code Issues 16 Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: edward:main
Branches Tags
edward:main
edward:launch-page
edward:navbar
..
compare: edward:launch-page
Branches Tags
edward:main
edward:launch-page
edward:navbar

No commits in common. "main" and "launch-page" have entirely different histories.
main ... launch-pag

89 changed files with 1130 additions and 12942 deletions
Show stats Expand all files Collapse all files

17
.eslintrc.js
View file

@ -1,17 +0,0 @@
module.exports = {
"env": {
"browser": true,
"es6": true
},
"extends": "eslint:recommended",
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"parserOptions": {
"ecmaVersion": 14,
"sourceType": "module"
},
"rules": {
}
};

32
AGENTS.md
View file

@ -1,32 +0,0 @@
# Development Guidelines
## Project Overview
This is a personal agenda web application built with Flask that tracks various events and important dates:
- Events: birthdays, holidays, travel itineraries, conferences, waste collection schedules
- Space launches, meteor showers, astronomical events
- Financial information (FX rates, stock market)
- UK-specific features (holidays, waste collection, railway schedules)
- Authentication via UniAuth
- Frontend uses Bootstrap 5, Leaflet for maps, FullCalendar for calendar views
## Python Environment
- Always use `python3` directly, never `python`
- All Python code should include type annotations
- Use `typing.Any` instead of `Any` in type hints (import from typing module)
- Run `mypy --strict` (fix any type errors in the file) and `black` on modified code after creating or modifying Python files
- Avoid running `black .`
- Main entry point: `python3 web_view.py` (Flask app on port 5000)
- Tests: Use `pytest` (tests in `/tests/` directory)
## Project Structure
- `agenda/` - Main Python package with modules for different event types
- `web_view.py` - Flask web application entry point
- `templates/` - Jinja2 HTML templates
- `static/` - CSS, JS, and frontend assets
- `config/` - Configuration files
- `personal-data/` - User's personal data (not in git)
## Git Workflow
- Avoid committing unrelated untracked files (e.g., `node_modules/`, build artifacts)
- Only commit relevant project files
- Personal data directory (`personal-data/`) is excluded from git

32
agenda/__init__.py
View file

@ -2,7 +2,6 @@
from datetime import date, datetime, time
import pycountry
import pytz
uk_tz = pytz.timezone("Europe/London")
@ -11,34 +10,3 @@ uk_tz = pytz.timezone("Europe/London")
def uk_time(d: date, t: time) -> datetime:
"""Combine time and date for UK timezone."""
return uk_tz.localize(datetime.combine(d, t))
def format_list_with_ampersand(items: list[str]) -> str:
"""Join a list of strings with commas and an ampersand."""
if len(items) > 1:
return ", ".join(items[:-1]) + " & " + items[-1]
elif items:
return items[0]
return ""
def get_country(alpha_2: str | None) -> pycountry.db.Country | None:
"""Lookup country by alpha-2 country code."""
if not alpha_2:
return None
if alpha_2.count(",") > 3: # ESA
return pycountry.db.Country(flag="🇪🇺", name="ESA")
if not alpha_2:
return None
if alpha_2 == "xk":
return pycountry.db.Country(
flag="\U0001f1fd\U0001f1f0", name="Kosovo", alpha_2="xk"
)
country: pycountry.db.Country | None = None
if len(alpha_2) == 2:
country = pycountry.countries.get(alpha_2=alpha_2.upper())
elif len(alpha_2) == 3:
country = pycountry.countries.get(alpha_3=alpha_2.upper())
return country

9
agenda/accommodation.py
View file

@ -1,19 +1,20 @@
"""Accommodation."""
"""Accomodation"""
import yaml
from .event import Event
from .types import Event
def get_events(filepath: str) -> list[Event]:
"""Get accommodation from YAML."""
"""Get accomodation from YAML."""
with open(filepath) as f:
return [
Event(
date=item["from"],
end_date=item["to"],
name="accommodation",
title=(
title="🧳"
+ (
f'{item["location"]} Airbnb'
if item.get("operator") == "airbnb"
else item["name"]

190
agenda/airbnb.py
View file

@ -1,190 +0,0 @@
"""Library for parsing Airbnb booking HTML files."""
import json
import re
import typing
from datetime import datetime
from typing import Any
from zoneinfo import ZoneInfo
import lxml.html
import pycountry
StrDict = dict[str, typing.Any]
def build_datetime(date_str: str, time_str: str, tz_name: str) -> datetime:
"""
Combine an ISO date string, HH:MM time string, and a timezone name
into a timezone-aware datetime in the specified timezone.
"""
dt_str = f"{date_str}T{time_str}"
naive_dt = datetime.fromisoformat(dt_str)
return naive_dt.replace(tzinfo=ZoneInfo(tz_name))
def list_to_dict(items: list[typing.Any]) -> dict[str, typing.Any]:
"""Convert a flat list to a dict, assuming alternating keys and values."""
return {items[i]: items[i + 1] for i in range(0, len(items), 2)}
def extract_country_code(address: str) -> str | None:
"""Return ISO 3166-1 alpha-2 country code from a free-text address."""
address_lower = address.lower()
for country in pycountry.countries:
if country.name.lower() in address_lower:
return str(country.alpha_2.lower())
if (
hasattr(country, "official_name")
and country.official_name.lower() in address_lower
):
return str(country.alpha_2.lower())
return None
def get_json_blob(tree: Any) -> str:
data_id = "data-injector-instances"
js_string = tree.xpath(f'//*[@id="{data_id}"]/text()')[0]
return str(js_string)
def get_ui_state(tree: Any) -> StrDict:
data_id = "data-injector-instances"
js_string = tree.xpath(f'//*[@id="{data_id}"]/text()')[0]
big_blob = json.loads(str(js_string))
ui_state = walk_tree(big_blob, "uiState")
return list_to_dict(ui_state[0])
def get_reservation_data(ui_state: StrDict) -> StrDict:
return {
row["id"]: row for row in ui_state["reservation"]["scheduled_event"]["rows"]
}
def get_room_url(tree: Any) -> str | None:
for e in tree.xpath('//a[@data-testid="reservation-destination-link"]'):
href = e.get("href")
assert isinstance(href, str)
if not href.startswith("/room"):
continue
return "https://www.airbnb.co.uk" + href
return None
def get_price_from_reservation(reservation: StrDict) -> str:
price = reservation["payment_summary"]["subtitle"]
assert isinstance(price, str)
tc = "Total cost: "
if price.startswith(tc):
price = price[len(tc) :]
assert price[0] == "£"
return price[1:]
def extract_booking_from_html(html_file: str) -> StrDict:
"""Extract booking information from Airbnb HTML file."""
with open(html_file, "r", encoding="utf-8") as f:
text_content = f.read()
confirmation_match = re.search(
r"/trips/v1/reservation-details/ro/RESERVATION2_CHECKIN/([A-Z0-9]+)",
text_content,
)
if confirmation_match is None:
raise ValueError("Could not find confirmation code in HTML")
confirmation_code = confirmation_match.group(1)
tree = lxml.html.parse(html_file)
root = tree.getroot()
try:
ui_state = get_ui_state(tree)
except Exception:
print(html_file)
raise
reservation = get_reservation_data(ui_state)
m_guests = re.match(r"^(\d+) guests?$", reservation["guests"]["subtitle"])
if m_guests is None:
raise ValueError("Could not parse number of guests")
number_of_adults = int(m_guests.group(1))
price = get_price_from_reservation(reservation)
metadata = ui_state["reservation"]["metadata"]
country_code = metadata["country"].lower()
title = reservation["dynamic_marquee_title_image_v3"]["title"]
location = title.rpartition(" in ")[2]
checkin_checkout = reservation["checkin_checkout_arrival_guide"]
check_in_time = checkin_checkout["leading_subtitle"]
check_out_time = checkin_checkout["trailing_subtitle"]
check_in = build_datetime(
metadata["check_in_date"], check_in_time, metadata["timezone"]
)
check_out = build_datetime(
metadata["check_out_date"], check_out_time, metadata["timezone"]
)
address = reservation["map"]["address"] if "map" in reservation else None
if "header_action.pdp" in reservation:
name = reservation["header_action.pdp"]["subtitle"]
else:
name = root.findtext(".//h1")
booking = {
"type": "apartment",
"operator": "airbnb",
"name": name,
"location": location,
"booking_reference": confirmation_code,
"booking_url": f"https://www.airbnb.co.uk/trips/v1/reservation-details/ro/RESERVATION2_CHECKIN/{confirmation_code}",
"country": country_code,
"latitude": metadata["lat"],
"longitude": metadata["lng"],
"timezone": metadata["timezone"],
"from": check_in,
"to": check_out,
"price": price,
"currency": "GBP",
"number_of_adults": number_of_adults,
}
if address:
booking["address"] = address
room_url = get_room_url(tree)
if room_url is not None:
booking["url"] = room_url
return booking
def walk_tree(data: Any, want_key: str) -> Any:
"""Recursively search for a dict containing 'reservation' and return its value."""
if isinstance(data, dict):
if want_key in data:
return data[want_key]
for key, value in data.items():
result = walk_tree(value, want_key)
if result is not None:
return result
elif isinstance(data, list):
for item in data:
result = walk_tree(item, want_key)
if result is not None:
return result
return None
def parse_multiple_files(filenames: list[str]) -> list[StrDict]:
"""Parse multiple Airbnb HTML files and return a list of booking dictionaries."""
bookings = []
for html_file in sorted(filenames):
booking = extract_booking_from_html(html_file)
assert booking
bookings.append(booking)
return bookings

4
agenda/birthday.py
View file

@ -4,7 +4,7 @@ from datetime import date
import yaml
from .event import Event
from .types import Event
YEAR_NOT_KNOWN = 1900
@ -42,7 +42,7 @@ def get_birthdays(from_date: date, filepath: str) -> list[Event]:
Event(
date=bday.replace(year=bday.year + offset),
name="birthday",
title=f'{entity["label"]} ({display_age})',
title=f'🎈 {entity["label"]} ({display_age})',
)
)

131
agenda/bristol_waste.py
View file

@ -1,131 +0,0 @@
"""Waste collection schedules."""
import json
import os
import typing
from collections import defaultdict
from datetime import date, datetime, timedelta
import httpx
from .event import Event
from .utils import make_waste_dir
ttl_hours = 12
BristolSchedule = list[dict[str, typing.Any]]
async def get(start_date: date, data_dir: str, uprn: str, cache: str) -> list[Event]:
"""Get waste collection schedule from Bristol City Council."""
by_date: defaultdict[date, list[str]] = defaultdict(list)
for item in await get_data(data_dir, uprn, cache):
service = get_service(item)
for d in collections(item):
if d < start_date and service not in by_date[d]:
by_date[d].append(service)
return [
Event(name="waste_schedule", date=d, title="Bristol: " + ", ".join(services))
for d, services in by_date.items()
]
async def get_data(data_dir: str, uprn: str, cache: str) -> BristolSchedule:
"""Get Bristol Waste schedule, with cache."""
now = datetime.now()
waste_dir = os.path.join(data_dir, "waste")
make_waste_dir(data_dir)
existing_data = os.listdir(waste_dir)
existing = [f for f in existing_data if f.endswith(f"_{uprn}.json")]
if existing:
recent_filename = max(existing)
recent = datetime.strptime(recent_filename, f"%Y-%m-%d_%H:%M_{uprn}.json")
delta = now - recent
def get_from_recent() -> BristolSchedule:
json_data = json.load(open(os.path.join(waste_dir, recent_filename)))
return typing.cast(BristolSchedule, json_data["data"])
if (
cache != "refresh"
and existing
and (cache == "force" or delta < timedelta(hours=ttl_hours))
):
return get_from_recent()
try:
r = await get_web_data(uprn)
except httpx.ReadTimeout:
return get_from_recent()
with open(f'{waste_dir}/{now.strftime("%Y-%m-%d_%H:%M")}_{uprn}.json', "wb") as out:
out.write(r.content)
return typing.cast(BristolSchedule, r.json()["data"])
async def get_web_data(uprn: str) -> httpx.Response:
"""Get JSON from Bristol City Council."""
UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
HEADERS = {
"Accept": "*/*",
"Accept-Language": "en-GB,en;q=0.9",
"Connection": "keep-alive",
"Ocp-Apim-Subscription-Key": "47ffd667d69c4a858f92fc38dc24b150",
"Ocp-Apim-Trace": "true",
"Origin": "https://bristolcouncil.powerappsportals.com",
"Referer": "https://bristolcouncil.powerappsportals.com/",
"Sec-Fetch-Dest": "empty",
"Sec-Fetch-Mode": "cors",
"Sec-Fetch-Site": "cross-site",
"Sec-GPC": "1",
"User-Agent": UA,
}
_uprn = str(uprn).zfill(12)
async with httpx.AsyncClient(timeout=20) as client:
# Initialise form
payload = {"servicetypeid": "7dce896c-b3ba-ea11-a812-000d3a7f1cdc"}
response = await client.get(
"https://bristolcouncil.powerappsportals.com/completedynamicformunauth/",
headers=HEADERS,
params=payload,
)
host = "bcprdapidyna002.azure-api.net"
# Set the search criteria
payload = {"Uprn": "UPRN" + _uprn}
response = await client.post(
f"https://{host}/bcprdfundyna001-llpg/DetailedLLPG",
headers=HEADERS,
json=payload,
)
# Retrieve the schedule
payload = {"uprn": _uprn}
response = await client.post(
f"https://{host}/bcprdfundyna001-alloy/NextCollectionDates",
headers=HEADERS,
json=payload,
)
return response
def get_service(item: dict[str, typing.Any]) -> str:
"""Bristol waste service name."""
service: str = item["containerName"]
return "Recycling" if "Recycling" in service else service.partition(" ")[2]
def collections(item: dict[str, typing.Any]) -> typing.Iterable[date]:
"""Bristol dates from collections."""
for collection in item["collection"]:
for collection_date_key in ["nextCollectionDate", "lastCollectionDate"]:
yield date.fromisoformat(collection[collection_date_key][:10])

655
agenda/busy.py
View file

@ -1,655 +0,0 @@
"""Identify busy events and gaps when nothing is scheduled."""
import itertools
import typing
from datetime import date, datetime, timedelta
import flask
import pycountry
from . import events_yaml, get_country, travel
from .event import Event
from .types import StrDict, Trip
def busy_event(e: Event) -> bool:
"""Busy."""
if e.name not in {
"event",
"accommodation",
"conference",
"transport",
"meetup",
"party",
"trip",
"hackathon",
}:
return False
if e.title in ("IA UK board meeting", "Mill Road Winter Fair"):
return False
if e.name == "conference" and not e.going:
return False
if not e.title:
return True
if e.title == "LHG Run Club" or "Third Thursday Social" in e.title:
return False
lc_title = e.title.lower()
return (
"rebels" not in lc_title
and "south west data social" not in lc_title
and "dorkbot" not in lc_title
)
def get_busy_events(
start: date, config: flask.config.Config, trips: list[Trip]
) -> list[Event]:
"""Find busy events from a year ago to two years in the future."""
last_year = start - timedelta(days=365)
next_year = start + timedelta(days=2 * 365)
my_data = config["PERSONAL_DATA"]
events = events_yaml.read(my_data, last_year, next_year, skip_trips=True)
for trip in trips:
event_type = "trip"
if trip.events and not trip.conferences:
event_type = trip.events[0]["name"]
elif len(trip.conferences) == 1 and trip.conferences[0].get("hackathon"):
event_type = "hackathon"
events.append(
Event(
name=event_type,
title=trip.title + " " + trip.country_flags,
date=trip.start,
end_date=trip.end,
url=flask.url_for("trip_page", start=trip.start.isoformat()),
)
)
busy_events = [
e
for e in sorted(events, key=lambda e: e.as_date)
if (e.as_date >= start or (e.end_date and e.end_as_date >= start))
and e.as_date < next_year
and busy_event(e)
]
return busy_events
def _parse_datetime_field(datetime_obj: datetime | date) -> tuple[datetime, date]:
"""Parse a datetime field that could be datetime object or string."""
if hasattr(datetime_obj, "date"):
return datetime_obj, datetime_obj.date()
elif isinstance(datetime_obj, str):
dt = datetime.fromisoformat(datetime_obj.replace("Z", "+00:00"))
return dt, dt.date()
else:
raise ValueError(f"Invalid datetime format: {datetime_obj}")
def _get_accommodation_location(
acc: StrDict, on_trip: bool = False
) -> tuple[str | None, pycountry.db.Country]:
"""Get location from accommodation data."""
c = get_country(acc["country"])
assert c
assert isinstance(acc["location"], str)
return (acc["location"] if on_trip else None, c)
def _find_most_recent_travel_within_trip(
trip: Trip,
target_date: date,
) -> tuple[str | None, pycountry.db.Country] | None:
"""Find the most recent travel location within a trip."""
uk_airports = {"LHR", "LGW", "STN", "LTN", "BRS", "BHX", "MAN", "EDI", "GLA"}
trip_most_recent_date = None
trip_most_recent_location = None
trip_most_recent_datetime = None
# Check flights within trip period
for travel_item in trip.travel:
if travel_item["type"] == "flight" and "arrive" in travel_item:
arrive_datetime, arrive_date = _parse_datetime_field(travel_item["arrive"])
# Only consider flights within this trip and before target date
if not (trip.start <= arrive_date <= target_date):
continue
# Compare both date and time to handle same-day flights correctly
if (
trip_most_recent_date is None
or arrive_date > trip_most_recent_date
or (
arrive_date == trip_most_recent_date
and (
trip_most_recent_datetime is None
or arrive_datetime > trip_most_recent_datetime
)
)
):
trip_most_recent_date = arrive_date
trip_most_recent_datetime = arrive_datetime
destination_airport = travel_item["to"]
assert "to_airport" in travel_item
airport_info = travel_item["to_airport"]
airport_country = airport_info["country"]
if airport_country == "gb":
if destination_airport in uk_airports:
# UK airport while on trip - show actual location
location_name = airport_info.get(
"city", airport_info.get("name", "London")
)
trip_most_recent_location = (
location_name,
get_country("gb"),
)
else:
trip_most_recent_location = (None, get_country("gb"))
else:
location_name = airport_info.get(
"city", airport_info.get("name", destination_airport)
)
trip_most_recent_location = (
location_name,
get_country(airport_country),
)
# Check accommodations within trip period
for acc in trip.accommodation:
if "from" in acc:
try:
_, acc_date = _parse_datetime_field(acc["from"])
except ValueError:
continue
# Only consider accommodations within this trip and before/on target date
if trip.start <= acc_date <= target_date:
# Accommodation takes precedence over flights on the same date
# or if it's genuinely more recent
if (
trip_most_recent_date is None
or acc_date > trip_most_recent_date
or acc_date == trip_most_recent_date
):
trip_most_recent_date = acc_date
trip_most_recent_location = _get_accommodation_location(
acc, on_trip=True
)
# Check trains within trip period
for travel_item in trip.travel:
if travel_item["type"] == "train":
for leg in travel_item.get("legs", []):
if "arrive" in leg:
try:
arrive_datetime, arrive_date = _parse_datetime_field(
leg["arrive"]
)
except ValueError:
continue
# Only consider trains within this trip and before target date
if trip.start <= arrive_date <= target_date:
# Compare both date and time to handle same-day arrivals correctly
if (
trip_most_recent_date is None
or arrive_date > trip_most_recent_date
or (
arrive_date == trip_most_recent_date
and (
trip_most_recent_datetime is None
or arrive_datetime > trip_most_recent_datetime
)
)
):
trip_most_recent_date = arrive_date
trip_most_recent_datetime = arrive_datetime
# For trains, we can get station info from to_station if available
destination = leg.get("to")
assert "to_station" in leg
station_info = leg["to_station"]
station_country = station_info["country"]
if station_country == "gb":
trip_most_recent_location = (
destination,
get_country("gb"),
)
else:
trip_most_recent_location = (
destination,
get_country(station_country),
)
# Check ferries within trip period
for travel_item in trip.travel:
if travel_item["type"] == "ferry" and "arrive" in travel_item:
try:
arrive_datetime, arrive_date = _parse_datetime_field(
travel_item["arrive"]
)
except ValueError:
continue
# Only consider ferries within this trip and before target date
if trip.start <= arrive_date <= target_date:
# Compare both date and time to handle same-day arrivals correctly
if (
trip_most_recent_date is None
or arrive_date > trip_most_recent_date
or (
arrive_date == trip_most_recent_date
and (
trip_most_recent_datetime is None
or arrive_datetime > trip_most_recent_datetime
)
)
):
trip_most_recent_date = arrive_date
trip_most_recent_datetime = arrive_datetime
# For ferries, we can get terminal info from to_terminal if available
destination = travel_item.get("to")
assert "to_terminal" in travel_item
terminal_info = travel_item["to_terminal"]
terminal_country = terminal_info.get("country", "gb")
terminal_city = terminal_info.get("city", destination)
if terminal_country == "gb":
trip_most_recent_location = (
terminal_city,
get_country("gb"),
)
else:
trip_most_recent_location = (
terminal_city,
get_country(terminal_country),
)
return trip_most_recent_location
def _get_trip_location_by_progression(
trip: Trip, target_date: date
) -> tuple[str | None, pycountry.db.Country | None] | None:
"""Determine location based on trip progression and date."""
locations = trip.locations()
if not locations:
return None
# If only one location, use it (when on a trip, always show the location)
if len(locations) == 1:
city, country = locations[0]
return (city, country)
# Multiple locations: use progression through the trip
trip_duration = (trip.end - trip.start).days + 1
days_into_trip = (target_date - trip.start).days
# Simple progression: first half at first location, second half at last location
if days_into_trip <= trip_duration // 2:
city, country = locations[0]
else:
city, country = locations[-1]
return (city, country)
def _find_most_recent_travel_before_date(
target_date: date,
trips: list[Trip],
) -> tuple[str | None, pycountry.db.Country | None] | None:
"""Find the most recent travel location before a given date."""
uk_airports = {"LHR", "LGW", "STN", "LTN", "BRS", "BHX", "MAN", "EDI", "GLA"}
most_recent_location = None
most_recent_date = None
most_recent_datetime = None
# Check all travel across all trips
for trip in trips:
# Check flights
for travel_item in trip.travel:
if travel_item["type"] == "flight" and "arrive" in travel_item:
try:
arrive_datetime, arrive_date = _parse_datetime_field(
travel_item["arrive"]
)
except ValueError:
continue
if arrive_date <= target_date:
# Compare both date and time to handle same-day flights correctly
if (
most_recent_date is None
or arrive_date > most_recent_date
or (
arrive_date == most_recent_date
and (
most_recent_datetime is None
or arrive_datetime > most_recent_datetime
)
)
):
most_recent_date = arrive_date
most_recent_datetime = arrive_datetime
destination_airport = travel_item["to"]
# For flights, determine if we're "on trip" based on whether this is within any trip period
on_trip = any(
t.start <= arrive_date <= (t.end or t.start) for t in trips
)
if "to_airport" in travel_item:
airport_info = travel_item["to_airport"]
airport_country = airport_info.get("country", "gb")
if airport_country == "gb":
if not on_trip:
# When not on a trip, UK airports mean home
most_recent_location = (None, get_country("gb"))
else:
# When on a trip, show the actual location even for UK airports
location_name = airport_info.get(
"city", airport_info.get("name", "London")
)
most_recent_location = (
location_name,
get_country("gb"),
)
else:
location_name = airport_info.get(
"city",
airport_info.get("name", destination_airport),
)
most_recent_location = (
location_name,
get_country(airport_country),
)
else:
most_recent_location = (
destination_airport,
get_country("gb"),
)
# Check trains
elif travel_item["type"] == "train":
for leg in travel_item.get("legs", []):
if "arrive" in leg:
try:
arrive_datetime, arrive_date = _parse_datetime_field(
leg["arrive"]
)
except ValueError:
continue
if arrive_date <= target_date:
# Compare both date and time to handle same-day arrivals correctly
if (
most_recent_date is None
or arrive_date > most_recent_date
or (
arrive_date == most_recent_date
and (
most_recent_datetime is None
or arrive_datetime > most_recent_datetime
)
)
):
most_recent_date = arrive_date
most_recent_datetime = arrive_datetime
destination = leg.get("to")
on_trip = any(
t.start <= arrive_date <= (t.end or t.start)
for t in trips
)
if "to_station" in leg:
station_info = leg["to_station"]
station_country = station_info.get("country", "gb")
if station_country == "gb":
if not on_trip:
most_recent_location = (
None,
get_country("gb"),
)
else:
most_recent_location = (
destination,
get_country("gb"),
)
else:
most_recent_location = (
destination,
get_country(station_country),
)
else:
most_recent_location = (
destination,
get_country("gb"),
)
# Check ferries
elif travel_item["type"] == "ferry" and "arrive" in travel_item:
try:
arrive_datetime, arrive_date = _parse_datetime_field(
travel_item["arrive"]
)
except ValueError:
continue
if arrive_date <= target_date:
# Compare both date and time to handle same-day arrivals correctly
if (
most_recent_date is None
or arrive_date > most_recent_date
or (
arrive_date == most_recent_date
and (
most_recent_datetime is None
or arrive_datetime > most_recent_datetime
)
)
):
most_recent_date = arrive_date
most_recent_datetime = arrive_datetime
destination = travel_item.get("to")
on_trip = any(
t.start <= arrive_date <= (t.end or t.start) for t in trips
)
if "to_terminal" in travel_item:
terminal_info = travel_item["to_terminal"]
terminal_country = terminal_info.get("country", "gb")
terminal_city = terminal_info.get("city", destination)
if terminal_country == "gb":
if not on_trip:
most_recent_location = (None, get_country("gb"))
else:
most_recent_location = (
terminal_city,
get_country("gb"),
)
else:
most_recent_location = (
terminal_city,
get_country(terminal_country),
)
else:
most_recent_location = (destination, get_country("gb"))
# Check accommodation - only override if accommodation is more recent
for acc in trip.accommodation:
if "from" in acc:
try:
_, acc_date = _parse_datetime_field(acc["from"])
except ValueError:
continue
if acc_date <= target_date:
# Only update if this accommodation is more recent than existing result
if most_recent_date is None or acc_date > most_recent_date:
most_recent_date = acc_date
on_trip = any(
t.start <= acc_date <= (t.end or t.start) for t in trips
)
most_recent_location = _get_accommodation_location(
acc, on_trip=on_trip
)
return most_recent_location
def _check_return_home_heuristic(
target_date: date, trips: list[Trip]
) -> tuple[str | None, pycountry.db.Country | None] | None:
"""Check if should return home based on recent trips that have ended."""
for trip in trips:
if trip.end and trip.end < target_date:
locations = trip.locations()
if locations:
final_city, final_country = locations[-1]
final_alpha_2 = final_country.alpha_2
days_since_trip = (target_date - trip.end).days
# If trip ended in UK, you should be home now
if hasattr(final_country, "alpha_2") and final_country.alpha_2 == "GB":
return (None, get_country("gb"))
return None
def get_location_for_date(
target_date: date,
trips: list[Trip],
) -> tuple[str | None, pycountry.db.Country | None]:
"""Get location (city, country) for a specific date using travel history."""
# First check if currently on a trip
for trip in trips:
if not (trip.start <= target_date <= (trip.end or trip.start)):
continue
# For trips, find the most recent travel within the trip period
trip_location = _find_most_recent_travel_within_trip(
trip,
target_date,
)
if trip_location:
return trip_location
# Fallback: determine location based on trip progression and date
progression_location = _get_trip_location_by_progression(trip, target_date)
if progression_location:
return progression_location
# Find most recent travel before this date
recent_travel = _find_most_recent_travel_before_date(target_date, trips)
# Check for recent trips that have ended - prioritize this over individual travel data
# This handles cases where you're traveling home after a trip (e.g. stopovers, connections)
return_home = _check_return_home_heuristic(target_date, trips)
if return_home:
return return_home
# Return most recent location or default to home
if recent_travel:
return recent_travel
return (None, get_country("gb"))
def weekends(
start: date, busy_events: list[Event], trips: list[Trip], data_dir: str
) -> typing.Sequence[StrDict]:
"""Next ten weekends."""
weekday = start.weekday()
# Calculate the difference to the next or previous Saturday
if weekday == 6: # Sunday
start_date = start - timedelta(days=1)
else:
start_date = start + timedelta(days=(5 - weekday))
weekends_info = []
for i in range(52):
saturday = start_date + timedelta(weeks=i)
sunday = saturday + timedelta(days=1)
saturday_events = [
event
for event in busy_events
if event.end_date and event.as_date <= saturday <= event.end_as_date
]
sunday_events = [
event
for event in busy_events
if event.end_date and event.as_date <= sunday <= event.end_as_date
]
saturday_location = get_location_for_date(
saturday,
trips,
)
sunday_location = get_location_for_date(
sunday,
trips,
)
weekends_info.append(
{
"date": saturday,
"saturday": saturday_events,
"sunday": sunday_events,
"saturday_location": saturday_location,
"sunday_location": sunday_location,
}
)
return weekends_info
def find_gaps(events: list[Event], min_gap_days: int = 3) -> list[StrDict]:
"""Gaps of at least `min_gap_days` between events in a list of events."""
# Sort events by start date
gaps: list[tuple[date, date]] = []
previous_event_end = None
by_start_date = {
d: list(on_day)
for d, on_day in itertools.groupby(events, key=lambda e: e.as_date)
}
by_end_date = {
d: list(on_day)
for d, on_day in itertools.groupby(events, key=lambda e: e.end_as_date)
}
for event in events:
# Use start date for current event
start_date = event.as_date
# If previous event exists, calculate the gap
if previous_event_end:
gap_days = (start_date - previous_event_end).days
if gap_days >= (min_gap_days + 2):
start_end = (
previous_event_end + timedelta(days=1),
start_date - timedelta(days=1),
)
gaps.append(start_end)
# Update previous event end date
end = event.end_as_date
if not previous_event_end or end > previous_event_end:
previous_event_end = end
return [
{
"start": gap_start,
"end": gap_end,
"after": by_start_date[gap_end + timedelta(days=1)],
"before": by_end_date[gap_start - timedelta(days=1)],
}
for gap_start, gap_end in gaps
]

140
agenda/calendar.py
View file

@ -1,115 +1,79 @@
"""Calendar."""
import typing
import uuid
from datetime import timedelta
from .event import Event
from .types import Event
# A map to associate event types with a specific calendar ID
event_type_calendar_map = {
"bank_holiday": "uk_holidays",
"conference": "conferences",
"us_holiday": "us_holidays",
"birthday": "birthdays",
"waste_schedule": "home",
"accommodation": "travel",
"market": "markets",
event_type_color_map = {
"bank_holiday": "success-subtle",
"conference": "primary-subtle",
"us_holiday": "secondary-subtle",
"birthday": "info-subtle",
"waste_schedule": "danger-subtle",
}
# Define the calendars (categories) for TOAST UI
# These will be passed to the frontend to configure colors and names
toastui_calendars = [
{"id": "default", "name": "General", "backgroundColor": "#00a9ff"},
{"id": "uk_holidays", "name": "UK Bank Holiday", "backgroundColor": "#28a745"},
{"id": "us_holidays", "name": "US Holiday", "backgroundColor": "#6c757d"},
{"id": "conferences", "name": "Conference", "backgroundColor": "#007bff"},
{"id": "birthdays", "name": "Birthday", "backgroundColor": "#17a2b8"},
{"id": "home", "name": "Home", "backgroundColor": "#dc3545"},
{"id": "travel", "name": "Travel", "backgroundColor": "#ffc107", "color": "#000"},
{"id": "markets", "name": "Markets", "backgroundColor": "#e2e3e5", "color": "#000"},
]
colors = {
"primary-subtle": "#cfe2ff",
"secondary-subtle": "#e2e3e5",
"success-subtle": "#d1e7dd",
"info-subtle": "#cff4fc",
"warning-subtle": "#fff3cd",
"danger-subtle": "#f8d7da",
}
def build_toastui_events(events: list[Event]) -> list[dict[str, typing.Any]]:
"""Build a list of event objects for TOAST UI Calendar."""
def build_events(events: list[Event]) -> list[dict[str, typing.Any]]:
"""Build list of events for FullCalendar."""
items: list[dict[str, typing.Any]] = []
one_day = timedelta(days=1)
for e in events:
if e.name == "today":
continue
# Determine the calendar ID for the event, defaulting if not mapped
calendar_id = event_type_calendar_map.get(e.name, "default")
# Handle special case for 'accommodation'
if e.name == "accommodation":
assert e.title and e.end_date
# All-day event for the duration of the stay
items.append(
{
"id": str(uuid.uuid4()),
"calendarId": calendar_id,
"title": e.title_with_emoji,
"start": e.as_date.isoformat(),
"end": (e.end_as_date + one_day).isoformat(),
"isAllday": True,
"raw": {"url": e.url},
}
)
# Timed event for check-in
items.append(
{
"id": str(uuid.uuid4()),
"calendarId": calendar_id,
"title": f"Check-in: {e.title}",
"start": e.date.isoformat(),
"end": (e.date + timedelta(hours=1)).isoformat(),
"isAllday": False,
"raw": {"url": e.url},
}
)
# Timed event for check-out
items.append(
{
"id": str(uuid.uuid4()),
"calendarId": calendar_id,
"title": f"Checkout: {e.title}",
"start": e.end_date.isoformat(),
"end": (e.end_date + timedelta(hours=1)).isoformat(),
"isAllday": False,
"raw": {"url": e.url},
}
)
item = {
"allDay": True,
"title": e.display_title,
"start": e.as_date.isoformat(),
"end": (e.end_as_date + one_day).isoformat(),
"url": e.url,
}
items.append(item)
item = {
"allDay": False,
"title": "checkin: " + e.title,
"start": e.date.isoformat(),
"url": e.url,
}
items.append(item)
item = {
"allDay": False,
"title": "checkout: " + e.title,
"start": e.end_date.isoformat(),
"url": e.url,
}
items.append(item)
continue
# Handle all other events
start_iso = e.date.isoformat()
if e.has_time:
end_iso = (e.end_date or e.date + timedelta(minutes=30)).isoformat()
end = e.end_date or e.date + timedelta(hours=1)
else:
# For all-day events, the end date is exclusive.
# For a single-day event, the end date should be the same as the start date.
# For a multi-day event, a day is added to make the range inclusive.
if e.end_date:
# This is a multi-day event, so add one day to the end.
end_date = e.end_as_date + one_day
else:
# This is a single-day event. The end date is the same as the start date.
end_date = e.as_date
end_iso = end_date.isoformat()
end = (e.end_as_date if e.end_date else e.as_date) + one_day
item = {
"id": str(uuid.uuid4()),
"calendarId": calendar_id,
"title": e.title_with_emoji,
"start": start_iso,
"end": end_iso,
"isAllday": not e.has_time,
"allDay": not e.has_time,
"title": e.display_title,
"start": e.date.isoformat(),
"end": end.isoformat(),
}
if e.name in event_type_color_map:
item["color"] = colors[event_type_color_map[e.name]]
item["textColor"] = "black"
if e.url:
item["raw"] = {"url": e.url}
item["url"] = e.url
items.append(item)
return items

33
agenda/carnival.py
View file

@ -1,33 +0,0 @@
"""Calculate the date for carnival."""
from datetime import date, timedelta
from dateutil.easter import easter
from .event import Event
def rio_carnival_events(start_date: date, end_date: date) -> list[Event]:
"""List of events for Rio Carnival for each year between start_date and end_date."""
events = []
for year in range(start_date.year, end_date.year + 1):
easter_date = easter(year)
carnival_start = easter_date - timedelta(days=51)
carnival_end = easter_date - timedelta(days=46)
# Only include the carnival if it falls within the specified date range
if (
start_date <= carnival_start <= end_date
or start_date <= carnival_end <= end_date
):
events.append(
Event(
name="carnival",
title="Rio Carnival",
date=carnival_start,
end_date=carnival_end,
url="https://en.wikipedia.org/wiki/Rio_Carnival",
)
)
return events

41
agenda/conference.py
View file

@ -6,10 +6,7 @@ from datetime import date, datetime
import yaml
from . import utils
from .event import Event
MAX_CONF_DAYS = 20
from .types import Event
@dataclasses.dataclass
@ -21,8 +18,6 @@ class Conference:
location: str
start: date | datetime
end: date | datetime
trip: date | None = None
country: str | None = None
venue: str | None = None
address: str | None = None
url: str | None = None
@ -34,15 +29,6 @@ class Conference:
online: bool = False
price: decimal.Decimal | None = None
currency: str | None = None
latitude: float | None = None
longitude: float | None = None
cfp_end: date | None = None
cfp_url: str | None = None
free: bool | None = None
hackathon: bool | None = None
ticket_type: str | None = None
attendees: int | None = None
hashtag: str | None = None
@property
def display_name(self) -> str:
@ -56,28 +42,17 @@ class Conference:
def get_list(filepath: str) -> list[Event]:
"""Read conferences from a YAML file and return a list of Event objects."""
events: list[Event] = []
for conf in (Conference(**conf) for conf in yaml.safe_load(open(filepath, "r"))):
assert conf.start <= conf.end
duration = (utils.as_date(conf.end) - utils.as_date(conf.start)).days
assert duration < MAX_CONF_DAYS
event = Event(
return [
Event(
name="conference",
date=conf.start,
end_date=conf.end,
title=conf.display_name,
title=f"🎤 {conf.display_name}",
url=conf.url,
going=conf.going,
)
events.append(event)
if not conf.cfp_end:
continue
cfp_end_event = Event(
name="cfp_end",
date=conf.cfp_end,
title="CFP end: " + conf.display_name,
url=conf.cfp_url or conf.url,
for conf in (
Conference(**conf)
for conf in yaml.safe_load(open(filepath, "r"))["conferences"]
)
events.append(cfp_end_event)
return events
]

511
agenda/data.py
View file

@ -1,50 +1,51 @@
"""Agenda data."""
import asyncio
import collections
import itertools
import os
import typing
from datetime import date, datetime, timedelta
from time import time
import dateutil.rrule
import dateutil.tz
import flask
import holidays
import isodate # type: ignore
import lxml
import pytz
import yaml
from . import (
accommodation,
birthday,
bristol_waste,
busy,
carnival,
calendar,
conference,
domains,
economist,
events_yaml,
gandi,
fx,
gwr,
hn,
holidays,
meetup,
n_somerset_waste,
stock_market,
subscription,
sun,
thespacedevs,
travel,
uk_holiday,
uk_tz,
waste_schedule,
)
from .event import Event
from .types import StrDict
from .utils import time_function
from .types import Event, Holiday
StrDict = dict[str, typing.Any]
here = dateutil.tz.tzlocal()
# deadline to file tax return
# credit card expiry dates
# morzine ski lifts
# chalet availability calendar
# chalet availablity calendar
# starlink visible
@ -61,114 +62,298 @@ def timezone_transition(
]
async def n_somerset_waste_collection_events(
data_dir: str, postcode: str, uprn: str, force_cache: bool = False
def us_holidays(start_date: date, end_date: date) -> list[Holiday]:
"""Get US holidays."""
found: list[Holiday] = []
for year in range(start_date.year, end_date.year + 1):
hols = holidays.country_holidays("US", years=year, language="en")
found += [
Holiday(date=hol_date, name=title, country="us")
for hol_date, title in hols.items()
if start_date < hol_date < end_date
]
extra = []
for h in found:
if h.name != "Thanksgiving":
continue
extra += [
Holiday(date=h.date + timedelta(days=1), name="Black Friday", country="us"),
Holiday(date=h.date + timedelta(days=4), name="Cyber Monday", country="us"),
]
return found + extra
def get_nyse_holidays(
start_date: date, end_date: date, us_hols: list[Holiday]
) -> list[Event]:
"""NYSE holidays."""
known_us_hols = {(h.date, h.name) for h in us_hols}
found: list[Event] = []
rename = {"Thanksgiving Day": "Thanksgiving"}
for year in range(start_date.year, end_date.year + 1):
hols = holidays.financial_holidays("NYSE", years=year)
found += [
Event(
name="holiday",
date=hol_date,
title=rename.get(title, title),
)
for hol_date, title in hols.items()
if start_date < hol_date < end_date
]
found = [hol for hol in found if (hol.date, hol.title) not in known_us_hols]
for hol in found:
assert hol.title
hol.title += " (NYSE)"
return found
def get_holidays(country: str, start_date: date, end_date: date) -> list[Holiday]:
"""Get holidays."""
found: list[Holiday] = []
for year in range(start_date.year, end_date.year + 1):
hols = holidays.country_holidays(country.upper(), years=year, language="en_US")
found += [
Holiday(
date=hol_date,
name=title,
country=country.lower(),
)
for hol_date, title in hols.items()
if start_date < hol_date < end_date
]
return found
def midnight(d: date) -> datetime:
"""Convert from date to midnight on that day."""
return datetime.combine(d, datetime.min.time())
def dates_from_rrule(
rrule: str, start: date, end: date
) -> typing.Sequence[datetime | date]:
"""Generate events from an RRULE between start_date and end_date."""
all_day = not any(param in rrule for param in ["BYHOUR", "BYMINUTE", "BYSECOND"])
return [
i.date() if all_day else uk_tz.localize(i)
for i in dateutil.rrule.rrulestr(rrule, dtstart=midnight(start)).between(
midnight(start), midnight(end)
)
]
async def waste_collection_events(data_dir: str) -> list[Event]:
"""Waste colllection events."""
html = await n_somerset_waste.get_html(data_dir, postcode, uprn, force_cache)
postcode = "BS48 3HG"
uprn = "24071046"
html = await waste_schedule.get_html(data_dir, postcode, uprn)
root = lxml.html.fromstring(html)
events = n_somerset_waste.parse(root)
events = waste_schedule.parse(root)
return events
async def bristol_waste_collection_events(
data_dir: str, start_date: date, uprn: str, force_cache: bool = False
data_dir: str, start_date: date
) -> list[Event]:
"""Waste colllection events."""
cache = "force" if force_cache else "recent"
return await bristol_waste.get(start_date, data_dir, uprn, cache)
uprn = "358335"
return await waste_schedule.get_bristol_gov_uk(start_date, data_dir, uprn)
def find_events_during_stay(
accommodation_events: list[Event], markets: list[Event]
) -> list[Event]:
"""Market events that happen during accommodation stays."""
overlapping_markets = []
for market in markets:
market_date = market.as_date
assert isinstance(market_date, date)
for e in accommodation_events:
start, end = e.as_date, e.end_as_date
assert start and end and all(isinstance(i, date) for i in (start, end))
# Check if the market date is within the accommodation dates.
if start <= market_date <= end:
overlapping_markets.append(market)
break # Breaks the inner loop if overlap is found.
return overlapping_markets
def combine_holidays(holidays: list[Holiday]) -> list[Event]:
"""Combine UK and US holidays with the same date and title."""
all_countries = {h.country for h in holidays}
def hide_markets_while_away(
events: list[Event], accommodation_events: list[Event]
) -> None:
"""Hide markets that happen while away."""
optional = [
e
for e in events
if e.name == "market" or (e.title and "LHG Run Club" in e.title)
]
going = [e for e in events if e.going]
standard_name = {
(1, 1): "New Year's Day",
(1, 6): "Epiphany",
(5, 1): "Labour Day",
(8, 15): "Assumption Day",
(12, 8): "Immaculate conception",
(12, 25): "Christmas Day",
(12, 26): "Boxing Day",
}
overlapping_markets = find_events_during_stay(
accommodation_events + going, optional
)
for market in overlapping_markets:
events.remove(market)
combined: collections.defaultdict[
tuple[date, str], set[str]
] = collections.defaultdict(set)
for h in holidays:
assert isinstance(h.name, str) and isinstance(h.date, date)
class AgendaData(typing.TypedDict, total=False):
"""Agenda Data."""
event_key = (h.date, standard_name.get((h.date.month, h.date.day), h.name))
combined[event_key].add(h.country)
now: datetime
stock_markets: list[str]
rockets: list[thespacedevs.Summary]
gwr_advance_tickets: date | None
data_gather_seconds: float
stock_market_times_seconds: float
timings: list[tuple[str, float]]
events: list[Event]
accommodation_events: list[Event]
gaps: list[StrDict]
sunrise: datetime
sunset: datetime
last_week: date
two_weeks_ago: date
errors: list[tuple[str, Exception]]
def rocket_launch_events(rockets: list[thespacedevs.Summary]) -> list[Event]:
"""Rocket launch events."""
events: list[Event] = []
for launch in rockets:
dt = None
net_precision = launch["net_precision"]
skip = {"Year", "Month", "Quarter", "Fiscal Year"}
if net_precision == "Day":
dt = datetime.strptime(launch["net"], "%Y-%m-%dT%H:%M:%SZ").date()
elif (
net_precision
and net_precision not in skip
and "Year" not in net_precision
and launch["t0_time"]
):
dt = pytz.utc.localize(
datetime.strptime(launch["net"], "%Y-%m-%dT%H:%M:%SZ")
for (d, name), countries in combined.items():
if len(countries) == len(all_countries):
country_list = ""
elif len(countries) < len(all_countries) / 2:
country_list = ", ".join(sorted(country.upper() for country in countries))
else:
country_list = "not " + ", ".join(
sorted(country.upper() for country in all_countries - set(countries))
)
if not dt:
continue
rocket_name = (
f'{launch["rocket"]["full_name"]}: '
+ f'{launch["mission_name"] or "[no mission]"}'
e = Event(
name="holiday",
date=d,
title=f"{name} ({country_list})" if country_list else name,
)
e = Event(name="rocket", date=dt, title=rocket_name)
events.append(e)
return events
async def get_data(now: datetime, config: flask.config.Config) -> AgendaData:
def get_yaml_event_date_field(item: dict[str, str]) -> str:
"""Event date field name."""
return (
"end_date"
if item["name"] == "travel_insurance"
else ("start_date" if "start_date" in item else "date")
)
def get_yaml_event_end_date_field(item: dict[str, str]) -> str:
"""Event date field name."""
return (
"end_date"
if item["name"] == "travel_insurance"
else ("start_date" if "start_date" in item else "date")
)
def read_events_yaml(data_dir: str, start: date, end: date) -> list[Event]:
"""Read eventes from YAML file."""
events: list[Event] = []
for item in yaml.safe_load(open(os.path.join(data_dir, "events.yaml"))):
duration = (
isodate.parse_duration(item["duration"]) if "duration" in item else None
)
dates = (
dates_from_rrule(item["rrule"], start, end)
if "rrule" in item
else [item[get_yaml_event_date_field(item)]]
)
for dt in dates:
e = Event(
name=item["name"],
date=dt,
end_date=(
dt + duration
if duration
else (
item.get("end_date")
if item["name"] != "travel_insurance"
else None
)
),
title=item.get("title"),
url=item.get("url"),
)
events.append(e)
return events
def find_markets_during_stay(
accommodation_events: list[Event], markets: list[Event]
) -> list[Event]:
"""Market events that happen during accommodation stays."""
overlapping_markets = []
for market in markets:
for e in accommodation_events:
# Check if the market date is within the accommodation dates.
if e.as_date <= market.as_date <= e.end_as_date:
overlapping_markets.append(market)
break # Breaks the inner loop if overlap is found.
return overlapping_markets
def find_gaps(events: list[Event], min_gap_days: int = 3) -> list[StrDict]:
"""Gaps of at least `min_gap_days` between events in a list of events."""
# Sort events by start date
gaps: list[tuple[date, date]] = []
previous_event_end = None
by_start_date = {
d: list(on_day)
for d, on_day in itertools.groupby(events, key=lambda e: e.as_date)
}
by_end_date = {
d: list(on_day)
for d, on_day in itertools.groupby(events, key=lambda e: e.end_as_date)
}
for event in events:
# Use start date for current event
start_date = event.as_date
# If previous event exists, calculate the gap
if previous_event_end:
gap_days = (start_date - previous_event_end).days
if gap_days >= (min_gap_days + 2):
start_end = (
previous_event_end + timedelta(days=1),
start_date - timedelta(days=1),
)
gaps.append(start_end)
# Update previous event end date
end = event.end_as_date
if not previous_event_end or end > previous_event_end:
previous_event_end = end
return [
{
"start": gap_start,
"end": gap_end,
"after": by_start_date[gap_end + timedelta(days=1)],
"before": by_end_date[gap_start - timedelta(days=1)],
}
for gap_start, gap_end in gaps
]
def busy_event(e: Event) -> bool:
"""Busy."""
if e.name not in {
"event",
"accommodation",
"conference",
"dodainville",
"transport",
"meetup",
"party",
}:
return False
if e.title in ("IA UK board meeting", "Mill Road Winter Fair"):
return False
if e.name == "conference" and not e.going:
return False
if not e.title:
return True
if e.title == "LHG Run Club" or "Third Thursday Social" in e.title:
return False
lc_title = e.title.lower()
return "rebels" not in lc_title and "south west data social" not in lc_title
async def get_data(
now: datetime, config: flask.config.Config
) -> typing.Mapping[str, str | object]:
"""Get data to display on agenda dashboard."""
data_dir = config["DATA_DIR"]
@ -182,51 +367,28 @@ async def get_data(now: datetime, config: flask.config.Config) -> AgendaData:
minus_365 = now - timedelta(days=365)
plus_365 = now + timedelta(days=365)
t0 = time()
offline_mode = bool(config.get("OFFLINE_MODE"))
result_list = await asyncio.gather(
time_function(
"gwr_advance_tickets", gwr.advance_ticket_date, data_dir, offline_mode
),
time_function(
"backwell_bins",
n_somerset_waste_collection_events,
data_dir,
config["BACKWELL_POSTCODE"],
config["BACKWELL_UPRN"],
offline_mode,
),
time_function(
"bristol_bins",
bristol_waste_collection_events,
data_dir,
today,
config["BRISTOL_UPRN"],
offline_mode,
),
(
gbpusd,
gwr_advance_tickets,
bank_holiday,
rockets,
backwell_bins,
bristol_bins,
) = await asyncio.gather(
fx.get_gbpusd(config),
gwr.advance_ticket_date(data_dir),
uk_holiday.bank_holiday_list(last_year, next_year, data_dir),
thespacedevs.get_launches(rocket_dir, limit=40),
waste_collection_events(data_dir),
bristol_waste_collection_events(data_dir, today),
)
rockets = thespacedevs.read_cached_launches(rocket_dir)
results = {call[0]: call[1] for call in result_list}
errors = [(call[0], call[3]) for call in result_list if call[3]]
gwr_advance_tickets = results["gwr_advance_tickets"]
data_gather_seconds = time() - t0
t0 = time()
stock_market_times = stock_market.open_and_close()
stock_market_times_seconds = time() - t0
reply: AgendaData = {
reply: dict[str, typing.Any] = {
"now": now,
"stock_markets": stock_market_times,
"gbpusd": gbpusd,
"stock_markets": stock_market.open_and_close(),
"rockets": rockets,
"gwr_advance_tickets": gwr_advance_tickets,
"data_gather_seconds": data_gather_seconds,
"stock_market_times_seconds": stock_market_times_seconds,
"timings": [(call[0], call[2]) for call in result_list],
}
my_data = config["PERSONAL_DATA"]
@ -243,43 +405,85 @@ async def get_data(now: datetime, config: flask.config.Config) -> AgendaData:
if gwr_advance_tickets:
events.append(Event(name="gwr_advance_tickets", date=gwr_advance_tickets))
us_hols = holidays.us_holidays(last_year, next_year)
events += holidays.get_nyse_holidays(last_year, next_year, us_hols)
us_hols = us_holidays(last_year, next_year)
holidays: list[Holiday] = bank_holiday + us_hols
for country in (
"at",
"be",
"br",
"ch",
"cz",
"de",
"dk",
"ee",
"es",
"fi",
"fr",
"gr",
"it",
"ke",
"nl",
"pl",
):
holidays += get_holidays(country, last_year, next_year)
events += get_nyse_holidays(last_year, next_year, us_hols)
accommodation_events = accommodation.get_events(
os.path.join(my_data, "accommodation.yaml")
)
holiday_list = holidays.get_all(last_year, next_year, data_dir)
events += holidays.combine_holidays(holiday_list)
if flask.g.user.is_authenticated:
events += birthday.get_birthdays(
last_year, os.path.join(my_data, "entities.yaml")
)
events += domains.renewal_dates(my_data)
events += combine_holidays(holidays)
events += birthday.get_birthdays(last_year, os.path.join(my_data, "entities.yaml"))
events += accommodation_events
events += travel.all_events(my_data)
events += conference.get_list(os.path.join(my_data, "conferences.yaml"))
for key in "backwell_bins", "bristol_bins":
if results[key]:
events += results[key]
events += events_yaml.read(my_data, last_year, next_year)
events += backwell_bins + bristol_bins
events += read_events_yaml(my_data, last_year, next_year)
events += subscription.get_events(os.path.join(my_data, "subscriptions.yaml"))
events += gandi.get_events(data_dir)
events += economist.publication_dates(last_week, next_year)
events += meetup.get_events(my_data)
events += hn.whoishiring(last_year, next_year)
events += carnival.rio_carnival_events(last_year, next_year)
events += rocket_launch_events(rockets)
events += domains.renewal_dates(my_data)
# hide markets that happen while away
markets = [e for e in events if e.name == "market"]
going = [e for e in events if e.going]
overlapping_markets = find_markets_during_stay(
accommodation_events + going, markets
)
for market in overlapping_markets:
events.remove(market)
for launch in rockets:
dt = None
if launch["net_precision"] == "Day":
dt = datetime.strptime(launch["net"], "%Y-%m-%dT00:00:00Z").date()
elif launch["t0_time"]:
dt = pytz.utc.localize(
datetime.strptime(launch["net"], "%Y-%m-%dT%H:%M:%SZ")
)
if not dt:
continue
rocket_name = f'🚀{launch["rocket"]}: {launch["mission_name"] or "[no mission]"}'
e = Event(name="rocket", date=dt, title=rocket_name)
events.append(e)
events += [Event(name="today", date=today)]
busy_events = [
e
for e in sorted(events, key=lambda e: e.as_date)
if e.as_date > today and e.as_date < next_year and busy.busy_event(e)
if e.as_date > today and e.as_date < next_year and busy_event(e)
]
gaps = busy.find_gaps(busy_events)
gaps = find_gaps(busy_events)
events += [
Event(name="gap", date=gap["start"], end_date=gap["end"]) for gap in gaps
@ -297,10 +501,9 @@ async def get_data(now: datetime, config: flask.config.Config) -> AgendaData:
reply["sunrise"] = sun.sunrise(observer)
reply["sunset"] = sun.sunset(observer)
reply["events"] = events
reply["accommodation_events"] = accommodation_events
reply["last_week"] = last_week
reply["two_weeks_ago"] = two_weeks_ago
reply["errors"] = errors
reply["fullcalendar_events"] = calendar.build_events(events)
return reply

4
agenda/domains.py
View file

@ -1,10 +1,10 @@
"""Domain renewal dates."""
"""Accomodation."""
import csv
import os
from datetime import datetime
from .event import Event
from .types import Event
url = "https://admin.gandi.net/domain/01578ef0-a84b-11e7-bdf3-00163e6dc886/"

2
agenda/economist.py
View file

@ -5,7 +5,7 @@ from datetime import date, time, timedelta
from dateutil.relativedelta import TH, relativedelta
from . import uk_time
from .event import Event
from .types import Event
def publication_dates(start_date: date, end_date: date) -> list[Event]:

149
agenda/event.py
View file

@ -1,149 +0,0 @@
"""Types."""
import datetime
from dataclasses import dataclass
from . import utils
from .types import DateOrDateTime, StrDict
emojis = {
"market": "🧺",
"us_presidential_election": "🗳️🇺🇸",
"bus_route_closure": "🚌❌",
"meetup": "👥",
"dinner": "🍷",
"party": "🍷",
"ba_voucher": "✈️",
"accommodation": "🏨", # alternative: 🧳
"flight": "✈️",
"conference": "🎤",
"rocket": "🚀",
"birthday": "🎈",
"waste_schedule": "🗑️",
"economist": "📰",
"running": "🏃",
"critical_mass": "🚴",
"trip": "🧳",
"hackathon": "💻",
}
@dataclass
class Event:
"""Event."""
name: str
date: DateOrDateTime
end_date: DateOrDateTime | None = None
title: str | None = None
url: str | None = None
going: bool | None = None
@property
def as_datetime(self) -> datetime.datetime:
"""Date/time of event."""
return utils.as_datetime(self.date)
@property
def has_time(self) -> bool:
"""Event has a time associated with it."""
return isinstance(self.date, datetime.datetime)
@property
def as_date(self) -> datetime.date:
"""Date of event."""
return (
self.date.date() if isinstance(self.date, datetime.datetime) else self.date
)
@property
def end_as_date(self) -> datetime.date:
"""Date of event."""
return (
(
self.end_date.date()
if isinstance(self.end_date, datetime.datetime)
else self.end_date
)
if self.end_date
else self.as_date
)
@property
def display_time(self) -> str | None:
"""Time for display on web page."""
return (
self.date.strftime("%H:%M")
if isinstance(self.date, datetime.datetime)
else None
)
@property
def display_timezone(self) -> str | None:
"""Timezone for display on web page."""
return (
self.date.strftime("%z")
if isinstance(self.date, datetime.datetime)
else None
)
def display_duration(self) -> str | None:
"""Duration for display."""
if self.end_as_date != self.as_date or not self.has_time:
return None
assert isinstance(self.date, datetime.datetime)
assert isinstance(self.end_date, datetime.datetime)
secs: int = int((self.end_date - self.date).total_seconds())
hours: int = secs // 3600
mins: int = (secs % 3600) // 60
if mins == 0:
return f"{hours:d}h"
if hours == 0:
return f"{mins:d} mins"
return f"{hours:d}h {mins:02d} mins"
def delta_days(self, today: datetime.date) -> str:
"""Return number of days from today as a string."""
delta = (self.as_date - today).days
match delta:
case 0:
return "today"
case 1:
return "1 day"
case _:
return f"{delta:,d} days"
@property
def display_date(self) -> str:
"""Date for display on web page."""
if isinstance(self.date, datetime.datetime):
return self.date.strftime("%a, %d, %b %Y %H:%M %z")
else:
return self.date.strftime("%a, %d, %b %Y")
@property
def display_title(self) -> str:
"""Name for display."""
return self.title or self.name
@property
def emoji(self) -> str | None:
"""Emoji."""
if self.title == "LHG Run Club":
return "🏃🍻"
return emojis.get(self.name)
@property
def title_with_emoji(self) -> str | None:
"""Title with optional emoji at the start."""
title = self.title or self.name
if title is None:
return None
emoji = self.emoji
return f"{emoji} {title}" if emoji else title

85
agenda/events_yaml.py
View file

@ -1,85 +0,0 @@
"""Read events from YAML."""
import os
import typing
from datetime import date, datetime
import dateutil.rrule
import isodate # type: ignore
import yaml
from . import uk_tz
from .event import Event
def midnight(d: date) -> datetime:
"""Convert from date to midnight on that day."""
return datetime.combine(d, datetime.min.time())
def dates_from_rrule(
rrule: str, start: date, end: date
) -> typing.Sequence[datetime | date]:
"""Generate events from an RRULE between start_date and end_date."""
all_day = not any(param in rrule for param in ["BYHOUR", "BYMINUTE", "BYSECOND"])
return [
i.date() if all_day else uk_tz.localize(i)
for i in dateutil.rrule.rrulestr(rrule, dtstart=midnight(start)).between(
midnight(start), midnight(end)
)
]
def get_yaml_event_date_field(item: dict[str, str]) -> str:
"""Event date field name."""
return (
"end_date"
if item["name"] == "travel_insurance"
else ("start_date" if "start_date" in item else "date")
)
def get_yaml_event_end_date_field(item: dict[str, str]) -> str:
"""Event date field name."""
return (
"end_date"
if item["name"] == "travel_insurance"
else ("start_date" if "start_date" in item else "date")
)
def read(
data_dir: str, start: date, end: date, skip_trips: bool = False
) -> list[Event]:
"""Read eventes from YAML file."""
events: list[Event] = []
for item in yaml.safe_load(open(os.path.join(data_dir, "events.yaml"))):
if "trip" in item and skip_trips:
continue
duration = (
isodate.parse_duration(item["duration"]) if "duration" in item else None
)
dates = (
dates_from_rrule(item["rrule"], start, end)
if "rrule" in item
else [item[get_yaml_event_date_field(item)]]
)
for dt in dates:
e = Event(
name=item["name"],
date=dt,
end_date=(
dt + duration
if duration
else (
item.get("end_date")
if item["name"] != "travel_insurance"
else None
)
),
title=item.get("title"),
url=item.get("url"),
)
events.append(e)
return events

71
agenda/fx.py
View file

@ -42,74 +42,3 @@ async def get_gbpusd(config: flask.config.Config) -> Decimal:
data = json.loads(r.text, parse_float=Decimal)
return typing.cast(Decimal, 1 / data["quotes"]["USDGBP"])
def read_cached_rates(
filename: str | None, currencies: list[str]
) -> dict[str, Decimal]:
"""Read FX rates from cache."""
if filename is None:
return {}
with open(filename) as file:
data = json.load(file, parse_float=Decimal)
return {
cur: Decimal(data["quotes"][f"GBP{cur}"])
for cur in currencies
if f"GBP{cur}" in data["quotes"]
}
def get_rates(config: flask.config.Config) -> dict[str, Decimal]:
"""Get current values of exchange rates for a list of currencies against GBP."""
currencies = config["CURRENCIES"]
access_key = config["EXCHANGERATE_ACCESS_KEY"]
data_dir = config["DATA_DIR"]
now = datetime.now()
now_str = now.strftime("%Y-%m-%d_%H:%M")
fx_dir = os.path.join(data_dir, "fx")
os.makedirs(fx_dir, exist_ok=True) # Ensure the directory exists
currency_string = ",".join(sorted(currencies))
file_suffix = f"{currency_string}_to_GBP.json"
existing_data = os.listdir(fx_dir)
existing_files = [f for f in existing_data if f.endswith(".json")]
full_path: str | None = None
if existing_files:
recent_filename = max(existing_files)
recent = datetime.strptime(recent_filename[:16], "%Y-%m-%d_%H:%M")
delta = now - recent
full_path = os.path.join(fx_dir, recent_filename)
if recent_filename.endswith(file_suffix) and (
delta < timedelta(hours=12) or config["OFFLINE_MODE"]
):
return read_cached_rates(full_path, currencies)
url = "http://api.exchangerate.host/live"
params = {"currencies": currency_string, "source": "GBP", "access_key": access_key}
filename = f"{now_str}_{file_suffix}"
try:
with httpx.Client() as client:
response = client.get(url, params=params, timeout=10)
except (httpx.ConnectError, httpx.ReadTimeout):
return read_cached_rates(full_path, currencies)
try:
data = json.loads(response.text, parse_float=Decimal)
except json.decoder.JSONDecodeError:
return read_cached_rates(full_path, currencies)
with open(os.path.join(fx_dir, filename), "w") as file:
file.write(response.text)
return {
cur: Decimal(data["quotes"][f"GBP{cur}"])
for cur in currencies
if f"GBP{cur}" in data["quotes"]
}

27
agenda/gandi.py
View file

@ -1,27 +0,0 @@
"""Gandi domain renewal dates."""
import os
from .event import Event
from datetime import datetime
import json
def get_events(data_dir: str) -> list[Event]:
"""Get subscription renewal dates."""
filename = os.path.join(data_dir, "gandi_domains.json")
with open(filename) as f:
items = json.load(f)
assert isinstance(items, list)
assert all(item["fqdn"] and item["dates"]["registry_ends_at"] for item in items)
return [
Event(
date=datetime.fromisoformat(item["dates"]["registry_ends_at"]).date(),
name="domain",
title=item["fqdn"] + " renewal",
)
for item in items
]

110
agenda/geomob.py
View file

@ -1,110 +0,0 @@
"""Geomob events."""
import os
from dataclasses import dataclass
from datetime import date, datetime
from typing import List
import dateutil.parser
import flask
import lxml.html
import requests
import agenda.mail
import agenda.utils
@dataclass(frozen=True)
class GeomobEvent:
"""Geomob event."""
date: date
href: str
hashtag: str
def extract_events(
tree: lxml.html.HtmlElement,
) -> List[GeomobEvent]:
"""Extract upcoming events from the HTML content."""
events = []
for event in tree.xpath('//ol[@class="event-list"]/li/a'):
date_str, _, hashtag = event.text_content().strip().rpartition(" ")
events.append(
GeomobEvent(
date=dateutil.parser.parse(date_str).date(),
href=event.get("href"),
hashtag=hashtag,
)
)
return events
def find_new_events(
prev: list[GeomobEvent], cur: list[GeomobEvent]
) -> list[GeomobEvent]:
"""Find new events that appear in cur but not in prev."""
return list(set(cur) - set(prev))
def geomob_email(new_events: list[GeomobEvent], base_url: str) -> tuple[str, str]:
"""Generate email subject and body for new events.
Args:
new_events (List[Event]): List of new events.
base_url (str): The base URL of the website.
Returns:
tuple[str, str]: Email subject and body.
"""
assert new_events
subject = f"{len(new_events)} New Geomob Event(s) Announced"
body_lines = ["Hello,\n", "Here are the new Geomob events:\n"]
for event in new_events:
url = base_url + event.href
# Check for double slashes in the path part only (after protocol)
if "://" in url:
protocol, rest = url.split("://", 1)
assert "//" not in rest, f"Double slash found in URL path: {url}"
else:
assert "//" not in url, f"Double slash found in URL: {url}"
event_details = f"Date: {event.date}\nURL: {url}\nHashtag: {event.hashtag}\n"
body_lines.append(event_details)
body_lines.append("-" * 40)
body = "\n".join(body_lines)
return (subject, body)
def get_cached_upcoming_events_list(geomob_dir: str) -> list[GeomobEvent]:
"""Get known geomob events."""
filename = agenda.utils.get_most_recent_file(geomob_dir, "html")
return extract_events(lxml.html.parse(filename).getroot()) if filename else []
def update(config: flask.config.Config) -> None:
"""Get upcoming Geomob events and report new ones."""
geomob_dir = os.path.join(config["DATA_DIR"], "geomob")
prev_events = get_cached_upcoming_events_list(geomob_dir)
r = requests.get("https://thegeomob.com/")
cur_events = extract_events(lxml.html.fromstring(r.content))
if cur_events == prev_events:
return # no change
now = datetime.now()
new_filename = os.path.join(geomob_dir, now.strftime("%Y-%m-%d_%H:%M:%S.html"))
open(new_filename, "w").write(r.text)
new_events = list(set(cur_events) - set(prev_events))
if not new_events:
return
base_url = "https://thegeomob.com"
subject, body = geomob_email(new_events, base_url)
agenda.mail.send_mail(config, subject, body)

45
agenda/gwr.py
View file

@ -10,30 +10,6 @@ import httpx
url = "https://www.gwr.com/your-tickets/choosing-your-ticket/advance-tickets"
def parse_date_string(date_str: str) -> date:
"""Parse date string from HTML."""
if not date_str[-1].isdigit(): # If the year is missing, use the current year
date_str += f" {date.today().year}"
return datetime.strptime(date_str, "%A %d %B %Y").date()
def extract_dates(html: str) -> None | dict[str, date]:
"""Extract dates from HTML."""
pattern = re.compile(
r"<tr>\s*<td>(Weekdays|Saturdays|Sundays)</td>*"
+ r"\s*<td>(.*?)(?:\*\*)?</td>\s*</tr>",
)
if not pattern.search(html):
return None
return {
match.group(1): parse_date_string(match.group(2))
for match in pattern.finditer(html)
}
def extract_weekday_date(html: str) -> date | None:
"""Furthest date of GWR advance ticket booking."""
# Compile a regular expression pattern to match the relevant table row
@ -42,19 +18,22 @@ def extract_weekday_date(html: str) -> date | None:
)
# Search the HTML for the pattern
if match := pattern.search(html):
return parse_date_string(match.group(1))
else:
if not (match := pattern.search(html)):
return None
date_str = match.group(1)
# If the year is missing, use the current year
if not date_str[-1].isdigit():
date_str += f" {date.today().year}"
return datetime.strptime(date_str, "%A %d %B %Y").date()
async def advance_tickets_page_html(
data_dir: str, ttl: int = 60 * 60 * 6, force_cache: bool = False
) -> str:
async def advance_tickets_page_html(data_dir: str, ttl: int = 60 * 60 * 6) -> str:
"""Get advance-tickets web page HTML with cache."""
filename = os.path.join(data_dir, "advance-tickets.html")
mtime = os.path.getmtime(filename) if os.path.exists(filename) else 0
if force_cache or (time() - mtime) < ttl: # use cache
if (time() - mtime) < ttl: # use cache
return open(filename).read()
async with httpx.AsyncClient() as client:
r = await client.get(url)
@ -63,7 +42,7 @@ async def advance_tickets_page_html(
return html
async def advance_ticket_date(data_dir: str, force_cache: bool = False) -> date | None:
async def advance_ticket_date(data_dir: str) -> date | None:
"""Get GWR advance tickets date with cache."""
html = await advance_tickets_page_html(data_dir, force_cache=force_cache)
html = await advance_tickets_page_html(data_dir)
return extract_weekday_date(html)

2
agenda/hn.py
View file

@ -5,7 +5,7 @@ from datetime import date, datetime, time, timedelta
import pytz
from dateutil.relativedelta import relativedelta
from .event import Event
from .types import Event
eastern_time = pytz.timezone("America/New_York")

166
agenda/holidays.py
View file

@ -1,166 +0,0 @@
"""Holidays."""
import collections
from datetime import date, timedelta
import flask
import agenda.uk_holiday
import holidays
from .event import Event
from .types import Holiday, Trip
def get_trip_holidays(trip: Trip) -> list[Holiday]:
"""Get holidays happening during trip."""
if not trip.end:
return []
countries = {c.alpha_2 for c in trip.countries}
return sorted(
(
hol
for hol in get_all(
trip.start, trip.end, flask.current_app.config["DATA_DIR"]
)
if hol.country.upper() in countries
),
key=lambda item: (item.date, item.country),
)
def us_holidays(start_date: date, end_date: date) -> list[Holiday]:
"""Get US holidays."""
found: list[Holiday] = []
for year in range(start_date.year, end_date.year + 1):
hols = holidays.country_holidays("US", years=year, language="en")
found += [
Holiday(date=hol_date, name=title, country="us")
for hol_date, title in hols.items()
if start_date < hol_date < end_date
]
extra = []
for h in found:
if h.name != "Thanksgiving":
continue
extra += [
Holiday(date=h.date + timedelta(days=1), name="Black Friday", country="us"),
Holiday(date=h.date + timedelta(days=4), name="Cyber Monday", country="us"),
]
return found + extra
def get_nyse_holidays(
start_date: date, end_date: date, us_hols: list[Holiday]
) -> list[Event]:
"""NYSE holidays."""
known_us_hols = {(h.date, h.name) for h in us_hols}
found: list[Event] = []
rename = {"Thanksgiving Day": "Thanksgiving"}
for year in range(start_date.year, end_date.year + 1):
hols = holidays.financial_holidays("NYSE", years=year)
found += [
Event(
name="holiday",
date=hol_date,
title=rename.get(title, title),
)
for hol_date, title in hols.items()
if start_date <= hol_date <= end_date
]
found = [hol for hol in found if (hol.date, hol.title) not in known_us_hols]
for hol in found:
assert hol.title
hol.title += " (NYSE)"
return found
def get_holidays(country: str, start_date: date, end_date: date) -> list[Holiday]:
"""Get holidays."""
found: list[Holiday] = []
uc_country = country.upper()
holiday_country = getattr(holidays, uc_country)
default_language = holiday_country.default_language
def skip_holiday(holiday_name: str) -> bool:
"""Skip holiday."""
return country == "se" and holiday_name == "Sunday"
for year in range(start_date.year, end_date.year + 1):
en_hols = holidays.country_holidays(uc_country, years=year, language="en_US")
local_lang = holidays.country_holidays(
uc_country, years=year, language=default_language
)
found += [
Holiday(
date=hol_date,
name=title,
local_name=local_lang[hol_date],
country=country.lower(),
)
for hol_date, title in en_hols.items()
if start_date <= hol_date <= end_date and not skip_holiday(title)
]
return found
def combine_holidays(holidays: list[Holiday]) -> list[Event]:
"""Combine UK and US holidays with the same date and title."""
all_countries = {h.country for h in holidays}
standard_name = {
(1, 1): "New Year's Day",
(1, 6): "Epiphany",
(5, 1): "Labour Day",
(8, 15): "Assumption Day",
(12, 8): "Immaculate conception",
(12, 25): "Christmas Day",
(12, 26): "Boxing Day",
}
combined: collections.defaultdict[tuple[date, str], set[str]] = (
collections.defaultdict(set)
)
for h in holidays:
assert isinstance(h.name, str) and isinstance(h.date, date)
event_key = (h.date, standard_name.get((h.date.month, h.date.day), h.name))
combined[event_key].add(h.country)
events: list[Event] = []
for (d, name), countries in combined.items():
if len(countries) == len(all_countries):
country_list = ""
elif len(countries) < len(all_countries) / 2:
country_list = ", ".join(sorted(country.upper() for country in countries))
else:
country_list = "not " + ", ".join(
sorted(country.upper() for country in all_countries - set(countries))
)
e = Event(
name="holiday",
date=d,
title=f"{name} ({country_list})" if country_list else name,
)
events.append(e)
return events
def get_all(last_year: date, next_year: date, data_dir: str) -> list[Holiday]:
"""Get holidays for various countries and return as a list."""
us_hols = us_holidays(last_year, next_year)
bank_holidays = agenda.uk_holiday.bank_holiday_list(last_year, next_year, data_dir)
holiday_list: list[Holiday] = bank_holidays + us_hols
for country in flask.current_app.config["HOLIDAY_COUNTRIES"]:
holiday_list += get_holidays(country, last_year, next_year)
return holiday_list

28
agenda/mail.py
View file

@ -1,28 +0,0 @@
"""Send e-mail."""
import smtplib
from email.message import EmailMessage
from email.utils import formatdate, make_msgid
import flask
def send_mail(config: flask.config.Config, subject: str, body: str) -> None:
"""Send an e-mail."""
msg = EmailMessage()
msg["Subject"] = subject
msg["To"] = f"{config['NAME']} <{config['MAIL_TO']}>"
msg["From"] = f"{config['NAME']} <{config['MAIL_FROM']}>"
msg["Date"] = formatdate()
msg["Message-ID"] = make_msgid()
# Add extra mail headers
for header, value in config["MAIL_HEADERS"]:
msg[header] = value
msg.set_content(body)
s = smtplib.SMTP(config["SMTP_HOST"])
s.sendmail(config["MAIL_TO"], [config["MAIL_TO"]], msg.as_string())
s.quit()

4
agenda/meetup.py
View file

@ -4,7 +4,7 @@ import json
import os.path
from datetime import datetime
from .event import Event
from .types import Event
def get_events(data_dir: str) -> list[Event]:
@ -21,7 +21,7 @@ def get_events(data_dir: str) -> list[Event]:
date=start,
end_date=end,
name="meetup",
title=item_event["title"],
title="👥" + item_event["title"],
url=item_event["eventUrl"],
)
events.append(e)

270
agenda/meteors.py
View file

@ -1,270 +0,0 @@
"""Meteor shower data calculations."""
import typing
from datetime import datetime, timedelta
import ephem # type: ignore
MeteorShower = dict[str, typing.Any]
# Meteor shower definitions with parent comet orbital elements
METEOR_SHOWERS = {
"Quadrantids": {
"name": "Quadrantids",
"radiant_ra": "15h20m", # Right ascension at peak
"radiant_dec": "+49.5°", # Declination at peak
"peak_solar_longitude": 283.16, # Solar longitude at peak
"activity_start": 283.16 - 10, # Activity period
"activity_end": 283.16 + 10,
"rate_max": 120,
"rate_min": 50,
"parent_body": "2003 EH1",
"visibility": "Northern Hemisphere",
"description": "The year kicks off with the Quadrantids, known for their brief but intense peak lasting only about 4 hours.",
"velocity_kms": 41,
},
"Lyrids": {
"name": "Lyrids",
"radiant_ra": "18h04m",
"radiant_dec": "+32.32°",
"peak_solar_longitude": 32.32,
"activity_start": 32.32 - 10,
"activity_end": 32.32 + 10,
"rate_max": 18,
"rate_min": 10,
"parent_body": "C/1861 G1 (Thatcher)",
"visibility": "Both hemispheres",
"description": "The Lyrids are one of the oldest recorded meteor showers, with observations dating back 2,700 years.",
"velocity_kms": 49,
},
"Eta Aquariids": {
"name": "Eta Aquariids",
"radiant_ra": "22h32m",
"radiant_dec": "-1.0°",
"peak_solar_longitude": 45.5,
"activity_start": 45.5 - 15,
"activity_end": 45.5 + 15,
"rate_max": 60,
"rate_min": 30,
"parent_body": "1P/Halley",
"visibility": "Southern Hemisphere (best)",
"description": "Created by debris from Halley's Comet, these meteors are fast and often leave glowing trails.",
"velocity_kms": 66,
},
"Perseids": {
"name": "Perseids",
"radiant_ra": "03h04m",
"radiant_dec": "+58.0°",
"peak_solar_longitude": 140.0,
"activity_start": 140.0 - 15,
"activity_end": 140.0 + 15,
"rate_max": 100,
"rate_min": 50,
"parent_body": "109P/Swift-Tuttle",
"visibility": "Northern Hemisphere",
"description": "One of the most popular meteor showers, viewing conditions vary by year based on moon phase.",
"velocity_kms": 59,
},
"Orionids": {
"name": "Orionids",
"radiant_ra": "06h20m",
"radiant_dec": "+16.0°",
"peak_solar_longitude": 208.0,
"activity_start": 208.0 - 15,
"activity_end": 208.0 + 15,
"rate_max": 25,
"rate_min": 15,
"parent_body": "1P/Halley",
"visibility": "Both hemispheres",
"description": "Another shower created by Halley's Comet debris, known for their speed and brightness.",
"velocity_kms": 66,
},
"Geminids": {
"name": "Geminids",
"radiant_ra": "07h28m",
"radiant_dec": "+32.0°",
"peak_solar_longitude": 262.2,
"activity_start": 262.2 - 10,
"activity_end": 262.2 + 10,
"rate_max": 120,
"rate_min": 60,
"parent_body": "3200 Phaethon",
"visibility": "Both hemispheres",
"description": "The best shower of most years with the highest rates. Unusual for being caused by an asteroid rather than a comet.",
"velocity_kms": 35,
},
"Ursids": {
"name": "Ursids",
"radiant_ra": "14h28m",
"radiant_dec": "+75.0°",
"peak_solar_longitude": 270.7,
"activity_start": 270.7 - 5,
"activity_end": 270.7 + 5,
"rate_max": 10,
"rate_min": 5,
"parent_body": "8P/Tuttle",
"visibility": "Northern Hemisphere",
"description": "A minor shower that closes out the year, best viewed from dark locations away from city lights.",
"velocity_kms": 33,
},
}
def calculate_solar_longitude_date(year: int, target_longitude: float) -> datetime:
"""Calculate the date when the Sun reaches a specific longitude for a given year."""
# Start from beginning of year
start_date = datetime(year, 1, 1)
# Use PyEphem to calculate solar longitude
observer = ephem.Observer()
observer.lat = "0" # Equator
observer.lon = "0" # Greenwich
observer.date = start_date
sun = ephem.Sun(observer)
# Search for the date when solar longitude matches target
# Solar longitude 0° = Spring Equinox (around March 20)
# We need to find when sun reaches the target longitude
# Approximate: start search from reasonable date based on longitude
if target_longitude < 90: # Spring (Mar-Jun)
search_start = datetime(year, 3, 1)
elif target_longitude < 180: # Summer (Jun-Sep)
search_start = datetime(year, 6, 1)
elif target_longitude < 270: # Fall (Sep-Dec)
search_start = datetime(year, 9, 1)
else: # Winter (Dec-Mar)
search_start = datetime(year, 12, 1)
observer.date = search_start
# Search within a reasonable range (±60 days)
for day_offset in range(-60, 61):
test_date = search_start + timedelta(days=day_offset)
observer.date = test_date
sun.compute(observer)
# Convert ecliptic longitude to degrees
sun_longitude = float(sun.hlon) * 180 / ephem.pi
# Check if we're close to target longitude (within 0.5 degrees)
if abs(sun_longitude - target_longitude) < 0.5:
return test_date
# Fallback: return approximation based on solar longitude
# Rough approximation: solar longitude increases ~1° per day
days_from_equinox = target_longitude
equinox_date = datetime(year, 3, 20) # Approximate spring equinox
return equinox_date + timedelta(days=days_from_equinox)
def calculate_moon_phase(date_obj: datetime) -> tuple[float, str]:
"""Calculate moon phase for a given date."""
observer = ephem.Observer()
observer.date = date_obj
moon = ephem.Moon(observer)
moon.compute(observer)
# Moon phase (0 = new moon, 0.5 = full moon, 1 = new moon again)
phase = moon.phase / 100.0
# Determine moon phase name and viewing quality
if phase < 0.1:
phase_name = "New Moon"
viewing_quality = "excellent"
elif phase < 0.3:
phase_name = "Waxing Crescent"
viewing_quality = "good"
elif phase < 0.7:
phase_name = "First Quarter" if phase < 0.5 else "Waxing Gibbous"
viewing_quality = "moderate"
elif phase < 0.9:
phase_name = "Full Moon"
viewing_quality = "poor"
else:
phase_name = "Waning Crescent"
viewing_quality = "good"
return phase, f"{phase_name} ({viewing_quality} viewing)"
def calculate_meteor_shower_data(year: int) -> list[MeteorShower]:
"""Calculate meteor shower data for a given year using astronomical calculations."""
meteor_data = []
for shower_id, shower_info in METEOR_SHOWERS.items():
# Calculate peak date based on solar longitude
peak_longitude = shower_info["peak_solar_longitude"]
assert isinstance(peak_longitude, (int, float))
peak_date = calculate_solar_longitude_date(year, peak_longitude)
# Calculate activity period
start_longitude = shower_info["activity_start"]
assert isinstance(start_longitude, (int, float))
activity_start = calculate_solar_longitude_date(year, start_longitude)
end_longitude = shower_info["activity_end"]
assert isinstance(end_longitude, (int, float))
activity_end = calculate_solar_longitude_date(year, end_longitude)
# Calculate moon phase at peak
moon_illumination, moon_phase_desc = calculate_moon_phase(peak_date)
# Format dates
peak_formatted = peak_date.strftime("%B %d")
if peak_date.day != (peak_date + timedelta(days=1)).day:
peak_formatted += f"-{(peak_date + timedelta(days=1)).strftime('%d')}"
active_formatted = (
f"{activity_start.strftime('%B %d')} - {activity_end.strftime('%B %d')}"
)
# Determine viewing quality based on moon phase
viewing_quality = (
"excellent"
if moon_illumination < 0.3
else (
"good"
if moon_illumination < 0.7
else "moderate" if moon_illumination < 0.9 else "poor"
)
)
meteor_shower = {
"name": shower_info["name"],
"peak": peak_formatted,
"active": active_formatted,
"rate": f"{shower_info['rate_min']}-{shower_info['rate_max']} meteors per hour",
"radiant": str(shower_info["radiant_ra"]).split("h")[0]
+ "h "
+ str(shower_info["radiant_dec"]),
"moon_phase": moon_phase_desc,
"visibility": shower_info["visibility"],
"description": shower_info["description"],
"peak_date": peak_date.strftime("%Y-%m-%d"),
"start_date": activity_start.strftime("%Y-%m-%d"),
"end_date": activity_end.strftime("%Y-%m-%d"),
"rate_min": shower_info["rate_min"],
"rate_max": shower_info["rate_max"],
"moon_illumination": moon_illumination,
"viewing_quality": viewing_quality,
"parent_body": shower_info["parent_body"],
"velocity_kms": shower_info["velocity_kms"],
}
meteor_data.append(meteor_shower)
# Sort by peak date
meteor_data.sort(key=lambda x: datetime.strptime(str(x["peak_date"]), "%Y-%m-%d"))
return meteor_data
def get_meteor_data(year: int | None = None) -> list[MeteorShower]:
"""Get meteor shower data for a specific year using astronomical calculations."""
if year is None:
year = datetime.now().year
return calculate_meteor_shower_data(year)

93
agenda/n_somerset_waste.py
View file

@ -1,93 +0,0 @@
"""Waste collection schedules."""
import os
import re
from collections import defaultdict
from datetime import date, datetime, time, timedelta
import httpx
import lxml.html
from . import uk_time
from .event import Event
from .utils import make_waste_dir
ttl_hours = 12
async def get_html(
data_dir: str, postcode: str, uprn: str, force_cache: bool = False
) -> str:
"""Get waste schedule."""
now = datetime.now()
waste_dir = os.path.join(data_dir, "waste")
make_waste_dir(data_dir)
existing_data = os.listdir(waste_dir)
existing = [f for f in existing_data if f.endswith(".html")]
if existing:
recent_filename = max(existing)
recent = datetime.strptime(recent_filename, "%Y-%m-%d_%H:%M.html")
delta = now - recent
if existing and (force_cache or delta < timedelta(hours=ttl_hours)):
return open(os.path.join(waste_dir, recent_filename)).read()
now_str = now.strftime("%Y-%m-%d_%H:%M")
filename = f"{waste_dir}/{now_str}.html"
forms_base_url = "https://forms.n-somerset.gov.uk"
url = "https://forms.n-somerset.gov.uk/Waste/CollectionSchedule"
async with httpx.AsyncClient() as client:
r = await client.post(
url,
data={
"PreviousHouse": "",
"PreviousPostcode": "-",
"Postcode": postcode,
"SelectedUprn": uprn,
},
)
form_post_html = r.text
pattern = r'<h2>Object moved to <a href="([^"]*)">here<\/a>\.<\/h2>'
m = re.search(pattern, form_post_html)
if m:
r = await client.get(forms_base_url + m.group(1))
html = r.text
open(filename, "w").write(html)
return html
def parse_waste_schedule_date(day_and_month: str) -> date:
"""Parse waste schedule date."""
today = date.today()
fmt = "%A %d %B %Y"
d = datetime.strptime(f"{day_and_month} {today.year}", fmt).date()
if d < today:
d = datetime.strptime(f"{day_and_month} {today.year + 1}", fmt).date()
return d
def parse(root: lxml.html.HtmlElement) -> list[Event]:
"""Parse waste schedule."""
tbody = root.find(".//table/tbody")
assert tbody is not None
by_date = defaultdict(list)
for e_service, e_next_date, e_following in tbody:
assert e_service.text and e_next_date.text and e_following.text
service = e_service.text
next_date = parse_waste_schedule_date(e_next_date.text)
following_date = parse_waste_schedule_date(e_following.text)
by_date[next_date].append(service)
by_date[following_date].append(service)
return [
Event(
name="waste_schedule",
date=uk_time(d, time(6, 30)),
title="Backwell: " + ", ".join(services),
)
for d, services in by_date.items()
]

299
agenda/schengen.py
View file

@ -1,299 +0,0 @@
"""Schengen area rolling time calculator for travel tracking."""
from datetime import date, datetime, timedelta
from .trip import depart_datetime
from .types import SchengenCalculation, SchengenStay, StrDict
# Schengen Area countries as of 2025
SCHENGEN_COUNTRIES = {
# EU countries in Schengen
"at", # Austria
"be", # Belgium
"bg", # Bulgaria (joined January 2025)
"hr", # Croatia
"cz", # Czech Republic
"dk", # Denmark
"ee", # Estonia
"fi", # Finland
"fr", # France
"de", # Germany
"gr", # Greece
"hu", # Hungary
"it", # Italy
"lv", # Latvia
"lt", # Lithuania
"lu", # Luxembourg
"mt", # Malta
"nl", # Netherlands
"pl", # Poland
"pt", # Portugal
"ro", # Romania (joined January 2025)
"sk", # Slovakia
"si", # Slovenia
"es", # Spain
"se", # Sweden
# Non-EU countries in Schengen
"is", # Iceland
"li", # Liechtenstein
"no", # Norway
"ch", # Switzerland
}
def is_schengen_country(country_code: str) -> bool:
"""Check if a country is in the Schengen area."""
if not country_code or not isinstance(country_code, str):
return False
return country_code.lower() in SCHENGEN_COUNTRIES
def extract_schengen_stays_from_travel(
travel_items: list[StrDict],
) -> list[SchengenStay]:
"""Extract Schengen stays from travel items."""
stays: list[SchengenStay] = []
current_location = None
entry_date = None
# Handle empty travel items
if not travel_items:
return stays
# Sort travel items by departure date, filtering out items without depart date
sorted_items = sorted(
[item for item in travel_items if item.get("depart")],
key=lambda x: depart_datetime(x),
)
for item in sorted_items:
from_country = None
to_country = None
travel_date = item.get("depart")
if not travel_date:
continue
# Extract travel date
if isinstance(travel_date, datetime):
travel_date = travel_date.date()
elif not isinstance(travel_date, date):
# Skip items with invalid travel dates
continue
# Determine origin and destination countries
if item.get("type") == "flight":
from_airport = item.get("from_airport", {})
to_airport = item.get("to_airport", {})
from_country = from_airport.get("country")
to_country = to_airport.get("country")
elif item.get("type") == "train":
from_station = item.get("from_station", {})
to_station = item.get("to_station", {})
from_country = from_station.get("country")
to_country = to_station.get("country")
elif item.get("type") == "ferry":
from_terminal = item.get("from_terminal", {})
to_terminal = item.get("to_terminal", {})
from_country = from_terminal.get("country")
to_country = to_terminal.get("country")
# Handle entering/exiting Schengen
if current_location and is_schengen_country(current_location):
# Currently in Schengen
if to_country and not is_schengen_country(to_country):
# Exiting Schengen - use departure date
if entry_date:
stays.append(
SchengenStay(
entry_date=entry_date,
exit_date=travel_date,
country=current_location,
days=0, # Will be calculated in __post_init__
)
)
entry_date = None
else:
# Currently outside Schengen
if to_country and is_schengen_country(to_country):
# Entering Schengen - use arrival date for long-haul flights
arrive_date = item.get("arrive")
assert arrive_date
if isinstance(arrive_date, datetime):
arrive_date = arrive_date.date()
assert isinstance(arrive_date, date)
entry_date = arrive_date
current_location = to_country
# Handle case where still in Schengen
if current_location and is_schengen_country(current_location) and entry_date:
stays.append(
SchengenStay(
entry_date=entry_date,
exit_date=None, # Still in Schengen
country=current_location,
days=0, # Will be calculated in __post_init__
)
)
return stays
def calculate_schengen_time(
travel_items: list[StrDict], calculation_date: date | None = None
) -> SchengenCalculation:
"""
Calculate Schengen rolling time compliance.
Args:
travel_items: List of travel items from the trip system
calculation_date: Date to calculate from (defaults to today)
Returns:
SchengenCalculation with compliance status and details
"""
if calculation_date is None:
calculation_date = date.today()
# Extract Schengen stays from travel data
stays = extract_schengen_stays_from_travel(travel_items)
# Calculate 180-day window (ending on calculation_date)
window_start = calculation_date - timedelta(days=179)
window_end = calculation_date
# Find stays that overlap with the 180-day window
relevant_stays = []
total_days = 0
for stay in stays:
# Check if stay overlaps with our 180-day window
stay_start = stay.entry_date
stay_end = stay.exit_date or calculation_date
if stay_end >= window_start and stay_start <= window_end:
# Calculate overlap with window
overlap_start = max(stay_start, window_start)
overlap_end = min(stay_end, window_end)
overlap_days = (overlap_end - overlap_start).days + 1
if overlap_days > 0:
# Create a new stay object for the overlapping period
overlapping_stay = SchengenStay(
entry_date=overlap_start,
exit_date=overlap_end if overlap_end != calculation_date else None,
country=stay.country,
days=overlap_days,
)
relevant_stays.append(overlapping_stay)
total_days += overlap_days
# Calculate compliance
is_compliant = total_days <= 90
days_remaining = max(0, 90 - total_days)
# Calculate next reset date (when earliest stay in window expires)
next_reset_date = None
if relevant_stays:
earliest_stay = min(relevant_stays, key=lambda s: s.entry_date)
next_reset_date = earliest_stay.entry_date + timedelta(days=180)
return SchengenCalculation(
total_days_used=total_days,
days_remaining=days_remaining,
is_compliant=is_compliant,
current_180_day_period=(window_start, window_end),
stays_in_period=relevant_stays,
next_reset_date=next_reset_date,
)
def format_schengen_report(calculation: SchengenCalculation) -> str:
"""Format a human-readable Schengen compliance report."""
report = []
# Header
report.append("=== SCHENGEN AREA COMPLIANCE REPORT ===")
report.append(
f"Calculation period: {calculation.current_180_day_period[0]} to {calculation.current_180_day_period[1]}"
)
report.append("")
# Summary
status = "✅ COMPLIANT" if calculation.is_compliant else "❌ NON-COMPLIANT"
report.append(f"Status: {status}")
report.append(f"Days used: {calculation.total_days_used}/90")
if calculation.is_compliant:
report.append(f"Days remaining: {calculation.days_remaining}")
else:
report.append(f"Days over limit: {calculation.days_over_limit}")
if calculation.next_reset_date:
report.append(f"Next reset date: {calculation.next_reset_date}")
report.append("")
# Detailed stays
if calculation.stays_in_period:
report.append("Stays in current 180-day period:")
for stay in calculation.stays_in_period:
exit_str = (
stay.exit_date.strftime("%Y-%m-%d") if stay.exit_date else "ongoing"
)
report.append(
f" • {stay.entry_date.strftime('%Y-%m-%d')} to {exit_str} "
f"({stay.country.upper()}): {stay.days} days"
)
else:
report.append("No Schengen stays in current 180-day period.")
return "\n".join(report)
def get_schengen_countries_list() -> list[str]:
"""Get a list of all Schengen area country codes."""
return sorted(list(SCHENGEN_COUNTRIES))
def predict_future_compliance(
travel_items: list[StrDict],
future_travel: list[tuple[date, date, str]], # (entry_date, exit_date, country)
) -> list[SchengenCalculation]:
"""
Predict future Schengen compliance with planned travel.
Args:
travel_items: Existing travel history
future_travel: List of planned trips as (entry_date, exit_date, country)
Returns:
List of SchengenCalculation objects for each planned trip
"""
predictions = []
# Create mock travel items for future trips
extended_travel = travel_items.copy()
for entry_date, exit_date, country in future_travel:
# Add entry
extended_travel.append(
{"type": "flight", "depart": entry_date, "to_airport": {"country": country}}
)
# Add exit
extended_travel.append(
{
"type": "flight",
"depart": exit_date,
"from_airport": {"country": country},
"to_airport": {"country": "gb"}, # Assuming return to UK
}
)
# Calculate compliance at the exit date
calculation = calculate_schengen_time(extended_travel, exit_date)
predictions.append(calculation)
return predictions

67
agenda/stats.py
View file

@ -1,67 +0,0 @@
"""Trip statistic functions."""
from collections import defaultdict
from typing import Counter, Mapping
from agenda.types import StrDict, Trip
def travel_legs(trip: Trip, stats: StrDict) -> None:
"""Calculate stats for travel legs."""
for leg in trip.travel:
stats.setdefault("co2_kg", 0)
stats.setdefault("co2_by_transport_type", {})
if "co2_kg" in leg:
stats["co2_kg"] += leg["co2_kg"]
transport_type = leg["type"]
stats["co2_by_transport_type"].setdefault(transport_type, 0)
stats["co2_by_transport_type"][transport_type] += leg["co2_kg"]
if leg["type"] == "flight":
stats.setdefault("flight_count", 0)
stats.setdefault("airlines", Counter())
stats["flight_count"] += 1
stats["airlines"][leg["airline_detail"]["name"]] += 1
if leg["type"] == "train":
stats.setdefault("train_count", 0)
stats["train_count"] += 1
def conferences(trip: Trip, yearly_stats: Mapping[int, StrDict]) -> None:
"""Calculate conference stats."""
for c in trip.conferences:
yearly_stats[c["start"].year].setdefault("conferences", 0)
yearly_stats[c["start"].year]["conferences"] += 1
def calculate_yearly_stats(trips: list[Trip]) -> dict[int, StrDict]:
"""Calculate total distance and distance by transport type grouped by year."""
yearly_stats: defaultdict[int, StrDict] = defaultdict(dict)
for trip in trips:
year = trip.start.year
dist = trip.total_distance()
yearly_stats[year].setdefault("count", 0)
yearly_stats[year]["count"] += 1
conferences(trip, yearly_stats)
if dist:
yearly_stats[year]["total_distance"] = (
yearly_stats[year].get("total_distance", 0) + trip.total_distance()
)
for transport_type, distance in trip.distances_by_transport_type():
yearly_stats[year].setdefault("distances_by_transport_type", {})
yearly_stats[year]["distances_by_transport_type"][transport_type] = (
yearly_stats[year]["distances_by_transport_type"].get(transport_type, 0)
+ distance
)
for country in trip.countries:
if country.alpha_2 == "GB":
continue
yearly_stats[year].setdefault("countries", set())
yearly_stats[year]["countries"].add(country)
travel_legs(trip, yearly_stats[year])
return dict(yearly_stats)

26
agenda/stock_market.py
View file

@ -3,14 +3,26 @@
from datetime import timedelta, timezone
import dateutil.tz
import exchange_calendars # type: ignore
import pandas # type: ignore
from . import utils
import exchange_calendars
import pandas
here = dateutil.tz.tzlocal()
def timedelta_display(delta: timedelta) -> str:
"""Format timedelta as a human readable string."""
total_seconds = int(delta.total_seconds())
days, remainder = divmod(total_seconds, 24 * 60 * 60)
hours, remainder = divmod(remainder, 60 * 60)
mins, secs = divmod(remainder, 60)
return " ".join(
f"{v:>3} {label}"
for v, label in ((days, "days"), (hours, "hrs"), (mins, "mins"))
if v
)
def open_and_close() -> list[str]:
"""Stock markets open and close times."""
# The trading calendars code is slow, maybe there is a faster way to do this
@ -28,11 +40,11 @@ def open_and_close() -> list[str]:
if cal.is_open_on_minute(now_local):
next_close = cal.next_close(now).tz_convert(here)
next_close = next_close.replace(minute=round(next_close.minute, -1))
delta_close = utils.timedelta_display(next_close - now_local)
delta_close = timedelta_display(next_close - now_local)
prev_open = cal.previous_open(now).tz_convert(here)
prev_open = prev_open.replace(minute=round(prev_open.minute, -1))
delta_open = utils.timedelta_display(now_local - prev_open)
delta_open = timedelta_display(now_local - prev_open)
msg = (
f"{label:>6} market opened {delta_open} ago, "
@ -42,7 +54,7 @@ def open_and_close() -> list[str]:
ts = cal.next_open(now)
ts = ts.replace(minute=round(ts.minute, -1))
ts = ts.tz_convert(here)
delta = utils.timedelta_display(ts - now_local)
delta = timedelta_display(ts - now_local)
msg = f"{label:>6} market opens in {delta}" + (
f" ({ts:%H:%M})" if (ts - now_local) < timedelta(days=1) else ""
)

2
agenda/subscription.py
View file

@ -2,7 +2,7 @@
import yaml
from .event import Event
from .types import Event
def get_events(filepath: str) -> list[Event]:

2
agenda/sun.py
View file

@ -3,7 +3,7 @@
import typing
from datetime import datetime
import ephem # type: ignore
import ephem
def bristol() -> ephem.Observer:

218
agenda/thespacedevs.py
View file

@ -5,43 +5,35 @@ import os
import typing
from datetime import datetime
import requests
from .types import StrDict
from .utils import filename_timestamp, get_most_recent_file
import httpx
Launch = dict[str, typing.Any]
Summary = dict[str, typing.Any]
ttl = 60 * 60 * 2 # two hours
LIMIT = 500
def next_launch_api_data(rocket_dir: str, limit: int = LIMIT) -> StrDict | None:
async def next_launch_api(rocket_dir: str, limit: int = 200) -> list[Launch]:
"""Get the next upcoming launches from the API."""
now = datetime.now()
filename = os.path.join(rocket_dir, now.strftime("%Y-%m-%d_%H:%M:%S.json"))
url = "https://ll.thespacedevs.com/2.2.0/launch/upcoming/"
params: dict[str, str | int] = {"limit": limit}
r = requests.get(url, params=params)
try:
data: StrDict = r.json()
except requests.exceptions.JSONDecodeError:
return None
async with httpx.AsyncClient() as client:
r = await client.get(url, params=params)
open(filename, "w").write(r.text)
return data
def next_launch_api(rocket_dir: str, limit: int = LIMIT) -> list[Summary] | None:
"""Get the next upcoming launches from the API."""
data = next_launch_api_data(rocket_dir, limit)
if not data:
return None
data = r.json()
return [summarize_launch(launch) for launch in data["results"]]
def filename_timestamp(filename: str) -> tuple[datetime, str] | None:
"""Get datetime from filename."""
try:
ts = datetime.strptime(filename, "%Y-%m-%d_%H:%M:%S.json")
except ValueError:
return None
return (ts, filename)
def format_time(time_str: str, net_precision: str) -> tuple[str, str | None]:
"""Format time based on precision."""
dt = datetime.strptime(time_str, "%Y-%m-%dT%H:%M:%SZ")
@ -124,7 +116,6 @@ def summarize_launch(launch: Launch) -> Summary:
return {
"name": launch.get("name"),
"slug": launch["slug"],
"status": launch.get("status"),
"net": launch.get("net"),
"net_precision": net_precision,
@ -135,7 +126,7 @@ def summarize_launch(launch: Launch) -> Summary:
"launch_provider": launch_provider,
"launch_provider_abbrev": launch_provider_abbrev,
"launch_provider_type": get_nested(launch, ["launch_service_provider", "type"]),
"rocket": launch["rocket"]["configuration"],
"rocket": launch["rocket"]["configuration"]["full_name"],
"mission": launch.get("mission"),
"mission_name": get_nested(launch, ["mission", "name"]),
"pad_name": launch["pad"]["name"],
@ -143,191 +134,24 @@ def summarize_launch(launch: Launch) -> Summary:
"location": launch["pad"]["location"]["name"],
"country_code": launch["pad"]["country_code"],
"orbit": get_nested(launch, ["mission", "orbit"]),
"probability": launch["probability"],
"weather_concerns": launch["weather_concerns"],
"image": launch.get("image"),
}
def load_cached_launches(rocket_dir: str) -> StrDict | None:
"""Read the most recent cache of launches."""
filename = get_most_recent_file(rocket_dir, "json")
return typing.cast(StrDict, json.load(open(filename))) if filename else None
def read_cached_launches(rocket_dir: str) -> list[Summary]:
"""Read cached launches."""
data = load_cached_launches(rocket_dir)
return [summarize_launch(launch) for launch in data["results"]] if data else []
def get_launches(
rocket_dir: str, limit: int = LIMIT, refresh: bool = False
) -> list[Summary] | None:
async def get_launches(rocket_dir: str, limit: int = 200) -> list[Summary]:
"""Get rocket launches with caching."""
now = datetime.now()
existing = [
x for x in (filename_timestamp(f, "json") for f in os.listdir(rocket_dir)) if x
]
existing = [x for x in (filename_timestamp(f) for f in os.listdir(rocket_dir)) if x]
existing.sort(reverse=True)
if refresh or not existing or (now - existing[0][0]).seconds > ttl:
if not existing or (now - existing[0][0]).seconds > 3600: # one hour
try:
return next_launch_api(rocket_dir, limit=limit)
except Exception:
pass # fallback to cached version
return await next_launch_api(rocket_dir, limit=limit)
except httpx.ReadTimeout:
pass
f = existing[0][1]
filename = os.path.join(rocket_dir, f)
data = json.load(open(filename))
return [summarize_launch(launch) for launch in data["results"]]
def format_date(dt: datetime) -> str:
"""Human readable date."""
return dt.strftime("%d %b %Y at %H:%M UTC")
def format_datetime_change(field_name: str, old_val: str, new_val: str) -> str:
"""Format a datetime field change with proper error handling."""
try:
old_dt = datetime.fromisoformat(old_val.replace("Z", "+00:00"))
new_dt = datetime.fromisoformat(new_val.replace("Z", "+00:00"))
return (
f"{field_name} changed from {format_date(old_dt)} to {format_date(new_dt)}"
)
except (ValueError, AttributeError):
return f"{field_name} changed from {old_val} to {new_val}"
def format_datetime_update(field_name: str, new_val: str) -> str:
"""Format a datetime field update (showing only the new value)."""
try:
new_dt = datetime.fromisoformat(new_val.replace("Z", "+00:00"))
return f"{field_name}: {format_date(new_dt)}"
except (ValueError, AttributeError):
return f"{field_name}: {new_val}"
def format_probability_change(old_val: int, new_val: int) -> str:
"""Format probability field changes."""
if old_val is None:
return f"Launch probability set to {new_val}%"
elif new_val is None:
return "Launch probability removed"
else:
return f"Launch probability changed from {old_val}% to {new_val}%"
def format_launch_changes(differences: StrDict) -> str:
"""Convert deepdiff output to human-readable format."""
changes: list[str] = []
processed_paths: set[str] = set()
SKIP_FIELDS = {
"agency_launch_attempt_count",
"agency_launch_attempt_count_year",
"location_launch_attempt_count",
"location_launch_attempt_count_year",
"pad_launch_attempt_count",
"pad_launch_attempt_count_year",
"orbital_launch_attempt_count",
"orbital_launch_attempt_count_year",
}
# --- 1. Handle Special Group Value Changes ---
# Process high-level, user-friendly summaries first.
values = differences.get("values_changed", {})
if "root['status']['name']" in values:
old_val = values["root['status']['name']"]["old_value"]
new_val = values["root['status']['name']"]["new_value"]
changes.append(f"Status changed from '{old_val}' to '{new_val}'")
processed_paths.add("root['status']")
if "root['net_precision']['name']" in values:
old_val = values["root['net_precision']['name']"]["old_value"]
new_val = values["root['net_precision']['name']"]["new_value"]
changes.append(f"Launch precision changed from '{old_val}' to '{new_val}'")
processed_paths.add("root['net_precision']")
# --- 2. Handle Type Changes ---
# This is often more significant than a value change (e.g., probability becoming None).
if "type_changes" in differences:
for path, change in differences["type_changes"].items():
if any(path.startswith(p) for p in processed_paths):
continue
field = path.replace("root['", "").replace("']", "").replace("root.", "")
if field == "probability":
# Use custom formatter only for meaningful None transitions.
if change["old_type"] is type(None) or change["new_type"] is type(None):
changes.append(
format_probability_change(
change["old_value"], change["new_value"]
)
)
else: # For other type changes (e.g., int to str), use the generic message.
changes.append(
f"{field.replace('_', ' ').title()} type changed "
+ f"from {change['old_type'].__name__} to {change['new_type'].__name__}"
)
else:
changes.append(
f"{field.replace('_', ' ').title()} type changed "
+ f"from {change['old_type'].__name__} to {change['new_type'].__name__}"
)
processed_paths.add(path)
# --- 3. Handle Remaining Value Changes ---
for path, change in values.items():
if any(path.startswith(p) for p in processed_paths):
continue
field = path.replace("root['", "").replace("']", "").replace("root.", "")
if field in SKIP_FIELDS:
continue
old_val = change["old_value"]
new_val = change["new_value"]
match field:
case "net":
changes.append(format_datetime_change("Launch time", old_val, new_val))
case "window_start":
changes.append(
format_datetime_change("Launch window start", old_val, new_val)
)
case "window_end":
changes.append(
format_datetime_change("Launch window end", old_val, new_val)
)
case "last_updated":
changes.append(format_datetime_update("Last updated", new_val))
case "name":
changes.append(f"Mission name changed from '{old_val}' to '{new_val}'")
case "probability":
changes.append(format_probability_change(old_val, new_val))
case _:
changes.append(f"{field} changed from '{old_val}' to '{new_val}'")
processed_paths.add(path)
# --- 4. Handle Added/Removed Fields ---
if "dictionary_item_added" in differences:
for path in differences["dictionary_item_added"]:
field = path.replace("root['", "").replace("']", "").replace("root.", "")
changes.append(f"New field added: {field.replace('_', ' ').title()}")
if "dictionary_item_removed" in differences:
for path in differences["dictionary_item_removed"]:
field = path.replace("root['", "").replace("']", "").replace("root.", "")
changes.append(f"Field removed: {field.replace('_', ' ').title()}")
# Sort changes for deterministic output in tests
return (
"\n".join(f"• {change}" for change in sorted(changes))
if changes
else "No specific changes detected"
)

120
agenda/travel.py
View file

@ -1,86 +1,36 @@
"""Travel."""
import decimal
import json
import os
import typing
import flask
import yaml
from geopy.distance import geodesic # type: ignore
from .event import Event
from .types import StrDict
from .types import Event
Leg = dict[str, str]
TravelList = list[dict[str, typing.Any]]
RouteDistances = dict[tuple[str, str], float]
def coords(airport: StrDict) -> tuple[float, float]:
"""Longitude / Latitude as coordinate tuples."""
# return (airport["longitude"], airport["latitude"])
return (airport["latitude"], airport["longitude"])
def flight_distance(f: StrDict) -> float:
"""Distance of flight."""
return float(geodesic(coords(f["from_airport"]), coords(f["to_airport"])).km)
def route_distances_as_json(route_distances: RouteDistances) -> str:
"""Format route distances as JSON string."""
return (
"[\n"
+ ",\n".join(
" " + json.dumps([s1, s2, dist])
for (s1, s2), dist in route_distances.items()
)
+ "\n]"
)
def parse_yaml(travel_type: str, data_dir: str) -> TravelList:
"""Parse flights YAML and return list of travel."""
filepath = os.path.join(data_dir, travel_type + ".yaml")
items: TravelList = yaml.safe_load(open(filepath))
if not all(isinstance(item, dict) for item in items):
return items
for item in items:
price = item.get("price")
if price:
item["price"] = decimal.Decimal(price)
return items
return typing.cast(TravelList, yaml.safe_load(open(filepath)))
def get_flights(data_dir: str) -> list[Event]:
"""Get travel events."""
bookings = parse_yaml("flights", data_dir)
airlines = parse_yaml("airlines", data_dir)
by_iata = {a["iata"]: a for a in airlines}
events = []
for booking in bookings:
for item in booking["flights"]:
if not item["depart"].date():
continue
airline = by_iata[item["airline"]]
item["airline_code"] = airline[
"iata" if not airline.get("flight_number_prefer_icao") else "icao"
]
e = Event(
date=item["depart"],
end_date=item.get("arrive"),
name="transport",
title=f'✈️ {item["from"]} to {item["to"]} ({flight_number(item)})',
url=(item.get("url") if flask.g.user.is_authenticated else None),
)
events.append(e)
return events
return [
Event(
date=item["depart"],
end_date=item.get("arrive"),
name="transport",
title=f'✈️ {item["from"]} to {item["to"]} ({flight_number(item)})',
url=item.get("url"),
)
for item in parse_yaml("flights", data_dir)
if item["depart"].date()
]
def get_trains(data_dir: str) -> list[Event]:
@ -93,7 +43,7 @@ def get_trains(data_dir: str) -> list[Event]:
end_date=leg["arrive"],
name="transport",
title=f'🚆 {leg["from"]} to {leg["to"]}',
url=(item.get("url") if flask.g.user.is_authenticated else None),
url=item.get("url"),
)
for leg in item["legs"]
]
@ -102,7 +52,7 @@ def get_trains(data_dir: str) -> list[Event]:
def flight_number(flight: Leg) -> str:
"""Flight number."""
airline_code = flight["airline_code"]
airline_code = flight["airline"]
# make sure this is the airline code, not the airline name
assert " " not in airline_code and not any(c.islower() for c in airline_code)
@ -112,43 +62,3 @@ def flight_number(flight: Leg) -> str:
def all_events(data_dir: str) -> list[Event]:
"""Get all flights and rail journeys."""
return get_trains(data_dir) + get_flights(data_dir)
def train_leg_distance(geojson_data: StrDict) -> float:
"""Calculate the total length of a LineString in kilometers from GeoJSON data."""
# Extract coordinates
first_object = geojson_data["features"][0]["geometry"]
assert first_object["type"] in ("LineString", "MultiLineString")
if first_object["type"] == "LineString":
coord_list = [first_object["coordinates"]]
else:
first_object["type"] == "MultiLineString"
coord_list = first_object["coordinates"]
total_length_km = 0.0
for coordinates in coord_list:
total_length_km += sum(
float(geodesic(coordinates[i], coordinates[i + 1]).km)
for i in range(len(coordinates) - 1)
)
return total_length_km
def load_route_distances(data_dir: str) -> RouteDistances:
"""Load cache of route distances."""
route_distances: RouteDistances = {}
with open(os.path.join(data_dir, "route_distances.json")) as f:
for s1, s2, dist in json.load(f):
route_distances[(s1, s2)] = dist
return route_distances
def add_leg_route_distance(leg: StrDict, route_distances: RouteDistances) -> None:
s1, s2 = sorted([leg["from"], leg["to"]])
dist = route_distances.get((s1, s2))
if dist:
leg["distance"] = dist

498
agenda/trip.py
View file

@ -1,498 +0,0 @@
"""Trips."""
import decimal
import os
import typing
from datetime import date, datetime, time
from zoneinfo import ZoneInfo
import flask
import yaml
from agenda import travel
from agenda.types import StrDict, Trip
class Airline(typing.TypedDict, total=False):
"""Airline."""
iata: str
icao: str
name: str
def load_travel(travel_type: str, plural: str, data_dir: str) -> list[StrDict]:
"""Read flight and train journeys."""
items = travel.parse_yaml(plural, data_dir)
for item in items:
item["type"] = travel_type
return items
def add_station_objects(item: StrDict, by_name: dict[str, StrDict]) -> None:
"""Lookup stations and add to train or leg."""
item["from_station"] = by_name[item["from"]]
item["to_station"] = by_name[item["to"]]
def load_trains(
data_dir: str, route_distances: travel.RouteDistances | None = None
) -> list[StrDict]:
"""Load trains."""
trains = load_travel("train", "trains", data_dir)
stations = travel.parse_yaml("stations", data_dir)
by_name = {station["name"]: station for station in stations}
for train in trains:
add_station_objects(train, by_name)
for leg in train["legs"]:
add_station_objects(leg, by_name)
if route_distances:
travel.add_leg_route_distance(leg, route_distances)
# Calculate CO2 emissions for train leg (0.037 kg CO2e per passenger per km)
if "distance" in leg:
leg["co2_kg"] = leg["distance"] * 0.037
if all("distance" in leg for leg in train["legs"]):
train["distance"] = sum(leg["distance"] for leg in train["legs"])
# Calculate total CO2 for entire train journey
train["co2_kg"] = sum(leg["co2_kg"] for leg in train["legs"])
return trains
def load_ferries(
data_dir: str, route_distances: travel.RouteDistances | None = None
) -> list[StrDict]:
"""Load ferries."""
ferries = load_travel("ferry", "ferries", data_dir)
terminals = travel.parse_yaml("ferry_terminals", data_dir)
by_name = {terminal["name"]: terminal for terminal in terminals}
for item in ferries:
assert item["from"] in by_name and item["to"] in by_name
from_terminal, to_terminal = by_name[item["from"]], by_name[item["to"]]
item["from_terminal"] = from_terminal
item["to_terminal"] = to_terminal
if route_distances:
travel.add_leg_route_distance(item, route_distances)
# Calculate CO2 emissions for ferry (0.02254 kg CO2e per passenger per km)
if "distance" in item:
item["co2_kg"] = item["distance"] * 0.02254
geojson = from_terminal["routes"].get(item["to"])
if geojson:
item["geojson_filename"] = geojson
return ferries
def load_coaches(
data_dir: str, route_distances: travel.RouteDistances | None = None
) -> list[StrDict]:
"""Load coaches."""
coaches = load_travel("coach", "coaches", data_dir)
stations = travel.parse_yaml("coach_stations", data_dir)
by_name = {station["name"]: station for station in stations}
for item in coaches:
add_station_objects(item, by_name)
# Add route distance and CO2 calculation if available
if route_distances:
travel.add_leg_route_distance(item, route_distances)
if "distance" in item:
# Calculate CO2 emissions for coach (0.027 kg CO2e per passenger per km)
item["co2_kg"] = item["distance"] * 0.027
# Include GeoJSON route if defined in stations data
from_station = item.get("from_station")
to_station = item.get("to_station")
if from_station and to_station:
# Support scalar or mapping routes: string or dict of station name -> geojson base name
routes_val = from_station.get("routes", {})
if isinstance(routes_val, str):
geo = routes_val
else:
geo = routes_val.get(to_station.get("name"))
if geo:
item["geojson_filename"] = geo
return coaches
def depart_datetime(item: StrDict) -> datetime:
"""Return a datetime for this travel item.
If the travel item already has a datetime return that, otherwise if the
departure time is just a date return midnight UTC for that date.
"""
depart = item["depart"]
if isinstance(depart, datetime):
return depart
return datetime.combine(depart, time.min).replace(tzinfo=ZoneInfo("UTC"))
def process_flight(
flight: StrDict, by_iata: dict[str, Airline], airports: list[StrDict]
) -> None:
"""Add airport detail, airline name and distance to flight."""
if flight["from"] in airports:
flight["from_airport"] = airports[flight["from"]]
if flight["to"] in airports:
flight["to_airport"] = airports[flight["to"]]
if "airline" in flight:
airline = by_iata[flight["airline"]]
flight["airline_detail"] = airline
flight["airline_code"] = airline[
"iata" if not airline.get("flight_number_prefer_icao") else "icao"
]
flight["distance"] = travel.flight_distance(flight)
def load_flight_bookings(data_dir: str) -> list[StrDict]:
"""Load flight bookings."""
bookings = load_travel("flight", "flights", data_dir)
airlines = yaml.safe_load(open(os.path.join(data_dir, "airlines.yaml")))
by_iata = {a["iata"]: a for a in airlines}
airports = travel.parse_yaml("airports", data_dir)
for booking in bookings:
for flight in booking["flights"]:
process_flight(flight, by_iata, airports)
return bookings
def load_flights(flight_bookings: list[StrDict]) -> list[StrDict]:
"""Load flights."""
flights = []
for booking in flight_bookings:
for flight in booking["flights"]:
for f in "type", "trip", "booking_reference", "price", "currency":
if f in booking:
flight[f] = booking[f]
flights.append(flight)
return flights
def collect_travel_items(
flight_bookings: list[StrDict],
data_dir: str | None = None,
route_distances: travel.RouteDistances | None = None,
) -> list[StrDict]:
"""Generate list of trips."""
if data_dir is None:
data_dir = flask.current_app.config["PERSONAL_DATA"]
return sorted(
load_flights(load_flight_bookings(data_dir))
+ load_trains(data_dir, route_distances=route_distances)
+ load_ferries(data_dir, route_distances=route_distances)
+ load_coaches(data_dir, route_distances=route_distances),
key=depart_datetime,
)
def group_travel_items_into_trips(
data: StrDict, yaml_trip_list: list[StrDict]
) -> list[Trip]:
"""Group travel items into trips."""
trips: dict[date, Trip] = {}
yaml_trip_lookup = {item["trip"]: item for item in yaml_trip_list}
for key, item_list in data.items():
assert isinstance(item_list, list)
for item in item_list:
if not (start := item.get("trip")):
continue
if start not in trips:
from_yaml = yaml_trip_lookup.get(start, {})
trips[start] = Trip(
start=start, **{k: v for k, v in from_yaml.items() if k != "trip"}
)
getattr(trips[start], key).append(item)
return [trip for _, trip in sorted(trips.items())]
def build_trip_list(
data_dir: str | None = None,
route_distances: travel.RouteDistances | None = None,
) -> list[Trip]:
"""Generate list of trips."""
if data_dir is None:
data_dir = flask.current_app.config["PERSONAL_DATA"]
yaml_trip_list = travel.parse_yaml("trips", data_dir)
flight_bookings = load_flight_bookings(data_dir)
data = {
"flight_bookings": flight_bookings,
"travel": collect_travel_items(flight_bookings, data_dir, route_distances),
"accommodation": travel.parse_yaml("accommodation", data_dir),
"conferences": travel.parse_yaml("conferences", data_dir),
"events": travel.parse_yaml("events", data_dir),
}
for item in data["accommodation"]:
price = item.get("price")
if price:
item["price"] = decimal.Decimal(price)
return group_travel_items_into_trips(data, yaml_trip_list)
def add_coordinates_for_unbooked_flights(
routes: list[StrDict], coordinates: list[StrDict]
) -> None:
"""Add coordinates for flights that haven't been booked yet."""
if not (
any(route["type"] == "unbooked_flight" for route in routes)
and not any(pin["type"] == "airport" for pin in coordinates)
):
return
data_dir = flask.current_app.config["PERSONAL_DATA"]
airports = typing.cast(dict[str, StrDict], travel.parse_yaml("airports", data_dir))
lhr = airports["LHR"]
coordinates.append(
{
"name": lhr["name"],
"type": "airport",
"latitude": lhr["latitude"],
"longitude": lhr["longitude"],
}
)
def stations_from_travel(t: StrDict) -> list[StrDict]:
"""Stations from train journey."""
station_list = [t["from_station"], t["to_station"]]
for leg in t["legs"]:
station_list.append(leg["from_station"])
station_list.append(leg["to_station"])
return station_list
def process_station_list(station_list: list[StrDict]) -> StrDict:
"""Proess sation list."""
stations = {}
for s in station_list:
if s["name"] in stations:
continue
stations[s["name"]] = s
return stations
def get_locations(trip: Trip) -> dict[str, StrDict]:
"""Collect locations of all travel locations in trip."""
locations: dict[str, StrDict] = {
"station": {},
"airport": {},
"ferry_terminal": {},
}
station_list = []
for t in trip.travel:
match t["type"]:
case "train":
station_list += stations_from_travel(t)
case "coach":
station_list += [t["from_station"], t["to_station"]]
case "flight":
for field in "from_airport", "to_airport":
if field in t:
locations["airport"][t[field]["iata"]] = t[field]
case "ferry":
for field in "from_terminal", "to_terminal":
terminal = t[field]
locations["ferry_terminal"][terminal["name"]] = terminal
locations["station"] = process_station_list(station_list)
return locations
def coordinate_dict(item: StrDict, coord_type: str) -> StrDict:
"""Build coordinate dict for item."""
return {
"name": item["name"],
"type": coord_type,
"latitude": item["latitude"],
"longitude": item["longitude"],
}
def collect_trip_coordinates(trip: Trip) -> list[StrDict]:
"""Extract and de-duplicate travel location coordinates from trip."""
coords = []
src = [
("accommodation", trip.accommodation),
("conference", trip.conferences),
("event", trip.events),
]
for coord_type, item_list in src:
coords += [
coordinate_dict(item, coord_type)
for item in item_list
if "latitude" in item and "longitude" in item
]
locations = get_locations(trip)
for coord_type, coord_dict in locations.items():
coords += [coordinate_dict(s, coord_type) for s in coord_dict.values()]
return coords
def latlon_tuple_prefer_airport(stop: StrDict, data_dir: str) -> tuple[float, float]:
airport_lookup = {
("Berlin", "de"): "BER",
("Hamburg", "de"): "HAM",
}
iata = airport_lookup.get((stop["location"], stop["country"]))
if not iata:
return latlon_tuple(stop)
airports = typing.cast(dict[str, StrDict], travel.parse_yaml("airports", data_dir))
return latlon_tuple(airports[iata])
def latlon_tuple(stop: StrDict) -> tuple[float, float]:
"""Given a transport stop return the lat/lon as a tuple."""
return (stop["latitude"], stop["longitude"])
def read_geojson(data_dir: str, filename: str) -> str:
"""Read GeoJSON from file."""
return open(os.path.join(data_dir, filename + ".geojson")).read()
def get_trip_routes(trip: Trip, data_dir: str) -> list[StrDict]:
"""Get routes for given trip to show on map."""
routes: list[StrDict] = []
seen_geojson = set()
for t in trip.travel:
if t["type"] == "ferry":
ferry_from, ferry_to = t["from_terminal"], t["to_terminal"]
key = "_".join(["ferry"] + sorted([ferry_from["name"], ferry_to["name"]]))
filename = os.path.join("ferry_routes", t["geojson_filename"])
routes.append(
{
"type": "train",
"key": key,
"geojson_filename": filename,
}
)
continue
if t["type"] == "flight":
if "from_airport" not in t or "to_airport" not in t:
continue
fly_from, fly_to = t["from_airport"], t["to_airport"]
key = "_".join(["flight"] + sorted([fly_from["iata"], fly_to["iata"]]))
routes.append(
{
"type": "flight",
"key": key,
"from": latlon_tuple(fly_from),
"to": latlon_tuple(fly_to),
}
)
continue
if t["type"] == "coach":
coach_from, coach_to = t["from_station"], t["to_station"]
key = "_".join(["coach"] + sorted([coach_from["name"], coach_to["name"]]))
# Use GeoJSON route when available, otherwise draw straight line
if t.get("geojson_filename"):
filename = os.path.join("coach_routes", t["geojson_filename"])
routes.append({"type": "coach", "key": key, "geojson_filename": filename})
else:
routes.append(
{
"type": "coach",
"key": key,
"from": latlon_tuple(coach_from),
"to": latlon_tuple(coach_to),
}
)
continue
if t["type"] == "train":
for leg in t["legs"]:
train_from, train_to = leg["from_station"], leg["to_station"]
geojson_filename = train_from.get("routes", {}).get(train_to["name"])
key = "_".join(["train"] + sorted([train_from["name"], train_to["name"]]))
if not geojson_filename:
routes.append(
{
"type": "train",
"key": key,
"from": latlon_tuple(train_from),
"to": latlon_tuple(train_to),
}
)
continue
if geojson_filename in seen_geojson:
continue
seen_geojson.add(geojson_filename)
routes.append(
{
"type": "train",
"key": key,
"geojson_filename": os.path.join("train_routes", geojson_filename),
}
)
if routes:
return routes
lhr = (51.4775, -0.461389)
return [
{
"type": "unbooked_flight",
"key": f'LHR_{item["location"]}_{item["country"]}',
"from": lhr,
"to": latlon_tuple_prefer_airport(item, data_dir),
}
for item in trip.conferences
if "latitude" in item
and "longitude" in item
and item["country"] not in {"gb", "be", "fr"} # not flying to Belgium or France
]
def get_coordinates_and_routes(
trip_list: list[Trip], data_dir: str | None = None
) -> tuple[list[StrDict], list[StrDict]]:
"""Given a list of trips return the associated coordinates and routes."""
if data_dir is None:
data_dir = flask.current_app.config["PERSONAL_DATA"]
coordinates = []
seen_coordinates: set[tuple[str, str]] = set()
routes = []
seen_routes: set[str] = set()
for trip in trip_list:
for stop in collect_trip_coordinates(trip):
key = (stop["type"], stop["name"])
if key in seen_coordinates:
continue
coordinates.append(stop)
seen_coordinates.add(key)
for route in get_trip_routes(trip, data_dir):
if route["key"] in seen_routes:
continue
routes.append(route)
seen_routes.add(route["key"])
for route in routes:
if "geojson_filename" in route:
route["geojson"] = read_geojson(data_dir, route.pop("geojson_filename"))
return (coordinates, routes)

288
agenda/trip_schengen.py
View file

@ -1,288 +0,0 @@
"""Integration of Schengen calculator with the existing trip system."""
import logging
import typing
from datetime import date, timedelta
import flask
from . import get_country, trip
from .schengen import calculate_schengen_time, extract_schengen_stays_from_travel
from .types import SchengenCalculation, SchengenStay, StrDict, Trip
def add_schengen_compliance_to_trip(trip_obj: Trip) -> Trip:
"""Add Schengen compliance information to a trip object."""
try:
# Calculate Schengen compliance for the trip
calculation = calculate_schengen_time(trip_obj.travel)
# Add the calculation to the trip object
trip_obj.schengen_compliance = calculation
except Exception as e:
# Log the error but don't fail the trip loading
logging.warning(
f"Failed to calculate Schengen compliance for trip {trip_obj.start}: {e}"
)
trip_obj.schengen_compliance = None
return trip_obj
def get_schengen_compliance_for_all_trips(
trip_list: list[Trip],
) -> dict[date, SchengenCalculation]:
"""Calculate Schengen compliance for all trips."""
compliance_by_date = {}
# Collect all travel items across all trips
all_travel_items = []
for trip_obj in trip_list:
all_travel_items.extend(trip_obj.travel)
# Calculate compliance for each trip's start date
for trip_obj in trip_list:
calculation = calculate_schengen_time(all_travel_items, trip_obj.start)
compliance_by_date[trip_obj.start] = calculation
return compliance_by_date
def generate_schengen_warnings(trip_list: list[Trip]) -> list[dict[str, typing.Any]]:
"""Generate warnings for potential Schengen violations."""
warnings = []
# Get compliance for all trips
compliance_by_date = get_schengen_compliance_for_all_trips(trip_list)
for trip_date, calculation in compliance_by_date.items():
if not calculation.is_compliant:
warnings.append(
{
"type": "schengen_violation",
"date": trip_date,
"message": f"Schengen violation on {trip_date}: {calculation.days_over_limit} days over limit",
"severity": "error",
"calculation": calculation,
}
)
elif calculation.days_remaining < 10:
warnings.append(
{
"type": "schengen_warning",
"date": trip_date,
"message": f"Low Schengen allowance on {trip_date}: only {calculation.days_remaining} days remaining",
"severity": "warning",
"calculation": calculation,
}
)
return warnings
def extract_schengen_stays_with_trip_info(
trip_list: list[Trip],
) -> list[SchengenStay]:
"""Extract Schengen stays from travel items with trip information."""
# Create a mapping of travel items to their trips
travel_to_trip_map = {}
for trip_obj in trip_list:
for travel_item in trip_obj.travel:
travel_to_trip_map[id(travel_item)] = trip_obj
# Collect all travel items
all_travel_items = []
for trip_obj in trip_list:
all_travel_items.extend(trip_obj.travel)
# Get stays with trip information
stays = extract_schengen_stays_from_travel(all_travel_items)
# Try to associate stays with trips based on entry dates
for stay in stays:
# Find the trip that contains this stay's entry date
for trip_obj in trip_list:
if trip_obj.start <= stay.entry_date <= (trip_obj.end or stay.entry_date):
stay.trip_date = trip_obj.start
stay.trip_name = trip_obj.title
break
# If no exact match, find the closest trip by start date
if stay.trip_date is None:
closest_trip = min(
trip_list,
key=lambda t: abs((t.start - stay.entry_date).days),
default=None,
)
if closest_trip:
stay.trip_date = closest_trip.start
stay.trip_name = closest_trip.title
return stays
def schengen_dashboard_data(data_dir: str | None = None) -> dict[str, typing.Any]:
"""Generate dashboard data for Schengen compliance."""
if data_dir is None:
data_dir = flask.current_app.config["PERSONAL_DATA"]
# Load all trips
trip_list = trip.build_trip_list(data_dir)
# Calculate current compliance with trip information
all_travel_items = []
for trip_obj in trip_list:
all_travel_items.extend(trip_obj.travel)
current_calculation = calculate_schengen_time(all_travel_items)
# Get stays with trip information
stays_with_trip_info = extract_schengen_stays_with_trip_info(trip_list)
# Update current calculation with trip information
current_calculation.stays_in_period = [
stay
for stay in stays_with_trip_info
if stay.entry_date >= current_calculation.current_180_day_period[0]
and stay.entry_date <= current_calculation.current_180_day_period[1]
]
# Generate warnings
warnings = generate_schengen_warnings(trip_list)
# Get compliance history for the last year
compliance_history = []
current_date = date.today()
for i in range(365, 0, -7): # Weekly snapshots for the last year
snapshot_date = current_date - timedelta(days=i)
calculation = calculate_schengen_time(all_travel_items, snapshot_date)
compliance_history.append(
{
"date": snapshot_date,
"days_used": calculation.total_days_used,
"is_compliant": calculation.is_compliant,
}
)
return {
"current_compliance": current_calculation,
"warnings": warnings,
"compliance_history": compliance_history,
"trips_with_compliance": get_schengen_compliance_for_all_trips(trip_list),
}
def flask_route_schengen_report() -> str:
"""Flask route for Schengen compliance report."""
data_dir = flask.current_app.config["PERSONAL_DATA"]
dashboard_data = schengen_dashboard_data(data_dir)
# Load trips for the template
trip_list = trip.build_trip_list(data_dir)
return flask.render_template(
"schengen_report.html",
trip_list=trip_list,
get_country=get_country,
**dashboard_data,
)
def export_schengen_data_for_external_calculator(
travel_items: list[StrDict],
) -> list[dict[str, typing.Any]]:
"""Export travel data in format suitable for external Schengen calculators."""
stays = extract_schengen_stays_from_travel(travel_items)
export_data = []
for stay in stays:
export_data.append(
{
"entry_date": stay.entry_date.strftime("%Y-%m-%d"),
"exit_date": (
stay.exit_date.strftime("%Y-%m-%d") if stay.exit_date else None
),
"country": stay.country.upper(),
"days": stay.days,
}
)
return export_data
def add_schengen_info_to_events(events: list, data_dir: str | None = None) -> list:
"""Add Schengen compliance info to event list."""
if data_dir is None:
data_dir = flask.current_app.config["PERSONAL_DATA"]
# Load all trips to get travel context
trip_list = trip.build_trip_list(data_dir)
all_travel_items = []
for trip_obj in trip_list:
all_travel_items.extend(trip_obj.travel)
# Add Schengen status to each event
for event in events:
if hasattr(event, "date"):
calculation = calculate_schengen_time(all_travel_items, event.date)
event.schengen_days_used = calculation.total_days_used
event.schengen_compliant = calculation.is_compliant
event.schengen_days_remaining = calculation.days_remaining
return events
# Integration with existing trip.py functions
def enhanced_build_trip_list(
data_dir: str | None = None,
route_distances: typing.Any = None,
include_schengen: bool = True,
) -> list[Trip]:
"""Enhanced version of build_trip_list that includes Schengen compliance."""
# Use the original function
trip_list = trip.build_trip_list(data_dir, route_distances)
if include_schengen:
# Add Schengen compliance to each trip
for trip_obj in trip_list:
add_schengen_compliance_to_trip(trip_obj)
return trip_list
def check_schengen_compliance_for_new_trip(
existing_trips: list[Trip],
new_trip_dates: tuple[date, date],
destination_country: str,
) -> SchengenCalculation:
"""Check if a new trip would violate Schengen rules."""
# Collect all existing travel
all_travel_items = []
for trip_obj in existing_trips:
all_travel_items.extend(trip_obj.travel)
# Add the new trip as mock travel items
entry_date, exit_date = new_trip_dates
# Mock entry to Schengen
all_travel_items.append(
{
"type": "flight",
"depart": entry_date,
"to_airport": {"country": destination_country},
}
)
# Mock exit from Schengen
all_travel_items.append(
{
"type": "flight",
"depart": exit_date,
"from_airport": {"country": destination_country},
"to_airport": {"country": "gb"}, # Assuming return to UK
}
)
# Calculate compliance at the exit date
return calculate_schengen_time(all_travel_items, exit_date)

515
agenda/types.py
View file

@ -1,447 +1,104 @@
"""Types."""
import collections
import dataclasses
import datetime
import functools
import typing
from collections import defaultdict
from dataclasses import dataclass, field
from datetime import date
import emoji
from pycountry.db import Country
import agenda
from agenda import format_list_with_ampersand
from . import utils
StrDict = dict[str, typing.Any]
DateOrDateTime = datetime.datetime | datetime.date
@dataclass
class TripElement:
"""Trip element."""
start_time: DateOrDateTime
title: str
element_type: str
detail: StrDict
end_time: DateOrDateTime | None = None
start_loc: str | None = None
end_loc: str | None = None
start_country: Country | None = None
end_country: Country | None = None
def get_emoji(self) -> str | None:
"""Emoji for trip element."""
emoji_map = {
"check-in": ":hotel:",
"check-out": ":hotel:",
"train": ":train:",
"flight": ":airplane:",
"ferry": ":ferry:",
"coach": ":bus:",
}
alias = emoji_map.get(self.element_type)
return emoji.emojize(alias, language="alias") if alias else None
def airport_label(airport: StrDict) -> str:
"""Airport label: name and iata."""
name = airport.get("alt_name") or airport["city"]
return f"{name} ({airport['iata']})"
@dataclass
class Trip:
"""Trip."""
start: datetime.date
travel: list[StrDict] = field(default_factory=list)
accommodation: list[StrDict] = field(default_factory=list)
conferences: list[StrDict] = field(default_factory=list)
events: list[StrDict] = field(default_factory=list)
flight_bookings: list[StrDict] = field(default_factory=list)
name: str | None = None
private: bool = False
schengen_compliance: typing.Optional["SchengenCalculation"] = None
@property
def title(self) -> str:
"""Trip title."""
if self.name:
return self.name
titles: list[str] = [conf["name"] for conf in self.conferences] + [
event["title"] for event in self.events
] or self.titles_from_travel()
if not titles:
titles = [acc["location"] for acc in self.accommodation]
return format_list_with_ampersand(titles) or "[unnamed trip]"
def titles_from_travel(self) -> list[str]:
"""Titles from travel."""
titles = []
for travel in self.travel:
if not (depart := (travel["depart"] and utils.as_date(travel["depart"]))):
continue
for when, from_or_to in ((self.start, "from"), (self.end, "to")):
if depart != when and travel[from_or_to] not in titles:
titles.append(travel[from_or_to])
return titles
@property
def end(self) -> datetime.date | None:
"""End date for trip."""
max_conference_end = (
max(utils.as_date(item["end"]) for item in self.conferences)
if self.conferences
else datetime.date.min
)
assert isinstance(max_conference_end, datetime.date)
arrive = [
utils.as_date(item["arrive"]) for item in self.travel if "arrive" in item
]
travel_end = max(arrive) if arrive else datetime.date.min
assert isinstance(travel_end, datetime.date)
accommodation_end = (
max(utils.as_date(item["to"]) for item in self.accommodation)
if self.accommodation
else datetime.date.min
)
assert isinstance(accommodation_end, datetime.date)
max_date = max(max_conference_end, travel_end, accommodation_end)
return max_date if max_date != datetime.date.min else None
def locations(self) -> list[tuple[str, Country]]:
"""Locations for trip."""
seen: set[tuple[str, str]] = set()
items = []
for item in self.conferences + self.accommodation + self.events:
if "country" not in item or "location" not in item:
continue
key = (item["location"], item["country"])
if key in seen:
continue
seen.add(key)
country = agenda.get_country(item["country"])
assert country
items.append((item["location"], country))
return items
@property
def countries(self) -> list[Country]:
"""Countries visited as part of trip, in order."""
seen: set[str] = set()
items: list[Country] = []
for item in self.conferences + self.accommodation + self.events:
if "country" not in item:
continue
if item["country"] in seen:
continue
seen.add(item["country"])
country = agenda.get_country(item["country"])
assert country
items.append(country)
for item in self.travel:
travel_countries = set()
if item["type"] == "flight":
for key in "from_airport", "to_airport":
c = item[key]["country"]
travel_countries.add(c)
if item["type"] == "train":
for leg in item["legs"]:
for key in "from_station", "to_station":
c = leg[key]["country"]
travel_countries.add(c)
for c in travel_countries - seen:
seen.add(c)
country = agenda.get_country(c)
assert country
items.append(country)
# Don't include GB in countries visited unless entire trip was GB based
return [c for c in items if c.alpha_2 != "GB"] or items
@functools.cached_property
def show_flags(self) -> bool:
"""Show flags for international trips."""
return len({c for c in self.countries if c.name != "United Kingdom"}) > 1
@property
def countries_str(self) -> str:
"""List of countries visited on this trip."""
return format_list_with_ampersand(
[f"{c.name} {c.flag}" for c in self.countries]
)
@property
def locations_str(self) -> str:
"""List of countries visited on this trip."""
return format_list_with_ampersand(
[
f"{location} ({c.name})" + (f" {c.flag}" if self.show_flags else "")
for location, c in self.locations()
]
)
@property
def country_flags(self) -> str:
"""Countries flags for trip."""
return "".join(c.flag for c in self.countries)
def total_distance(self) -> float:
"""Total distance for trip.
Sums distances for travel items where a distance value is present.
Ignores legs with missing or falsy distances rather than returning None.
"""
total = 0.0
for t in self.travel:
distance = t.get("distance")
if distance:
total += distance
return total
def total_co2_kg(self) -> float | None:
"""Total CO₂ for trip."""
return sum(float(t.get("co2_kg", 0)) for t in self.travel)
@property
def flights(self) -> list[StrDict]:
"""Flights."""
return [item for item in self.travel if item["type"] == "flight"]
def distances_by_transport_type(self) -> list[tuple[str, float]]:
"""Calculate the total distance travelled for each type of transport.
Any travel item with a missing or None 'distance' field is ignored.
"""
transport_distances: defaultdict[str, float] = defaultdict(float)
for item in self.travel:
distance = item.get("distance")
if distance:
transport_type: str = item.get("type", "unknown")
transport_distances[transport_type] += distance
return list(transport_distances.items())
def co2_by_transport_type(self) -> list[tuple[str, float]]:
"""Calculate the total CO₂ emissions for each type of transport.
Any travel item with a missing or None 'co2_kg' field is ignored.
"""
transport_co2: defaultdict[str, float] = defaultdict(float)
for item in self.travel:
co2_kg = item.get("co2_kg")
if co2_kg:
transport_type: str = item.get("type", "unknown")
transport_co2[transport_type] += float(co2_kg)
return list(transport_co2.items())
def elements(self) -> list[TripElement]:
"""Trip elements ordered by time."""
elements: list[TripElement] = []
for item in self.accommodation:
title = "Airbnb" if item.get("operator") == "airbnb" else item["name"]
start = TripElement(
start_time=item["from"],
title=title,
detail=item,
element_type="check-in",
)
elements.append(start)
end = TripElement(
start_time=item["to"],
title=title,
detail=item,
element_type="check-out",
)
elements.append(end)
for item in self.travel:
if item["type"] == "flight":
name = (
f"{airport_label(item['from_airport'])} → "
+ f"{airport_label(item['to_airport'])}"
)
from_country = agenda.get_country(item["from_airport"]["country"])
to_country = agenda.get_country(item["to_airport"]["country"])
elements.append(
TripElement(
start_time=item["depart"],
end_time=item.get("arrive"),
title=name,
detail=item,
element_type="flight",
start_loc=airport_label(item["from_airport"]),
end_loc=airport_label(item["to_airport"]),
start_country=from_country,
end_country=to_country,
)
)
if item["type"] == "train":
for leg in item["legs"]:
from_country = agenda.get_country(leg["from_station"]["country"])
to_country = agenda.get_country(leg["to_station"]["country"])
assert from_country and to_country
name = f"{leg['from']} → {leg['to']}"
elements.append(
TripElement(
start_time=leg["depart"],
end_time=leg["arrive"],
title=name,
detail=leg,
element_type="train",
start_loc=leg["from"],
end_loc=leg["to"],
start_country=from_country,
end_country=to_country,
)
)
if item["type"] == "ferry":
from_country = agenda.get_country(item["from_terminal"]["country"])
to_country = agenda.get_country(item["to_terminal"]["country"])
name = f"{item['from']} → {item['to']}"
elements.append(
TripElement(
start_time=item["depart"],
end_time=item["arrive"],
title=name,
detail=item,
element_type="ferry",
start_loc=item["from"],
end_loc=item["to"],
start_country=from_country,
end_country=to_country,
)
)
if item["type"] == "coach":
# Include coach journeys in trip elements
from_country = agenda.get_country(item["from_station"]["country"])
to_country = agenda.get_country(item["to_station"]["country"])
name = f"{item['from']} → {item['to']}"
elements.append(
TripElement(
start_time=item["depart"],
end_time=item.get("arrive"),
title=name,
detail=item,
element_type="coach",
start_loc=item["from"],
end_loc=item["to"],
start_country=from_country,
end_country=to_country,
)
)
return sorted(elements, key=lambda e: utils.as_datetime(e.start_time))
def elements_grouped_by_day(self) -> list[tuple[datetime.date, list[TripElement]]]:
"""Group trip elements by day."""
# Create a dictionary to hold lists of TripElements grouped by their date
grouped_elements: collections.defaultdict[datetime.date, list[TripElement]] = (
collections.defaultdict(list)
)
for element in self.elements():
# Extract the date part of the 'when' attribute
day = utils.as_date(element.start_time)
grouped_elements[day].append(element)
# Sort elements within each day
for day in grouped_elements:
grouped_elements[day].sort(
key=lambda e: (
e.element_type == "check-in", # check-out elements last
e.element_type != "check-out", # check-in elements first
utils.as_datetime(e.start_time), # then sort by time
)
)
# Convert the dictionary to a sorted list of tuples
grouped_elements_list = sorted(grouped_elements.items())
return grouped_elements_list
# Example usage:
# You would call the function with your travel list here to get the results.
@dataclass
@dataclasses.dataclass
class Holiday:
"""Holiay."""
name: str
country: str
date: datetime.date
local_name: str | None = None
@dataclasses.dataclass
class Event:
"""Event."""
name: str
date: datetime.date | datetime.datetime
end_date: datetime.date | datetime.datetime | None = None
title: str | None = None
url: str | None = None
going: bool | None = None
@property
def display_name(self) -> str:
"""Format name for display."""
def as_datetime(self) -> datetime.datetime:
"""Date/time of event."""
d = self.date
t0 = datetime.datetime.min.time()
return (
f"{self.name} ({self.local_name})"
if self.local_name and self.local_name != self.name
else self.name
d
if isinstance(d, datetime.datetime)
else datetime.datetime.combine(d, t0).replace(tzinfo=datetime.timezone.utc)
)
@dataclass
class SchengenStay:
"""Represents a stay in the Schengen area."""
entry_date: date
exit_date: typing.Optional[date] # None if currently in Schengen
country: str
days: int
trip_date: typing.Optional[date] = None # Trip start date for linking
trip_name: typing.Optional[str] = None # Trip name for display
def __post_init__(self) -> None:
if self.exit_date is None:
# Currently in Schengen, calculate days up to today
self.days = (date.today() - self.entry_date).days + 1
else:
self.days = (self.exit_date - self.entry_date).days + 1
@dataclass
class SchengenCalculation:
"""Result of Schengen time calculation."""
total_days_used: int
days_remaining: int
is_compliant: bool
current_180_day_period: tuple[date, date] # (start, end)
stays_in_period: list["SchengenStay"]
next_reset_date: typing.Optional[date] # When the 180-day window resets
@property
def has_time(self) -> bool:
"""Event has a time associated with it."""
return isinstance(self.date, datetime.datetime)
@property
def days_over_limit(self) -> int:
"""Days over the 90-day limit."""
return max(0, self.total_days_used - 90)
def as_date(self) -> datetime.date:
"""Date of event."""
return (
self.date.date() if isinstance(self.date, datetime.datetime) else self.date
)
@property
def end_as_date(self) -> datetime.date:
"""Date of event."""
return (
(
self.end_date.date()
if isinstance(self.end_date, datetime.datetime)
else self.end_date
)
if self.end_date
else self.as_date
)
@property
def display_time(self) -> str | None:
"""Time for display on web page."""
return (
self.date.strftime("%H:%M")
if isinstance(self.date, datetime.datetime)
else None
)
@property
def display_timezone(self) -> str | None:
"""Timezone for display on web page."""
return (
self.date.strftime("%z")
if isinstance(self.date, datetime.datetime)
else None
)
def delta_days(self, today: datetime.date) -> str:
"""Return number of days from today as a string."""
delta = (self.as_date - today).days
match delta:
case 0:
return "today"
case 1:
return "1 day"
case _:
return f"{delta:,d} days"
@property
def display_date(self) -> str:
"""Date for display on web page."""
if isinstance(self.date, datetime.datetime):
return self.date.strftime("%a, %d, %b %Y %H:%M %z")
else:
return self.date.strftime("%a, %d, %b %Y")
@property
def display_title(self) -> str:
"""Name for display."""
return self.title or self.name

37
agenda/uk_holiday.py
View file

@ -3,38 +3,29 @@
import json
import os
from datetime import date, datetime, timedelta
from time import time
import httpx
from dateutil.easter import easter
from .types import Holiday, StrDict
url = "https://www.gov.uk/bank-holidays.json"
from .types import Holiday
def json_filename(data_dir: str) -> str:
"""Filename for cached bank holidays."""
assert os.path.exists(data_dir)
return os.path.join(data_dir, "bank-holidays.json")
async def get_holiday_list(data_dir: str) -> list[StrDict]:
"""Download holiday list and save cache."""
filename = json_filename(data_dir)
async with httpx.AsyncClient() as client:
r = await client.get(url)
events: list[StrDict] = r.json()["england-and-wales"]["events"] # check valid
open(filename, "w").write(r.text)
return events
def bank_holiday_list(start_date: date, end_date: date, data_dir: str) -> list[Holiday]:
async def bank_holiday_list(
start_date: date, end_date: date, data_dir: str
) -> list[Holiday]:
"""Date and name of the next UK bank holiday."""
filename = json_filename(data_dir)
url = "https://www.gov.uk/bank-holidays.json"
filename = os.path.join(data_dir, "bank-holidays.json")
mtime = os.path.getmtime(filename)
if (time() - mtime) > 60 * 60 * 6: # six hours
async with httpx.AsyncClient() as client:
r = await client.get(url)
open(filename, "w").write(r.text)
events = json.load(open(filename))["england-and-wales"]["events"]
hols: list[Holiday] = []
for event in json.load(open(filename))["england-and-wales"]["events"]:
for event in events:
event_date = datetime.strptime(event["date"], "%Y-%m-%d").date()
if event_date < start_date:
continue

120
agenda/utils.py
View file

@ -1,120 +0,0 @@
"""Utility functions."""
import os
import typing
from datetime import date, datetime, timedelta, timezone
from time import time
def as_date(d: datetime | date) -> date:
"""Convert datetime to date."""
match d:
case datetime():
return d.date()
case date():
return d
case _:
raise TypeError(f"Unsupported type: {type(d)}")
def as_datetime(d: datetime | date) -> datetime:
"""Date/time of event."""
match d:
case datetime():
return d
case date():
return datetime.combine(d, datetime.min.time()).replace(tzinfo=timezone.utc)
case _:
raise TypeError(f"Unsupported type: {type(d)}")
def timedelta_display(delta: timedelta) -> str:
"""Format timedelta as a human readable string."""
total_seconds = int(delta.total_seconds())
days, remainder = divmod(total_seconds, 24 * 60 * 60)
hours, remainder = divmod(remainder, 60 * 60)
mins, secs = divmod(remainder, 60)
return " ".join(
f"{v} {label}"
for v, label in ((days, "days"), (hours, "hrs"), (mins, "mins"))
if v
)
def plural(value: int, unit: str) -> str:
"""Value + unit with unit written as singular or plural as appropriate."""
return f"{value} {unit}{'s' if value > 1 else ''}"
def human_readable_delta(future_date: date) -> str | None:
"""
Calculate the human-readable time delta for a given future date.
Args:
future_date (date): The future date as a datetime.date object.
Returns:
str: Human-readable time delta.
"""
# Ensure the input is a future date
if future_date <= date.today():
return None
# Calculate the delta
delta = future_date - date.today()
# Convert delta to a more human-readable format
months, days = divmod(delta.days, 30)
weeks, days = divmod(days, 7)
# Formatting the output
parts = [
plural(value, unit)
for value, unit in ((months, "month"), (weeks, "week"), (days, "day"))
if value > 0
]
return " ".join(parts) if parts else None
def filename_timestamp(filename: str, ext: str) -> tuple[datetime, str] | None:
"""Get datetime from filename."""
try:
ts = datetime.strptime(filename, f"%Y-%m-%d_%H:%M:%S.{ext}")
except ValueError:
return None
return (ts, filename)
def get_most_recent_file(directory: str, ext: str) -> str | None:
"""Get most recent file from directory."""
existing = [
x for x in (filename_timestamp(f, ext) for f in os.listdir(directory)) if x
]
if not existing:
return None
existing.sort(reverse=True)
return os.path.join(directory, existing[0][1])
def make_waste_dir(data_dir: str) -> None:
"""Make waste dir if missing."""
waste_dir = os.path.join(data_dir, "waste")
if not os.path.exists(waste_dir):
os.mkdir(waste_dir)
async def time_function(
name: str,
func: typing.Callable[..., typing.Coroutine[typing.Any, typing.Any, typing.Any]],
*args: typing.Any,
**kwargs: typing.Any,
) -> tuple[str, typing.Any, float, Exception | None]:
"""Time the execution of an asynchronous function."""
start_time, result, exception = time(), None, None
try:
result = await func(*args, **kwargs)
except Exception as e:
exception = e
end_time = time()
return name, result, end_time - start_time, exception

209
agenda/waste_schedule.py Normal file
View file

@ -0,0 +1,209 @@
"""Waste collection schedules."""
import json
import os
import re
import typing
from collections import defaultdict
from datetime import date, datetime, time, timedelta
import httpx
import lxml.html
from . import uk_time
from .types import Event
ttl_hours = 12
def make_waste_dir(data_dir: str) -> None:
"""Make waste dir if missing."""
waste_dir = os.path.join(data_dir, "waste")
if not os.path.exists(waste_dir):
os.mkdir(waste_dir)
async def get_html(data_dir: str, postcode: str, uprn: str) -> str:
"""Get waste schedule."""
now = datetime.now()
waste_dir = os.path.join(data_dir, "waste")
make_waste_dir(data_dir)
existing_data = os.listdir(waste_dir)
existing = [f for f in existing_data if f.endswith(".html")]
if existing:
recent_filename = max(existing)
recent = datetime.strptime(recent_filename, "%Y-%m-%d_%H:%M.html")
delta = now - recent
if existing and delta < timedelta(hours=ttl_hours):
return open(os.path.join(waste_dir, recent_filename)).read()
now_str = now.strftime("%Y-%m-%d_%H:%M")
filename = f"{waste_dir}/{now_str}.html"
forms_base_url = "https://forms.n-somerset.gov.uk"
# url2 = "https://forms.n-somerset.gov.uk/Waste/CollectionSchedule/ViewSchedule"
url = "https://forms.n-somerset.gov.uk/Waste/CollectionSchedule"
async with httpx.AsyncClient() as client:
r = await client.post(
url,
data={
"PreviousHouse": "",
"PreviousPostcode": "-",
"Postcode": postcode,
"SelectedUprn": uprn,
},
)
form_post_html = r.text
pattern = r'<h2>Object moved to <a href="([^"]*)">here<\/a>\.<\/h2>'
m = re.search(pattern, form_post_html)
if m:
r = await client.get(forms_base_url + m.group(1))
html = r.text
open(filename, "w").write(html)
return html
def parse_waste_schedule_date(day_and_month: str) -> date:
"""Parse waste schedule date."""
today = date.today()
this_year = today.year
date_format = "%A %d %B %Y"
d = datetime.strptime(f"{day_and_month} {this_year}", date_format).date()
if d < today:
d = datetime.strptime(f"{day_and_month} {this_year + 1}", date_format).date()
return d
def parse(root: lxml.html.HtmlElement) -> list[Event]:
"""Parse waste schedule."""
tbody = root.find(".//table/tbody")
assert tbody is not None
by_date = defaultdict(list)
for e_service, e_next_date, e_following in tbody:
assert e_service.text and e_next_date.text and e_following.text
service = e_service.text
next_date = parse_waste_schedule_date(e_next_date.text)
following_date = parse_waste_schedule_date(e_following.text)
by_date[next_date].append(service)
by_date[following_date].append(service)
return [
Event(
name="waste_schedule",
date=uk_time(d, time(6, 30)),
title="🗑️ Backwell: " + ", ".join(services),
)
for d, services in by_date.items()
]
BristolSchedule = list[dict[str, typing.Any]]
async def get_bristol_data(data_dir: str, uprn: str) -> BristolSchedule:
"""Get Bristol Waste schedule, with cache."""
now = datetime.now()
waste_dir = os.path.join(data_dir, "waste")
make_waste_dir(data_dir)
existing_data = os.listdir(waste_dir)
existing = [f for f in existing_data if f.endswith(f"_{uprn}.json")]
if existing:
recent_filename = max(existing)
recent = datetime.strptime(recent_filename, f"%Y-%m-%d_%H:%M_{uprn}.json")
delta = now - recent
def get_from_recent() -> BristolSchedule:
json_data = json.load(open(os.path.join(waste_dir, recent_filename)))
return typing.cast(BristolSchedule, json_data["data"])
if existing and delta < timedelta(hours=ttl_hours):
return get_from_recent()
try:
r = await get_bristol_gov_uk_data(uprn)
except httpx.ReadTimeout:
return get_from_recent()
with open(f'{waste_dir}/{now.strftime("%Y-%m-%d_%H:%M")}_{uprn}.json', "wb") as out:
out.write(r.content)
return typing.cast(BristolSchedule, r.json()["data"])
async def get_bristol_gov_uk_data(uprn: str) -> httpx.Response:
"""Get JSON from Bristol City Council."""
UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
HEADERS = {
"Accept": "*/*",
"Accept-Language": "en-GB,en;q=0.9",
"Connection": "keep-alive",
"Ocp-Apim-Subscription-Key": "47ffd667d69c4a858f92fc38dc24b150",
"Ocp-Apim-Trace": "true",
"Origin": "https://bristolcouncil.powerappsportals.com",
"Referer": "https://bristolcouncil.powerappsportals.com/",
"Sec-Fetch-Dest": "empty",
"Sec-Fetch-Mode": "cors",
"Sec-Fetch-Site": "cross-site",
"Sec-GPC": "1",
"User-Agent": UA,
}
_uprn = str(uprn).zfill(12)
async with httpx.AsyncClient(timeout=20) as client:
# Initialise form
payload = {"servicetypeid": "7dce896c-b3ba-ea11-a812-000d3a7f1cdc"}
response = await client.get(
"https://bristolcouncil.powerappsportals.com/completedynamicformunauth/",
headers=HEADERS,
params=payload,
)
host = "bcprdapidyna002.azure-api.net"
# Set the search criteria
payload = {"Uprn": "UPRN" + _uprn}
response = await client.post(
f"https://{host}/bcprdfundyna001-llpg/DetailedLLPG",
headers=HEADERS,
json=payload,
)
# Retrieve the schedule
payload = {"uprn": _uprn}
response = await client.post(
f"https://{host}/bcprdfundyna001-alloy/NextCollectionDates",
headers=HEADERS,
json=payload,
)
return response
async def get_bristol_gov_uk(start_date: date, data_dir: str, uprn: str) -> list[Event]:
"""Get waste collection schedule from Bristol City Council."""
data = await get_bristol_data(data_dir, uprn)
by_date: defaultdict[date, list[str]] = defaultdict(list)
for item in data:
service = item["containerName"]
service = "Recycling" if "Recycling" in service else service.partition(" ")[2]
for collection in item["collection"]:
for collection_date_key in ["nextCollectionDate", "lastCollectionDate"]:
d = date.fromisoformat(collection[collection_date_key][:10])
if d < start_date:
continue
if service not in by_date[d]:
by_date[d].append(service)
return [
Event(name="waste_schedule", date=d, title="🗑️ Bristol: " + ", ".join(services))
for d, services in by_date.items()
]

0
frontend/index.js
View file

224
get_airport.py
View file

@ -1,224 +0,0 @@
#!/usr/bin/python3
import sys
from typing import Any, Dict, List
import requests
import yaml
# Define the base URL for the Wikidata API
WIKIDATA_API_URL = "https://www.wikidata.org/w/api.php"
def get_entity_label(qid: str) -> str | None:
"""
Fetches the English label for a given Wikidata entity QID.
Args:
qid (str): The Wikidata entity ID (e.g., "Q6106").
Returns:
Optional[str]: The English label of the entity, or None if not found.
"""
params: Dict[str, str] = {
"action": "wbgetentities",
"ids": qid,
"format": "json",
"props": "labels",
"languages": "en",
}
try:
response = requests.get(WIKIDATA_API_URL, params=params)
response.raise_for_status()
entity = response.json().get("entities", {}).get(qid, {})
return entity.get("labels", {}).get("en", {}).get("value")
except requests.exceptions.RequestException as e:
print(f"Error fetching label for QID {qid}: {e}", file=sys.stderr)
return None
def get_entity_details(qid: str) -> dict[str, Any] | None:
"""
Fetches and processes detailed information for a given airport QID.
Args:
qid (str): The QID of the airport Wikidata entity.
Returns:
Optional[Dict[str, Any]]: A dictionary containing the detailed airport data.
"""
params: Dict[str, str] = {
"action": "wbgetentities",
"ids": qid,
"format": "json",
"props": "claims|labels",
}
try:
response = requests.get(WIKIDATA_API_URL, params=params)
response.raise_for_status()
entity = response.json().get("entities", {}).get(qid, {})
if not entity:
return None
claims = entity.get("claims", {})
# Helper to safely extract claim values
def get_simple_claim_value(prop_id: str) -> str | None:
claim = claims.get(prop_id)
if not claim:
return None
v = claim[0].get("mainsnak", {}).get("datavalue", {}).get("value")
assert isinstance(v, str) or v is None
return v
# Get IATA code, name, and website
iata = get_simple_claim_value("P238")
name = entity.get("labels", {}).get("en", {}).get("value")
website = get_simple_claim_value("P856")
# Get City Name by resolving its QID
city_qid_claim = claims.get("P131")
city_name = None
if city_qid_claim:
city_qid = (
city_qid_claim[0]
.get("mainsnak", {})
.get("datavalue", {})
.get("value", {})
.get("id")
)
if city_qid:
city_name = get_entity_label(city_qid)
# Get coordinates
coords_claim = claims.get("P625")
latitude, longitude = None, None
if coords_claim:
coords = (
coords_claim[0]
.get("mainsnak", {})
.get("datavalue", {})
.get("value", {})
)
latitude = coords.get("latitude")
longitude = coords.get("longitude")
# Get elevation
elevation_claim = claims.get("P2044")
elevation = None
if elevation_claim:
amount_str = (
elevation_claim[0]
.get("mainsnak", {})
.get("datavalue", {})
.get("value", {})
.get("amount")
)
if amount_str:
elevation = float(amount_str) if "." in amount_str else int(amount_str)
# Get Country Code
country_claim = claims.get("P17")
country_code = None
if country_claim:
country_qid = (
country_claim[0]
.get("mainsnak", {})
.get("datavalue", {})
.get("value", {})
.get("id")
)
if country_qid:
# Fetch the ISO 3166-1 alpha-2 code (P297) for the country entity
country_code_params = {
"action": "wbgetclaims",
"entity": country_qid,
"property": "P297",
"format": "json",
}
country_res = requests.get(WIKIDATA_API_URL, params=country_code_params)
country_res.raise_for_status()
country_claims = country_res.json().get("claims", {}).get("P297")
if country_claims:
code = (
country_claims[0]
.get("mainsnak", {})
.get("datavalue", {})
.get("value")
)
if code:
country_code = code.lower()
data = {
"iata": iata,
"name": name,
"city": city_name,
"qid": qid,
"latitude": latitude,
"longitude": longitude,
"elevation": elevation,
"website": website,
"country": country_code,
}
# Return the final structure, filtering out null values for cleaner output
return {iata: {k: v for k, v in data.items() if v is not None}}
except requests.exceptions.RequestException as e:
print(f"Error fetching entity details for QID {qid}: {e}", file=sys.stderr)
return None
def find_airport_by_iata(iata_code: str) -> dict[str, Any] | None:
"""
Finds an airport by its IATA code using Wikidata's search API.
Args:
iata_code (str): The IATA code of the airport (e.g., "PDX").
Returns:
Optional[Dict[str, Any]]: A dictionary with the airport data or None.
"""
params: Dict[str, str] = {
"action": "query",
"list": "search",
"srsearch": f"haswbstatement:P238={iata_code.upper()}",
"format": "json",
}
try:
response = requests.get(WIKIDATA_API_URL, params=params)
response.raise_for_status()
search_results: List[Dict[str, Any]] = (
response.json().get("query", {}).get("search", [])
)
if not search_results:
print(f"No airport found with IATA code: {iata_code}", file=sys.stderr)
return None
qid = search_results[0]["title"]
return get_entity_details(qid)
except requests.exceptions.RequestException as e:
print(f"Error searching on Wikidata API: {e}", file=sys.stderr)
return None
if __name__ == "__main__":
if len(sys.argv) != 2:
print("Usage: python airport_lookup.py <IATA_CODE>", file=sys.stderr)
sys.exit(1)
iata_code_arg = sys.argv[1]
airport_data = find_airport_by_iata(iata_code_arg)
if airport_data:
print(
yaml.safe_dump(
airport_data,
default_flow_style=False,
allow_unicode=True,
sort_keys=False,
),
end="",
)

28
package.json
View file

@ -1,28 +0,0 @@
{
"name": "agenda",
"version": "1.0.0",
"directories": {
"test": "tests"
},
"repository": {
"type": "git",
"url": "https://git.4angle.com/edward/agenda.git"
},
"license": "ISC",
"devDependencies": {
"copy-webpack-plugin": "^12.0.2",
"eslint": "^9.2.0",
"webpack": "^5.91.0",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@fullcalendar/core": "^6.1.11",
"@fullcalendar/daygrid": "^6.1.11",
"@fullcalendar/list": "^6.1.11",
"@fullcalendar/timegrid": "^6.1.11",
"bootstrap": "^5.3.3",
"es-module-shims": "^1.8.3",
"leaflet": "^1.9.4",
"leaflet.geodesic": "^2.7.1"
}
}

19
parse_airbnb.py
View file

@ -1,19 +0,0 @@
#!/usr/bin/python3
import sys
import yaml
from agenda.airbnb import parse_multiple_files
def main() -> None:
"""Main function."""
filenames = sys.argv[1:]
bookings = parse_multiple_files(filenames)
print(yaml.dump(bookings, sort_keys=False))
if __name__ == "__main__":
main()

1
requirements.txt
View file

@ -9,4 +9,3 @@ dateutil
ephem
flask
requests
emoji

4
run.fcgi
View file

@ -1,8 +1,8 @@
#!/usr/bin/python3
from flipflop import WSGIServer
import sys
sys.path.append('/home/edward/src/agenda') # isort:skip
from web_view import app # isort:skip
sys.path.append('/home/edward/src/2021/agenda')
from web_view import app
if __name__ == '__main__':
WSGIServer(app).run()

177
static/js/map.js
View file

@ -1,177 +0,0 @@
if (![].at) {
Array.prototype.at = function(pos) { return this.slice(pos, pos + 1)[0] }
}
function emoji_icon(emoji) {
var iconStyle = "<div style='background-color: white; border-radius: 50%; width: 30px; height: 30px; display: flex; justify-content: center; align-items: center; border: 1px solid black;'> <div style='font-size: 18px;'>" + emoji + "</div></div>";
return L.divIcon({
className: 'custom-div-icon',
html: iconStyle,
iconSize: [60, 60],
iconAnchor: [15, 15],
});
}
var icons = {
"station": emoji_icon("🚉"),
"airport": emoji_icon("✈️"),
"ferry_terminal": emoji_icon("🚢"),
"accommodation": emoji_icon("🏨"),
"conference": emoji_icon("🖥️"),
"event": emoji_icon("🍷"),
}
function build_map(map_id, coordinates, routes) {
var map = L.map(map_id).fitBounds(coordinates.map(station => [station.latitude, station.longitude]));
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
var markers = [];
var offset_lines = [];
function getIconBounds(latlng) {
let iconSize = 20; // Assuming the icon size as a square
if (!latlng) return null;
let pixel = map.project(latlng, map.getZoom());
let sw = map.unproject([pixel.x - iconSize / 2, pixel.y + iconSize / 2], map.getZoom());
let ne = map.unproject([pixel.x + iconSize / 2, pixel.y - iconSize / 2], map.getZoom());
return L.latLngBounds(sw, ne);
}
function calculateCentroid(markers) {
let latSum = 0, lngSum = 0, count = 0;
markers.forEach(marker => {
latSum += marker.getLatLng().lat;
lngSum += marker.getLatLng().lng;
count++;
});
return count > 0 ? L.latLng(latSum / count, lngSum / count) : null;
}
// Function to detect and group overlapping markers
function getOverlappingGroups() {
let groups = [];
let visited = new Set();
markers.forEach((marker, index) => {
if (visited.has(marker)) {
return;
}
let group = [];
let markerBounds = getIconBounds(marker.getLatLng());
markers.forEach((otherMarker) => {
if (marker !== otherMarker && markerBounds.intersects(getIconBounds(otherMarker.getLatLng()))) {
group.push(otherMarker);
visited.add(otherMarker);
}
});
if (group.length > 0) {
group.push(marker); // Add the original marker to the group
groups.push(group);
visited.add(marker);
}
});
return groups;
}
function displaceMarkers(group, zoom) {
const markerPixelSize = 30; // Width/height of the marker in pixels
let map = group[0]._map; // Assuming all markers are on the same map
let centroid = calculateCentroid(group);
let centroidPoint = map.project(centroid, zoom);
const radius = markerPixelSize; // Set radius for even distribution
const angleIncrement = (2 * Math.PI) / group.length; // Evenly space markers
group.forEach((marker, index) => {
let angle = index * angleIncrement;
let newX = centroidPoint.x + radius * Math.cos(angle);
let newY = centroidPoint.y + radius * Math.sin(angle);
let newPoint = L.point(newX, newY);
let newLatLng = map.unproject(newPoint, zoom);
// Store original position for polyline
let originalPos = marker.getLatLng();
marker.setLatLng(newLatLng);
marker.polyline = L.polyline([originalPos, newLatLng], {color: "gray", weight: 2}).addTo(map);
offset_lines.push(marker.polyline);
});
}
coordinates.forEach(function(item, index) {
let latlng = L.latLng(item.latitude, item.longitude);
let marker = L.marker(latlng, { icon: icons[item.type] }).addTo(map);
marker.bindPopup(item.name);
markers.push(marker);
});
map.on('zoomend', function() {
markers.forEach((marker, index) => {
marker.setLatLng([coordinates[index].latitude, coordinates[index].longitude]); // Reset position on zoom
if (marker.polyline) {
map.removeLayer(marker.polyline);
}
});
offset_lines.forEach(polyline => {
map.removeLayer(polyline);
});
let overlappingGroups = getOverlappingGroups();
// console.log(overlappingGroups); // Process or display groups as needed
overlappingGroups.forEach(group => displaceMarkers(group, map.getZoom()));
});
let overlappingGroups = getOverlappingGroups();
// console.log(overlappingGroups); // Process or display groups as needed
overlappingGroups.forEach(group => displaceMarkers(group, map.getZoom()));
// Draw routes
routes.forEach(function(route) {
var color = {"train": "blue", "flight": "red", "unbooked_flight": "orange", "coach": "green"}[route.type];
var style = { weight: 3, opacity: 0.5, color: color };
if (route.geojson) {
L.geoJSON(JSON.parse(route.geojson), {
style: function(feature) { return style; }
}).addTo(map);
} else if (route.type === "flight" || route.type === "unbooked_flight") {
var flightPath = new L.Geodesic([[route.from, route.to]], style).addTo(map);
} else {
L.polyline([route.from, route.to], style).addTo(map);
}
});
var mapElement = document.getElementById(map_id);
document.getElementById('toggleMapSize').addEventListener('click', function() {
var mapElement = document.getElementById(map_id);
var isFullWindow = mapElement.classList.contains('full-window-map');
if (isFullWindow) {
mapElement.classList.remove('full-window-map');
mapElement.classList.add('half-map');
mapElement.style.position = 'relative';
} else {
mapElement.classList.add('full-window-map');
mapElement.classList.remove('half-map');
mapElement.style.position = '';
}
// Ensure the map adjusts to the new container size
map.invalidateSize();
});
return map;
}

38
templates/accommodation.html
View file

@ -1,12 +1,9 @@
{% extends "base.html" %}
{% from "macros.html" import trip_link, accommodation_row with context %}
{% block title %}Accommodation - Edward Betts{% endblock %}
{% block style %}
{% set column_count = 9 %}
<style>
.grid-container {
display: grid;
grid-template-columns: repeat({{ column_count }}, auto);
grid-template-columns: repeat(6, auto);
gap: 10px;
justify-content: start;
}
@ -16,18 +13,24 @@
}
.heading {
grid-column: 1 / {{ column_count + 1 }}; /* Spans from the 1st line to the 7th line */
grid-column: 1 / 7; /* Spans from the 1st line to the 7th line */
}
</style>
{% endblock %}
{% macro row(item, badge) %}
<div class="grid-item text-end">{{ item.from.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item text-end">{{ item.to.strftime("%a, %d %b") }}</div>
<div class="grid-item text-end">{{ (item.to.date() - item.from.date()).days }}</div>
<div class="grid-item">{{ item.name }}</div>
<div class="grid-item">{{ item.operator }}</div>
<div class="grid-item">{{ item.location }}</div>
{% endmacro %}
{% macro section(heading, item_list, badge) %}
{% if item_list %}
<div class="heading"><h2>{{heading}}</h2></div>
{% for item in item_list %}
{{ accommodation_row(item, badge) }}
<div class="grid-item">{% if item.linked_trip %} trip: {{ trip_link(item.linked_trip) }} {% endif %}</div>
{% endfor %}
{% for item in item_list %}{{ row(item, badge) }}{% endfor %}
{% endif %}
{% endmacro %}
@ -37,24 +40,13 @@
<h1>Accommodation</h1>
<h3>Statistics</h3>
<ul>
{% for year, stats in year_stats %}
{% set days_in_year = 366 if (year % 4 == 0 and year % 100 != 0) or (year % 400 == 0) else 365 %}
{% set total_percentage = (stats.total_nights / days_in_year) * 100 %}
{% set abroad_percentage = (stats.nights_abroad / days_in_year) * 100 %}
<li>
<strong>{{ year }}:</strong>
Total nights away: {{ stats.total_nights }} ({{ "%.1f"|format(total_percentage) }}%),
Total nights abroad: {{ stats.nights_abroad }} ({{ "%.1f"|format(abroad_percentage) }}%)
</li>
{% endfor %}
<li>Total nights away in 2024: {{ total_nights_2024 }}</li>
<li>Total nights abroad in 2024: {{ nights_abroad_2024 }}</li>
</ul>
<div class="grid-container">
{{ section("Current", current) }}
{{ section("Future", future) }}
{{ section("Past", past) }}
{{ section("Accommodation", items) }}
</div>
</div>

4
templates/base.html
View file

@ -7,7 +7,7 @@
<title>{% block title %}{% endblock %}</title>
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>📅</text></svg>">
<link href="{{ url_for("static", filename="bootstrap5/css/bootstrap.min.css") }}" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
{% block style %}
{% endblock %}
@ -18,6 +18,6 @@
{% block nav %}{{ navbar() }}{% endblock %}
{% block content %}{% endblock %}
{% block scripts %}{% endblock %}
<script src="{{ url_for("static", filename="bootstrap5/js/bootstrap.bundle.min.js") }}"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
</body>
</html>

17
templates/birthday_list.html
View file

@ -1,17 +0,0 @@
{% extends "base.html" %}
{% from "macros.html" import display_date %}
{% block title %}Birthdays - Edward Betts{% endblock %}
{% block content %}
<div class="container-fluid mt-2">
<h1>Birthdays</h1>
<table class="w-auto table">
{% for event in items %}
<tr>
<td class="text-end">{{event.as_date.strftime("%a, %d, %b %Y")}}</td>
<td>{{ event.title }}</td>
</tr>
{% endfor %}
</table>
</div>
{% endblock %}

266
templates/calendar.html
View file

@ -1,266 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Agenda - Edward Betts</title>
<link href="{{ url_for("static", filename="bootstrap5/css/bootstrap.min.css") }}" rel="stylesheet">
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>📅</text></svg>">
<!-- TOAST UI Calendar CSS -->
<link rel="stylesheet" href="https://uicdn.toast.com/calendar/latest/toastui-calendar.min.css" />
<style>
/* Custom styles to better integrate with Bootstrap */
.toastui-calendar-layout {
border: 1px solid #dee2e6;
border-radius: 0.375rem;
}
#calendar-header {
margin-bottom: 1rem;
}
</style>
</head>
{% set event_labels = {
"economist": "📰 The Economist",
"mothers_day": "Mothers' day",
"fathers_day": "Fathers' day",
"uk_financial_year_end": "End of financial year",
"bank_holiday": "UK bank holiday",
"us_holiday": "US holiday",
"uk_clock_change": "UK clock change",
"us_clock_change": "US clock change",
"us_presidential_election": "US pres. election",
"xmas_last_second": "Christmas last posting 2nd class",
"xmas_last_first": "Christmas last posting 1st class",
"up_series": "Up documentary",
"waste_schedule": "Waste schedule",
"gwr_advance_tickets": "GWR advance tickets",
"critical_mass": "Critical Mass",
}
%}
{% from "navbar.html" import navbar with context %}
<body>
{{ navbar() }}
<div class="container-fluid mt-2">
<h1>Agenda</h1>
<p>
<a href="/tools">← personal tools</a>
</p>
{% if errors %}
{% for error in errors %}
<div class="alert alert-danger" role="alert">
Error: {{ error }}
</div>
{% endfor %}
{% endif %}
<div>
Markets:
<a href="{{ url_for(request.endpoint) }}">Hide while away</a>
| <a href="{{ url_for(request.endpoint, markets="show") }}">Show all</a>
| <a href="{{ url_for(request.endpoint, markets="hide") }}">Hide all</a>
</div>
<!-- Header for calendar controls -->
<div id="calendar-header" class="d-flex justify-content-between align-items-center mt-3">
<div class="btn-group" role="group">
<button type="button" class="btn btn-primary" id="prevBtn">Prev</button>
<button type="button" class="btn btn-primary" id="nextBtn">Next</button>
<button type="button" class="btn btn-outline-primary" id="todayBtn">Today</button>
</div>
<h3 id="calendar-title" class="mb-0"></h3>
<div class="btn-group" role="group">
<button type="button" class="btn btn-outline-primary" id="monthViewBtn">Month</button>
<button type="button" class="btn btn-outline-primary" id="weekViewBtn">Week</button>
<button type="button" class="btn btn-outline-primary" id="dayViewBtn">Day</button>
</div>
</div>
<div class="mb-3" id="calendar" style="height: 80vh;"></div>
{#
<div class="mt-2">
<h5>Page generation time</h5>
<ul>
<li>Data gather took {{ "%.1f" | format(data_gather_seconds) }} seconds</li>
<li>Stock market open/close took
{{ "%.1f" | format(stock_market_times_seconds) }} seconds</li>
{% for name, seconds in timings %}
<li>{{ name }} took {{ "%.1f" | format(seconds) }} seconds</li>
{% endfor %}
</ul>
</div>
#}
</div>
<!-- TOAST UI Calendar JS -->
<script src="https://uicdn.toast.com/calendar/latest/toastui-calendar.min.js"></script>
<script src="{{ url_for("static", filename="bootstrap5/js/bootstrap.bundle.min.js") }}"></script>
<script>
document.addEventListener('DOMContentLoaded', function() {
const Calendar = tui.Calendar;
const container = document.getElementById('calendar');
// --- Configuration ---
const calendars = {{ toastui_calendars | tojson }};
const events = {{ toastui_events | tojson }};
function getSavedView() {
return localStorage.getItem('toastUiCalendarDefaultView') || 'month';
}
function saveView(view) {
localStorage.setItem('toastUiCalendarDefaultView', view);
}
const options = {
defaultView: getSavedView(),
useDetailPopup: true,
useCreationPopup: false,
calendars: calendars,
week: {
startDayOfWeek: 1, // Monday
taskView: false,
eventView: ['time'],
showNowIndicator: true,
},
month: {
startDayOfWeek: 1, // Monday
},
timezone: {
zones: [{
timezoneName: Intl.DateTimeFormat().resolvedOptions().timeZone
}]
},
template: {
allday(event) {
return `<span title="${event.title}">${event.title}</span>`;
},
time(event) {
return `<span title="${event.title}">${event.title}</span>`;
},
},
};
const calendar = new Calendar(container, options);
calendar.createEvents(events);
// --- Event Handlers ---
calendar.on('clickEvent', ({ event }) => {
if (event.raw && event.raw.url) {
window.open(event.raw.url, '_blank');
}
});
calendar.on('afterRenderEvent', () => {
const currentView = calendar.getViewName();
saveView(currentView);
updateCalendarTitle();
});
// --- UI Control Logic ---
const prevBtn = document.getElementById('prevBtn');
const nextBtn = document.getElementById('nextBtn');
const todayBtn = document.getElementById('todayBtn');
const monthViewBtn = document.getElementById('monthViewBtn');
const weekViewBtn = document.getElementById('weekViewBtn');
const dayViewBtn = document.getElementById('dayViewBtn');
const calendarTitle = document.getElementById('calendar-title');
function updateCalendarTitle() {
const currentView = calendar.getViewName();
const currentDate = calendar.getDate().toDate();
let titleText = '';
if (currentView === 'month') {
const year = currentDate.getFullYear();
const monthName = currentDate.toLocaleDateString('en-GB', { month: 'long' });
titleText = `${monthName} ${year}`;
} else if (currentView === 'week') {
// Manually calculate the start and end of the week
const startDayOfWeek = options.week.startDayOfWeek; // 1 for Monday
const day = currentDate.getDay(); // 0 for Sunday, 1 for Monday...
// Calculate days to subtract to get to the start of the week
const offset = (day - startDayOfWeek + 7) % 7;
const startDate = new Date(currentDate);
startDate.setDate(currentDate.getDate() - offset);
const endDate = new Date(startDate);
endDate.setDate(startDate.getDate() + 6);
const startMonth = startDate.toLocaleDateString('en-GB', { month: 'short' });
const endMonth = endDate.toLocaleDateString('en-GB', { month: 'short' });
if (startMonth === endMonth) {
titleText = `${startDate.getDate()} - ${endDate.getDate()} ${startMonth} ${startDate.getFullYear()}`;
} else {
titleText = `${startDate.getDate()} ${startMonth} - ${endDate.getDate()} ${endMonth} ${startDate.getFullYear()}`;
}
} else { // Day view
titleText = currentDate.toLocaleDateString('en-GB', { dateStyle: 'full' });
}
calendarTitle.textContent = titleText;
}
// --- View-aware navigation logic (no changes here) ---
prevBtn.addEventListener('click', () => {
const currentView = calendar.getViewName();
if (currentView === 'month') {
const currentDate = calendar.getDate().toDate();
currentDate.setMonth(currentDate.getMonth() - 1);
currentDate.setDate(1);
calendar.setDate(currentDate);
} else {
calendar.prev();
}
updateCalendarTitle();
});
nextBtn.addEventListener('click', () => {
const currentView = calendar.getViewName();
if (currentView === 'month') {
const currentDate = calendar.getDate().toDate();
currentDate.setMonth(currentDate.getMonth() + 1);
currentDate.setDate(1);
calendar.setDate(currentDate);
} else {
calendar.next();
}
updateCalendarTitle();
});
todayBtn.addEventListener('click', () => {
calendar.today();
updateCalendarTitle();
});
monthViewBtn.addEventListener('click', () => {
calendar.changeView('month');
updateCalendarTitle();
});
weekViewBtn.addEventListener('click', () => {
calendar.changeView('week');
updateCalendarTitle();
});
dayViewBtn.addEventListener('click', () => {
calendar.changeView('day');
updateCalendarTitle();
});
// Initial setup
updateCalendarTitle();
});
</script>
</body>
</html>

56
templates/conference_list.html
View file

@ -1,15 +1,10 @@
{% extends "base.html" %}
{% from "macros.html" import trip_link, conference_row with context %}
{% block title %}Conferences - Edward Betts{% endblock %}
{% block style %}
{% set column_count = 9 %}
<style>
.grid-container {
display: grid;
grid-template-columns: repeat({{ column_count }}, auto); /* 7 columns for each piece of information */
grid-template-columns: repeat(6, auto); /* 7 columns for each piece of information */
gap: 10px;
justify-content: start;
}
@ -19,40 +14,49 @@
}
.heading {
grid-column: 1 / {{ column_count + 1 }}; /* Spans from the 1st line to the 7th line */
grid-column: 1 / 7; /* Spans from the 1st line to the 7th line */
}
</style>
{% endblock %}
{% macro section(heading, item_list, badge) %}
{% if item_list %}
<div class="heading">
<h2>{{ heading }}</h2>
<p>
{% set item_count = item_list|length %}
{% if item_count == 1 %}{{ item_count }} conference{% else %}{{ item_count }} conferences{% endif %}
</p>
</div>
{% for item in item_list %}
{{ conference_row(item, badge) }}
<div class="grid-item">
{% if item.linked_trip %} trip: {{ trip_link(item.linked_trip) }} {% endif %}
</div>
{% endfor %}
{% macro row(item, badge) %}
<div class="grid-item text-end">{{ item.start.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item text-end">{{ item.end.strftime("%a, %d %b") }}</div>
<div class="grid-item">{{ item.name }}
{% if item.going and not (item.accommodation_booked or item.travel_booked) %}
<span class="badge text-bg-primary">
{{ badge }}
</span>
{% endif %}
{% if item.accommodation_booked %}
<span class="badge text-bg-success">accommodation</span>
{% endif %}
{% if item.transport_booked %}
<span class="badge text-bg-success">transport</span>
{% endif %}
</div>
<div class="grid-item">{{ item.topic }}</div>
<div class="grid-item">{{ item.location }}</div>
<div class="grid-item"><a href="{{ item.url }}">{{ item.url }}</a></div>
{% endmacro %}
{% macro section(heading, item_list, badge) %}
{% if item_list %}
<div class="heading"><h2>{{heading}}</h2></div>
{% for item in item_list %}{{ row(item, badge) }}{% endfor %}
{% endif %}
{% endmacro %}
{% block content %}
<div class="container-fluid mt-2">
<h1>Conferences</h1>
<div class="grid-container">
{{ section("Current", current, "attending") }}
{{ section("Future", future, "going") }}
{{ section("Past", past|reverse|list, "went") }}
{{ section("Past", past|reverse, "went") }}
</div>
</div>

25
templates/gaps.html
View file

@ -1,5 +1,4 @@
{% extends "base.html" %}
{% block title %}Gaps - Edward Betts{% endblock %}
{% block content %}
<div class="p-2">
@ -18,31 +17,11 @@
<tbody>
{% for gap in gaps %}
<tr>
<td class="text-start">
{% for event in gap.before %}
<div>
{% if event.url %}
<a href="{{event.url}}">{{ event.title_with_emoji }}</a>
{% else %}
{{ event.title_with_emoji }}
{% endif %}
</div>
{% endfor %}
</td>
<td>{% for event in gap.before %}{% if not loop.first %}<br/>{% endif %}<span class="text-nowrap">{{ event.title or event.name }}</span>{% endfor %}</td>
<td class="text-end text-nowrap">{{ gap.start.strftime("%A, %-d %b %Y") }}</td>
<td class="text-end text-nowrap">{{ (gap.end - gap.start).days }} days</td>
<td class="text-end text-nowrap">{{ gap.end.strftime("%A, %-d %b %Y") }}</td>
<td class="text-start">
{% for event in gap.after %}
<div>
{% if event.url %}
<a href="{{event.url}}">{{ event.title_with_emoji }}</a>
{% else %}
{{ event.title_with_emoji }}
{% endif %}
</div>
{% endfor %}
</td>
<td>{% for event in gap.after %}{% if not loop.first %}<br/>{% endif %}<span class="text-nowrap">{{ event.title or event.name }}</span>{% endfor %}</td>
</tr>
{% endfor %}
</tbody>

24
templates/holiday_list.html
View file

@ -1,24 +0,0 @@
{% extends "base.html" %}
{% from "macros.html" import display_date %}
{% block title %}Holidays - Edward Betts{% endblock %}
{% block content %}
<div class="container-fluid mt-2">
<h1>Holidays</h1>
<table class="table table-hover w-auto">
{% for item in items %}
{% set country = get_country(item.country) %}
<tr>
{% if loop.first or item.date != loop.previtem.date %}
<td class="text-end">{{ display_date(item.date) }}</td>
<td>in {{ (item.date - today).days }} days</td>
{% else %}
<td colspan="2"></td>
{% endif %}
<td>{{ country.flag }} {{ country.name }}</td>
<td>{{ item.display_name }}</td>
</tr>
{% endfor %}
</table>
</div>
{% endblock %}

115
templates/event_list.html → templates/index.html
View file

@ -3,11 +3,72 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Agenda - Edward Betts</title>
<link href="{{ url_for("static", filename="bootstrap5/css/bootstrap.min.css") }}" rel="stylesheet">
<title>Agenda</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>📅</text></svg>">
<script async src="{{ url_for("static", filename="es-module-shims/es-module-shims.js") }}"></script>
<script async src="https://unpkg.com/es-module-shims@1.8.2/dist/es-module-shims.js"></script>
<script type='importmap'>
{
"imports": {
"@fullcalendar/core": "https://cdn.skypack.dev/@fullcalendar/core@6.1.9",
"@fullcalendar/daygrid": "https://cdn.skypack.dev/@fullcalendar/daygrid@6.1.9",
"@fullcalendar/timegrid": "https://cdn.skypack.dev/@fullcalendar/timegrid@6.1.9",
"@fullcalendar/list": "https://cdn.skypack.dev/@fullcalendar/list@6.1.9",
"@fullcalendar/core/locales/en-gb": "https://cdn.skypack.dev/@fullcalendar/core@6.1.9/locales/en-gb"
}
}
</script>
<script type='module'>
import { Calendar } from '@fullcalendar/core'
import dayGridPlugin from '@fullcalendar/daygrid'
import timeGridPlugin from '@fullcalendar/timegrid'
import listPlugin from '@fullcalendar/list'
import gbLocale from '@fullcalendar/core/locales/en-gb';
// Function to save the current view to local storage
function saveView(view) {
localStorage.setItem('fullCalendarDefaultView', view);
}
// Function to get the saved view from local storage
function getSavedView() {
return localStorage.getItem('fullCalendarDefaultView') || 'dayGridMonth';
}
document.addEventListener('DOMContentLoaded', function() {
const calendarEl = document.getElementById('calendar')
const calendar = new Calendar(calendarEl, {
locale: gbLocale,
plugins: [dayGridPlugin, timeGridPlugin, listPlugin ],
themeSystem: 'bootstrap5',
firstDay: 1,
initialView: getSavedView(),
viewDidMount: function(info) {
saveView(info.view.type);
},
headerToolbar: {
left: 'prev,next today',
center: 'title',
right: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek'
},
nowIndicator: true,
weekNumbers: true,
eventTimeFormat: {
hour: '2-digit',
minute: '2-digit',
hour12: false,
},
events: {{ fullcalendar_events | tojson(indent=2) }},
eventDidMount: function(info) {
info.el.title = info.event.title;
},
})
calendar.render()
})
</script>
</head>
@ -39,7 +100,6 @@
} %}
{% from "macros.html" import trip_link, display_date_no_year, trip_item with context %}
{% from "navbar.html" import navbar with context %}
<body>
@ -67,36 +127,16 @@
Sunset: {{ sunset.strftime("%H:%M:%S") }}</li>
</ul>
{% if errors %}
{% for error in errors %}
<div class="alert alert-danger" role="alert">
Error: {{ error }}
</div>
{% endfor %}
{% endif %}
<h3>Stock markets</h3>
{% for market in stock_markets %}
<p>{{ market }}</p>
{% endfor %}
{% if current_trip %}
<div>
<h3>Current trip</h3>
{{ trip_item(current_trip) }}
</div>
{% endif %}
<div class="mb-3" id="calendar"></div>
<h3>Agenda</h3>
<div>
Markets:
<a href="{{ url_for(request.endpoint) }}">Hide while away</a>
| <a href="{{ url_for(request.endpoint, markets="show") }}">Show all</a>
| <a href="{{ url_for(request.endpoint, markets="hide") }}">Hide all</a>
</div>
{% for event in events if start_event_list <= event.as_date <= end_event_list %}
{% for event in events if event.as_date >= two_weeks_ago %}
{% if loop.first or event.date.year != loop.previtem.date.year or event.date.month != loop.previtem.date.month %}
<div class="row mt-2">
<div class="col">
@ -126,10 +166,9 @@
<div class="col-md-2{{ cell_bg }}">
{% if event.end_date %}
{% set duration = event.display_duration() %}
{% if duration %}
{% if event.end_as_date == event.as_date and event.has_time %}
end: {{event.end_date.strftime("%H:%M") }}
(duration: {{duration}})
(duration: {{event.end_date - event.date}})
{% elif event.end_date != event.date %}
{{event.end_date}}
{% endif %}
@ -139,7 +178,7 @@
<div class="col-md-7 text-start">
{% if event.url %}<a href="{{ event.url }}">{% endif %}
{{ event_labels.get(event.name) or event.name }}
{%- if event.title -%}: {{ event.title_with_emoji }}{% endif %}
{%- if event.title -%}: {{ event.title }}{% endif %}
{% if event.url %}</a>{% endif %}
</div>
<div class="col-md-1{{ cell_bg }}">
@ -149,21 +188,7 @@
{% endif %}
{% endfor %}
<div class="mt-2">
<h5>Page generation time</h5>
<ul>
<li>Data gather took {{ "%.1f" | format(data_gather_seconds) }} seconds</li>
<li>Stock market open/close took
{{ "%.1f" | format(stock_market_times_seconds) }} seconds</li>
{% for name, seconds in timings %}
<li>{{ name }} took {{ "%.1f" | format(seconds) }} seconds</li>
{% endfor %}
<li>Render time: {{ "%.1f" | format(render_time) }} seconds</li>
</ul>
</div>
</div>
<script src="{{ url_for("static", filename="bootstrap5/js/bootstrap.bundle.min.js") }}"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
</body>
</html>

104
templates/launches.html
View file

@ -1,63 +1,11 @@
{% extends "base.html" %}
{% block title %}Space launches - Edward Betts{% endblock %}
{% block content %}
<div class="container-fluid mt-2">
<h1>Space launches</h1>
<h4>Filters</h4>
<p>Mission type:
{% if request.args.type %}<a href="{{ request.path }}">🗙</a>{% endif %}
{% for t in mission_types | sort %}
{% if t == request.args.type %}
<strong>{{ t }}</strong>
{% else %}
<a href="?type={{ t }}" class="text-nowrap">
{{ t }}
</a>
{% endif %}
{% if not loop.last %} | {% endif %}
{% endfor %}
</p>
<p>Vehicle:
{% if request.args.rocket %}<a href="{{ request.path }}">🗙</a>{% endif %}
{% for r in rockets | sort %}
{% if r == request.args.rockets %}
<strong>{{ r }}</strong>
{% else %}
<a href="?rocket={{ r }}" class="text-nowrap">
{{ r }}
</a>
{% endif %}
{% if not loop.last %} | {% endif %}
{% endfor %}
</p>
<p>Orbit:
{% if request.args.orbit %}<a href="{{ request.path }}">🗙</a>{% endif %}
{% for name, abbrev in orbits | sort %}
{% if abbrev == request.args.orbit %}
<strong>{{ name }}</strong>
{% else %}
<a href="?orbit={{ abbrev }}" class="text-nowrap">
{{ name }}
</a>
{% endif %}
{% if not loop.last %} | {% endif %}
{% endfor %}
</p>
{% for launch in launches %}
{% set highlight =" bg-primary-subtle" if launch.slug in config.FOLLOW_LAUNCHES else "" %}
{% set country = get_country(launch.country_code) %}
<div class="row{{highlight}}">
{% for launch in rockets %}
<div class="row">
<div class="col-md-1 text-nowrap text-md-end">{{ launch.t0_date }}
<br class="d-none d-md-block"/>
@ -68,17 +16,8 @@
<div class="col-md-1 text-md-nowrap">
<span class="d-md-none">launch status:</span>
<abbr title="{{ launch.status.name }}">{{ launch.status.abbrev }}</abbr>
{% if launch.probability %}{{ launch.probability }}%{% endif %}
</div>
<div class="col">
<div>
{% if launch.image %}
<div>
<img src="{{ launch.image }}" class="img-fluid img-thumbnail" style="max-width: 350px; height: auto;" />
</div>
{% endif %}
<abbr title="{{ country.name }}">{{ country.flag }}</abbr>
{{ launch.rocket.full_name }}
<div class="col">{{ launch.rocket }}
&ndash;
<strong>{{launch.mission.name }}</strong>
&ndash;
@ -91,29 +30,14 @@
({{ launch.launch_provider_type }})
&mdash;
{{ launch.orbit.name }} ({{ launch.orbit.abbrev }})
&mdash;
{{ launch.mission.type }}
</div>
<div>
{% if launch.pad_wikipedia_url %}
<a href="{{ launch.pad_wikipedia_url }}">{{ launch.pad_name }}</a>
{% else %}
{{ launch.pad_name }} {% if launch.pad_name != "Unknown Pad" %}(no Wikipedia article){% endif %}
{% endif %}
&mdash; {{ launch.location }}
</div>
{% if launch.mission.agencies | count %}
<div>
{% for agency in launch.mission.agencies %}
{% set agency_country = get_country(agency.country_code) %}
{%- if not loop.first %}, {% endif %}
<a href="{{ agency.wiki_url }}">{{agency.name }}</a>
<abbr title="{{ agency_country.name }}">{{ agency_country.flag }}</abbr>
({{ agency.type }}) {# <img src="{{ agency.logo_url }}"/> #}
{% endfor %}
</div>
<br/>
{% if launch.pad_wikipedia_url %}
<a href="{{ launch.pad_wikipedia_url }}">{{ launch.pad_name }}</a>
{% else %}
{{ launch.pad_name }} {% if launch.pad_name != "Unknown Pad" %}(no Wikipedia article){% endif %}
{% endif %}
<div>
&mdash; {{ launch.location }}<br/>
{% if launch.mission %}
{% for line in launch.mission.description.splitlines() %}
<p>{{ line }}</p>
@ -121,13 +45,7 @@
{% else %}
<p>No description.</p>
{% endif %}
{% if launch.weather_concerns %}
<h4>Weather concerns</h4>
{% for line in launch.weather_concerns.splitlines() %}
<p>{{ line }}</p>
{% endfor %}
{% endif %}
</div>
</div>
</div>
{% endfor %}

475
templates/macros.html
View file

@ -1,475 +0,0 @@
{% macro display_datetime(dt) %}{{ dt.strftime("%a, %d, %b %Y %H:%M %z") }}{% endmacro %}
{% macro display_time(dt) %}
{% if dt %}{{ dt.strftime("%H:%M %z") }}{% endif %}
{% endmacro %}
{% macro display_date(dt) %}{{ dt.strftime("%a %-d %b %Y") }}{% endmacro %}
{% macro display_date_no_year(dt) %}{{ dt.strftime("%a %-d %b") }}{% endmacro %}
{% macro format_distance(distance) %}
{{ "{:,.0f} km / {:,.0f} miles".format(distance, distance / 1.60934) }}
{% endmacro %}
{% macro trip_link(trip) %}
<a href="{{ url_for("trip_page", start=trip.start.isoformat()) }}">{{ trip.title }}</a>
{% endmacro %}
{% macro conference_row(item, badge, show_flags=True) %}
{% set country = get_country(item.country) if item.country else None %}
<div class="grid-item text-end text-nowrap">{{ item.start.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item text-end text-nowrap">{{ item.end.strftime("%a, %d %b") }}</div>
<div class="grid-item">
{% if item.url %}
<a href="{{ item.url }}">{{ item.name }}</a>
{% else %}
{{ item.name }}
{% endif %}
{% if item.going and not (item.accommodation_booked or item.travel_booked) %}
<span class="badge text-bg-primary">
{{ badge }}
</span>
{% endif %}
{% if item.accommodation_booked %}
<span class="badge text-bg-success">accommodation</span>
{% endif %}
{% if item.transport_booked %}
<span class="badge text-bg-success">transport</span>
{% endif %}
</div>
<div class="grid-item text-end">
{% if item.price and item.currency %}
<span class="badge bg-info text-nowrap">{{ "{:,d}".format(item.price | int) }} {{ item.currency }}</span>
{% if item.currency != "GBP" and item.currency in fx_rate %}
<span class="badge bg-info text-nowrap">{{ "{:,.2f}".format(item.price / fx_rate[item.currency]) }} GBP</span>
{% endif %}
{% elif item.free %}
<span class="badge bg-success text-nowrap">free to attend</span>
{% endif %}
</div>
<div class="grid-item">{{ item.topic }}</div>
<div class="grid-item">{{ item.location }}</div>
<div class="grid-item text-end text-nowrap">{{ display_date(item.cfp_end) if item.cfp_end else "" }}</div>
<div class="grid-item">
{% if country %}
{% if show_flags %}{{ country.flag }}{% endif %} {{ country.name }}
{% elif item.online %}
💻 Online
{% else %}
<span class="text-bg-danger p-2">
country code <strong>{{ item.country }}</strong> not found
</span>
{% endif %}
</div>
{% endmacro %}
{% macro accommodation_row(item, badge, show_flags=True) %}
{% set country = get_country(item.country) %}
{% set nights = (item.to.date() - item.from.date()).days %}
<div class="grid-item text-end">{{ item.from.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item text-end">{{ item.to.strftime("%a, %d %b") }}</div>
<div class="grid-item text-end">{% if nights == 1 %}1 night{% else %}{{ nights }} nights{% endif %}</div>
<div class="grid-item">{{ item.operator }}</div>
<div class="grid-item">{{ item.location }}</div>
<div class="grid-item">
{% if country %}
{% if show_flags %}{{ country.flag }}{% endif %} {{ country.name }}
{% else %}
<span class="text-bg-danger p-2">
country code <strong>{{ item.country }}</strong> not found
</span>
{% endif %}
</div>
<div class="grid-item">
{% if g.user.is_authenticated and item.url %}
<a href="{{ item.url }}">{{ item.name }}</a>
{% else %}
{{ item.name }}
{% endif %}
</div>
<div class="grid-item text-end">
{% if g.user.is_authenticated and item.price and item.currency %}
<span class="badge bg-info text-nowrap">{{ "{:,f}".format(item.price) }} {{ item.currency }}</span>
{% if item.currency != "GBP" %}
<span class="badge bg-info text-nowrap">{{ "{:,.2f}".format(item.price / fx_rate[item.currency]) }} GBP</span>
{% endif %}
{% endif %}
</div>
{% endmacro %}
{% macro flightradar24_url(flight) -%}
https://www.flightradar24.com/data/flights/{{ flight.airline_detail.iata | lower + flight.flight_number }}
{%- endmacro %}
{% macro flight_booking_row(booking, show_flags=True) %}
<div class="grid-item">
{% if g.user.is_authenticated %}
{{ booking.booking_reference or "reference missing" }}
{% else %}
<em>redacted</em>
{% endif %}
</div>
<div class="grid-item text-end">
{% if g.user.is_authenticated and booking.price and booking.currency %}
<span class="badge bg-info text-nowrap">{{ "{:,f}".format(booking.price) }} {{ booking.currency }}</span>
{% if booking.currency != "GBP" %}
<span class="badge bg-info text-nowrap">{{ "{:,.2f}".format(booking.price / fx_rate[booking.currency]) }} GBP</span>
{% endif %}
{% endif %}
</div>
{% for i in range(9) %}
<div class="grid-item"></div>
{% endfor %}
{% for item in booking.flights %}
{% set full_flight_number = item.airline_code + item.flight_number %}
{% set radarbox_url = "https://www.radarbox.com/data/flights/" + full_flight_number %}
<div class="grid-item"></div>
<div class="grid-item"></div>
<div class="grid-item text-end">{{ item.depart.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item">{{ item.from }} → {{ item.to }}</div>
<div class="grid-item">{{ item.depart.strftime("%H:%M") }}</div>
<div class="grid-item">
{% if item.arrive %}
{{ item.arrive.strftime("%H:%M") }}
{% if item.arrive.date() != item.depart.date() %}+1 day{% endif %}
{% endif %}
</div>
<div class="grid-item">{{ item.duration }}</div>
<div class="grid-item">{{ full_flight_number }}</div>
<div class="grid-item">
<a href="{{ flightradar24_url(item) }}">flightradar24</a>
| <a href="https://uk.flightaware.com/live/flight/{{ full_flight_number }}">FlightAware</a>
| <a href="{{ radarbox_url }}">radarbox</a>
</div>
<div class="grid-item text-end">
{% if item.distance %}
{{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
{% endif %}
</div>
<div class="grid-item text-end">{{ "{:,.1f}".format(item.co2_kg) }} kg</div>
{% endfor %}
{% endmacro %}
{% macro flight_row(item) %}
{% set full_flight_number = item.airline_code + item.flight_number %}
{% set radarbox_url = "https://www.radarbox.com/data/flights/" + full_flight_number %}
<div class="grid-item text-end">{{ item.depart.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item">{{ item.from }} → {{ item.to }}</div>
<div class="grid-item">{{ item.depart.strftime("%H:%M") }}</div>
<div class="grid-item">
{% if item.arrive %}
{{ item.arrive.strftime("%H:%M") }}
{% if item.arrive.date() != item.depart.date() %}+1 day{% endif %}
{% endif %}
</div>
<div class="grid-item">{{ item.duration }}</div>
<div class="grid-item">{{ full_flight_number }}</div>
<div class="grid-item">
{% if g.user.is_authenticated %}
{{ item.booking_reference }}
{% else %}
<em>redacted</em>
{% endif %}
</div>
<div class="grid-item">
<a href="{{ flightradar24_url(item) }}">flightradar24</a>
| <a href="https://uk.flightaware.com/live/flight/{{ full_flight_number }}">FlightAware</a>
| <a href="{{ radarbox_url }}">radarbox</a>
</div>
<div class="grid-item text-end">
{% if item.distance %}
{{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
{% endif %}
</div>
<div class="grid-item text-end">
{% if g.user.is_authenticated and item.price and item.currency %}
<span class="badge bg-info text-nowrap">{{ "{:,f}".format(item.price) }} {{ item.currency }}</span>
{% if item.currency != "GBP" %}
<span class="badge bg-info text-nowrap">{{ "{:,.2f}".format(item.price / fx_rate[item.currency]) }} GBP</span>
{% endif %}
{% endif %}
</div>
{% endmacro %}
{% macro train_row(item) %}
{% set url = item.url %}
<div class="grid-item text-end">{{ item.depart.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item">
{% if g.user.is_authenticated and item.url %}<a href="{{ url }}">{% endif %}
{{ item.from }} → {{ item.to }}
{% if g.user.is_authenticated and item.url %}</a>{% endif %}
</div>
<div class="grid-item">{{ item.depart.strftime("%H:%M") }}</div>
<div class="grid-item">
{% if item.arrive %}
{{ item.arrive.strftime("%H:%M") }}
{% if item.depart != item.arrive and item.arrive.date() != item.depart.date() %}+1 day{% endif %}
{% endif %}
</div>
<div class="grid-item">{{ ((item.arrive - item.depart).total_seconds() // 60) | int }} mins</div>
<div class="grid-item">{{ item.operator }}</div>
<div class="grid-item">
{% if g.user.is_authenticated %}
{{ item.booking_reference }}
{% else %}
<em>redacted</em>
{% endif %}
</div>
<div class="grid-item">
{% for leg in item.legs %}
{% if leg.url %}
<a href="{{ leg.url }}">[{{ loop.index }}]</a>
{% endif %}
{% endfor %}
</div>
<div class="grid-item text-end">
{% if item.distance %}
{{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
{% endif %}
</div>
<div class="grid-item text-end">
{% if g.user.is_authenticated and item.price and item.currency %}
<span class="badge bg-info text-nowrap">{{ "{:,f}".format(item.price) }} {{ item.currency }}</span>
{% if item.currency != "GBP" and item.currency in fx_rate %}
<span class="badge bg-info text-nowrap">{{ "{:,.2f}".format(item.price / fx_rate[item.currency]) }} GBP</span>
{% endif %}
{% endif %}
</div>
{% endmacro %}
{% macro coach_row(item) %}
{% set url = item.url %}
<div class="grid-item text-end">{{ item.depart.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item">
{% if g.user.is_authenticated and item.url %}<a href="{{ url }}">{% endif %}
{{ item.from }} → {{ item.to }}
{% if g.user.is_authenticated and item.url %}</a>{% endif %}
</div>
<div class="grid-item">{{ item.depart.strftime("%H:%M") }}</div>
<div class="grid-item">
{% if item.arrive %}
{{ item.arrive.strftime("%H:%M") }}
{% if item.depart != item.arrive and item.arrive.date() != item.depart.date() %}+1 day{% endif %}
{% endif %}
</div>
<div class="grid-item">{{ ((item.arrive - item.depart).total_seconds() // 60) | int }} mins</div>
<div class="grid-item">{{ item.operator }}</div>
<div class="grid-item">
{% if g.user.is_authenticated %}
{{ item.booking_reference }}
{% else %}
<em>redacted</em>
{% endif %}
</div>
<div class="grid-item">
</div>
<div class="grid-item text-end">
{% if item.distance %}
{{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
{% endif %}
</div>
<div class="grid-item text-end">
{% if g.user.is_authenticated and item.price and item.currency %}
<span class="badge bg-info text-nowrap">{{ "{:,f}".format(item.price) }} {{ item.currency }}</span>
{% if item.currency != "GBP" and item.currency in fx_rate %}
<span class="badge bg-info text-nowrap">{{ "{:,.2f}".format(item.price / fx_rate[item.currency]) }} GBP</span>
{% endif %}
{% endif %}
</div>
{% endmacro %}
{% macro ferry_row(item) %}
<div class="grid-item text-end">{{ item.depart.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item">
{{ item.from }} → {{ item.to }}
</div>
<div class="grid-item">{{ item.depart.strftime("%H:%M") }}</div>
<div class="grid-item">
{% if item.arrive %}
{{ item.arrive.strftime("%H:%M") }}
{% if item.depart != item.arrive and item.arrive.date() != item.depart.date() %}+1 day{% endif %}
{% endif %}
</div>
<div class="grid-item"></div>
<div class="grid-item">{{ item.operator }}</div>
<div class="grid-item"></div>
<div class="grid-item"></div>
<div class="grid-item"></div>
<div class="grid-item text-end">
{% if g.user.is_authenticated and item.price and item.currency %}
<span class="badge bg-info text-nowrap">{{ "{:,f}".format(item.price) }} {{ item.currency }}</span>
{% if item.currency != "GBP" %}
<span class="badge bg-info text-nowrap">{{ "{:,.2f}".format(item.price / fx_rate[item.currency]) }} GBP</span>
{% endif %}
{% endif %}
</div>
{# <div class="grid-item">{{ item | pprint }}</div> #}
{% endmacro %}
{% macro flag(trip, flag) %}{% if trip.show_flags %}{{ flag }}{% endif %}{% endmacro %}
{% macro conference_list(trip) %}
{% for item in trip.conferences %}
{% set country = get_country(item.country) if item.country else None %}
<div class="card my-1">
<div class="card-body">
<h5 class="card-title">
<a href="{{ item.url }}">{{ item.name }}</a>
<small class="text-muted">
{{ display_date_no_year(item.start) }} to {{ display_date_no_year(item.end) }}
</small>
</h5>
<p class="card-text">
Topic: {{ item.topic }}
| Venue: {{ item.venue }}
| Location: {{ item.location }}
{% if country %}
{{ flag(trip, country.flag) }}
{% elif item.online %}
💻 Online
{% else %}
<span class="text-bg-danger p-2">
country code <strong>{{ item.country }}</strong> not found
</span>
{% endif %}
{% if item.free %}
| <span class="badge bg-success text-nowrap">free to attend</span>
{% elif item.price and item.currency %}
| <span class="badge bg-info text-nowrap">price: {{ item.price }} {{ item.currency }}</span>
{% endif %}
</p>
</div>
</div>
{% endfor %}
{% endmacro %}
{% macro trip_item(trip) %}
{% set distances_by_transport_type = trip.distances_by_transport_type() %}
{% set total_distance = trip.total_distance() %}
{% set total_co2_kg = trip.total_co2_kg() %}
{% set end = trip.end %}
<div class="border border-2 rounded mb-2 p-2">
<h3>
{{ trip_link(trip) }}
<small class="text-muted">({{ display_date(trip.start) }})</small></h3>
<ul class="list-unstyled">
{% for c in trip.countries %}
<li>
{{ c.name }}
{{ c.flag }}
</li>
{% endfor %}
</ul>
{% if end %}
<div>Dates: {{ display_date_no_year(trip.start) }} to {{ display_date_no_year(end) }}
{% if g.user.is_authenticated and trip.start <= today %}
<a href="https://photos.4angle.com/search?query=%7B%22takenAfter%22%3A%22{{trip.start}}T00%3A00%3A00.000Z%22%2C%22takenBefore%22%3A%22{{end}}T23%3A59%3A59.999Z%22%7D">photos</a>
{% endif %}
</div>
{% else %}
<div>Start: {{ display_date_no_year(trip.start) }} (end date missing)</div>
{% endif %}
{% if total_distance %}
<div>
Total distance:
{{ format_distance(total_distance) }}
</div>
{% endif %}
{% if distances_by_transport_type %}
{% for transport_type, distance in distances_by_transport_type %}
<div>
{{ transport_type | title }}
distance: {{format_distance(distance) }}
</div>
{% endfor %}
{% endif %}
{% if total_co2_kg %}
<div>Total CO₂: {{ "{:,.1f}".format(total_co2_kg) }} kg</div>
{% endif %}
{% set co2_by_transport = trip.co2_by_transport_type() %}
{% if co2_by_transport %}
{% for transport_type, co2_kg in co2_by_transport %}
<div>
{{ transport_type | title }}
CO₂: {{ "{:,.1f}".format(co2_kg) }} kg
</div>
{% endfor %}
{% endif %}
{% if trip.schengen_compliance %}
<div>
<strong>Schengen:</strong>
{% if trip.schengen_compliance.is_compliant %}
<span class="badge bg-success">✅ Compliant</span>
{% else %}
<span class="badge bg-danger">❌ Non-compliant</span>
{% endif %}
<span class="text-muted small">({{ trip.schengen_compliance.total_days_used }}/90 days used)</span>
</div>
{% endif %}
{{ conference_list(trip) }}
{% for day, elements in trip.elements_grouped_by_day() %}
<h4>{{ display_date_no_year(day) }}
{% if g.user.is_authenticated and day <= today %}
<span class="lead">
<a href="https://photos.4angle.com/search?query=%7B%22takenAfter%22%3A%22{{day}}T00%3A00%3A00.000Z%22%2C%22takenBefore%22%3A%22{{day}}T23%3A59%3A59.999Z%22%7D">photos</a>
</span>
{% endif %}
</h4>
{% set accommodation_label = {"check-in": "check-in from", "check-out": "check-out by"} %}
{% for e in elements %}
{% if e.element_type in accommodation_label %}
{% set c = get_country(e.detail.country) %}
<div>
{{ e.get_emoji() }} {{ e.title }} {{ flag(trip, c.flag) }}
({{ accommodation_label[e.element_type] }} {{ display_time(e.start_time) }})
</div>
{% else %}
<div>
{{ e.get_emoji() }}
{{ display_time(e.start_time) }}
&ndash;
{{ e.start_loc }} {{ flag(trip, e.start_country.flag) }}
→
{{ display_time(e.end_time) }}
&ndash;
{{ e.end_loc }} {{ flag(trip, e.end_country.flag) }}
{% if e.element_type == "flight" %}
{% set flight = e.detail %}
{% set full_flight_number = flight.airline_code + flight.flight_number %}
{% set radarbox_url = "https://www.radarbox.com/data/flights/" + full_flight_number %}
<span class="text-nowrap"><strong>airline:</strong> {{ flight.airline_name }}</span>
<span class="text-nowrap"><strong>flight number:</strong> {{ full_flight_number }}</span>
{% if flight.duration %}
<span class="text-nowrap"><strong>duration:</strong> {{ flight.duration }}</span>
{% endif %}
{# <pre>{{ flight | pprint }}</pre> #}
<span class="text-nowrap"><strong>CO₂:</strong> {{ "{:,.1f}".format(flight.co2_kg) }} kg</span>
{% endif %}
{% if e.detail.distance %}
<span class="text-nowrap"><strong>distance:</strong> {{ format_distance(e.detail.distance) }}</span>
{% endif %}
{% if e.element_type == "flight" %}
<a href="{{ flightradar24_url(flight) }}">flightradar24</a>
| <a href="https://uk.flightaware.com/live/flight/{{ full_flight_number }}">FlightAware</a>
| <a href="{{ radarbox_url }}">radarbox</a>
{% endif %}
</div>
{% endif %}
{% endfor %}
{% endfor %}
</div>
{% endmacro %}

54
templates/meteors.html
View file

@ -1,54 +0,0 @@
{% extends "base.html" %}
{% block title %}Meteor Showers 2025 - Edward Betts{% endblock %}
{% block content %}
<div class="container-fluid mt-2">
<h1>Meteor Showers 2025</h1>
<p>Major meteor showers visible throughout 2025. All times are approximate and viewing conditions depend on light pollution, weather, and moon phase.</p>
{% for meteor in meteors %}
<div class="row mb-4">
<div class="col-md-2 text-nowrap text-md-end">
<strong>{{ meteor.peak }}</strong>
<br class="d-none d-md-block"/>
<small class="text-muted">{{ meteor.active }}</small>
</div>
<div class="col-md-2 text-md-nowrap">
<span class="d-md-none">Rate:</span>
{{ meteor.rate }}
<br class="d-none d-md-block"/>
<small class="text-muted">{{ meteor.radiant }}</small>
</div>
<div class="col">
<div>
<h4>{{ meteor.name }}</h4>
<p><strong>Moon Phase:</strong> {{ meteor.moon_phase }}</p>
<p><strong>Best Visibility:</strong> {{ meteor.visibility }}</p>
<p>{{ meteor.description }}</p>
</div>
</div>
</div>
{% endfor %}
<div class="mt-4">
<h3>Viewing Tips</h3>
<ul>
<li>Find a dark location away from city lights</li>
<li>Allow your eyes to adjust to darkness for 20-30 minutes</li>
<li>Look northeast for most showers, but meteors can appear anywhere</li>
<li>Best viewing is typically after midnight</li>
<li>No telescope needed - use naked eye viewing</li>
<li>Check weather conditions and moon phase before planning</li>
</ul>
</div>
<div class="mt-4">
<h3>About Meteor Showers</h3>
<p>Meteor showers occur when Earth passes through debris trails left by comets or asteroids. The debris burns up in our atmosphere, creating the streaks of light we see as "shooting stars."</p>
<p><strong>Data Sources:</strong> Information compiled from NASA, American Meteor Society, and astronomical observations for 2025.</p>
</div>
</div>
{% endblock %}

71
templates/navbar.html
View file

@ -1,33 +1,12 @@
{% macro navbar() %}
{% set pages_before_dropdowns = [
{% set pages = [
{"endpoint": "index", "label": "Home" },
{"endpoint": "recent", "label": "Recent" },
{"endpoint": "calendar_page", "label": "Calendar" },
] %}
{% set pages_after_dropdowns = [
{"endpoint": "conference_list", "label": "Conference" },
{"endpoint": "travel_list", "label": "Travel" },
{"endpoint": "accommodation_list", "label": "Accommodation" },
{"endpoint": "gaps_page", "label": "Gaps" },
{"endpoint": "weekends", "label": "Weekends" },
{"endpoint": "launch_list", "label": "Space launches" },
{"endpoint": "meteor_list", "label": "Meteor showers" },
{"endpoint": "holiday_list", "label": "Holidays" },
{"endpoint": "schengen_report", "label": "Schengen" },
] + ([{"endpoint": "birthday_list", "label": "Birthdays" }]
if g.user.is_authenticated else [])
%}
{% set trip_pages = [
{"endpoint": "trip_future_list", "label": "Future trips" },
{"endpoint": "trip_past_list", "label": "Past trips" },
{"endpoint": "trip_stats", "label": "Trip statistics" },
] %}
{% set conference_pages = [
{"endpoint": "conference_list", "label": "Conferences" },
{"endpoint": "past_conference_list", "label": "Past conferences" },
] %}
@ -39,7 +18,7 @@
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
{% for page in pages_before_dropdowns %}
{% for page in pages %}
{% set is_active = request.endpoint == page.endpoint %}
<li class="nav-item">
<a class="nav-link{% if is_active %} border border-white border-2 active{% endif %}" {% if is_active %} aria-current="page"{% endif %} href="{{ url_for(page.endpoint) }}">
@ -47,50 +26,6 @@
</a>
</li>
{% endfor %}
<!-- Trip dropdown -->
{% set trip_active = request.endpoint in ['trip_future_list', 'trip_past_list', 'trip_stats'] %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle{% if trip_active %} border border-white border-2 active{% endif %}" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Trips
</a>
<ul class="dropdown-menu">
{% for page in trip_pages %}
{% set is_active = request.endpoint == page.endpoint %}
<li><a class="dropdown-item{% if is_active %} active{% endif %}" href="{{ url_for(page.endpoint) }}">{{ page.label }}</a></li>
{% endfor %}
</ul>
</li>
<!-- Conference dropdown -->
{% set conference_active = request.endpoint in ['conference_list', 'past_conference_list'] %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle{% if conference_active %} border border-white border-2 active{% endif %}" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Conferences
</a>
<ul class="dropdown-menu">
{% for page in conference_pages %}
{% set is_active = request.endpoint == page.endpoint %}
<li><a class="dropdown-item{% if is_active %} active{% endif %}" href="{{ url_for(page.endpoint) }}">{{ page.label }}</a></li>
{% endfor %}
</ul>
</li>
{% for page in pages_after_dropdowns %}
{% set is_active = request.endpoint == page.endpoint %}
<li class="nav-item">
<a class="nav-link{% if is_active %} border border-white border-2 active{% endif %}" {% if is_active %} aria-current="page"{% endif %} href="{{ url_for(page.endpoint) }}">
{{ page.label }}
</a>
</li>
{% endfor %}
</ul>
<ul class="navbar-nav ms-auto">
{% if g.user.is_authenticated %}
<li class="nav-item"><a class="nav-link" href="{{ url_for("logout", next=request.url) }}">Logout</a></li>
{% else %}
<li class="nav-item"><a class="nav-link" href="{{ url_for("login", next=request.url) }}">Login</a></li>
{% endif %}
</ul>
</div>
</div>

230
templates/schengen_report.html
View file

@ -1,230 +0,0 @@
{% extends "base.html" %}
{% set heading = "Schengen area compliance report" %}
{% block title %}{{ heading }} - Edward Betts{% endblock %}
{% block content %}
<div class="container-fluid mt-2">
<h1>{{ heading }}</h1>
<div class="row">
<div class="col-md-8">
<div class="card mb-4">
<div class="card-header">
<h5 class="card-title">Current Status</h5>
</div>
<div class="card-body">
<div class="row">
<div class="col-md-6">
<h6>Compliance Status</h6>
{% if current_compliance.is_compliant %}
<span class="badge bg-success fs-6">✅ COMPLIANT</span>
{% else %}
<span class="badge bg-danger fs-6">❌ NON-COMPLIANT</span>
{% endif %}
</div>
<div class="col-md-6">
<h6>Days Used</h6>
<div class="fs-4">{{ current_compliance.total_days_used }}/90</div>
</div>
</div>
<div class="row mt-3">
<div class="col-md-6">
{% if current_compliance.is_compliant %}
<h6>Days Remaining</h6>
<div class="fs-5 text-success">{{ current_compliance.days_remaining }}</div>
{% else %}
<h6>Days Over Limit</h6>
<div class="fs-5 text-danger">{{ current_compliance.days_over_limit }}</div>
{% endif %}
</div>
<div class="col-md-6">
{% if current_compliance.next_reset_date %}
<h6>Next Reset Date</h6>
<div class="fs-6">{{ current_compliance.next_reset_date.strftime('%Y-%m-%d') }}</div>
{% endif %}
</div>
</div>
<div class="mt-3">
<h6>Current 180-day Period</h6>
<div class="text-muted">
{{ current_compliance.current_180_day_period[0].strftime('%Y-%m-%d') }} to
{{ current_compliance.current_180_day_period[1].strftime('%Y-%m-%d') }}
</div>
</div>
</div>
</div>
{% if current_compliance.stays_in_period %}
<div class="card mb-4">
<div class="card-header">
<h5 class="card-title">Stays in Current 180-day Period</h5>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>Entry Date</th>
<th>Exit Date</th>
<th>Country</th>
<th>Days</th>
<th>Trip</th>
</tr>
</thead>
<tbody>
{% for stay in current_compliance.stays_in_period %}
<tr>
<td>{{ stay.entry_date.strftime('%Y-%m-%d') }}</td>
<td>
{% if stay.exit_date %}
{{ stay.exit_date.strftime('%Y-%m-%d') }}
{% else %}
<span class="text-muted">ongoing</span>
{% endif %}
</td>
{% set country = get_country(stay.country) %}
<td>{{ country.flag }} {{ country.name }}</td>
<td>{{ stay.days }}</td>
<td>
{% if stay.trip_date and stay.trip_name %}
<a href="{{ url_for('trip_page', start=stay.trip_date.strftime('%Y-%m-%d')) }}" class="text-decoration-none">
{{ stay.trip_name }}
</a>
{% else %}
<span class="text-muted">-</span>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
{% if warnings %}
<div class="card mb-4">
<div class="card-header">
<h5 class="card-title">Warnings</h5>
</div>
<div class="card-body">
{% for warning in warnings %}
<div class="alert alert-{{ 'danger' if warning.severity == 'error' else 'warning' }} alert-dismissible fade show" role="alert">
<strong>{{ warning.date.strftime('%Y-%m-%d') }}</strong><br>
{{ warning.message }}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
{% endfor %}
</div>
</div>
{% endif %}
<div class="card">
<div class="card-header">
<h5 class="card-title">Compliance History</h5>
</div>
<div class="card-body">
<div class="chart-container" style="height: 300px;">
<canvas id="complianceChart"></canvas>
</div>
</div>
</div>
</div>
</div>
{% if trips_with_compliance %}
<div class="card mt-4">
<div class="card-header">
<h5 class="card-title">Trip Compliance History</h5>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>Trip Date</th>
<th>Trip Name</th>
<th>Days Used</th>
<th>Days Remaining</th>
<th>Status</th>
</tr>
</thead>
<tbody>
{% for trip_date, calculation in trips_with_compliance.items() %}
<tr>
<td>{{ trip_date.strftime('%Y-%m-%d') }}</td>
<td>
<a href="{{ url_for('trip_page', start=trip_date.strftime('%Y-%m-%d')) }}" class="text-decoration-none">
{% for trip_obj in trip_list if trip_obj.start == trip_date %}
{{ trip_obj.title }}
{% endfor %}
</a>
</td>
<td>{{ calculation.total_days_used }}/90</td>
<td>{{ calculation.days_remaining }}</td>
<td>
{% if calculation.is_compliant %}
<span class="badge bg-success">Compliant</span>
{% else %}
<span class="badge bg-danger">Non-compliant</span>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% endif %}
</div>
{% endblock %}
{% block scripts %}
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<script>
const ctx = document.getElementById('complianceChart').getContext('2d');
const complianceHistory = {{ compliance_history | tojson }};
const chart = new Chart(ctx, {
type: 'line',
data: {
labels: complianceHistory.map(item => item.date),
datasets: [{
label: 'Days Used',
data: complianceHistory.map(item => item.days_used),
borderColor: 'rgb(75, 192, 192)',
backgroundColor: 'rgba(75, 192, 192, 0.2)',
tension: 0.1
}]
},
options: {
responsive: true,
maintainAspectRatio: false,
scales: {
y: {
beginAtZero: true,
max: 90,
ticks: {
callback: function(value) {
return value + '/90';
}
}
}
},
plugins: {
legend: {
display: true
}
}
}
});
</script>
{% endblock %}

2
templates/show_error.html
View file

@ -1,7 +1,5 @@
{% extends "base.html" %}
{% block title %}Agenda error - Edward Betts{% endblock %}
{% block style %}
<link rel="stylesheet" href="{{url_for('static', filename='css/exception.css')}}" />
{% endblock %}

51
templates/travel.html
View file

@ -1,23 +1,23 @@
{% extends "base.html" %}
{% from "macros.html" import flight_booking_row, train_row with context %}
{% block title %}Travel - Edward Betts{% endblock %}
{% block travel %}
{% endblock %}
{% set flight_column_count = 11 %}
{% set column_count = 10 %}
{% macro display_datetime(dt) %}{{ dt.strftime("%a, %d, %b %Y %H:%M %z") }}{% endmacro %}
{% macro display_time(dt) %}{{ dt.strftime("%H:%M %z") }}{% endmacro %}
{% block style %}
<style>
.grid-container {
display: grid;
grid-template-columns: repeat({{ flight_column_count }}, auto);
grid-template-columns: repeat(7, auto); /* 7 columns for each piece of information */
gap: 10px;
justify-content: start;
}
.train-grid-container {
display: grid;
grid-template-columns: repeat({{ column_count }}, auto);
grid-template-columns: repeat(6, auto); /* 7 columns for each piece of information */
gap: 10px;
justify-content: start;
}
@ -37,20 +37,27 @@
<h3>flights</h3>
<div class="grid-container">
<div class="grid-item">reference</div>
<div class="grid-item">price</div>
<div class="grid-item text-end">date</div>
<div class="grid-item">route</div>
<div class="grid-item">take-off</div>
<div class="grid-item">land</div>
<div class="grid-item">duration</div>
<div class="grid-item">flight</div>
<div class="grid-item">tracking</div>
<div class="grid-item">distance</div>
<div class="grid-item">CO₂ (kg)</div>
<div class="grid-item">reference</div>
{% for item in flights %}
{{ flight_booking_row(item) }}
{% for item in flights | sort(attribute="depart") if item.arrive %}
<div class="grid-item text-end">{{ item.depart.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item">{{ item.from }} &rarr; {{ item.to }}</div>
<div class="grid-item">{{ item.depart.strftime("%H:%M") }}</div>
<div class="grid-item">
{% if item.arrive %}
{{ item.arrive.strftime("%H:%M") }}
{% if item.arrive.date() != item.depart.date() %}+1 day{% endif %}
{% endif %}
</div>
<div class="grid-item">{{ item.duration }}</div>
<div class="grid-item">{{ item.airline }}{{ item.flight_number }}</div>
<div class="grid-item">{{ item.booking_reference }}</div>
{% endfor %}
</div>
@ -61,15 +68,21 @@
<div class="grid-item">route</div>
<div class="grid-item">depart</div>
<div class="grid-item">arrive</div>
<div class="grid-item">duration</div>
<div class="grid-item">operator</div>
<div class="grid-item">reference</div>
<div class="grid-item"></div>
<div class="grid-item"></div>
<div class="grid-item"></div>
{% for item in trains | sort(attribute="depart") %}
{{ train_row(item) }}
{% for item in trains | sort(attribute="depart") if item.arrive %}
<div class="grid-item text-end">{{ item.depart.strftime("%a, %d %b %Y") }}</div>
<div class="grid-item">{{ item.from }} &rarr; {{ item.to }}</div>
<div class="grid-item">{{ item.depart.strftime("%H:%M") }}</div>
<div class="grid-item">
{% if item.arrive %}
{{ item.arrive.strftime("%H:%M") }}
{% if item.arrive.date() != item.depart.date() %}+1 day{% endif %}
{% endif %}
</div>
<div class="grid-item">{{ item.operator }}</div>
<div class="grid-item">{{ item.booking_reference }}</div>
{% endfor %}
</div>

106
templates/trip/list.html
View file

@ -1,106 +0,0 @@
{% extends "base.html" %}
{% from "macros.html" import trip_link, display_date_no_year, display_date, display_datetime, display_time, format_distance, trip_item with context %}
{% block title %}{{ heading }} - Edward Betts{% endblock %}
{% block style %}
<link rel="stylesheet" href="{{ url_for("static", filename="leaflet/leaflet.css") }}">
<style>
body, html {
height: 100%;
margin: 0;
}
.container-fluid {
height: calc(100% - 56px); /* Subtracting the height of the navbar */
}
.text-content {
overflow-y: scroll;
height: 100%;
}
.map-container {
position: sticky;
top: 56px; /* Adjust to be below the navbar */
height: calc(100vh - 56px); /* Subtracting the height of the navbar */
}
#map {
height: 100%;
}
@media (max-width: 767.98px) {
.container-fluid {
display: block;
height: auto;
}
.map-container {
position: relative;
top: 0;
height: 50vh; /* Adjust as needed */
}
.text-content {
height: auto;
overflow-y: auto;
}
}
</style>
{% endblock %}
{% macro section(heading, item_list) %}
{% if item_list %}
{% set items = item_list | list %}
<div class="heading"><h2>{{ heading }}</h2></div>
<p><a href="{{ url_for("trip_stats") }}">Trip statistics</a></p>
<p>{{ items | count }} trips</p>
<div>Total distance: {{ format_distance(total_distance) }}</div>
{% for transport_type, distance in distances_by_transport_type %}
<div>
{{ transport_type | title }}
distance: {{format_distance(distance) }}
</div>
{% endfor %}
<div>Total CO₂: {{ "{:,.1f}".format(total_co2_kg / 1000.0) }} tonnes</div>
{% for transport_type, co2_kg in co2_by_transport_type %}
<div>
{{ transport_type | title }}
CO₂: {{ "{:,.1f}".format(co2_kg) }} kg
</div>
{% endfor %}
{% for trip in items %}
{{ trip_item(trip) }}
{% endfor %}
{% endif %}
{% endmacro %}
{% block content %}
<div class="container-fluid d-flex flex-column flex-md-row">
<div class="map-container col-12 col-md-6 order-1 order-md-2">
<div id="map" class="map"></div>
</div>
<div class="text-content col-12 col-md-6 order-2 order-md-1 pe-3">
{{ section(heading, trips) }}
</div>
</div>
{% endblock %}
{% block scripts %}
<script src="{{ url_for("static", filename="leaflet/leaflet.js") }}"></script>
<script src="{{ url_for("static", filename="leaflet-geodesic/leaflet.geodesic.umd.min.js") }}"></script>
<script src="{{ url_for("static", filename="js/map.js") }}"></script>
<script>
var coordinates = {{ coordinates | tojson }};
var routes = {{ routes | tojson }};
build_map("map", coordinates, routes);
</script>
{% endblock %}

89
templates/trip/stats.html
View file

@ -1,89 +0,0 @@
{% extends "base.html" %}
{% from "macros.html" import format_distance with context %}
{% set heading = "Trip statistics" %}
{% block title %}{{ heading }} - Edward Betts{% endblock %}
{% block content %}
<div class="container-fluid">
<h1>Trip statistics</h1>
<div>Trips: {{ count }}</div>
<div>Conferences: {{ conferences }}</div>
<div>Total distance: {{ format_distance(total_distance) }}</div>
{% for transport_type, distance in distances_by_transport_type %}
<div>
{{ transport_type | title }}
distance: {{format_distance(distance) }}
</div>
{% endfor %}
{% for year, year_stats in yearly_stats | dictsort %}
{% set countries = year_stats.countries | sort(attribute="name") %}
<h4>{{ year }}</h4>
<div>Trips in {{ year }}: {{ year_stats.count }}</div>
<div>Conferences in {{ year }}: {{ year_stats.conferences }}</div>
<div>{{ countries | count }} countries visited in {{ year }}:
{% set new_countries = [] %}
{% for c in countries %}
{% if c.alpha_2 not in previously_visited %}
{% set _ = new_countries.append(c) %}
{% endif %}
{% endfor %}
{% if new_countries %}
({{ new_countries | count }} new)
{% endif %}
{% for c in countries %}
<span class="text-nowrap border border-2 px-2 my-3 mx-1">
{{ c.flag }} {{ c.name }} ({{ c.alpha_2 }})
{% if c.alpha_2 not in previously_visited %}
<span class="badge text-bg-info">new</span>
{% endif %}
</span>
{% endfor %}
</div>
<div>
Flight segments in {{ year }}: {{ year_stats.flight_count or 0 }}
{% if year_stats.airlines %}
[ by airline:
{% for airline, count in year_stats.airlines.most_common() %}
{{ airline }}: {{ count }}{% if not loop.last %},{% endif %}
{% endfor %} ]
{% endif %}
</div>
{% if year_stats.co2_kg %}
<div>Total CO₂:
{% if year_stats.co2_kg >= 1000 %}
{{ "{:,.2f}".format(year_stats.co2_kg / 1000.0) }} tonnes
{% else %}
{{ "{:,.0f}".format(year_stats.co2_kg) }} kg
{% endif %}
</div>
{% if year_stats.co2_by_transport_type %}
{% for transport_type, co2_kg in year_stats.co2_by_transport_type.items() %}
<div style="margin-left: 20px;">
{{ transport_type | title }} CO₂:
{% if co2_kg >= 1000 %}
{{ "{:,.2f}".format(co2_kg / 1000.0) }} tonnes
{% else %}
{{ "{:,.0f}".format(co2_kg) }} kg
{% endif %}
</div>
{% endfor %}
{% endif %}
{% endif %}
<div>Trains segments in {{ year }}: {{ year_stats.train_count or 0 }}</div>
<div>Total distance in {{ year}}: {{ format_distance(year_stats.total_distance or 0) }}</div>
{% if year_stats.distances_by_transport_type %}
{% for transport_type, distance in year_stats.distances_by_transport_type.items() %}
<div>
{{ transport_type | title }}
distance: {{format_distance(distance) }}
</div>
{% endfor %}
{% endif %}
{% endfor %}
</div>
{% endblock %}

128
templates/trip_debug.html
View file

@ -1,128 +0,0 @@
{% extends "base.html" %}
{% block title %}Debug: {{ trip.title }} ({{ trip.start }}) - Edward Betts{% endblock %}
{% block style %}
<style>
.json-display {
background-color: #f8f9fa;
border: 1px solid #dee2e6;
border-radius: 0.375rem;
padding: 1rem;
font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
font-size: 0.875rem;
line-height: 1.4;
white-space: pre-wrap;
overflow-x: auto;
max-height: 80vh;
overflow-y: auto;
}
.debug-header {
background-color: #fff3cd;
border: 1px solid #ffeaa7;
border-radius: 0.375rem;
padding: 1rem;
margin-bottom: 1rem;
}
.debug-header h1 {
color: #856404;
margin-bottom: 0.5rem;
}
.debug-header p {
color: #856404;
margin-bottom: 0.5rem;
}
.debug-header .btn {
margin-right: 0.5rem;
}
/* Basic JSON syntax highlighting using CSS */
.json-display .json-key {
color: #d73a49;
font-weight: bold;
}
.json-display .json-string {
color: #032f62;
}
.json-display .json-number {
color: #005cc5;
}
.json-display .json-boolean {
color: #e36209;
font-weight: bold;
}
.json-display .json-null {
color: #6f42c1;
font-weight: bold;
}
</style>
{% endblock %}
{% block content %}
<div class="container-fluid">
<div class="debug-header">
<h1>🐛 Trip Debug Information</h1>
<p>Raw trip object data for: <strong>{{ trip.title }}</strong></p>
<a href="{{ url_for('trip_page', start=start) }}" class="btn btn-primary">← Back to Trip Page</a>
<button onclick="copyToClipboard()" class="btn btn-secondary">📋 Copy JSON</button>
</div>
<div class="row">
<div class="col-12">
<h3>Trip Object (JSON)</h3>
<div class="json-display" id="jsonDisplay">{{ trip_json }}</div>
</div>
</div>
</div>
{% endblock %}
{% block scripts %}
<script>
function copyToClipboard() {
const jsonText = document.getElementById('jsonDisplay').textContent;
navigator.clipboard.writeText(jsonText).then(function() {
// Show a temporary notification
const btn = event.target;
const originalText = btn.textContent;
btn.textContent = '✅ Copied!';
btn.classList.remove('btn-secondary');
btn.classList.add('btn-success');
setTimeout(function() {
btn.textContent = originalText;
btn.classList.remove('btn-success');
btn.classList.add('btn-secondary');
}, 2000);
}).catch(function(err) {
console.error('Failed to copy: ', err);
alert('Failed to copy to clipboard');
});
}
// Simple JSON syntax highlighting
function highlightJSON() {
const display = document.getElementById('jsonDisplay');
let content = display.textContent;
// Highlight different JSON elements
content = content.replace(/"([^"]+)":/g, '<span class="json-key">"$1":</span>');
content = content.replace(/"([^"]*)"(?=\s*[,\]\}])/g, '<span class="json-string">"$1"</span>');
content = content.replace(/\b(\d+\.?\d*)\b/g, '<span class="json-number">$1</span>');
content = content.replace(/\b(true|false)\b/g, '<span class="json-boolean">$1</span>');
content = content.replace(/\bnull\b/g, '<span class="json-null">null</span>');
display.innerHTML = content;
}
// Apply highlighting when page loads
document.addEventListener('DOMContentLoaded', highlightJSON);
</script>
{% endblock %}

67
templates/trip_list_text.html
View file

@ -1,67 +0,0 @@
{% extends "base.html" %}
{% from "macros.html" import trip_link, display_date_no_year, display_date, conference_row, accommodation_row, flight_row, train_row with context %}
{% set row = { "flight": flight_row, "train": train_row } %}
{% block style %}
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
crossorigin=""/>
{% set conference_column_count = 7 %}
{% set accommodation_column_count = 7 %}
{% set travel_column_count = 8 %}
<style>
.conferences {
display: grid;
grid-template-columns: repeat({{ conference_column_count }}, auto); /* 7 columns for each piece of information */
gap: 10px;
justify-content: start;
}
.accommodation {
display: grid;
grid-template-columns: repeat({{ accommodation_column_count }}, auto);
gap: 10px;
justify-content: start;
}
.travel {
display: grid;
grid-template-columns: repeat({{ travel_column_count }}, auto);
gap: 10px;
justify-content: start;
}
.grid-item {
/* Additional styling for grid items can go here */
}
.map {
height: 80vh;
}
</style>
{% endblock %}
{% block content %}
<div class="p-2">
<h1>Trips</h1>
<p>{{ future | count }} trips</p>
{% for trip in future %}
{% set end = trip.end %}
<div>
{{ display_date_no_year(trip.start) }} to {{ display_date_no_year(end) }}:
{{ trip.title }} &mdash; {{ trip.locations_str }}
</div>
{% endfor %}
</div>
{% endblock %}

425
templates/trip_page.html
View file

@ -1,425 +0,0 @@
{% extends "base.html" %}
{% block title %}{{ trip.title }} ({{ display_date(trip.start) }}) - Edward Betts{% endblock %}
{% from "macros.html" import trip_link, display_datetime, display_date_no_year, display_date, conference_row, accommodation_row, flight_row, train_row, ferry_row, coach_row with context %}
{% set row = {"flight": flight_row, "train": train_row, "ferry": ferry_row, "coach": coach_row} %}
{% macro next_and_previous() %}
<p>
{% if prev_trip %}
previous: {{ trip_link(prev_trip) }} ({{ (trip.start - prev_trip.end).days }} days)
{% endif %}
{% if next_trip %}
next: {{ trip_link(next_trip) }} ({{ (next_trip.start - trip.end).days }} days)
{% endif %}
</p>
{% endmacro %}
{% block style %}
{% if coordinates %}
<link rel="stylesheet" href="{{ url_for("static", filename="leaflet/leaflet.css") }}">
{% endif %}
{% set conference_column_count = 7 %}
{% set accommodation_column_count = 7 %}
{% set travel_column_count = 9 %}
<style>
.conferences {
display: grid;
grid-template-columns: repeat({{ conference_column_count }}, auto); /* 7 columns for each piece of information */
gap: 10px;
justify-content: start;
}
.accommodation {
display: grid;
grid-template-columns: repeat({{ accommodation_column_count }}, auto);
gap: 10px;
justify-content: start;
}
.travel {
display: grid;
grid-template-columns: repeat({{ travel_column_count }}, auto);
gap: 10px;
justify-content: start;
}
.grid-item {
/* Additional styling for grid items can go here */
}
.half-map {
height: 90vh;
}
.full-window-map {
position: fixed; /* Make the map fixed position */
top: 56px;
left: 0;
right: 0;
bottom: 0;
z-index: 9999; /* Make sure it sits on top */
}
#toggleMapSize {
position: fixed; /* Fixed position */
top: 66px; /* 10px from the top */
right: 10px; /* 10px from the right */
z-index: 10000; /* Higher than the map's z-index */
}
</style>
{% endblock %}
{% set end = trip.end %}
{% set total_distance = trip.total_distance() %}
{% set distances_by_transport_type = trip.distances_by_transport_type() %}
{% set total_co2_kg = trip.total_co2_kg() %}
{% set co2_by_transport_type = trip.co2_by_transport_type() %}
{% block content %}
<div class="row">
<div class="col-md-6 col-sm-12">
<div class="m-3">
{{ next_and_previous() }}
<h1>{{ trip.title }}</h1>
<p class="lead">
{% if end %}
{{ display_date_no_year(trip.start) }} to {{ display_date_no_year(end) }}
({{ (end - trip.start).days }} nights)
{% else %}
{{ display_date_no_year(trip.start) }} (end date missing)
{% endif %}
</p>
<div class="mb-3">
{# <div>Countries: {{ trip.countries_str }}</div> #}
<div>Locations: {{ trip.locations_str }}</div>
{% if total_distance %}
<div>Total distance:
{{ "{:,.0f} km / {:,.0f} miles".format(total_distance, total_distance / 1.60934) }}
</div>
{% endif %}
{% if distances_by_transport_type %}
{% for transport_type, distance in distances_by_transport_type %}
<div>{{ transport_type | title }} distance:
{{ "{:,.0f} km / {:,.0f} miles".format(distance, distance / 1.60934) }}
</div>
{% endfor %}
{% endif %}
{% if total_co2_kg %}
<div>Total CO₂: {{ "{:,.1f}".format(total_co2_kg) }} kg</div>
{% endif %}
{% if co2_by_transport_type %}
{% for transport_type, co2_kg in co2_by_transport_type %}
<div>{{ transport_type | title }} CO₂:
{{ "{:,.1f}".format(co2_kg) }} kg
</div>
{% endfor %}
{% endif %}
{% set delta = human_readable_delta(trip.start) %}
{% if delta %}
<div>How long until trip: {{ delta }}</div>
{% endif %}
{% if trip.schengen_compliance %}
<div class="mt-3">
<strong>Schengen Compliance:</strong>
{% if trip.schengen_compliance.is_compliant %}
<span class="badge bg-success">✅ Compliant</span>
{% else %}
<span class="badge bg-danger">❌ Non-compliant</span>
{% endif %}
<div class="text-muted small">
{{ trip.schengen_compliance.total_days_used }}/90 days used
{% if trip.schengen_compliance.is_compliant %}
({{ trip.schengen_compliance.days_remaining }} remaining)
{% else %}
({{ trip.schengen_compliance.days_over_limit }} over limit)
{% endif %}
</div>
</div>
{% endif %}
</div>
{% for item in trip.conferences %}
{% set country = get_country(item.country) if item.country else None %}
<div class="card my-1">
<div class="card-body">
<h5 class="card-title">
<a href="{{ item.url }}">{{ item.name }}</a>
<small class="text-muted">
{{ display_date_no_year(item.start) }} to {{ display_date_no_year(item.end) }}
</small>
</h5>
<p class="card-text">
<strong>Topic:</strong> {{ item.topic }}
<strong>Venue:</strong> {{ item.venue }}
<strong>Location:</strong> {{ item.location }}
{% if country %}
{{ country.flag if trip.show_flags }}
{% elif item.online %}
💻 Online
{% else %}
<span class="text-bg-danger p-2">
country code <strong>{{ item.country }}</strong> not found
</span>
{% endif %}
{% if item.free %}
<span class="badge bg-success text-nowrap">free to attend</span>
{% elif item.price and item.currency %}
<span class="badge bg-info text-nowrap">price: {{ item.price }} {{ item.currency }}</span>
{% endif %}
</p>
</div>
</div>
{% endfor %}
{% for item in trip.accommodation %}
{% set country = get_country(item.country) if item.country else None %}
{% set nights = (item.to.date() - item.from.date()).days %}
<div class="card my-1">
<div class="card-body">
<h5 class="card-title">
{% if item.operator %}{{ item.operator }}: {% endif %}
<a href="{{ item.url }}">{{ item.name }}</a>
<small class="text-muted">
{{ display_date_no_year(item.from) }} to {{ display_date_no_year(item.to) }}
({% if nights == 1 %}1 night{% else %}{{ nights }} nights{% endif %})
</small>
</h5>
<p class="card-text">
<strong>Address:</strong> {{ item.address }}
<strong>Location:</strong> {{ item.location }}
{% if country %}
{{ country.flag if trip.show_flags }}
{% else %}
<span class="text-bg-danger p-2">
country code <strong>{{ item.country }}</strong> not found
</span>
{% endif %}
{% if g.user.is_authenticated and item.price and item.currency %}
<span class="badge bg-info text-nowrap">price: {{ item.price }} {{ item.currency }}</span>
{% endif %}
</p>
</div>
</div>
{% endfor %}
{% if trip.flight_bookings %}
<h3>Flight bookings</h3>
{% for item in trip.flight_bookings %}
<div>
{{ item.flights | map(attribute="airline_name") | unique | join(" + ") }}
{% if g.user.is_authenticated and item.booking_reference %}
<strong>booking reference:</strong> {{ item.booking_reference }}
{% endif %}
{% if g.user.is_authenticated and item.price and item.currency %}
<span class="badge bg-info text-nowrap">price: {{ item.price }} {{ item.currency }}</span>
{% endif %}
</div>
{% endfor %}
{% endif %}
{% for item in trip.events %}
{% set country = get_country(item.country) if item.country else None %}
<div class="card my-1">
<div class="card-body">
<h5 class="card-title">
<a href="{{ item.url }}">{{ item.title }}</a>
<small class="text-muted">{{ display_date_no_year(item.date) }}</small>
</h5>
<p class="card-text">
Address: {{ item.address }}
| Location: {{ item.location }}
{% if country %}
{{ country.flag if trip.show_flags }}
{% else %}
<span class="text-bg-danger p-2">
country code <strong>{{ item.country }}</strong> not found
</span>
{% endif %}
{% if g.user.is_authenticated and item.price and item.currency %}
| <span class="badge bg-info text-nowrap">price: {{ item.price }} {{ item.currency }}</span>
{% endif %}
</p>
</div>
</div>
{% endfor %}
{% for item in trip.travel %}
<div class="card my-1">
<div class="card-body">
<h5 class="card-title">
{% if item.type == "flight" %}
✈️
{{ item.from_airport.name }} ({{ item.from_airport.iata}})
→
{{ item.to_airport.name }} ({{item.to_airport.iata}})
{% elif item.type == "train" %}
🚆
{{ item.from }}
→
{{ item.to }}
{% elif item.type == "coach" %}
🚌
{{ item.from }}
→
{{ item.to }}
{% elif item.type == "ferry" %}
⛴️
{{ item.from }}
→
{{ item.to }}
{% endif %}
</h5>
<p class="card-text">
{% if item.type == "flight" %}
<div>
<span>{{ item.airline_name }} ({{ item.airline }})</span>
✨
{{ display_datetime(item.depart) }}
{% if item.arrive %}
→
{{ item.arrive.strftime("%H:%M %z") }}
<span>🕒{{ ((item.arrive - item.depart).total_seconds() // 60) | int }} mins</span>
{% endif %}
✨
<span>{{ item.airline_code }}{{ item.flight_number }}</span>
{% if item.distance %}
<span>
🌍distance:
{{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
</span>
{% endif %}
</div>
{% elif item.type == "train" %}
<div>
{{ display_datetime(item.depart) }}
→
{{ item.arrive.strftime("%H:%M %z") }}
{% if item.class %}
<span class="badge bg-info text-nowrap">{{ item.class }}</span>
{% endif %}
<span>🕒{{ ((item.arrive - item.depart).total_seconds() // 60) | int }} mins</span>
{% if item.distance %}
<span>
🛤️
{{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
</span>
{% endif %}
</div>
{% elif item.type == "coach" %}
<div>
{{ display_datetime(item.depart) }}
→
{{ item.arrive.strftime("%H:%M %z") }}
{% if item.class %}
<span class="badge bg-info text-nowrap">{{ item.class }}</span>
{% endif %}
<span>🕒{{ ((item.arrive - item.depart).total_seconds() // 60) | int }} mins</span>
{% if item.distance %}
<span>
🛤️
{{ "{:,.0f} km / {:,.0f} miles".format(item.distance, item.distance / 1.60934) }}
</span>
{% endif %}
</div>
{% elif item.type == "ferry" %}
<div>
<span>{{ item.operator }} - {{ item.ferry }}</span>
✨
{{ display_datetime(item.depart) }}
→
{{ item.arrive.strftime("%H:%M %z") }}
<span>🕒{{ ((item.arrive - item.depart).total_seconds() // 60) | int }} mins</span>
{% if item.class %}
<span class="badge bg-info text-nowrap">{{ item.class }}</span>
{% endif %}
</div>
{% if item.vehicle %}
<div>
🚗 Vehicle: {{ item.vehicle.type }} {% if g.user.is_authenticated %}({{ item.vehicle.registration }}) {% endif %}
{% if item.vehicle.extras %}
- Extras: {{ item.vehicle.extras | join(", ") }}
{% endif %}
</div>
{% endif %}
{% if g.user.is_authenticated %}
<div>
{% if item.booking_reference %}
<strong>Booking reference:</strong> {{ item.booking_reference }}
{% endif %}
{% if item.price and item.currency %}
<span class="badge bg-info text-nowrap">Price: {{ item.price }} {{ item.currency }}</span>
{% endif %}
</div>
{% endif %}
{% endif %}
</p>
</div>
</div>
{% endfor %}
<div class="mt-3">
<h4>Holidays</h4>
{% if holidays %}
<table class="table table-hover w-auto">
{% for item in holidays %}
{% set country = get_country(item.country) %}
<tr>
{% if loop.first or item.date != loop.previtem.date %}
<td class="text-end">{{ display_date(item.date) }}</td>
{% else %}
<td></td>
{% endif %}
<td>{{ country.flag if trip.show_flags }} {{ country.name }}</td>
<td>{{ item.display_name }}</td>
</tr>
{% endfor %}
</table>
{% else %}
<p>No public holidays during trip.</p>
{% endif %}
</div>
{{ next_and_previous() }}
</div>
</div>
<div class="col-md-6 col-sm-12">
<button id="toggleMapSize" class="btn btn-primary mb-2">Toggle map size</button>
<div id="map" class="half-map">
</div>
</div>
</div>
{% endblock %}
{% block scripts %}
<script src="{{ url_for("static", filename="leaflet/leaflet.js") }}"></script>
<script src="{{ url_for("static", filename="leaflet-geodesic/leaflet.geodesic.umd.min.js") }}"></script>
<script src="{{ url_for("static", filename="js/map.js") }}"></script>
<script>
var coordinates = {{ coordinates | tojson }};
var routes = {{ routes | tojson }};
build_map("map", coordinates, routes);
</script>
{% endblock %}

62
templates/weekends.html
View file

@ -1,62 +0,0 @@
{% extends "base.html" %}
{% block title %}Weekends - Edward Betts{% endblock %}
{% block content %}
<div class="p-2">
<h1>Weekends</h1>
<table class="table table-hover w-auto">
<thead>
<tr>
<th class="text-end">Week</th>
<th class="text-end">Date</th>
<th>Saturday</th>
<th>Saturday Location</th>
<th>Sunday</th>
<th>Sunday Location</th>
</tr>
</thead>
<tbody>
{% set current_isocalendar = today.isocalendar() %}
{% for weekend in items %}
{% set week_number = weekend.date.isocalendar().week %}
{% set iso_week_year = weekend.date.isocalendar().year %}
{% if week_number == current_week_number and iso_week_year == current_isocalendar.year %}
{% set extra_class = " bg-warning-subtle" %}
{% else %}
{% set extra_class = "" %}
{% endif %}
<tr{% if week_number == current_week_number %} class="bg-warning-subtle"{% endif %}>
<td class="text-end{{ extra_class }}">
{{ week_number }}
</td>
<td class="text-end text-nowrap{{ extra_class }}">
{{ weekend.date.strftime("%-d %b %Y") }}
</td>
{% for day in "saturday", "sunday" %}
{% if extra_class %}<td class="{{ extra_class|trim }}">{% else %}<td>{% endif %}
{% if weekend[day] %}
{% for event in weekend[day] %}
<a href="{{ event.url }}">{{ event.title }}</a>{% if not loop.last %},{%endif %}
{% endfor %}
{% else %}
<strong>free</strong>
{% endif %}
</td>
{% if extra_class %}<td class="{{ extra_class|trim }}">{% else %}<td>{% endif %}
{% set city, country = weekend[day + '_location'] %}
{% if city %}
{{ city }}, {{ country.flag }} {{ country.name }}
{% endif %}
</td>
{% endfor %}
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% endblock %}

186
tests/test_accommodation.py
View file

@ -1,186 +0,0 @@
"""Tests for accommodation functionality."""
import tempfile
from datetime import date, datetime
from typing import Any
import pytest
import yaml
from agenda.accommodation import get_events
from agenda.event import Event
class TestGetEvents:
"""Test the get_events function."""
def test_get_events_airbnb(self) -> None:
"""Test getting accommodation events for Airbnb."""
accommodation_data = [
{
"from": date(2024, 6, 1),
"to": date(2024, 6, 5),
"location": "Paris",
"operator": "airbnb",
"url": "https://airbnb.com/rooms/123"
}
]
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(accommodation_data, f)
filepath = f.name
try:
events = get_events(filepath)
assert len(events) == 1
event = events[0]
assert event.date == date(2024, 6, 1)
assert event.end_date == date(2024, 6, 5)
assert event.name == "accommodation"
assert event.title == "Paris Airbnb"
assert event.url == "https://airbnb.com/rooms/123"
finally:
import os
os.unlink(filepath)
def test_get_events_hotel(self) -> None:
"""Test getting accommodation events for hotel."""
accommodation_data = [
{
"from": date(2024, 6, 1),
"to": date(2024, 6, 5),
"name": "Hilton Hotel",
"url": "https://hilton.com"
}
]
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(accommodation_data, f)
filepath = f.name
try:
events = get_events(filepath)
assert len(events) == 1
event = events[0]
assert event.date == date(2024, 6, 1)
assert event.end_date == date(2024, 6, 5)
assert event.name == "accommodation"
assert event.title == "Hilton Hotel"
assert event.url == "https://hilton.com"
finally:
import os
os.unlink(filepath)
def test_get_events_no_url(self) -> None:
"""Test getting accommodation events without URL."""
accommodation_data = [
{
"from": date(2024, 6, 1),
"to": date(2024, 6, 5),
"name": "Local B&B"
}
]
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(accommodation_data, f)
filepath = f.name
try:
events = get_events(filepath)
assert len(events) == 1
event = events[0]
assert event.url is None
assert event.title == "Local B&B"
finally:
import os
os.unlink(filepath)
def test_get_events_multiple_accommodations(self) -> None:
"""Test getting multiple accommodation events."""
accommodation_data = [
{
"from": date(2024, 6, 1),
"to": date(2024, 6, 5),
"location": "London",
"operator": "airbnb"
},
{
"from": date(2024, 6, 10),
"to": date(2024, 6, 15),
"name": "Royal Hotel"
}
]
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(accommodation_data, f)
filepath = f.name
try:
events = get_events(filepath)
assert len(events) == 2
# Check first accommodation (Airbnb)
assert events[0].title == "London Airbnb"
assert events[0].date == date(2024, 6, 1)
# Check second accommodation (Hotel)
assert events[1].title == "Royal Hotel"
assert events[1].date == date(2024, 6, 10)
finally:
import os
os.unlink(filepath)
def test_get_events_empty_file(self) -> None:
"""Test getting events from empty file."""
accommodation_data: list[dict[str, Any]] = []
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(accommodation_data, f)
filepath = f.name
try:
events = get_events(filepath)
assert events == []
finally:
import os
os.unlink(filepath)
def test_get_events_file_not_found(self) -> None:
"""Test error handling when file doesn't exist."""
with pytest.raises(FileNotFoundError):
get_events("/nonexistent/file.yaml")
def test_get_events_datetime_objects(self) -> None:
"""Test with datetime objects instead of dates."""
accommodation_data = [
{
"from": datetime(2024, 6, 1, 15, 0),
"to": datetime(2024, 6, 5, 11, 0),
"name": "Hotel Example"
}
]
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(accommodation_data, f)
filepath = f.name
try:
events = get_events(filepath)
assert len(events) == 1
event = events[0]
assert event.date == datetime(2024, 6, 1, 15, 0)
assert event.end_date == datetime(2024, 6, 5, 11, 0)
finally:
import os
os.unlink(filepath)

158
tests/test_agenda.py
View file

@ -1,130 +1,80 @@
"""Tests for agenda."""
import datetime
import json
from decimal import Decimal
from unittest.mock import patch
import pytest
from agenda import format_list_with_ampersand, get_country, uk_time
from agenda.data import timezone_transition
from agenda.economist import publication_dates
from agenda.fx import get_gbpusd
from agenda.holidays import get_all
from agenda.uk_holiday import bank_holiday_list, get_mothers_day
from agenda.utils import timedelta_display
from agenda import (
get_gbpusd,
get_next_bank_holiday,
get_next_timezone_transition,
next_economist,
next_uk_fathers_day,
next_uk_mothers_day,
timedelta_display,
uk_financial_year_end,
)
@pytest.fixture
def mock_today() -> datetime.date:
"""Mock the current date for testing purposes."""
def mock_today():
# Mock the current date for testing purposes
return datetime.date(2023, 10, 5)
@pytest.fixture
def mock_now() -> datetime.datetime:
"""Mock the current date and time for testing purposes."""
def mock_now():
# Mock the current date and time for testing purposes
return datetime.datetime(2023, 10, 5, 12, 0, 0)
def test_get_mothers_day(mock_today: datetime.date) -> None:
"""Test get_mothers_day function."""
mothers_day = get_mothers_day(mock_today)
# UK Mother's Day 2024 is April 21st (3 weeks after Easter)
assert mothers_day == datetime.date(2024, 4, 21)
def test_next_uk_mothers_day(mock_today):
# Test next_uk_mothers_day function
next_mothers_day = next_uk_mothers_day(mock_today)
assert next_mothers_day == datetime.date(2024, 4, 21)
def test_timezone_transition(mock_now: datetime.datetime) -> None:
"""Test timezone_transition function."""
start = datetime.datetime(2023, 10, 1)
end = datetime.datetime(2023, 11, 1)
transitions = timezone_transition(start, end, "uk_clock_change", "Europe/London")
assert len(transitions) == 1
assert transitions[0].name == "uk_clock_change"
assert transitions[0].date.date() == datetime.date(2023, 10, 29)
def test_next_uk_fathers_day(mock_today):
# Test next_uk_fathers_day function
next_fathers_day = next_uk_fathers_day(mock_today)
assert next_fathers_day == datetime.date(2024, 6, 21)
def test_get_gbpusd_function_exists() -> None:
"""Test that get_gbpusd function exists and is callable."""
# Simple test to verify the function exists and has correct signature
from inspect import signature
sig = signature(get_gbpusd)
assert len(sig.parameters) == 1
assert "config" in sig.parameters
assert sig.return_annotation == Decimal
def test_get_next_timezone_transition(mock_now) -> None:
# Test get_next_timezone_transition function
next_transition = get_next_timezone_transition(mock_now, "Europe/London")
assert next_transition == datetime.date(2023, 10, 29)
def test_publication_dates(mock_today: datetime.date) -> None:
"""Test publication_dates function."""
start_date = mock_today
end_date = mock_today + datetime.timedelta(days=30)
publications = publication_dates(start_date, end_date)
assert len(publications) >= 0 # Should return some publications
if publications:
assert all(pub.name == "economist" for pub in publications)
def test_get_next_bank_holiday(mock_today) -> None:
# Test get_next_bank_holiday function
next_holiday = get_next_bank_holiday(mock_today)[0]
assert next_holiday.date == datetime.date(2023, 12, 25)
assert next_holiday.title == "Christmas Day"
def test_timedelta_display() -> None:
"""Test timedelta_display function."""
def test_get_gbpusd(mock_now):
# Test get_gbpusd function
gbpusd = get_gbpusd()
assert isinstance(gbpusd, Decimal)
# You can add more assertions based on your specific use case.
def test_next_economist(mock_today):
# Test next_economist function
next_publication = next_economist(mock_today)
assert next_publication == datetime.date(2023, 10, 5)
def test_uk_financial_year_end():
# Test uk_financial_year_end function
financial_year_end = uk_financial_year_end(datetime.date(2023, 4, 1))
assert financial_year_end == datetime.date(2023, 4, 5)
def test_timedelta_display():
# Test timedelta_display function
delta = datetime.timedelta(days=2, hours=5, minutes=30)
display = timedelta_display(delta)
assert display == "2 days 5 hrs 30 mins"
assert display == " 2 days 5 hrs 30 mins"
def test_format_list_with_ampersand() -> None:
"""Test format_list_with_ampersand function."""
# Test with multiple items
items = ["apple", "banana", "cherry"]
result = format_list_with_ampersand(items)
assert result == "apple, banana & cherry"
# Test with two items
items = ["apple", "banana"]
result = format_list_with_ampersand(items)
assert result == "apple & banana"
# Test with single item
items = ["apple"]
result = format_list_with_ampersand(items)
assert result == "apple"
# Test with empty list
items = []
result = format_list_with_ampersand(items)
assert result == ""
def test_get_country() -> None:
"""Test get_country function."""
# Test with valid alpha-2 code
country = get_country("US")
assert country is not None
assert country.name == "United States"
# Test with valid alpha-3 code
country = get_country("GBR")
assert country is not None
assert country.name == "United Kingdom"
# Test with None
country = get_country(None)
assert country is None
# Test with Kosovo special case
country = get_country("xk")
assert country is not None
assert country.name == "Kosovo"
def test_uk_time() -> None:
"""Test uk_time function."""
test_date = datetime.date(2023, 7, 15) # Summer time
test_time = datetime.time(14, 30, 0)
result = uk_time(test_date, test_time)
assert isinstance(result, datetime.datetime)
assert result.date() == test_date
assert result.time() == test_time
assert result.tzinfo is not None
# You can add more test cases for other functions as needed.

186
tests/test_airbnb.py
View file

@ -1,186 +0,0 @@
"""Tests for agenda.airbnb module."""
import pytest
from datetime import datetime
from zoneinfo import ZoneInfo
from unittest.mock import Mock, patch, mock_open
from agenda.airbnb import (
build_datetime,
list_to_dict,
extract_country_code,
walk_tree,
get_ui_state,
get_reservation_data,
get_price_from_reservation,
parse_multiple_files,
)
class TestBuildDatetime:
def test_build_datetime_utc(self):
result = build_datetime("2025-07-28", "15:30", "UTC")
expected = datetime(2025, 7, 28, 15, 30, tzinfo=ZoneInfo("UTC"))
assert result == expected
def test_build_datetime_local_timezone(self):
result = build_datetime("2025-12-25", "09:00", "Europe/London")
expected = datetime(2025, 12, 25, 9, 0, tzinfo=ZoneInfo("Europe/London"))
assert result == expected
class TestListToDict:
def test_list_to_dict_even_items(self):
items = ["key1", "value1", "key2", "value2"]
result = list_to_dict(items)
expected = {"key1": "value1", "key2": "value2"}
assert result == expected
def test_list_to_dict_empty_list(self):
result = list_to_dict([])
assert result == {}
def test_list_to_dict_single_pair(self):
items = ["name", "John"]
result = list_to_dict(items)
assert result == {"name": "John"}
class TestExtractCountryCode:
def test_extract_country_code_uk(self):
address = "123 Main Street, London, United Kingdom"
result = extract_country_code(address)
assert result == "gb"
def test_extract_country_code_france(self):
address = "456 Rue de la Paix, Paris, France"
result = extract_country_code(address)
assert result == "fr"
def test_extract_country_code_usa(self):
address = "789 Broadway, New York, United States"
result = extract_country_code(address)
assert result == "us"
def test_extract_country_code_not_found(self):
address = "123 Unknown Street, Mystery City"
result = extract_country_code(address)
assert result is None
def test_extract_country_code_case_insensitive(self):
address = "123 Main Street, UNITED KINGDOM"
result = extract_country_code(address)
assert result == "gb"
class TestWalkTree:
def test_walk_tree_dict_found(self):
data = {"level1": {"level2": {"target": "found"}}}
result = walk_tree(data, "target")
assert result == "found"
def test_walk_tree_dict_not_found(self):
data = {"level1": {"level2": {"other": "value"}}}
result = walk_tree(data, "target")
assert result is None
def test_walk_tree_list_found(self):
data = [{"other": "value"}, {"target": "found"}]
result = walk_tree(data, "target")
assert result == "found"
def test_walk_tree_nested_list_dict(self):
data = [{"level1": [{"target": "found"}]}]
result = walk_tree(data, "target")
assert result == "found"
def test_walk_tree_empty_data(self):
result = walk_tree({}, "target")
assert result is None
class TestGetPriceFromReservation:
def test_get_price_from_reservation_valid(self):
reservation = {
"payment_summary": {"subtitle": "Total cost: £150.00"}
}
result = get_price_from_reservation(reservation)
assert result == "150.00"
def test_get_price_from_reservation_different_amount(self):
reservation = {
"payment_summary": {"subtitle": "Total cost: £89.99"}
}
result = get_price_from_reservation(reservation)
assert result == "89.99"
class TestParseMultipleFiles:
@patch('agenda.airbnb.extract_booking_from_html')
def test_parse_multiple_files_single_file(self, mock_extract):
mock_booking = {
"type": "apartment",
"operator": "airbnb",
"name": "Test Apartment",
"booking_reference": "ABC123"
}
mock_extract.return_value = mock_booking
result = parse_multiple_files(["test1.html"])
assert len(result) == 1
assert result[0] == mock_booking
mock_extract.assert_called_once_with("test1.html")
@patch('agenda.airbnb.extract_booking_from_html')
def test_parse_multiple_files_multiple_files(self, mock_extract):
mock_booking1 = {"booking_reference": "ABC123"}
mock_booking2 = {"booking_reference": "DEF456"}
mock_extract.side_effect = [mock_booking1, mock_booking2]
result = parse_multiple_files(["test2.html", "test1.html"])
assert len(result) == 2
assert result[0] == mock_booking1
assert result[1] == mock_booking2
@patch('agenda.airbnb.extract_booking_from_html')
def test_parse_multiple_files_empty_list(self, mock_extract):
result = parse_multiple_files([])
assert result == []
mock_extract.assert_not_called()
class TestGetUiState:
@patch('lxml.html.etree')
def test_get_ui_state_with_mock_tree(self, mock_etree):
mock_tree = Mock()
mock_tree.xpath.return_value = ['{"test": [["uiState", {"key": "value"}]]}']
with patch('agenda.airbnb.walk_tree') as mock_walk:
mock_walk.return_value = [["key", "value"]]
result = get_ui_state(mock_tree)
assert result == {"key": "value"}
mock_tree.xpath.assert_called_once_with('//*[@id="data-injector-instances"]/text()')
class TestGetReservationData:
def test_get_reservation_data(self):
ui_state = {
"reservation": {
"scheduled_event": {
"rows": [
{"id": "row1", "data": "value1"},
{"id": "row2", "data": "value2"}
]
}
}
}
result = get_reservation_data(ui_state)
expected = {
"row1": {"id": "row1", "data": "value1"},
"row2": {"id": "row2", "data": "value2"}
}
assert result == expected

227
tests/test_birthday.py
View file

@ -1,227 +0,0 @@
"""Tests for birthday functionality."""
import tempfile
from datetime import date
from typing import Any
import pytest
import yaml
from agenda.birthday import YEAR_NOT_KNOWN, get_birthdays, next_birthday
from agenda.event import Event
class TestNextBirthday:
"""Test the next_birthday function."""
def test_birthday_this_year_future(self) -> None:
"""Test birthday that hasn't occurred this year."""
from_date = date(2024, 3, 15)
birth_date = date(1990, 6, 20)
next_bday, age = next_birthday(from_date, birth_date)
assert next_bday == date(2024, 6, 20)
assert age == 34
def test_birthday_this_year_past(self) -> None:
"""Test birthday that already occurred this year."""
from_date = date(2024, 8, 15)
birth_date = date(1990, 6, 20)
next_bday, age = next_birthday(from_date, birth_date)
assert next_bday == date(2025, 6, 20)
assert age == 35
def test_birthday_today(self) -> None:
"""Test when today is the birthday."""
from_date = date(2024, 6, 20)
birth_date = date(1990, 6, 20)
next_bday, age = next_birthday(from_date, birth_date)
assert next_bday == date(2024, 6, 20)
assert age == 34
def test_birthday_unknown_year(self) -> None:
"""Test birthday with unknown year."""
from_date = date(2024, 3, 15)
birth_date = date(YEAR_NOT_KNOWN, 6, 20)
next_bday, age = next_birthday(from_date, birth_date)
assert next_bday == date(2024, 6, 20)
assert age is None
def test_birthday_unknown_year_past(self) -> None:
"""Test birthday with unknown year that already passed."""
from_date = date(2024, 8, 15)
birth_date = date(YEAR_NOT_KNOWN, 6, 20)
next_bday, age = next_birthday(from_date, birth_date)
assert next_bday == date(2025, 6, 20)
assert age is None
def test_leap_year_birthday(self) -> None:
"""Test birthday on leap day."""
from_date = date(2024, 1, 15) # 2024 is a leap year
birth_date = date(2000, 2, 29) # Born on leap day
next_bday, age = next_birthday(from_date, birth_date)
assert next_bday == date(2024, 2, 29)
assert age == 24
class TestGetBirthdays:
"""Test the get_birthdays function."""
def test_get_birthdays_with_year(self) -> None:
"""Test getting birthdays with known birth years."""
birthday_data = [
{
"label": "John Doe",
"birthday": {"year": 1990, "month": 6, "day": 20}
},
{
"label": "Jane Smith",
"birthday": {"year": 1985, "month": 12, "day": 15}
}
]
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(birthday_data, f)
filepath = f.name
try:
from_date = date(2024, 3, 15)
events = get_birthdays(from_date, filepath)
# Should have 4 events (2 people × 2 years each)
assert len(events) == 4
# Check John's birthdays
john_events = [e for e in events if "John Doe" in e.title]
assert len(john_events) == 2
assert john_events[0].date == date(2024, 6, 20)
assert "aged 34" in john_events[0].title
assert john_events[1].date == date(2025, 6, 20)
assert "aged 35" in john_events[1].title
# Check Jane's birthdays
jane_events = [e for e in events if "Jane Smith" in e.title]
assert len(jane_events) == 2
assert jane_events[0].date == date(2024, 12, 15)
assert "aged 39" in jane_events[0].title
# All events should be birthday events
for event in events:
assert event.name == "birthday"
assert isinstance(event, Event)
finally:
import os
os.unlink(filepath)
def test_get_birthdays_without_year(self) -> None:
"""Test getting birthdays with unknown birth years."""
birthday_data = [
{
"label": "Anonymous Person",
"birthday": {"month": 6, "day": 20}
}
]
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(birthday_data, f)
filepath = f.name
try:
from_date = date(2024, 3, 15)
events = get_birthdays(from_date, filepath)
# Should have 2 events (1 person × 2 years)
assert len(events) == 2
# Check that age is unknown
for event in events:
assert "age unknown" in event.title
assert "Anonymous Person" in event.title
assert event.name == "birthday"
finally:
import os
os.unlink(filepath)
def test_get_birthdays_mixed_data(self) -> None:
"""Test getting birthdays with mixed known/unknown years."""
birthday_data = [
{
"label": "Known Person",
"birthday": {"year": 1990, "month": 6, "day": 20}
},
{
"label": "Unknown Person",
"birthday": {"month": 8, "day": 15}
}
]
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(birthday_data, f)
filepath = f.name
try:
from_date = date(2024, 3, 15)
events = get_birthdays(from_date, filepath)
# Should have 4 events total
assert len(events) == 4
# Check known person events
known_events = [e for e in events if "Known Person" in e.title]
assert len(known_events) == 2
assert all("aged" in e.title and "age unknown" not in e.title for e in known_events)
# Check unknown person events
unknown_events = [e for e in events if "Unknown Person" in e.title]
assert len(unknown_events) == 2
assert all("age unknown" in e.title for e in unknown_events)
finally:
import os
os.unlink(filepath)
def test_get_birthdays_empty_file(self) -> None:
"""Test getting birthdays from empty file."""
birthday_data: list[dict[str, Any]] = []
with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
yaml.dump(birthday_data, f)
filepath = f.name
try:
from_date = date(2024, 3, 15)
events = get_birthdays(from_date, filepath)
assert events == []
finally:
import os
os.unlink(filepath)
def test_get_birthdays_file_not_found(self) -> None:
"""Test error handling when file doesn't exist."""
from_date = date(2024, 3, 15)
with pytest.raises(FileNotFoundError):
get_birthdays(from_date, "/nonexistent/file.yaml")
class TestConstants:
"""Test module constants."""
def test_year_not_known_constant(self) -> None:
"""Test that YEAR_NOT_KNOWN has expected value."""
assert YEAR_NOT_KNOWN == 1900

370
tests/test_bristol_waste.py
View file

@ -1,370 +0,0 @@
"""Test Bristol waste collection module."""
import json
import os
import tempfile
from datetime import date, datetime, timedelta
from unittest.mock import AsyncMock, Mock, patch
import httpx
import pytest
from agenda import bristol_waste
from agenda.event import Event
@pytest.fixture
def temp_data_dir():
"""Create a temporary directory for test data."""
with tempfile.TemporaryDirectory() as tmpdir:
yield tmpdir
@pytest.fixture
def sample_bristol_data():
"""Sample Bristol waste collection data."""
return [
{
"containerName": "Recycling Container",
"collection": [
{
"nextCollectionDate": "2024-07-15T00:00:00Z",
"lastCollectionDate": "2024-07-01T00:00:00Z",
}
],
},
{
"containerName": "General Waste Container",
"collection": [
{
"nextCollectionDate": "2024-07-22T00:00:00Z",
"lastCollectionDate": "2024-07-08T00:00:00Z",
}
],
},
{
"containerName": "Food Waste Container",
"collection": [
{
"nextCollectionDate": "2024-07-16T00:00:00Z",
"lastCollectionDate": "2024-07-02T00:00:00Z",
}
],
},
]
@pytest.fixture
def mock_response(sample_bristol_data):
"""Mock HTTP response for Bristol waste API."""
response = Mock(spec=httpx.Response)
response.content = json.dumps({"data": sample_bristol_data}).encode()
response.json.return_value = {"data": sample_bristol_data}
return response
class TestGetService:
"""Test get_service function."""
def test_recycling_container(self):
"""Test extracting recycling service name."""
item = {"containerName": "Recycling Container"}
result = bristol_waste.get_service(item)
assert result == "Recycling"
def test_general_waste_container(self):
"""Test extracting general waste service name."""
item = {"containerName": "General Waste Container"}
result = bristol_waste.get_service(item)
assert result == "Waste Container"
def test_food_waste_container(self):
"""Test extracting food waste service name."""
item = {"containerName": "Food Waste Container"}
result = bristol_waste.get_service(item)
assert result == "Waste Container"
def test_garden_waste_container(self):
"""Test extracting garden waste service name."""
item = {"containerName": "Garden Waste Container"}
result = bristol_waste.get_service(item)
assert result == "Waste Container"
class TestCollections:
"""Test collections function."""
def test_single_collection_dates(self):
"""Test extracting dates from a single collection."""
item = {
"collection": [
{
"nextCollectionDate": "2024-07-15T00:00:00Z",
"lastCollectionDate": "2024-07-01T00:00:00Z",
}
]
}
dates = list(bristol_waste.collections(item))
expected = [date(2024, 7, 15), date(2024, 7, 1)]
assert dates == expected
def test_multiple_collection_dates(self):
"""Test extracting dates from multiple collections."""
item = {
"collection": [
{
"nextCollectionDate": "2024-07-15T00:00:00Z",
"lastCollectionDate": "2024-07-01T00:00:00Z",
},
{
"nextCollectionDate": "2024-07-22T00:00:00Z",
"lastCollectionDate": "2024-07-08T00:00:00Z",
},
]
}
dates = list(bristol_waste.collections(item))
expected = [
date(2024, 7, 15),
date(2024, 7, 1),
date(2024, 7, 22),
date(2024, 7, 8),
]
assert dates == expected
def test_empty_collection(self):
"""Test extracting dates from empty collection."""
item = {"collection": []}
dates = list(bristol_waste.collections(item))
assert dates == []
class TestGetWebData:
"""Test get_web_data function."""
@pytest.mark.asyncio
async def test_get_web_data_success(self, mock_response):
"""Test successful web data retrieval."""
uprn = "123456789012"
with patch("httpx.AsyncClient") as mock_client:
mock_async_client = AsyncMock()
mock_client.return_value.__aenter__.return_value = mock_async_client
mock_async_client.get.return_value = mock_response
mock_async_client.post.return_value = mock_response
result = await bristol_waste.get_web_data(uprn)
assert result == mock_response
assert mock_async_client.get.call_count == 1
assert mock_async_client.post.call_count == 2
@pytest.mark.asyncio
async def test_get_web_data_zero_padded_uprn(self, mock_response):
"""Test UPRN is zero-padded to 12 digits."""
uprn = "123456"
with patch("httpx.AsyncClient") as mock_client:
mock_async_client = AsyncMock()
mock_client.return_value.__aenter__.return_value = mock_async_client
mock_async_client.get.return_value = mock_response
mock_async_client.post.return_value = mock_response
await bristol_waste.get_web_data(uprn)
# Check that the UPRN was zero-padded in the requests
calls = mock_async_client.post.call_args_list
assert calls[0][1]["json"] == {"Uprn": "UPRN000000123456"}
assert calls[1][1]["json"] == {"uprn": "000000123456"}
class TestGetData:
"""Test get_data function."""
@pytest.mark.asyncio
async def test_get_data_force_cache(self, temp_data_dir, sample_bristol_data):
"""Test using forced cache."""
uprn = "123456789012"
os.makedirs(os.path.join(temp_data_dir, "waste"))
# Create a cached file
cache_file = os.path.join(
temp_data_dir, "waste", f"2024-07-01_12:00_{uprn}.json"
)
with open(cache_file, "w") as f:
json.dump({"data": sample_bristol_data}, f)
result = await bristol_waste.get_data(temp_data_dir, uprn, "force")
assert result == sample_bristol_data
@pytest.mark.asyncio
async def test_get_data_refresh_cache(
self, temp_data_dir, sample_bristol_data, mock_response
):
"""Test refreshing cache."""
uprn = "123456789012"
with patch("agenda.bristol_waste.get_web_data", return_value=mock_response):
with patch("agenda.bristol_waste.datetime") as mock_datetime:
mock_now = datetime(2024, 7, 15, 14, 30)
mock_datetime.now.return_value = mock_now
mock_datetime.strptime = datetime.strptime
result = await bristol_waste.get_data(temp_data_dir, uprn, "refresh")
assert result == sample_bristol_data
# Check that cache file was created
waste_dir = os.path.join(temp_data_dir, "waste")
cache_files = [
f for f in os.listdir(waste_dir) if f.endswith(f"_{uprn}.json")
]
assert len(cache_files) == 1
assert cache_files[0] == f"2024-07-15_14:30_{uprn}.json"
@pytest.mark.asyncio
async def test_get_data_recent_cache(self, temp_data_dir, sample_bristol_data):
"""Test using recent cache within TTL."""
uprn = "123456789012"
os.makedirs(os.path.join(temp_data_dir, "waste"))
# Create a recent cached file (within TTL)
recent_time = datetime.now() - timedelta(hours=6)
cache_file = os.path.join(
temp_data_dir,
"waste",
f"{recent_time.strftime('%Y-%m-%d_%H:%M')}_{uprn}.json",
)
with open(cache_file, "w") as f:
json.dump({"data": sample_bristol_data}, f)
result = await bristol_waste.get_data(temp_data_dir, uprn, "auto")
assert result == sample_bristol_data
@pytest.mark.asyncio
async def test_get_data_expired_cache(
self, temp_data_dir, sample_bristol_data, mock_response
):
"""Test with expired cache, should fetch new data."""
uprn = "123456789012"
os.makedirs(os.path.join(temp_data_dir, "waste"))
# Create an old cached file (beyond TTL)
old_time = datetime.now() - timedelta(hours=25)
cache_file = os.path.join(
temp_data_dir, "waste", f"{old_time.strftime('%Y-%m-%d_%H:%M')}_{uprn}.json"
)
with open(cache_file, "w") as f:
json.dump({"data": [{"old": "data"}]}, f)
with patch("agenda.bristol_waste.get_web_data", return_value=mock_response):
result = await bristol_waste.get_data(temp_data_dir, uprn, "auto")
assert result == sample_bristol_data
@pytest.mark.asyncio
async def test_get_data_timeout_fallback(self, temp_data_dir, sample_bristol_data):
"""Test fallback to cache when web request times out."""
uprn = "123456789012"
os.makedirs(os.path.join(temp_data_dir, "waste"))
# Create a cached file
cache_file = os.path.join(
temp_data_dir, "waste", f"2024-07-01_12:00_{uprn}.json"
)
with open(cache_file, "w") as f:
json.dump({"data": sample_bristol_data}, f)
with patch(
"agenda.bristol_waste.get_web_data",
side_effect=httpx.ReadTimeout("Timeout"),
):
result = await bristol_waste.get_data(temp_data_dir, uprn, "refresh")
assert result == sample_bristol_data
class TestGet:
"""Test main get function."""
@pytest.mark.asyncio
async def test_get_events(self, temp_data_dir, sample_bristol_data):
"""Test generating events from Bristol waste data."""
start_date = date(2024, 7, 10)
uprn = "123456789012"
with patch("agenda.bristol_waste.get_data", return_value=sample_bristol_data):
events = await bristol_waste.get(start_date, temp_data_dir, uprn, "auto")
assert len(events) == 3 # Only dates before start_date
# Check event properties
for event in events:
assert isinstance(event, Event)
assert event.name == "waste_schedule"
assert event.title.startswith("Bristol: ")
assert event.date < start_date
@pytest.mark.asyncio
async def test_get_events_filtered_by_start_date(
self, temp_data_dir, sample_bristol_data
):
"""Test events are filtered by start date."""
start_date = date(2024, 7, 20) # Later start date
uprn = "123456789012"
with patch("agenda.bristol_waste.get_data", return_value=sample_bristol_data):
events = await bristol_waste.get(start_date, temp_data_dir, uprn, "auto")
# Should get all events before start_date (all dates in sample data)
assert len(events) == 5 # All collection dates are before 2024-07-20
for event in events:
assert event.date < start_date
@pytest.mark.asyncio
async def test_get_events_combined_services(self, temp_data_dir):
"""Test services are combined for same date."""
# Create data with multiple services on same date
data = [
{
"containerName": "Recycling Container",
"collection": [
{
"nextCollectionDate": "2024-07-15T00:00:00Z",
"lastCollectionDate": "2024-07-01T00:00:00Z",
}
],
},
{
"containerName": "Food Waste Container",
"collection": [
{
"nextCollectionDate": "2024-07-15T00:00:00Z",
"lastCollectionDate": "2024-07-01T00:00:00Z",
}
],
},
]
start_date = date(2024, 7, 10)
uprn = "123456789012"
with patch("agenda.bristol_waste.get_data", return_value=data):
events = await bristol_waste.get(start_date, temp_data_dir, uprn, "auto")
# Should have 1 event (only the 2024-07-01 date is before start_date)
assert len(events) == 1
# Check that the event for 2024-07-01 combines both services
july_1_event = events[0]
assert july_1_event.date == date(2024, 7, 1)
assert "Recycling" in july_1_event.title
assert "Waste Container" in july_1_event.title
@pytest.mark.asyncio
async def test_get_empty_data(self, temp_data_dir):
"""Test with empty data."""
start_date = date(2024, 7, 10)
uprn = "123456789012"
with patch("agenda.bristol_waste.get_data", return_value=[]):
events = await bristol_waste.get(start_date, temp_data_dir, uprn, "auto")
assert events == []

214
tests/test_busy.py
View file

@ -1,214 +0,0 @@
from datetime import date, datetime
import agenda.busy
import agenda.travel as travel
import agenda.trip
import pytest
from agenda.busy import _parse_datetime_field
from agenda.event import Event
from web_view import app
@pytest.fixture(scope="session")
def app_context():
"""Set up Flask app context for tests."""
app.config["SERVER_NAME"] = "test"
with app.app_context():
yield
@pytest.fixture(scope="session")
def trips(app_context):
"""Load trip list once for all tests."""
return agenda.trip.build_trip_list()
@pytest.fixture(scope="session")
def travel_data(app_context):
"""Load travel data (bookings, accommodations, airports) once for all tests."""
data_dir = app.config["PERSONAL_DATA"]
return {
"bookings": travel.parse_yaml("flights", data_dir),
"accommodations": travel.parse_yaml("accommodation", data_dir),
"airports": travel.parse_yaml("airports", data_dir),
"data_dir": data_dir,
}
def test_weekend_location_consistency(app_context, trips, travel_data):
"""Test that weekend locations are consistent with events (free=home, events=away)."""
for year in range(2023, 2025):
start = date(2023, 1, 1)
busy_events = agenda.busy.get_busy_events(start, app.config, trips)
weekends = agenda.busy.weekends(
start, busy_events, trips, travel_data["data_dir"]
)
for weekend in weekends:
for day in "saturday", "sunday":
# When free (no events), should be home (None)
# When traveling (events), should be away (City name)
location_exists = bool(weekend[day + "_location"][0])
has_events = bool(weekend[day])
assert location_exists == has_events, (
f"Weekend {weekend['date']} {day}: "
f"location_exists={location_exists}, has_events={has_events}"
)
def test_specific_home_dates(travel_data):
"""Test specific dates that should return home (None)."""
trips = agenda.trip.build_trip_list()
home_dates = [
date(2023, 4, 29),
date(2025, 7, 1),
date(2023, 12, 2),
date(2023, 10, 7),
date(2023, 2, 18),
date(2025, 8, 2),
]
for test_date in home_dates:
location = agenda.busy.get_location_for_date(
test_date,
trips,
)
assert not location[
0
], f"Expected home (None) for {test_date}, got {location[0]}"
def test_specific_away_dates(travel_data):
"""Test specific dates that should return away locations."""
trips = agenda.trip.build_trip_list()
away_cases = [
(date(2025, 2, 15), "Hackettstown"),
]
for test_date, expected_city in away_cases:
location = agenda.busy.get_location_for_date(
test_date,
trips,
)
assert (
location[0] == expected_city
), f"Expected {expected_city} for {test_date}, got {location[0]}"
def test_get_location_for_date_basic(travel_data):
"""Test basic functionality of get_location_for_date function."""
trips = agenda.trip.build_trip_list()
test_date = date(2023, 1, 1)
location = agenda.busy.get_location_for_date(
test_date,
trips,
)
# Should return a tuple with (city|None, country)
assert isinstance(location, tuple)
assert len(location) == 2
assert location[1] is not None # Should always have a country
def test_busy_event_classification():
"""Test the busy_event function for different event types."""
# Busy event types
busy_events = [
Event(name="event", title="Test Event", date=date(2023, 1, 1)),
Event(
name="conference",
title="Test Conference",
date=date(2023, 1, 1),
going=True,
),
Event(name="accommodation", title="Hotel", date=date(2023, 1, 1)),
Event(name="transport", title="Flight", date=date(2023, 1, 1)),
]
for event in busy_events:
assert agenda.busy.busy_event(event), f"Event {event.name} should be busy"
# Non-busy events
non_busy_events = [
Event(
name="conference",
title="Test Conference",
date=date(2023, 1, 1),
going=False,
),
Event(name="other", title="Other Event", date=date(2023, 1, 1)),
Event(name="event", title="LHG Run Club", date=date(2023, 1, 1)),
Event(name="event", title="IA UK board meeting", date=date(2023, 1, 1)),
]
for event in non_busy_events:
assert not agenda.busy.busy_event(
event
), f"Event {event.name}/{event.title} should not be busy"
def test_parse_datetime_field():
"""Test the _parse_datetime_field helper function."""
# Test with datetime object
dt = datetime(2023, 1, 1, 12, 0, 0)
parsed_dt, parsed_date = _parse_datetime_field(dt)
assert parsed_dt == dt
assert parsed_date == date(2023, 1, 1)
# Test with ISO string
iso_string = "2023-01-01T12:00:00Z"
parsed_dt, parsed_date = _parse_datetime_field(iso_string)
assert parsed_date == date(2023, 1, 1)
assert parsed_dt.year == 2023
assert parsed_dt.month == 1
assert parsed_dt.day == 1
def test_get_busy_events(app_context, trips):
"""Test get_busy_events function."""
start_date = date(2023, 1, 1)
busy_events = agenda.busy.get_busy_events(start_date, app.config, trips)
# Should return a list
assert isinstance(busy_events, list)
# All events should be Event objects
for event in busy_events:
assert hasattr(event, "name")
assert hasattr(event, "as_date")
# Events should be sorted by date
dates = [event.as_date for event in busy_events]
assert dates == sorted(dates), "Events should be sorted by date"
def test_weekends_function(app_context, trips, travel_data):
"""Test the weekends function."""
start_date = date(2023, 1, 1)
busy_events = agenda.busy.get_busy_events(start_date, app.config, trips)
weekends = agenda.busy.weekends(
start_date, busy_events, trips, travel_data["data_dir"]
)
# Should return a list of weekend info
assert isinstance(weekends, list)
assert len(weekends) == 52 # Should return 52 weekends
# Each weekend should have the required keys
for weekend in weekends[:5]: # Check first 5 weekends
assert "date" in weekend
assert "saturday" in weekend
assert "sunday" in weekend
assert "saturday_location" in weekend
assert "sunday_location" in weekend
# Locations should be tuples
assert isinstance(weekend["saturday_location"], tuple)
assert isinstance(weekend["sunday_location"], tuple)
assert len(weekend["saturday_location"]) == 2
assert len(weekend["sunday_location"]) == 2

125
tests/test_carnival.py
View file

@ -1,125 +0,0 @@
"""Tests for carnival functionality."""
from datetime import date
from agenda.carnival import rio_carnival_events
from agenda.event import Event
class TestRioCarnivalEvents:
"""Test the rio_carnival_events function."""
def test_carnival_events_single_year(self) -> None:
"""Test getting carnival events for a single year."""
# 2024 Easter is March 31, so carnival should be around Feb 9-14
start_date = date(2024, 1, 1)
end_date = date(2024, 12, 31)
events = rio_carnival_events(start_date, end_date)
assert len(events) == 1
event = events[0]
assert event.name == "carnival"
assert event.title == "Rio Carnival"
assert event.url == "https://en.wikipedia.org/wiki/Rio_Carnival"
assert event.date.year == 2024
assert event.end_date is not None
assert event.end_date.year == 2024
# Should be about 51 days before Easter (around early-mid February)
assert event.date.month == 2
assert event.end_date.month == 2
def test_carnival_events_multiple_years(self) -> None:
"""Test getting carnival events for multiple years."""
start_date = date(2023, 1, 1)
end_date = date(2025, 12, 31)
events = rio_carnival_events(start_date, end_date)
# Should have carnival for 2023, 2024, and 2025
assert len(events) == 3
years = [event.date.year for event in events]
assert sorted(years) == [2023, 2024, 2025]
# All events should be carnival events
for event in events:
assert event.name == "carnival"
assert event.title == "Rio Carnival"
assert event.url == "https://en.wikipedia.org/wiki/Rio_Carnival"
def test_carnival_events_no_overlap(self) -> None:
"""Test when date range doesn't overlap with carnival."""
# Choose a range that's unlikely to include carnival (summer)
start_date = date(2024, 6, 1)
end_date = date(2024, 8, 31)
events = rio_carnival_events(start_date, end_date)
assert events == []
def test_carnival_events_partial_overlap_start(self) -> None:
"""Test when carnival start overlaps with date range."""
# 2024 carnival should be around Feb 9-14
start_date = date(2024, 2, 10) # Might overlap with carnival start
end_date = date(2024, 2, 15)
events = rio_carnival_events(start_date, end_date)
# Should include carnival if there's any overlap
if events:
assert len(events) == 1
assert events[0].name == "carnival"
def test_carnival_events_partial_overlap_end(self) -> None:
"""Test when carnival end overlaps with date range."""
# 2024 carnival should be around Feb 9-14
start_date = date(2024, 2, 12)
end_date = date(2024, 2, 20) # Might overlap with carnival end
events = rio_carnival_events(start_date, end_date)
# Should include carnival if there's any overlap
if events:
assert len(events) == 1
assert events[0].name == "carnival"
def test_carnival_dates_relative_to_easter(self) -> None:
"""Test that carnival dates are correctly calculated relative to Easter."""
start_date = date(2024, 1, 1)
end_date = date(2024, 12, 31)
events = rio_carnival_events(start_date, end_date)
assert len(events) == 1
event = events[0]
# Carnival should be 5 days long
duration = (event.end_date - event.date).days + 1
assert duration == 6 # 51 days before to 46 days before Easter (6 days total)
# Both dates should be in February for 2024
assert event.date.month == 2
assert event.end_date.month == 2
# End date should be after start date
assert event.end_date > event.date
def test_carnival_events_empty_date_range(self) -> None:
"""Test with empty date range."""
start_date = date(2024, 6, 15)
end_date = date(2024, 6, 10) # End before start
events = rio_carnival_events(start_date, end_date)
# Should return empty list for invalid range
assert events == []
def test_carnival_events_same_start_end_date(self) -> None:
"""Test with same start and end date."""
# Pick a date that's definitely not carnival
test_date = date(2024, 7, 15)
events = rio_carnival_events(test_date, test_date)
assert events == []

370
tests/test_conference.py
View file

@ -1,370 +0,0 @@
"""Tests for agenda.conference module."""
import decimal
import tempfile
from datetime import date, datetime
from typing import Any
import pytest
import yaml
from agenda.conference import Conference, get_list
from agenda.event import Event
class TestConference:
"""Tests for Conference dataclass."""
def test_conference_creation_minimal(self) -> None:
"""Test creating conference with minimal required fields."""
conf = Conference(
name="PyCon",
topic="Python",
location="Portland",
start=date(2024, 5, 15),
end=date(2024, 5, 17),
)
assert conf.name == "PyCon"
assert conf.topic == "Python"
assert conf.location == "Portland"
assert conf.start == date(2024, 5, 15)
assert conf.end == date(2024, 5, 17)
assert conf.trip is None
assert conf.going is False
assert conf.online is False
def test_conference_creation_full(self) -> None:
"""Test creating conference with all fields."""
conf = Conference(
name="PyCon US",
topic="Python",
location="Portland",
start=date(2024, 5, 15),
end=date(2024, 5, 17),
trip=date(2024, 5, 14),
country="USA",
venue="Convention Center",
address="123 Main St",
url="https://pycon.org",
accommodation_booked=True,
transport_booked=True,
going=True,
registered=True,
speaking=True,
online=False,
price=decimal.Decimal("500.00"),
currency="USD",
latitude=45.5152,
longitude=-122.6784,
cfp_end=date(2024, 2, 1),
cfp_url="https://pycon.org/cfp",
free=False,
hackathon=True,
ticket_type="early_bird",
attendees=3000,
hashtag="#pycon2024",
)
assert conf.name == "PyCon US"
assert conf.going is True
assert conf.price == decimal.Decimal("500.00")
assert conf.currency == "USD"
assert conf.latitude == 45.5152
assert conf.longitude == -122.6784
assert conf.cfp_end == date(2024, 2, 1)
assert conf.hashtag == "#pycon2024"
def test_display_name_location_in_name(self) -> None:
"""Test display_name when location is already in conference name."""
conf = Conference(
name="PyCon Portland",
topic="Python",
location="Portland",
start=date(2024, 5, 15),
end=date(2024, 5, 17),
)
assert conf.display_name == "PyCon Portland"
def test_display_name_location_not_in_name(self) -> None:
"""Test display_name when location is not in conference name."""
conf = Conference(
name="PyCon",
topic="Python",
location="Portland",
start=date(2024, 5, 15),
end=date(2024, 5, 17),
)
assert conf.display_name == "PyCon (Portland)"
def test_display_name_partial_location_match(self) -> None:
"""Test display_name when location is partially in name."""
conf = Conference(
name="PyConf",
topic="Python",
location="Conference Center",
start=date(2024, 5, 15),
end=date(2024, 5, 17),
)
assert conf.display_name == "PyConf (Conference Center)"
def test_conference_with_datetime(self) -> None:
"""Test conference with datetime objects."""
start_dt = datetime(2024, 5, 15, 9, 0)
end_dt = datetime(2024, 5, 17, 17, 0)
conf = Conference(
name="PyCon",
topic="Python",
location="Portland",
start=start_dt,
end=end_dt,
)
assert conf.start == start_dt
assert conf.end == end_dt
class TestGetList:
"""Tests for get_list function."""
def test_get_list_single_conference(self) -> None:
"""Test reading single conference from YAML."""
yaml_data = [
{
"name": "PyCon",
"topic": "Python",
"location": "Portland",
"start": date(2024, 5, 15),
"end": date(2024, 5, 17),
"url": "https://pycon.org",
"going": True,
}
]
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump(yaml_data, f)
f.flush()
events = get_list(f.name)
assert len(events) == 1
event = events[0]
assert isinstance(event, Event)
assert event.name == "conference"
assert event.date == date(2024, 5, 15)
assert event.end_date == date(2024, 5, 17)
assert event.title == "PyCon (Portland)"
assert event.url == "https://pycon.org"
assert event.going is True
def test_get_list_conference_with_cfp(self) -> None:
"""Test reading conference with CFP end date."""
yaml_data = [
{
"name": "PyCon",
"topic": "Python",
"location": "Portland",
"start": date(2024, 5, 15),
"end": date(2024, 5, 17),
"url": "https://pycon.org",
"cfp_end": date(2024, 2, 1),
"cfp_url": "https://pycon.org/cfp",
}
]
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump(yaml_data, f)
f.flush()
events = get_list(f.name)
assert len(events) == 2
# Conference event
conf_event = events[0]
assert conf_event.name == "conference"
assert conf_event.title == "PyCon (Portland)"
assert conf_event.url == "https://pycon.org"
# CFP end event
cfp_event = events[1]
assert cfp_event.name == "cfp_end"
assert cfp_event.date == date(2024, 2, 1)
assert cfp_event.title == "CFP end: PyCon (Portland)"
assert cfp_event.url == "https://pycon.org/cfp"
def test_get_list_conference_cfp_no_url(self) -> None:
"""Test reading conference with CFP end date but no CFP URL."""
yaml_data = [
{
"name": "PyCon",
"topic": "Python",
"location": "Portland",
"start": date(2024, 5, 15),
"end": date(2024, 5, 17),
"url": "https://pycon.org",
"cfp_end": date(2024, 2, 1),
}
]
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump(yaml_data, f)
f.flush()
events = get_list(f.name)
assert len(events) == 2
cfp_event = events[1]
assert cfp_event.url == "https://pycon.org" # Falls back to conference URL
def test_get_list_multiple_conferences(self) -> None:
"""Test reading multiple conferences from YAML."""
yaml_data = [
{
"name": "PyCon",
"topic": "Python",
"location": "Portland",
"start": date(2024, 5, 15),
"end": date(2024, 5, 17),
},
{
"name": "EuroPython",
"topic": "Python",
"location": "Prague",
"start": date(2024, 7, 8),
"end": date(2024, 7, 14),
"cfp_end": date(2024, 3, 15),
},
]
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump(yaml_data, f)
f.flush()
events = get_list(f.name)
assert len(events) == 3 # 2 conferences + 1 CFP end
# First conference
assert events[0].title == "PyCon (Portland)"
assert events[0].date == date(2024, 5, 15)
# Second conference
assert events[1].title == "EuroPython (Prague)"
assert events[1].date == date(2024, 7, 8)
# CFP end event for second conference
assert events[2].name == "cfp_end"
assert events[2].title == "CFP end: EuroPython (Prague)"
def test_get_list_location_in_name(self) -> None:
"""Test conference where location is already in name."""
yaml_data = [
{
"name": "PyCon Portland",
"topic": "Python",
"location": "Portland",
"start": date(2024, 5, 15),
"end": date(2024, 5, 17),
}
]
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump(yaml_data, f)
f.flush()
events = get_list(f.name)
assert len(events) == 1
assert events[0].title == "PyCon Portland" # No location appended
def test_get_list_datetime_objects(self) -> None:
"""Test reading conferences with datetime objects."""
yaml_data = [
{
"name": "PyCon",
"topic": "Python",
"location": "Portland",
"start": datetime(2024, 5, 15, 9, 0),
"end": datetime(2024, 5, 17, 17, 0),
}
]
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump(yaml_data, f)
f.flush()
events = get_list(f.name)
assert len(events) == 1
event = events[0]
assert event.date == datetime(2024, 5, 15, 9, 0)
assert event.end_date == datetime(2024, 5, 17, 17, 0)
def test_get_list_invalid_date_order(self) -> None:
"""Test that conferences with end before start raise assertion error."""
yaml_data = [
{
"name": "Invalid Conference",
"topic": "Testing",
"location": "Nowhere",
"start": date(2024, 5, 17),
"end": date(2024, 5, 15), # End before start
}
]
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump(yaml_data, f)
f.flush()
with pytest.raises(AssertionError):
get_list(f.name)
def test_get_list_too_long_conference(self) -> None:
"""Test that conferences longer than MAX_CONF_DAYS raise assertion error."""
yaml_data = [
{
"name": "Too Long Conference",
"topic": "Testing",
"location": "Nowhere",
"start": date(2024, 5, 1),
"end": date(2024, 6, 1), # More than 20 days
}
]
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump(yaml_data, f)
f.flush()
with pytest.raises(AssertionError):
get_list(f.name)
def test_get_list_empty_file(self) -> None:
"""Test reading empty YAML file."""
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump([], f)
f.flush()
events = get_list(f.name)
assert events == []
def test_get_list_same_day_conference(self) -> None:
"""Test conference that starts and ends on same day."""
yaml_data = [
{
"name": "One Day Conference",
"topic": "Testing",
"location": "Test City",
"start": date(2024, 5, 15),
"end": date(2024, 5, 15),
}
]
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
yaml.dump(yaml_data, f)
f.flush()
events = get_list(f.name)
assert len(events) == 1
event = events[0]
assert event.date == date(2024, 5, 15)
assert event.end_date == date(2024, 5, 15)

168
tests/test_domains.py
View file

@ -1,168 +0,0 @@
"""Tests for domain renewal functionality."""
import csv
import os
import tempfile
from datetime import date
from typing import Any
import pytest
from agenda.domains import renewal_dates, url
from agenda.event import Event
class TestRenewalDates:
"""Test the renewal_dates function."""
def test_renewal_dates_empty_directory(self) -> None:
"""Test with empty directory."""
with tempfile.TemporaryDirectory() as temp_dir:
with pytest.raises(ValueError, match="max\\(\\) iterable argument is empty"):
renewal_dates(temp_dir)
def test_renewal_dates_no_matching_files(self) -> None:
"""Test with directory containing no matching files."""
with tempfile.TemporaryDirectory() as temp_dir:
# Create some non-matching files
with open(os.path.join(temp_dir, "other_file.csv"), "w") as f:
f.write("test")
with open(os.path.join(temp_dir, "not_export.csv"), "w") as f:
f.write("test")
with pytest.raises(ValueError, match="max\\(\\) iterable argument is empty"):
renewal_dates(temp_dir)
def test_renewal_dates_single_file(self) -> None:
"""Test with single domain export file."""
with tempfile.TemporaryDirectory() as temp_dir:
# Create a domain export file
filename = "export_domains_01_15_2024_02_30_PM.csv"
filepath = os.path.join(temp_dir, filename)
# Create CSV content
csv_data = [
["fqdn", "date_registry_end_utc"],
["example.com", "2024-06-15T00:00:00Z"],
["test.org", "2024-12-31T00:00:00Z"]
]
with open(filepath, "w", newline="") as f:
writer = csv.writer(f)
writer.writerows(csv_data)
result = renewal_dates(temp_dir)
assert len(result) == 2
# Check first domain
assert result[0].name == "domain"
assert result[0].title == "🌐 example.com"
assert result[0].date == date(2024, 6, 15)
assert result[0].url == url + "example.com"
# Check second domain
assert result[1].name == "domain"
assert result[1].title == "🌐 test.org"
assert result[1].date == date(2024, 12, 31)
assert result[1].url == url + "test.org"
def test_renewal_dates_multiple_files_latest_used(self) -> None:
"""Test that the latest file is used when multiple exist."""
with tempfile.TemporaryDirectory() as temp_dir:
# Create older file
older_filename = "export_domains_01_15_2024_02_30_PM.csv"
older_filepath = os.path.join(temp_dir, older_filename)
older_csv_data = [
["fqdn", "date_registry_end_utc"],
["old.com", "2024-06-15T00:00:00Z"]
]
with open(older_filepath, "w", newline="") as f:
writer = csv.writer(f)
writer.writerows(older_csv_data)
# Create newer file
newer_filename = "export_domains_01_16_2024_03_45_PM.csv"
newer_filepath = os.path.join(temp_dir, newer_filename)
newer_csv_data = [
["fqdn", "date_registry_end_utc"],
["new.com", "2024-08-20T00:00:00Z"]
]
with open(newer_filepath, "w", newline="") as f:
writer = csv.writer(f)
writer.writerows(newer_csv_data)
result = renewal_dates(temp_dir)
# Should only get data from newer file
assert len(result) == 1
assert result[0].title == "🌐 new.com"
assert result[0].date == date(2024, 8, 20)
def test_renewal_dates_empty_csv(self) -> None:
"""Test with empty CSV file."""
with tempfile.TemporaryDirectory() as temp_dir:
filename = "export_domains_01_15_2024_02_30_PM.csv"
filepath = os.path.join(temp_dir, filename)
# Create CSV with only headers
csv_data = [["fqdn", "date_registry_end_utc"]]
with open(filepath, "w", newline="") as f:
writer = csv.writer(f)
writer.writerows(csv_data)
result = renewal_dates(temp_dir)
assert result == []
def test_renewal_dates_directory_not_found(self) -> None:
"""Test error handling when directory doesn't exist."""
with pytest.raises(FileNotFoundError):
renewal_dates("/nonexistent/directory")
def test_renewal_dates_malformed_filename(self) -> None:
"""Test with malformed filename that can't be parsed."""
with tempfile.TemporaryDirectory() as temp_dir:
# Create file with name that starts correctly but can't be parsed as date
filename = "export_domains_invalid_date.csv"
filepath = os.path.join(temp_dir, filename)
with open(filepath, "w") as f:
f.write("test")
# Should raise ValueError when trying to parse the malformed date
with pytest.raises(ValueError, match="time data .* does not match format"):
renewal_dates(temp_dir)
def test_renewal_dates_various_date_formats(self) -> None:
"""Test with various date formats in the CSV."""
with tempfile.TemporaryDirectory() as temp_dir:
filename = "export_domains_01_15_2024_02_30_PM.csv"
filepath = os.path.join(temp_dir, filename)
csv_data = [
["fqdn", "date_registry_end_utc"],
["example1.com", "2024-06-15T12:34:56Z"],
["example2.com", "2024-12-31T00:00:00+00:00"],
["example3.com", "2024-03-20T23:59:59.999Z"]
]
with open(filepath, "w", newline="") as f:
writer = csv.writer(f)
writer.writerows(csv_data)
result = renewal_dates(temp_dir)
assert len(result) == 3
assert result[0].date == date(2024, 6, 15)
assert result[1].date == date(2024, 12, 31)
assert result[2].date == date(2024, 3, 20)
class TestConstants:
"""Test module constants."""
def test_url_constant(self) -> None:
"""Test that URL constant has expected value."""
expected_url = "https://admin.gandi.net/domain/01578ef0-a84b-11e7-bdf3-00163e6dc886/"
assert url == expected_url

49
tests/test_events_yaml.py
View file

@ -1,49 +0,0 @@
"""Tests for events_yaml functionality."""
from datetime import date, datetime, time
from agenda.events_yaml import midnight
class TestMidnight:
"""Test the midnight function."""
def test_midnight_with_date(self) -> None:
"""Test converting date to midnight datetime."""
test_date = date(2024, 6, 15)
result = midnight(test_date)
assert isinstance(result, datetime)
assert result.date() == test_date
assert result.time() == time(0, 0, 0) # Midnight
assert result == datetime(2024, 6, 15, 0, 0, 0)
def test_midnight_different_dates(self) -> None:
"""Test midnight function with different dates."""
test_cases = [
date(2024, 1, 1), # New Year's Day
date(2024, 12, 31), # New Year's Eve
date(2024, 2, 29), # Leap day
date(2024, 7, 4), # Independence Day
]
for test_date in test_cases:
result = midnight(test_date)
assert result.date() == test_date
assert result.time() == time(0, 0, 0)
assert result.hour == 0
assert result.minute == 0
assert result.second == 0
assert result.microsecond == 0
def test_midnight_preserves_year_month_day(self) -> None:
"""Test that midnight preserves the year, month, and day."""
test_date = date(2023, 11, 27)
result = midnight(test_date)
assert result.year == 2023
assert result.month == 11
assert result.day == 27
assert result.hour == 0
assert result.minute == 0
assert result.second == 0

182
tests/test_fx.py
View file

@ -1,182 +0,0 @@
"""Tests for foreign exchange functionality."""
import json
import os
import tempfile
from decimal import Decimal
from unittest.mock import Mock, patch
import pytest
from agenda.fx import read_cached_rates
class TestReadCachedRates:
"""Test the read_cached_rates function."""
def test_read_cached_rates_none_filename(self) -> None:
"""Test with None filename returns empty dict."""
result = read_cached_rates(None, ["USD", "EUR"])
assert result == {}
def test_read_cached_rates_valid_file(self) -> None:
"""Test reading valid cached rates file."""
currencies = ["USD", "EUR", "JPY"]
data = {
"quotes": {
"GBPUSD": 1.25,
"GBPEUR": 1.15,
"GBPJPY": 150.0,
"GBPCAD": 1.70 # Not requested
}
}
with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
json.dump(data, f)
filepath = f.name
try:
result = read_cached_rates(filepath, currencies)
assert len(result) == 3
assert result["USD"] == Decimal("1.25")
assert result["EUR"] == Decimal("1.15")
assert result["JPY"] == Decimal("150.0")
assert "CAD" not in result # Not requested
finally:
os.unlink(filepath)
def test_read_cached_rates_missing_currencies(self) -> None:
"""Test with some currencies missing from data."""
currencies = ["USD", "EUR", "CHF"] # CHF not in data
data = {
"quotes": {
"GBPUSD": 1.25,
"GBPEUR": 1.15
# GBPCHF missing
}
}
with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
json.dump(data, f)
filepath = f.name
try:
result = read_cached_rates(filepath, currencies)
assert len(result) == 2
assert result["USD"] == Decimal("1.25")
assert result["EUR"] == Decimal("1.15")
assert "CHF" not in result # Missing from data
finally:
os.unlink(filepath)
def test_read_cached_rates_empty_currencies_list(self) -> None:
"""Test with empty currencies list."""
data = {
"quotes": {
"GBPUSD": 1.25,
"GBPEUR": 1.15
}
}
with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
json.dump(data, f)
filepath = f.name
try:
result = read_cached_rates(filepath, [])
assert result == {}
finally:
os.unlink(filepath)
def test_read_cached_rates_no_quotes_key(self) -> None:
"""Test with data missing quotes key."""
currencies = ["USD", "EUR"]
data = {"other_key": "value"} # No quotes key
with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
json.dump(data, f)
filepath = f.name
try:
with pytest.raises(KeyError):
read_cached_rates(filepath, currencies)
finally:
os.unlink(filepath)
def test_read_cached_rates_file_not_found(self) -> None:
"""Test error handling when file doesn't exist."""
with pytest.raises(FileNotFoundError):
read_cached_rates("/nonexistent/file.json", ["USD"])
def test_read_cached_rates_invalid_json(self) -> None:
"""Test error handling with invalid JSON."""
with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
f.write("invalid json content")
filepath = f.name
try:
with pytest.raises(json.JSONDecodeError):
read_cached_rates(filepath, ["USD"])
finally:
os.unlink(filepath)
def test_read_cached_rates_decimal_precision(self) -> None:
"""Test that rates are returned as Decimal with proper precision."""
currencies = ["USD"]
data = {
"quotes": {
"GBPUSD": 1.234567890123456789 # High precision
}
}
with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
json.dump(data, f)
filepath = f.name
try:
result = read_cached_rates(filepath, currencies)
assert isinstance(result["USD"], Decimal)
# Should preserve reasonable precision from the JSON
# Python's JSON precision may be limited to float precision
expected = Decimal("1.234567890123456789")
assert abs(result["USD"] - expected) < Decimal("0.0000000000000001")
finally:
os.unlink(filepath)
def test_read_cached_rates_various_currency_codes(self) -> None:
"""Test with various currency codes."""
currencies = ["USD", "EUR", "JPY", "CHF", "CAD", "AUD"]
data = {
"quotes": {
"GBPUSD": 1.25,
"GBPEUR": 1.15,
"GBPJPY": 150.0,
"GBPCHF": 1.12,
"GBPCAD": 1.70,
"GBPAUD": 1.85
}
}
with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
json.dump(data, f)
filepath = f.name
try:
result = read_cached_rates(filepath, currencies)
assert len(result) == 6
for currency in currencies:
assert currency in result
assert isinstance(result[currency], Decimal)
finally:
os.unlink(filepath)

388
tests/test_geomob.py
View file

@ -1,388 +0,0 @@
"""Test geomob module."""
from datetime import date
from unittest.mock import Mock, mock_open, patch
import lxml.html
import pytest
from agenda.geomob import (
GeomobEvent,
extract_events,
find_new_events,
geomob_email,
get_cached_upcoming_events_list,
update,
)
def test_geomob_event_dataclass():
"""Test GeomobEvent dataclass creation and properties."""
event = GeomobEvent(
date=date(2024, 7, 15), href="/event/london-2024-07-15", hashtag="#geomobLDN"
)
assert event.date == date(2024, 7, 15)
assert event.href == "/event/london-2024-07-15"
assert event.hashtag == "#geomobLDN"
def test_geomob_event_frozen():
"""Test that GeomobEvent is frozen (immutable)."""
event = GeomobEvent(
date=date(2024, 7, 15), href="/event/london-2024-07-15", hashtag="#geomobLDN"
)
with pytest.raises(AttributeError):
event.date = date(2024, 8, 15)
def test_extract_events_with_valid_html():
"""Test extracting events from valid HTML."""
html_content = """
<html>
<body>
<ol class="event-list">
<li><a href="/event/london-2024-07-15">July 15, 2024 #geomobLDN</a></li>
<li><a href="/event/berlin-2024-08-20">August 20, 2024 #geomobBER</a></li>
</ol>
</body>
</html>
"""
tree = lxml.html.fromstring(html_content)
events = extract_events(tree)
assert len(events) == 2
assert events[0].date == date(2024, 7, 15)
assert events[0].href == "/event/london-2024-07-15"
assert events[0].hashtag == "#geomobLDN"
assert events[1].date == date(2024, 8, 20)
assert events[1].href == "/event/berlin-2024-08-20"
assert events[1].hashtag == "#geomobBER"
def test_extract_events_empty_list():
"""Test extracting events from HTML with no events."""
html_content = """
<html>
<body>
<ol class="event-list">
</ol>
</body>
</html>
"""
tree = lxml.html.fromstring(html_content)
events = extract_events(tree)
assert events == []
def test_extract_events_no_event_list():
"""Test extracting events from HTML with no event list."""
html_content = """
<html>
<body>
<p>No events here</p>
</body>
</html>
"""
tree = lxml.html.fromstring(html_content)
events = extract_events(tree)
assert events == []
def test_find_new_events_with_new_events():
"""Test finding new events when there are some."""
prev_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
GeomobEvent(date(2024, 8, 20), "/event/berlin-2024-08-20", "#geomobBER"),
]
cur_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
GeomobEvent(date(2024, 8, 20), "/event/berlin-2024-08-20", "#geomobBER"),
GeomobEvent(date(2024, 9, 25), "/event/paris-2024-09-25", "#geomobPAR"),
]
new_events = find_new_events(prev_events, cur_events)
assert len(new_events) == 1
assert new_events[0].date == date(2024, 9, 25)
assert new_events[0].href == "/event/paris-2024-09-25"
assert new_events[0].hashtag == "#geomobPAR"
def test_find_new_events_no_new_events():
"""Test finding new events when there are none."""
events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
GeomobEvent(date(2024, 8, 20), "/event/berlin-2024-08-20", "#geomobBER"),
]
new_events = find_new_events(events, events)
assert new_events == []
def test_find_new_events_empty_previous():
"""Test finding new events when previous list is empty."""
cur_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
GeomobEvent(date(2024, 8, 20), "/event/berlin-2024-08-20", "#geomobBER"),
]
new_events = find_new_events([], cur_events)
assert len(new_events) == 2
assert set(new_events) == set(cur_events)
def test_geomob_email_single_event():
"""Test generating email for a single new event."""
events = [GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")]
subject, body = geomob_email(events, "https://thegeomob.com")
assert subject == "1 New Geomob Event(s) Announced"
assert "Hello," in body
assert "Here are the new Geomob events:" in body
assert "Date: 2024-07-15" in body
assert "URL: https://thegeomob.com/event/london-2024-07-15" in body
assert "Hashtag: #geomobLDN" in body
assert "----------------------------------------" in body
def test_geomob_email_single_event_no_protocol():
"""Test generating email for a single new event with base URL without protocol."""
events = [GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")]
subject, body = geomob_email(events, "thegeomob.com")
assert subject == "1 New Geomob Event(s) Announced"
assert "Hello," in body
assert "Here are the new Geomob events:" in body
assert "Date: 2024-07-15" in body
assert "URL: thegeomob.com/event/london-2024-07-15" in body
assert "Hashtag: #geomobLDN" in body
assert "----------------------------------------" in body
def test_geomob_email_multiple_events():
"""Test generating email for multiple new events."""
events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
GeomobEvent(date(2024, 8, 20), "/event/berlin-2024-08-20", "#geomobBER"),
]
subject, body = geomob_email(events, "https://thegeomob.com")
assert subject == "2 New Geomob Event(s) Announced"
assert "Date: 2024-07-15" in body
assert "Date: 2024-08-20" in body
assert body.count("----------------------------------------") == 2
def test_geomob_email_no_double_slash():
"""Test that URL construction doesn't create double slashes."""
events = [GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")]
subject, body = geomob_email(events, "https://thegeomob.com")
# This should not raise an AssertionError due to double slashes
assert "https://thegeomob.com/event/london-2024-07-15" in body
def test_geomob_email_empty_list():
"""Test that geomob_email raises assertion error with empty list."""
with pytest.raises(AssertionError):
geomob_email([], "https://thegeomob.com")
def test_geomob_email_detects_double_slash_in_path():
"""Test that the function detects double slashes in the URL path."""
events = [GeomobEvent(date(2024, 7, 15), "//event/london-2024-07-15", "#geomobLDN")]
# This should raise an AssertionError due to double slash in path
with pytest.raises(AssertionError, match="Double slash found in URL"):
geomob_email(events, "https://thegeomob.com")
@patch("agenda.utils.get_most_recent_file")
@patch("lxml.html.parse")
def test_get_cached_upcoming_events_list_with_file(mock_parse, mock_get_file):
"""Test getting cached events when file exists."""
mock_get_file.return_value = "/path/to/recent.html"
# Mock the HTML parsing
mock_tree = Mock()
mock_parse.return_value.getroot.return_value = mock_tree
# Mock extract_events by patching it
with patch("agenda.geomob.extract_events") as mock_extract:
mock_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")
]
mock_extract.return_value = mock_events
result = get_cached_upcoming_events_list("/geomob/dir")
assert result == mock_events
mock_get_file.assert_called_once_with("/geomob/dir", "html")
mock_parse.assert_called_once_with("/path/to/recent.html")
mock_extract.assert_called_once_with(mock_tree)
@patch("agenda.utils.get_most_recent_file")
def test_get_cached_upcoming_events_list_no_file(mock_get_file):
"""Test getting cached events when no file exists."""
mock_get_file.return_value = None
result = get_cached_upcoming_events_list("/geomob/dir")
assert result == []
mock_get_file.assert_called_once_with("/geomob/dir", "html")
@patch("agenda.mail.send_mail")
@patch("requests.get")
@patch("agenda.geomob.get_cached_upcoming_events_list")
@patch("os.path.join")
@patch("builtins.open", new_callable=mock_open)
@patch("agenda.geomob.datetime")
def test_update_with_new_events(
mock_datetime,
mock_open_file,
mock_join,
mock_get_cached,
mock_requests,
mock_send_mail,
):
"""Test update function when there are new events."""
# Mock config
config = {"DATA_DIR": "/data"}
# Mock datetime
mock_now = Mock()
mock_now.strftime.return_value = "2024-07-15_12:00:00"
mock_datetime.now.return_value = mock_now
# Mock os.path.join
mock_join.return_value = "/data/geomob/2024-07-15_12:00:00.html"
# Mock previous events
prev_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")
]
mock_get_cached.return_value = prev_events
# Mock HTTP response
mock_response = Mock()
mock_response.text = "<html>mock content</html>"
mock_response.content = b"<html>mock content</html>"
mock_requests.return_value = mock_response
# Mock current events (with one new event)
with patch("agenda.geomob.extract_events") as mock_extract:
cur_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
GeomobEvent(date(2024, 8, 20), "/event/berlin-2024-08-20", "#geomobBER"),
]
mock_extract.return_value = cur_events
update(config)
# Verify file was written
mock_open_file.assert_called_once_with(
"/data/geomob/2024-07-15_12:00:00.html", "w"
)
mock_open_file().write.assert_called_once_with("<html>mock content</html>")
# Verify email was sent
mock_send_mail.assert_called_once()
args = mock_send_mail.call_args[0]
assert args[1] == "1 New Geomob Event(s) Announced" # subject
@patch("requests.get")
@patch("agenda.geomob.get_cached_upcoming_events_list")
def test_update_no_changes(mock_get_cached, mock_requests):
"""Test update function when there are no changes."""
config = {"DATA_DIR": "/data"}
# Mock identical events
events = [GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")]
mock_get_cached.return_value = events
# Mock HTTP response
mock_response = Mock()
mock_response.content = b"<html>mock content</html>"
mock_requests.return_value = mock_response
with patch("agenda.geomob.extract_events") as mock_extract:
mock_extract.return_value = events # Same events
with patch("builtins.open") as mock_open_file:
with patch("agenda.mail.send_mail") as mock_send_mail:
update(config)
# Verify no file was written and no email sent
mock_open_file.assert_not_called()
mock_send_mail.assert_not_called()
@patch("agenda.mail.send_mail")
@patch("requests.get")
@patch("agenda.geomob.get_cached_upcoming_events_list")
@patch("os.path.join")
@patch("builtins.open", new_callable=mock_open)
@patch("agenda.geomob.datetime")
def test_update_events_changed_but_no_new(
mock_datetime,
mock_open_file,
mock_join,
mock_get_cached,
mock_requests,
mock_send_mail,
):
"""Test update function when events changed but no new ones added."""
config = {"DATA_DIR": "/data"}
# Mock datetime
mock_now = Mock()
mock_now.strftime.return_value = "2024-07-15_12:00:00"
mock_datetime.now.return_value = mock_now
# Mock os.path.join
mock_join.return_value = "/data/geomob/2024-07-15_12:00:00.html"
# Mock previous events
prev_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
GeomobEvent(date(2024, 8, 20), "/event/berlin-2024-08-20", "#geomobBER"),
]
mock_get_cached.return_value = prev_events
# Mock HTTP response
mock_response = Mock()
mock_response.text = "<html>mock content</html>"
mock_response.content = b"<html>mock content</html>"
mock_requests.return_value = mock_response
# Mock current events (one event removed, but no new ones)
with patch("agenda.geomob.extract_events") as mock_extract:
cur_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")
]
mock_extract.return_value = cur_events
update(config)
# Verify file was written (events changed)
mock_open_file.assert_called_once()
# Verify no email was sent (no new events)
mock_send_mail.assert_not_called()

208
tests/test_gwr.py
View file

@ -1,208 +0,0 @@
"""Tests for agenda.gwr module."""
import os
import tempfile
from datetime import date
from typing import Any
from unittest.mock import AsyncMock, patch
import pytest
from agenda.gwr import (
advance_ticket_date,
advance_tickets_page_html,
extract_dates,
extract_weekday_date,
parse_date_string,
)
class TestParseDateString:
"""Tests for parse_date_string function."""
def test_parse_date_with_year(self) -> None:
"""Test parsing date string with year included."""
result = parse_date_string("Monday 25 December 2023")
assert result == date(2023, 12, 25)
def test_parse_date_without_year(self) -> None:
"""Test parsing date string without year (should use current year)."""
current_year = date.today().year
result = parse_date_string("Monday 25 December")
assert result == date(current_year, 12, 25)
def test_parse_different_formats(self) -> None:
"""Test parsing various date formats."""
result = parse_date_string("Friday 1 January 2024")
assert result == date(2024, 1, 1)
result = parse_date_string("Saturday 29 February 2024")
assert result == date(2024, 2, 29)
class TestExtractDates:
"""Tests for extract_dates function."""
def test_extract_valid_dates(self) -> None:
"""Test extracting dates from valid HTML."""
html = """
<tr><td>Weekdays</td><td>Monday 25 December 2023</td></tr>
<tr><td>Saturdays</td><td>Saturday 23 December 2023</td></tr>
<tr><td>Sundays</td><td>Sunday 24 December 2023</td></tr>
"""
result = extract_dates(html)
expected = {
"Weekdays": date(2023, 12, 25),
"Saturdays": date(2023, 12, 23),
"Sundays": date(2023, 12, 24),
}
assert result == expected
def test_extract_dates_with_asterisks(self) -> None:
"""Test extracting dates when HTML contains asterisks."""
html = """
<tr><td>Weekdays</td><td>Monday 25 December 2023**</td></tr>
"""
result = extract_dates(html)
expected = {"Weekdays": date(2023, 12, 25)}
assert result == expected
def test_extract_dates_no_match(self) -> None:
"""Test extracting dates when no pattern matches."""
html = "<p>No relevant table data here</p>"
result = extract_dates(html)
assert result is None
def test_extract_dates_whitespace_handling(self) -> None:
"""Test extracting dates with various whitespace."""
html = """
<tr> <td>Weekdays</td> <td>Monday 25 December 2023</td> </tr>
"""
result = extract_dates(html)
expected = {"Weekdays": date(2023, 12, 25)}
assert result == expected
class TestExtractWeekdayDate:
"""Tests for extract_weekday_date function."""
def test_extract_valid_weekday_date(self) -> None:
"""Test extracting weekday date from valid HTML."""
html = """
<tr><td>Weekdays</td><td>Monday 25 December 2023</td></tr>
"""
result = extract_weekday_date(html)
assert result == date(2023, 12, 25)
def test_extract_weekday_date_with_asterisks(self) -> None:
"""Test extracting weekday date when HTML contains asterisks."""
html = """
<tr><td>Weekdays</td><td>Monday 25 December 2023**</td></tr>
"""
result = extract_weekday_date(html)
assert result == date(2023, 12, 25)
def test_extract_weekday_date_no_match(self) -> None:
"""Test extracting weekday date when no pattern matches."""
html = "<p>No weekday data here</p>"
result = extract_weekday_date(html)
assert result is None
def test_extract_weekday_date_multiline(self) -> None:
"""Test extracting weekday date with multiline content."""
html = """
<tr>
<td>Weekdays</td>
<td>Monday 25 December 2023</td>
</tr>
"""
result = extract_weekday_date(html)
assert result == date(2023, 12, 25)
class TestAdvanceTicketsPageHtml:
"""Tests for advance_tickets_page_html function."""
@pytest.mark.asyncio
async def test_cache_hit(self) -> None:
"""Test using cached HTML when file is fresh."""
with tempfile.TemporaryDirectory() as temp_dir:
cache_file = os.path.join(temp_dir, "advance-tickets.html")
test_content = "<html>test content</html>"
# Create a fresh cache file
with open(cache_file, "w") as f:
f.write(test_content)
result = await advance_tickets_page_html(temp_dir, ttl=3600)
assert result == test_content
@pytest.mark.asyncio
async def test_force_cache(self) -> None:
"""Test forcing cache usage even when file doesn't exist."""
with tempfile.TemporaryDirectory() as temp_dir:
cache_file = os.path.join(temp_dir, "advance-tickets.html")
test_content = "<html>cached content</html>"
with open(cache_file, "w") as f:
f.write(test_content)
result = await advance_tickets_page_html(temp_dir, force_cache=True)
assert result == test_content
@pytest.mark.asyncio
@patch("httpx.AsyncClient")
async def test_fetch_from_web(self, mock_client: Any) -> None:
"""Test fetching from web when cache is stale."""
mock_response = AsyncMock()
mock_response.text = "<html>fresh content</html>"
mock_client.return_value.__aenter__.return_value.get.return_value = (
mock_response
)
with tempfile.TemporaryDirectory() as temp_dir:
result = await advance_tickets_page_html(temp_dir, ttl=0)
assert result == "<html>fresh content</html>"
# Check that content was cached
cache_file = os.path.join(temp_dir, "advance-tickets.html")
with open(cache_file) as f:
cached_content = f.read()
assert cached_content == "<html>fresh content</html>"
class TestAdvanceTicketDate:
"""Tests for advance_ticket_date function."""
@pytest.mark.asyncio
@patch("agenda.gwr.advance_tickets_page_html")
async def test_advance_ticket_date_success(self, mock_html: Any) -> None:
"""Test successfully extracting advance ticket date."""
mock_html.return_value = """
<tr><td>Weekdays</td><td>Monday 25 December 2023</td></tr>
"""
result = await advance_ticket_date("/fake/dir")
assert result == date(2023, 12, 25)
mock_html.assert_called_once_with("/fake/dir", force_cache=False)
@pytest.mark.asyncio
@patch("agenda.gwr.advance_tickets_page_html")
async def test_advance_ticket_date_no_match(self, mock_html: Any) -> None:
"""Test when no weekday date can be extracted."""
mock_html.return_value = "<p>No relevant data</p>"
result = await advance_ticket_date("/fake/dir")
assert result is None
@pytest.mark.asyncio
@patch("agenda.gwr.advance_tickets_page_html")
async def test_advance_ticket_date_force_cache(self, mock_html: Any) -> None:
"""Test advance_ticket_date with force_cache parameter."""
mock_html.return_value = """
<tr><td>Weekdays</td><td>Tuesday 26 December 2023</td></tr>
"""
result = await advance_ticket_date("/fake/dir", force_cache=True)
assert result == date(2023, 12, 26)
mock_html.assert_called_once_with("/fake/dir", force_cache=True)

739
tests/test_schengen.py
View file

@ -1,739 +0,0 @@
"""Tests for Schengen area travel tracking functionality."""
import pytest
from datetime import date, datetime, timedelta
from typing import Any
from agenda.schengen import (
is_schengen_country,
extract_schengen_stays_from_travel,
calculate_schengen_time,
format_schengen_report,
get_schengen_countries_list,
predict_future_compliance,
SCHENGEN_COUNTRIES,
)
from agenda.types import SchengenStay, SchengenCalculation
class TestIsSchengenCountry:
"""Test the is_schengen_country function."""
def test_valid_schengen_countries(self) -> None:
"""Test that valid Schengen countries are correctly identified."""
# Test some EU countries in Schengen
assert is_schengen_country("de") is True # Germany
assert is_schengen_country("fr") is True # France
assert is_schengen_country("es") is True # Spain
assert is_schengen_country("it") is True # Italy
# Test non-EU countries in Schengen
assert is_schengen_country("ch") is True # Switzerland
assert is_schengen_country("no") is True # Norway
assert is_schengen_country("is") is True # Iceland
# Test 2025 additions
assert is_schengen_country("bg") is True # Bulgaria
assert is_schengen_country("ro") is True # Romania
def test_non_schengen_countries(self) -> None:
"""Test that non-Schengen countries are correctly identified."""
assert is_schengen_country("gb") is False # United Kingdom
assert is_schengen_country("us") is False # United States
assert is_schengen_country("ca") is False # Canada
assert is_schengen_country("au") is False # Australia
assert is_schengen_country("jp") is False # Japan
def test_case_insensitive(self) -> None:
"""Test that country code matching is case insensitive."""
assert is_schengen_country("DE") is True
assert is_schengen_country("De") is True
assert is_schengen_country("dE") is True
assert is_schengen_country("GB") is False
assert is_schengen_country("Gb") is False
def test_invalid_inputs(self) -> None:
"""Test handling of invalid inputs."""
assert is_schengen_country("") is False
assert is_schengen_country(None) is False # type: ignore[arg-type]
assert is_schengen_country(123) is False # type: ignore[arg-type]
assert is_schengen_country("xyz") is False
assert is_schengen_country("toolong") is False
class TestExtractSchengenStaysFromTravel:
"""Test the extract_schengen_stays_from_travel function."""
def test_empty_travel_items(self) -> None:
"""Test with empty travel items list."""
stays = extract_schengen_stays_from_travel([])
assert stays == []
def test_no_schengen_travel(self) -> None:
"""Test with travel that doesn't involve Schengen countries."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "us"},
},
{
"type": "flight",
"depart": date(2024, 1, 10),
"arrive": date(2024, 1, 10),
"from_airport": {"country": "us"},
"to_airport": {"country": "gb"},
},
]
stays = extract_schengen_stays_from_travel(travel_items)
assert stays == []
def test_single_schengen_trip(self) -> None:
"""Test with a single trip to a Schengen country."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 1, 10),
"arrive": date(2024, 1, 10),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
]
stays = extract_schengen_stays_from_travel(travel_items)
assert len(stays) == 1
assert stays[0].entry_date == date(2024, 1, 1)
assert stays[0].exit_date == date(2024, 1, 10)
assert stays[0].country == "de"
assert stays[0].days == 10
def test_multiple_schengen_countries(self) -> None:
"""Test with travel through multiple Schengen countries."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "train",
"depart": date(2024, 1, 5),
"arrive": date(2024, 1, 5),
"from_station": {"country": "de"},
"to_station": {"country": "fr"},
},
{
"type": "flight",
"depart": date(2024, 1, 10),
"arrive": date(2024, 1, 10),
"from_airport": {"country": "fr"},
"to_airport": {"country": "gb"},
},
]
stays = extract_schengen_stays_from_travel(travel_items)
# Should be treated as one continuous stay since moving within Schengen
assert len(stays) == 1
assert stays[0].entry_date == date(2024, 1, 1)
assert stays[0].exit_date == date(2024, 1, 10)
assert stays[0].country == "fr" # Last country visited
assert stays[0].days == 10
def test_currently_in_schengen(self) -> None:
"""Test with travel where person is currently in Schengen."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
]
stays = extract_schengen_stays_from_travel(travel_items)
assert len(stays) == 1
assert stays[0].entry_date == date(2024, 1, 1)
assert stays[0].exit_date is None # Still in Schengen
assert stays[0].country == "de"
def test_ferry_travel(self) -> None:
"""Test with ferry travel."""
travel_items = [
{
"type": "ferry",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_terminal": {"country": "gb"},
"to_terminal": {"country": "fr"},
},
{
"type": "ferry",
"depart": date(2024, 1, 5),
"arrive": date(2024, 1, 5),
"from_terminal": {"country": "fr"},
"to_terminal": {"country": "gb"},
},
]
stays = extract_schengen_stays_from_travel(travel_items)
assert len(stays) == 1
assert stays[0].entry_date == date(2024, 1, 1)
assert stays[0].exit_date == date(2024, 1, 5)
assert stays[0].country == "fr"
assert stays[0].days == 5
def test_datetime_conversion(self) -> None:
"""Test with datetime objects instead of dates."""
travel_items = [
{
"type": "flight",
"depart": datetime(2024, 1, 1, 10, 30),
"arrive": datetime(2024, 1, 1, 14, 45),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": datetime(2024, 1, 10, 8, 15),
"arrive": datetime(2024, 1, 10, 11, 30),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
]
stays = extract_schengen_stays_from_travel(travel_items)
assert len(stays) == 1
assert stays[0].entry_date == date(2024, 1, 1)
assert stays[0].exit_date == date(2024, 1, 10)
def test_missing_depart_date(self) -> None:
"""Test handling of travel items with missing depart dates."""
travel_items = [
{
"type": "flight",
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "fr"},
},
]
stays = extract_schengen_stays_from_travel(travel_items) # type: ignore[arg-type]
# Should only process the item with a valid depart date
assert len(stays) == 1
assert stays[0].country == "fr"
class TestCalculateSchengenTime:
"""Test the calculate_schengen_time function."""
def test_no_schengen_travel(self) -> None:
"""Test calculation with no Schengen travel."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "us"},
},
]
calculation = calculate_schengen_time(travel_items, date(2024, 6, 1))
assert calculation.total_days_used == 0
assert calculation.days_remaining == 90
assert calculation.is_compliant is True
assert calculation.stays_in_period == []
assert calculation.next_reset_date is None
def test_single_stay_within_limit(self) -> None:
"""Test calculation with a single stay within the 90-day limit."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 1, 15),
"arrive": date(2024, 1, 15),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
]
calculation = calculate_schengen_time(travel_items, date(2024, 6, 1))
assert calculation.total_days_used == 15
assert calculation.days_remaining == 75
assert calculation.is_compliant is True
assert len(calculation.stays_in_period) == 1
assert calculation.next_reset_date == date(2024, 6, 29) # 180 days from entry
def test_stay_exceeding_limit(self) -> None:
"""Test calculation with stays exceeding the 90-day limit."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 4, 15), # 106 days later (inclusive)
"arrive": date(2024, 4, 15),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
]
calculation = calculate_schengen_time(travel_items, date(2024, 6, 1))
assert calculation.total_days_used == 106
assert calculation.days_remaining == 0
assert calculation.is_compliant is False
assert calculation.days_over_limit == 16
def test_180_day_window(self) -> None:
"""Test that only stays within the 180-day window are considered."""
travel_items = [
# Old stay outside 180-day window
{
"type": "flight",
"depart": date(2023, 1, 1),
"arrive": date(2023, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2023, 2, 1),
"arrive": date(2023, 2, 1),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
# Recent stay within 180-day window
{
"type": "flight",
"depart": date(2024, 5, 1),
"arrive": date(2024, 5, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "fr"},
},
{
"type": "flight",
"depart": date(2024, 5, 10),
"arrive": date(2024, 5, 10),
"from_airport": {"country": "fr"},
"to_airport": {"country": "gb"},
},
]
calculation = calculate_schengen_time(travel_items, date(2024, 6, 1))
# Should only count the recent stay
assert calculation.total_days_used == 10
assert len(calculation.stays_in_period) == 1
def test_partial_overlap_with_window(self) -> None:
"""Test stays that partially overlap with the 180-day window."""
travel_items = [
{
"type": "flight",
"depart": date(2023, 11, 20), # Before window
"arrive": date(2023, 11, 20),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 1, 10), # Within window
"arrive": date(2024, 1, 10),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
]
calculation = calculate_schengen_time(travel_items, date(2024, 6, 1))
window_start = date(2024, 6, 1) - timedelta(days=179)
# Should only count days from window start to exit date
expected_days = (date(2024, 1, 10) - window_start).days + 1
assert calculation.total_days_used == expected_days
def test_currently_in_schengen(self) -> None:
"""Test calculation when currently in Schengen."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 5, 20),
"arrive": date(2024, 5, 20),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
]
calculation = calculate_schengen_time(travel_items, date(2024, 6, 1))
assert calculation.total_days_used == 13 # 20 May to 1 June inclusive
assert calculation.days_remaining == 77
assert calculation.is_compliant is True
assert len(calculation.stays_in_period) == 1
assert calculation.stays_in_period[0].exit_date is None
class TestFormatSchengenReport:
"""Test the format_schengen_report function."""
def test_compliant_report(self) -> None:
"""Test formatting of a compliant report."""
calculation = SchengenCalculation(
total_days_used=45,
days_remaining=45,
is_compliant=True,
current_180_day_period=(date(2024, 1, 1), date(2024, 6, 29)),
stays_in_period=[
SchengenStay(
entry_date=date(2024, 5, 1),
exit_date=date(2024, 5, 15),
country="de",
days=15,
),
SchengenStay(
entry_date=date(2024, 6, 1),
exit_date=None,
country="fr",
days=30,
),
],
next_reset_date=date(2024, 10, 28),
)
report = format_schengen_report(calculation)
assert "=== SCHENGEN AREA COMPLIANCE REPORT ===" in report
assert "✅ COMPLIANT" in report
assert "Days used: 45/90" in report
assert "Days remaining: 45" in report
assert "Next reset date: 2024-10-28" in report
assert "2024-05-01 to 2024-05-15 (DE): 15 days" in report
assert (
"2024-06-01 to ongoing (FR):" in report
) # Don't check exact days since it's calculated from today
def test_non_compliant_report(self) -> None:
"""Test formatting of a non-compliant report."""
calculation = SchengenCalculation(
total_days_used=105,
days_remaining=0,
is_compliant=False,
current_180_day_period=(date(2024, 1, 1), date(2024, 6, 29)),
stays_in_period=[
SchengenStay(
entry_date=date(2024, 1, 1),
exit_date=date(2024, 4, 15),
country="de",
days=105,
),
],
next_reset_date=date(2024, 6, 29),
)
report = format_schengen_report(calculation)
assert "❌ NON-COMPLIANT" in report
assert "Days used: 105/90" in report
assert "Days over limit: 15" in report
def test_no_stays_report(self) -> None:
"""Test formatting when there are no stays."""
calculation = SchengenCalculation(
total_days_used=0,
days_remaining=90,
is_compliant=True,
current_180_day_period=(date(2024, 1, 1), date(2024, 6, 29)),
stays_in_period=[],
next_reset_date=None,
)
report = format_schengen_report(calculation)
assert "No Schengen stays in current 180-day period." in report
class TestGetSchengenCountriesList:
"""Test the get_schengen_countries_list function."""
def test_returns_sorted_list(self) -> None:
"""Test that function returns a sorted list of country codes."""
countries = get_schengen_countries_list()
assert isinstance(countries, list)
assert len(countries) == len(SCHENGEN_COUNTRIES)
assert countries == sorted(countries) # Should be sorted
assert "at" in countries # Austria
assert "de" in countries # Germany
assert "ch" in countries # Switzerland
assert "gb" not in countries # UK not in Schengen
class TestPredictFutureCompliance:
"""Test the predict_future_compliance function."""
def test_single_future_trip(self) -> None:
"""Test prediction with a single future trip."""
existing_travel = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 1, 30),
"arrive": date(2024, 1, 30),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
]
future_travel = [
(date(2024, 6, 1), date(2024, 6, 20), "fr"), # 20-day trip to France
]
# This will fail due to missing arrive field in predict_future_compliance
with pytest.raises(AssertionError):
predict_future_compliance(existing_travel, future_travel)
def test_multiple_future_trips(self) -> None:
"""Test prediction with multiple future trips."""
existing_travel: list[dict[str, Any]] = []
future_travel = [
(date(2024, 6, 1), date(2024, 6, 20), "de"), # 20 days
(date(2024, 8, 1), date(2024, 8, 30), "fr"), # 30 days
(
date(2024, 10, 1),
date(2024, 11, 15),
"es",
), # 45 days (would exceed limit)
]
# This will fail due to missing arrive field in predict_future_compliance
with pytest.raises(AssertionError):
predict_future_compliance(existing_travel, future_travel)
def test_rolling_window_effect(self) -> None:
"""Test that the rolling 180-day window affects predictions."""
# Trip 200 days ago - should not affect current calculation
existing_travel = [
{
"type": "flight",
"depart": date(2024, 1, 1) - timedelta(days=200),
"arrive": date(2024, 1, 1) - timedelta(days=200),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 1, 1) - timedelta(days=170),
"arrive": date(2024, 1, 1) - timedelta(days=170),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
]
future_travel = [
(date(2024, 6, 1), date(2024, 8, 30), "fr"), # 90-day trip
]
# This will fail due to missing arrive field in predict_future_compliance
with pytest.raises(AssertionError):
predict_future_compliance(existing_travel, future_travel)
class TestSchengenStayDataclass:
"""Test the SchengenStay dataclass functionality."""
def test_completed_stay_days_calculation(self) -> None:
"""Test days calculation for completed stays."""
stay = SchengenStay(
entry_date=date(2024, 1, 1),
exit_date=date(2024, 1, 10),
country="de",
days=0, # Will be calculated in __post_init__
)
assert stay.days == 10
def test_ongoing_stay_days_calculation(self) -> None:
"""Test days calculation for ongoing stays."""
entry_date = date.today() - timedelta(days=5)
stay = SchengenStay(
entry_date=entry_date,
exit_date=None,
country="de",
days=0,
)
assert stay.days == 6 # 5 days ago to today inclusive
class TestSchengenCalculationDataclass:
"""Test the SchengenCalculation dataclass functionality."""
def test_days_over_limit_property(self) -> None:
"""Test the days_over_limit property."""
# Compliant case
compliant_calc = SchengenCalculation(
total_days_used=80,
days_remaining=10,
is_compliant=True,
current_180_day_period=(date(2024, 1, 1), date(2024, 6, 29)),
stays_in_period=[],
next_reset_date=None,
)
assert compliant_calc.days_over_limit == 0
# Non-compliant case
non_compliant_calc = SchengenCalculation(
total_days_used=105,
days_remaining=0,
is_compliant=False,
current_180_day_period=(date(2024, 1, 1), date(2024, 6, 29)),
stays_in_period=[],
next_reset_date=None,
)
assert non_compliant_calc.days_over_limit == 15
class TestEdgeCases:
"""Test edge cases and error handling."""
def test_same_day_entry_exit(self) -> None:
"""Test handling of same-day entry and exit."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
]
stays = extract_schengen_stays_from_travel(travel_items)
assert len(stays) == 1
assert stays[0].days == 1 # Same day should count as 1 day
def test_invalid_date_types(self) -> None:
"""Test handling of invalid date types."""
travel_items = [
{
"type": "flight",
"depart": "invalid_date",
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "fr"},
},
]
# The function should skip items with invalid depart dates during sorting
# but this will raise an error due to the depart_datetime call
with pytest.raises(TypeError):
extract_schengen_stays_from_travel(travel_items)
def test_missing_country_data(self) -> None:
"""Test handling of missing country data."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {}, # Missing country
"to_airport": {"country": "de"},
},
]
stays = extract_schengen_stays_from_travel(travel_items)
# Should handle gracefully and create stay when entering Schengen
assert len(stays) == 1
assert stays[0].country == "de"
def test_calculation_date_edge_cases(self) -> None:
"""Test calculation with edge case dates."""
travel_items = [
{
"type": "flight",
"depart": date(2024, 1, 1),
"arrive": date(2024, 1, 1),
"from_airport": {"country": "gb"},
"to_airport": {"country": "de"},
},
{
"type": "flight",
"depart": date(2024, 1, 10),
"arrive": date(2024, 1, 10),
"from_airport": {"country": "de"},
"to_airport": {"country": "gb"},
},
]
# Test with calculation date exactly on travel date
calculation = calculate_schengen_time(travel_items, date(2024, 1, 10))
assert calculation.total_days_used == 10
# Test with calculation date before any travel
calculation = calculate_schengen_time(travel_items, date(2023, 12, 1))
assert calculation.total_days_used == 0
def test_default_calculation_date(self) -> None:
"""Test that default calculation date is today."""
travel_items: list[dict[str, Any]] = []
calculation = calculate_schengen_time(travel_items)
expected_window_end = date.today()
expected_window_start = expected_window_end - timedelta(days=179)
assert calculation.current_180_day_period == (
expected_window_start,
expected_window_end,
)

183
tests/test_sun.py
View file

@ -1,183 +0,0 @@
"""Tests for sun functionality."""
from datetime import datetime
from unittest.mock import Mock, patch
import pytest
from agenda.sun import bristol, sunrise, sunset
class TestBristol:
"""Test the bristol function."""
def test_bristol_returns_observer(self) -> None:
"""Test that bristol returns an ephem.Observer with correct coordinates."""
observer = bristol()
# Check that it's an observer object with the right attributes
assert hasattr(observer, 'lat')
assert hasattr(observer, 'lon')
# Check coordinates are set to Bristol
assert str(observer.lat) == "51:27:16.2" # 51.4545 degrees
assert str(observer.lon) == "-2:35:16.4" # -2.5879 degrees
def test_bristol_observer_type(self) -> None:
"""Test that bristol returns the correct type."""
observer = bristol()
# Should have methods needed for sun calculations
assert hasattr(observer, 'next_rising')
assert hasattr(observer, 'next_setting')
class TestSunrise:
"""Test the sunrise function."""
@patch('agenda.sun.ephem')
def test_sunrise_returns_datetime(self, mock_ephem: Mock) -> None:
"""Test that sunrise returns a datetime object."""
# Mock the observer and sun
mock_observer = Mock()
mock_sun = Mock()
mock_ephem.Sun.return_value = mock_sun
# Mock the rising calculation
mock_rising = Mock()
mock_rising.datetime.return_value = datetime(2024, 6, 15, 5, 30, 0)
mock_observer.next_rising.return_value = mock_rising
result = sunrise(mock_observer)
assert isinstance(result, datetime)
assert result == datetime(2024, 6, 15, 5, 30, 0)
# Verify ephem calls
mock_ephem.Sun.assert_called_once_with(mock_observer)
mock_observer.next_rising.assert_called_once_with(mock_sun)
def test_sunrise_with_real_observer(self) -> None:
"""Test sunrise with a real observer (integration test)."""
observer = bristol()
# Set a specific date for the observer
observer.date = "2024/6/21" # Summer solstice
result = sunrise(observer)
# Should return a datetime object
assert isinstance(result, datetime)
# On summer solstice in Bristol, sunrise should be early morning
assert 3 <= result.hour <= 6 # Roughly between 3-6 AM
# Should be in 2024
assert result.year == 2024
def test_sunrise_different_dates(self) -> None:
"""Test sunrise for different dates."""
observer = bristol()
# Summer solstice (longest day)
observer.date = "2024/6/21"
summer_sunrise = sunrise(observer)
# Winter solstice (shortest day)
observer.date = "2024/12/21"
winter_sunrise = sunrise(observer)
# Summer sunrise should be earlier than winter sunrise
assert summer_sunrise.hour < winter_sunrise.hour
class TestSunset:
"""Test the sunset function."""
@patch('agenda.sun.ephem')
def test_sunset_returns_datetime(self, mock_ephem: Mock) -> None:
"""Test that sunset returns a datetime object."""
# Mock the observer and sun
mock_observer = Mock()
mock_sun = Mock()
mock_ephem.Sun.return_value = mock_sun
# Mock the setting calculation
mock_setting = Mock()
mock_setting.datetime.return_value = datetime(2024, 6, 15, 20, 30, 0)
mock_observer.next_setting.return_value = mock_setting
result = sunset(mock_observer)
assert isinstance(result, datetime)
assert result == datetime(2024, 6, 15, 20, 30, 0)
# Verify ephem calls
mock_ephem.Sun.assert_called_once_with(mock_observer)
mock_observer.next_setting.assert_called_once_with(mock_sun)
def test_sunset_with_real_observer(self) -> None:
"""Test sunset with a real observer (integration test)."""
observer = bristol()
# Set a specific date for the observer
observer.date = "2024/6/21" # Summer solstice
result = sunset(observer)
# Should return a datetime object
assert isinstance(result, datetime)
# On summer solstice in Bristol, sunset should be in evening
assert 19 <= result.hour <= 22 # Roughly between 7-10 PM
# Should be in 2024
assert result.year == 2024
def test_sunset_different_dates(self) -> None:
"""Test sunset for different dates."""
observer = bristol()
# Summer solstice (longest day)
observer.date = "2024/6/21"
summer_sunset = sunset(observer)
# Winter solstice (shortest day)
observer.date = "2024/12/21"
winter_sunset = sunset(observer)
# Summer sunset should be later than winter sunset
assert summer_sunset.hour > winter_sunset.hour
class TestSunIntegration:
"""Integration tests for sun calculations."""
def test_day_length_summer_vs_winter(self) -> None:
"""Test that summer days are longer than winter days."""
observer = bristol()
# Summer solstice
observer.date = "2024/6/21"
summer_sunrise = sunrise(observer)
summer_sunset = sunset(observer)
summer_day_length = summer_sunset - summer_sunrise
# Winter solstice
observer.date = "2024/12/21"
winter_sunrise = sunrise(observer)
winter_sunset = sunset(observer)
winter_day_length = winter_sunset - winter_sunrise
# Summer day should be longer than winter day
assert summer_day_length > winter_day_length
def test_sunrise_before_sunset(self) -> None:
"""Test that sunrise is always before sunset."""
observer = bristol()
observer.date = "2024/6/15" # Arbitrary date
sunrise_time = sunrise(observer)
sunset_time = sunset(observer)
assert sunrise_time < sunset_time

612
tests/test_thespacedevs.py
View file

@ -1,612 +0,0 @@
# test_thespacedevs.py
import deepdiff
import pytest
from agenda.thespacedevs import format_launch_changes
# --- Helper Functions for Tests ---
def create_base_launch():
"""Creates a base launch dictionary for diffing."""
return {
"id": "test-id",
"name": "Starship | Flight 10",
"status": {
"id": 8,
"name": "To Be Confirmed",
"abbrev": "TBC",
"description": "Awaiting official confirmation...",
},
"last_updated": "2025-08-08T16:03:39Z",
"net": "2025-08-22T23:30:00Z",
"window_end": "2025-08-23T01:34:00Z",
"window_start": "2025-08-22T23:30:00Z",
"net_precision": {
"id": 1,
"name": "Minute",
"abbrev": "MIN",
"description": "The T-0 is accurate to the minute.",
},
"probability": 75,
"pad": {
"id": 188,
"name": "Orbital Launch Mount A",
"location": {"name": "SpaceX Starbase, TX, USA"},
},
"mission": {
"name": "Flight 10"
# description intentionally omitted initially for test_dictionary_item_added
},
# Fields that should be skipped
"agency_launch_attempt_count": 550,
"location_launch_attempt_count": 18,
"pad_launch_attempt_count": 9,
"orbital_launch_attempt_count": 5,
"agency_launch_attempt_count_year": 100,
"location_launch_attempt_count_year": 3,
"pad_launch_attempt_count_year": 3,
"orbital_launch_attempt_count_year": 1,
}
# --- Tests for format_launch_changes ---
def test_no_changes():
"""Test when there are no differences."""
prev = create_base_launch()
cur = create_base_launch()
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
assert result == "No specific changes detected"
def test_status_change():
"""Test changes to the status name."""
prev = create_base_launch()
cur = create_base_launch()
cur["status"]["name"] = "Go for Launch"
# Note: ID change might happen, but the test focuses on the name change message
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
# print(f"DEBUG test_status_change diff: {diff}") # Uncomment for debugging
result = format_launch_changes(diff)
# DeepDiff should report this as values_changed
assert "Status changed from 'To Be Confirmed' to 'Go for Launch'" in result
def test_net_precision_change():
"""Test changes to the net precision name."""
prev = create_base_launch()
cur = create_base_launch()
cur["net_precision"]["name"] = "Hour"
# Note: ID change might happen, but the test focuses on the name change message
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
# print(f"DEBUG test_net_precision_change diff: {diff}") # Uncomment for debugging
result = format_launch_changes(diff)
# DeepDiff should report this as values_changed
assert "Launch precision changed from 'Minute' to 'Hour'" in result
def test_net_change():
"""Test changes to the net (launch time)."""
prev = create_base_launch()
cur = create_base_launch()
cur["net"] = "2025-08-23T00:00:00Z"
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
# The function uses format_date, so the output will be formatted
assert (
"Launch time changed from 22 Aug 2025 at 23:30 UTC to 23 Aug 2025 at 00:00 UTC"
in result
)
def test_window_start_change():
"""Test changes to the window start."""
prev = create_base_launch()
cur = create_base_launch()
cur["window_start"] = "2025-08-22T23:00:00Z"
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
assert (
"Launch window start changed from 22 Aug 2025 at 23:30 UTC to 22 Aug 2025 at 23:00 UTC"
in result
)
def test_window_end_change():
"""Test changes to the window end."""
prev = create_base_launch()
cur = create_base_launch()
cur["window_end"] = "2025-08-23T02:00:00Z"
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
assert (
"Launch window end changed from 23 Aug 2025 at 01:34 UTC to 23 Aug 2025 at 02:00 UTC"
in result
)
def test_last_updated_change():
"""Test changes to the last updated time."""
prev = create_base_launch()
cur = create_base_launch()
cur["last_updated"] = "2025-08-09T10:00:00Z"
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
assert "Last updated: 09 Aug 2025 at 10:00 UTC" in result
def test_name_change():
"""Test changes to the launch name."""
prev = create_base_launch()
cur = create_base_launch()
cur["name"] = "Starship | Flight 10 - Revised"
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
assert (
"Mission name changed from 'Starship | Flight 10' to 'Starship | Flight 10 - Revised'"
in result
)
def test_probability_change():
"""Test changes to the launch probability."""
prev = create_base_launch()
cur = create_base_launch()
cur["probability"] = 85
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
assert "Launch probability changed from 75% to 85%" in result
def test_probability_set():
"""Test setting probability from None."""
prev = create_base_launch()
prev["probability"] = None # Start with None
cur = create_base_launch() # End with 75 (int)
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
assert "Launch probability set to 75%" in result
def test_probability_removed():
"""Test removing probability (setting to None)."""
prev = create_base_launch() # Start with 75 (int)
cur = create_base_launch()
cur["probability"] = None # End with None
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
assert "Launch probability removed" in result
def test_skip_fields():
"""Test that specific fields are skipped."""
prev = create_base_launch()
cur = create_base_launch()
cur["agency_launch_attempt_count"] = 551
cur["pad_launch_attempt_count_year"] = 4
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
# The only change is in skipped fields, so no user-facing changes
assert result == "No specific changes detected"
def test_dictionary_item_added():
"""Test adding a new field."""
prev = create_base_launch()
# Ensure 'description' is not in the base mission dict
assert "description" not in prev["mission"]
cur = create_base_launch()
cur["mission"]["description"] = "New mission description."
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
# print(f"DEBUG test_dictionary_item_added diff: {diff}") # Uncomment for debugging
result = format_launch_changes(diff)
# DeepDiff path for nested dict item added
assert (
"New field added: Mission['Description" in result
) # Matches the output format
def test_dictionary_item_removed():
"""Test removing a field."""
prev = create_base_launch()
# Add 'description' to prev so it can be removed
prev["mission"]["description"] = "Old description."
cur = create_base_launch()
# Ensure 'description' is not in cur's mission dict
assert "description" not in cur["mission"]
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
# print(f"DEBUG test_dictionary_item_removed diff: {diff}") # Uncomment for debugging
result = format_launch_changes(diff)
# DeepDiff path for nested dict item removed
assert "Field removed: Mission['Description" in result # Matches the output format
def test_type_change():
"""Test changing the type of a field."""
prev = create_base_launch()
cur = create_base_launch()
cur["probability"] = "High" # Change int to string
diff = deepdiff.DeepDiff(prev, cur, ignore_order=True)
result = format_launch_changes(diff)
assert "Probability type changed from int to str" in result
# --- Test with Sample Data (Simulated Diff) ---
def test_with_sample_data_status_change():
"""Simulate a diff like the one that might occur for status change using sample data structure."""
# Simulate a diff where status changes from TBC to Success (ID 3)
# This mimics the EXACT structure DeepDiff produces for values_changed
# We only include the fields we care about in the test
sample_diff_status = deepdiff.DeepDiff(
{"status": {"id": 8, "name": "To Be Confirmed"}},
{"status": {"id": 3, "name": "Success"}},
ignore_order=True,
)
# print(f"DEBUG test_with_sample_data_status_change diff: {sample_diff_status}") # Debug
result = format_launch_changes(sample_diff_status)
# Should report the status name change
assert "Status changed from 'To Be Confirmed' to 'Success'" in result
# Ensure it doesn't report ID change separately due to the 'startswith' logic
# (The logic should group them under the name change)
# A simple check: if name change is there, and ID is handled, it's likely correct.
# The exact number of bullet points might vary based on ID/abbrev handling,
# but the key message should be present.
def test_with_sample_data_net_change():
"""Simulate a diff for net change."""
sample_diff_net = {
"values_changed": {
"root['net']": {
"new_value": "2025-08-25T12:00:00Z",
"old_value": "2025-08-22T23:30:00Z",
}
}
}
result = format_launch_changes(sample_diff_net)
assert (
"Launch time changed from 22 Aug 2025 at 23:30 UTC to 25 Aug 2025 at 12:00 UTC"
in result
)
def test_status_name_change():
diffs = {
"values_changed": {
"root['status']['name']": {
"old_value": "To Be Confirmed",
"new_value": "Go for Launch",
}
}
}
out = format_launch_changes(diffs)
assert "Status changed from 'To Be Confirmed' to 'Go for Launch'" in out
def test_net_precision_change():
diffs = {
"values_changed": {
"root['net_precision']['name']": {
"old_value": "Hour",
"new_value": "Minute",
}
}
}
out = format_launch_changes(diffs)
assert "Launch precision changed from 'Hour' to 'Minute'" in out
@pytest.mark.parametrize(
"field,label",
[
("net", "Launch time"),
("window_start", "Launch window start"),
("window_end", "Launch window end"),
],
)
def test_datetime_changes_formatted(field: str, label: str):
diffs = {
"values_changed": {
f"root['{field}']": {
"old_value": "2025-08-22T23:30:00Z",
"new_value": "2025-08-23T01:34:00Z",
}
}
}
out = format_launch_changes(diffs)
assert (
f"{label} changed from 22 Aug 2025 at 23:30 UTC " f"to 23 Aug 2025 at 01:34 UTC"
) in out
def test_last_updated_formatted():
diffs = {
"values_changed": {
"root['last_updated']": {
"old_value": "2025-08-08T16:03:39Z",
"new_value": "2025-08-09T12:00:00Z",
}
}
}
out = format_launch_changes(diffs)
# Only the new value is shown for last_updated
assert "Last updated: 09 Aug 2025 at 12:00 UTC" in out
assert "16:03" not in out # ensure old value not included
def test_name_and_probability_changes():
diffs = {
"values_changed": {
"root['name']": {
"old_value": "Starship | Flight 10",
"new_value": "Starship | Flight X",
},
"root['probability']": {"old_value": 70, "new_value": 85},
}
}
out = format_launch_changes(diffs)
assert (
"Mission name changed from 'Starship | Flight 10' to 'Starship | Flight X'"
in out
)
assert "Launch probability changed from 70% to 85%" in out
def test_probability_set_and_removed():
# Set from None
diffs_set = {
"values_changed": {"root['probability']": {"old_value": None, "new_value": 40}}
}
out_set = format_launch_changes(diffs_set)
assert "Launch probability set to 40%" in out_set
# Removed to None
diffs_removed = {
"values_changed": {"root['probability']": {"old_value": 30, "new_value": None}}
}
out_removed = format_launch_changes(diffs_removed)
assert "Launch probability removed" in out_removed
def test_skipped_fields_are_not_reported():
diffs = {
"values_changed": {
"root['agency_launch_attempt_count']": {
"old_value": 556,
"new_value": 557,
},
"root['pad_launch_attempt_count_year']": {
"old_value": 3,
"new_value": 4,
},
}
}
out = format_launch_changes(diffs)
# No bullet points should be produced for skipped fields
assert out == "No specific changes detected"
def test_generic_value_change_fallback():
diffs = {
"values_changed": {
"root['rocket']['configuration']['variant']": {
"old_value": "",
"new_value": "Block 2",
}
}
}
out = format_launch_changes(diffs)
assert (
"rocket']['configuration']['variant'] changed from '' to 'Block 2'" not in out
) # ensure path cleaning happened
assert "rocket']['configuration']['variant" not in out # sanity: no stray brackets
assert "rocket']['configuration']['variant" not in out # redundant but explicit
# Expected cleaned path from the function logic:
assert (
"rocket']['configuration']['variant" not in out
) # path is cleaned to "rocket']['configuration']['variant"
# The function replaces prefixes; the fallback prints the cleaned field string:
# "rocket']['configuration']['variant changed from '' to 'Block 2'"
# Because there is no special handling for deeper nesting, we assert a substring:
assert "variant changed from '' to 'Block 2'" in out
def test_dictionary_item_added_removed_and_type_change():
diffs = {
"dictionary_item_added": {"root['new_field']"},
"dictionary_item_removed": {"root['old_field_name']"},
"type_changes": {
"root['probability']": {
"old_type": int,
"new_type": str,
"old_value": 70,
"new_value": "70%",
}
},
}
out = format_launch_changes(diffs)
assert "New field added: New Field" in out
assert "Field removed: Old Field Name" in out
assert "Probability type changed from int to str" in out
def test_no_changes_message():
diffs = {}
out = format_launch_changes(diffs)
assert out == "No specific changes detected"
def test_no_changes():
"""
Tests that no message is generated when there are no differences.
"""
old_launch = {"id": 1, "name": "Launch A"}
new_launch = {"id": 1, "name": "Launch A"}
diff = deepdiff.DeepDiff(old_launch, new_launch)
assert format_launch_changes(diff) == "No specific changes detected"
def test_mission_name_change():
"""
Tests a simple change to the mission name.
"""
old_launch = {"name": "Starship | Flight 9"}
new_launch = {"name": "Starship | Flight 10"}
diff = deepdiff.DeepDiff(old_launch, new_launch)
expected = "• Mission name changed from 'Starship | Flight 9' to 'Starship | Flight 10'"
assert format_launch_changes(diff) == expected
def test_status_change():
"""
Tests that a change in status name is formatted correctly and that other
changes within the 'status' dictionary are ignored for a cleaner output.
"""
old_launch = {"status": {"id": 8, "name": "To Be Confirmed", "abbrev": "TBC"}}
new_launch = {"status": {"id": 1, "name": "Go for Launch", "abbrev": "Go"}}
diff = deepdiff.DeepDiff(old_launch, new_launch)
expected = "• Status changed from 'To Be Confirmed' to 'Go for Launch'"
assert format_launch_changes(diff) == expected
def test_datetime_changes():
"""
Tests the custom formatting for various datetime fields.
"""
old_launch = {
"net": "2025-08-22T23:30:00Z",
"window_start": "2025-08-22T23:30:00Z",
"window_end": "2025-08-23T01:34:00Z",
"last_updated": "2025-08-08T16:03:39Z",
}
new_launch = {
"net": "2025-08-23T00:00:00Z",
"window_start": "2025-08-23T00:00:00Z",
"window_end": "2025-08-23T02:00:00Z",
"last_updated": "2025-08-09T10:00:00Z",
}
diff = deepdiff.DeepDiff(old_launch, new_launch)
result_lines = format_launch_changes(diff).split("\n")
expected_changes = [
"• Launch time changed from 22 Aug 2025 at 23:30 UTC to 23 Aug 2025 at 00:00 UTC",
"• Launch window start changed from 22 Aug 2025 at 23:30 UTC to 23 Aug 2025 at 00:00 UTC",
"• Launch window end changed from 23 Aug 2025 at 01:34 UTC to 23 Aug 2025 at 02:00 UTC",
"• Last updated: 09 Aug 2025 at 10:00 UTC",
]
assert len(result_lines) == len(expected_changes)
for expected_line in expected_changes:
assert expected_line in result_lines
def test_datetime_change_fallback():
"""
Tests the fallback for malformed datetime strings.
"""
old_launch = {"net": "an-invalid-date"}
new_launch = {"net": "another-invalid-date"}
diff = deepdiff.DeepDiff(old_launch, new_launch)
expected = "• Launch time changed from an-invalid-date to another-invalid-date"
assert format_launch_changes(diff) == expected
def test_probability_changes():
"""
Tests the three scenarios for probability changes:
1. From a value to another value.
2. From None to a value.
3. From a value to None.
"""
# From value to value
old = {"probability": 70}
new = {"probability": 80}
diff = deepdiff.DeepDiff(old, new)
assert format_launch_changes(diff) == "• Launch probability changed from 70% to 80%"
# From None to value
old = {"probability": None}
new = {"probability": 90}
diff = deepdiff.DeepDiff(old, new)
assert format_launch_changes(diff) == "• Launch probability set to 90%"
# From value to None
old = {"probability": 90}
new = {"probability": None}
diff = deepdiff.DeepDiff(old, new)
assert format_launch_changes(diff) == "• Launch probability removed"
def test_skipped_field_is_ignored():
"""
Tests that changes to fields in the SKIP_FIELDS list are ignored.
"""
old = {"pad_launch_attempt_count_year": 4}
new = {"pad_launch_attempt_count_year": 5}
diff = deepdiff.DeepDiff(old, new)
assert format_launch_changes(diff) == "No specific changes detected"
def test_dictionary_item_added():
"""
Tests that newly added fields are reported.
"""
old = {"name": "Launch"}
new = {"name": "Launch", "hashtag": "#launchday"}
diff = deepdiff.DeepDiff(old, new)
assert format_launch_changes(diff) == "• New field added: Hashtag"
def test_dictionary_item_removed():
"""
Tests that removed fields are reported.
"""
old = {"name": "Launch", "hashtag": "#launchday"}
new = {"name": "Launch"}
diff = deepdiff.DeepDiff(old, new)
assert format_launch_changes(diff) == "• Field removed: Hashtag"
def test_type_change():
"""
Tests that a change in the data type of a field is reported.
"""
old = {"probability": 50}
new = {"probability": "50%"}
diff = deepdiff.DeepDiff(old, new)
assert format_launch_changes(diff) == "• Probability type changed from int to str"
def test_multiple_changes():
"""
Tests a scenario with multiple, mixed changes to ensure all are reported.
Order is not guaranteed, so we check for the presence of each line.
"""
old_launch = {
"status": {"name": "To Be Confirmed"},
"probability": 90,
"name": "Old Mission Name",
}
new_launch = {
"status": {"name": "Go for Launch"},
"name": "New Mission Name",
"weather_concerns": "High winds.",
}
diff = deepdiff.DeepDiff(old_launch, new_launch)
result_lines = format_launch_changes(diff).split("\n")
expected_changes = [
"• Status changed from 'To Be Confirmed' to 'Go for Launch'",
"• Mission name changed from 'Old Mission Name' to 'New Mission Name'",
"• Field removed: Probability",
"• New field added: Weather Concerns",
]
assert len(result_lines) == len(expected_changes)
for expected_line in expected_changes:
assert expected_line in result_lines

96
tests/test_utils.py
View file

@ -1,96 +0,0 @@
"""Test utility functions."""
from datetime import date, datetime, timedelta, timezone
import pytest
from agenda.utils import as_date, as_datetime, human_readable_delta
from freezegun import freeze_time
def test_as_date_with_datetime() -> None:
"""Test converting a datetime object to a date."""
dt = datetime(2024, 7, 7, 12, 0, 0, tzinfo=timezone.utc)
result = as_date(dt)
assert result == date(2024, 7, 7)
def test_as_date_with_date() -> None:
"""Test passing a date object through as_date."""
d = date(2024, 7, 7)
result = as_date(d)
assert result == d
def test_as_date_with_invalid_type() -> None:
"""Test as_date with an invalid type, expecting a TypeError."""
with pytest.raises(TypeError):
as_date("2024-07-07")
def test_as_datetime_with_datetime() -> None:
"""Test passing a datetime object through as_datetime."""
dt = datetime(2024, 7, 7, 12, 0, 0, tzinfo=timezone.utc)
result = as_datetime(dt)
assert result == dt
def test_as_datetime_with_date() -> None:
"""Test converting a date object to a datetime."""
d = date(2024, 7, 7)
result = as_datetime(d)
expected = datetime(2024, 7, 7, 0, 0, 0, tzinfo=timezone.utc)
assert result == expected
def test_as_datetime_with_invalid_type() -> None:
"""Test as_datetime with an invalid type, expecting a TypeError."""
with pytest.raises(TypeError):
as_datetime("2024-07-07")
@freeze_time("2024-07-01")
def test_human_readable_delta_future_date() -> None:
"""Test human_readable_delta with a future date 45 days from today."""
future_date = date.today() + timedelta(days=45)
result = human_readable_delta(future_date)
assert result == "1 month 2 weeks 1 day"
@freeze_time("2024-07-01")
def test_human_readable_delta_today() -> None:
"""Test human_readable_delta with today's date, expecting None."""
today = date.today()
result = human_readable_delta(today)
assert result is None
@freeze_time("2024-07-01")
def test_human_readable_delta_past_date() -> None:
"""Test human_readable_delta with a past date, expecting None."""
past_date = date.today() - timedelta(days=1)
result = human_readable_delta(past_date)
assert result is None
@freeze_time("2024-07-01")
def test_human_readable_delta_months_only() -> None:
"""Test human_readable_delta with a future date 60 days from today."""
future_date = date.today() + timedelta(days=60)
result = human_readable_delta(future_date)
assert result == "2 months"
@freeze_time("2024-07-01")
def test_human_readable_delta_weeks_only() -> None:
"""Test human_readable_delta with a future date 14 days from today."""
future_date = date.today() + timedelta(days=14)
result = human_readable_delta(future_date)
assert result == "2 weeks"
@freeze_time("2024-07-01")
def test_human_readable_delta_days_only() -> None:
"""Test human_readable_delta with a future date 3 days from today."""
future_date = date.today() + timedelta(days=3)
result = human_readable_delta(future_date)
assert result == "3 days"

431
update.py
View file

@ -1,431 +0,0 @@
#!/usr/bin/python3
"""Combined update script for various data sources."""
import asyncio
import os
import sys
import typing
from datetime import date, datetime
from time import time
import deepdiff
import flask
import requests
import agenda.birthday
import agenda.bristol_waste
import agenda.fx
import agenda.geomob
import agenda.gwr
import agenda.mail
import agenda.thespacedevs
import agenda.types
import agenda.uk_holiday
from agenda.event import Event
from agenda.types import StrDict
from web_view import app
async def update_bank_holidays(config: flask.config.Config) -> None:
"""Update cached copy of UK Bank holidays."""
t0 = time()
events = await agenda.uk_holiday.get_holiday_list(config["DATA_DIR"])
time_taken = time() - t0
if not sys.stdin.isatty():
return
print(len(events), "bank holidays in list")
print(f"took {time_taken:.1f} seconds")
async def update_bristol_bins(config: flask.config.Config) -> None:
"""Update waste schedule from Bristol City Council."""
t0 = time()
events = await agenda.bristol_waste.get(
date.today(),
config["DATA_DIR"],
config["BRISTOL_UPRN"],
cache="refresh",
)
time_taken = time() - t0
if not sys.stdin.isatty():
return
for event in events:
print(event)
print(f"took {time_taken:.1f} seconds")
def update_gwr_advance_ticket_date(config: flask.config.Config) -> None:
"""Update GWR advance ticket date cache."""
filename = os.path.join(config["DATA_DIR"], "advance-tickets.html")
existing_html = open(filename).read()
existing_dates = agenda.gwr.extract_dates(existing_html)
assert existing_dates
assert list(existing_dates.keys()) == ["Weekdays", "Saturdays", "Sundays"]
new_html = requests.get(agenda.gwr.url).text
new_dates = agenda.gwr.extract_dates(new_html)
if not new_dates:
subject = "Error parsing GWR advance ticket booking dates"
body = new_html
agenda.mail.send_mail(config, subject, body)
return
assert new_dates
assert list(new_dates.keys()) == ["Weekdays", "Saturdays", "Sundays"]
if existing_dates == new_dates:
if sys.stdin.isatty():
print(filename)
print(agenda.gwr.url)
print("dates haven't changed:", existing_dates)
return
open(filename, "w").write(new_html)
subject = (
"New GWR advance ticket booking date: "
+ f'{new_dates["Weekdays"].strftime("%d %b %Y")} (Weekdays)'
)
body = f"""
{"\n".join(f'{key}: {when.strftime("%d %b %Y")}' for key, when in new_dates.items())}
{agenda.gwr.url}
Agenda: https://edwardbetts.com/agenda/
"""
if sys.stdin.isatty():
print(filename)
print(agenda.gwr.url)
print()
print("dates have changed")
print("old:", existing_dates)
print("new:", new_dates)
print()
print(subject)
print(body)
agenda.mail.send_mail(config, subject, body)
def report_space_launch_change(
config: flask.config.Config, prev_launch: StrDict | None, cur_launch: StrDict | None
) -> None:
"""Send mail to announce change to space launch data."""
# Handle case where launch disappeared from upcoming list
if prev_launch and not cur_launch:
# Launch is no longer in upcoming list - could be completed, cancelled, or failed
# Check if we can determine status from previous data
prev_status_id = (
prev_launch.get("status", {}).get("id", 0)
if isinstance(prev_launch.get("status"), dict)
else 0
)
name = prev_launch["name"]
launch_date = prev_launch.get("net", "Unknown")
location = (
prev_launch.get("pad", {}).get("location", {}).get("name", "Unknown")
if isinstance(prev_launch.get("pad"), dict)
else "Unknown"
)
# Since launch is no longer in upcoming list, it likely completed
# We can't know the exact outcome, so provide helpful message
subject = f"🚀 Space Launch Completed: {name}"
# Format launch date nicely
formatted_date = "Unknown"
if launch_date and launch_date != "Unknown":
try:
dt = datetime.fromisoformat(launch_date.replace("Z", "+00:00"))
formatted_date = dt.strftime("%d %b %Y at %H:%M UTC")
except:
formatted_date = launch_date
body = f"""🚀 Space Launch Completed
Mission: {name}
Launch Date: {formatted_date}
Location: {location}
This launch is no longer appearing in the upcoming launches list, which typically means it has taken place.
To check if the launch was successful or failed, visit:
https://edwardbetts.com/agenda/launches
View all launches: https://edwardbetts.com/agenda/launches
"""
agenda.mail.send_mail(config, subject, body)
return
# Handle regular status updates
if cur_launch:
name = cur_launch["name"]
status = (
cur_launch.get("status", {}).get("name", "Unknown")
if isinstance(cur_launch.get("status"), dict)
else "Unknown"
)
status_id = (
cur_launch.get("status", {}).get("id", 0)
if isinstance(cur_launch.get("status"), dict)
else 0
)
launch_date = cur_launch.get("net", "Unknown")
location = (
cur_launch.get("pad", {}).get("location", {}).get("name", "Unknown")
if isinstance(cur_launch.get("pad"), dict)
else "Unknown"
)
# Check for specific status changes that deserve special attention
prev_status_id = 0
if prev_launch and isinstance(prev_launch.get("status"), dict):
prev_status_id = prev_launch.get("status", {}).get("id", 0)
# Customize subject based on status changes
if status_id == 3: # Launch Successful
subject = f"🎉 Launch Successful: {name}"
elif status_id == 4: # Launch Failure
subject = f"💥 Launch Failed: {name}"
elif status_id == 7: # Partial Failure
subject = f"⚠️ Launch Partial Failure: {name}"
elif status_id == 6: # In Flight
subject = f"🚀 Launch In Flight: {name}"
elif status_id == 5: # On Hold
subject = f"⏸️ Launch On Hold: {name}"
else:
subject = f"Space Launch Update: {name}"
else:
# This shouldn't happen with the new logic above, but keep as fallback
assert prev_launch
name = prev_launch["name"]
status = "Unknown"
launch_date = prev_launch.get("net", "Unknown")
location = (
prev_launch.get("pad", {}).get("location", {}).get("name", "Unknown")
if isinstance(prev_launch.get("pad"), dict)
else "Unknown"
)
subject = f"Space Launch Update: {name}"
differences = deepdiff.DeepDiff(prev_launch, cur_launch)
changes_text = agenda.thespacedevs.format_launch_changes(differences)
# Format launch date nicely
formatted_date = "Unknown"
if launch_date and launch_date != "Unknown":
try:
dt = datetime.fromisoformat(launch_date.replace("Z", "+00:00"))
formatted_date = dt.strftime("%d %b %Y at %H:%M UTC")
except:
formatted_date = launch_date
body = f"""🚀 Space Launch Update
Mission: {name}
Status: {status}
Launch Date: {formatted_date}
Location: {location}
Changes:
{changes_text}
View all launches: https://edwardbetts.com/agenda/launches
"""
agenda.mail.send_mail(config, subject, body)
def is_test_flight(launch: StrDict) -> bool:
"""Return True if the launch is a test flight."""
mission = typing.cast(dict[str, typing.Any] | None, launch.get("mission"))
return bool(mission and mission.get("type") == "Test Flight")
def get_launch_by_slug(data: StrDict, slug: str) -> StrDict | None:
"""Find last update for space launch."""
return {item["slug"]: typing.cast(StrDict, item) for item in data["results"]}.get(
slug
)
def update_thespacedevs(config: flask.config.Config) -> None:
"""Update cache of space launch API and send emails on relevant changes.
In addition to the configured FOLLOW_LAUNCHES, also send emails for any
launch whose mission.type == "Test Flight" even if its slug is not in
FOLLOW_LAUNCHES.
"""
rocket_dir = os.path.join(config["DATA_DIR"], "thespacedevs")
existing_data = agenda.thespacedevs.load_cached_launches(rocket_dir)
assert existing_data
# Always follow configured slugs
follow_slugs: set[str] = set(config["FOLLOW_LAUNCHES"])
# Identify test-flight slugs present in the previous cache
prev_test_slugs: set[str] = {
typing.cast(str, item["slug"])
for item in existing_data.get("results", [])
if is_test_flight(typing.cast(StrDict, item))
}
t0 = time()
data = agenda.thespacedevs.next_launch_api_data(rocket_dir)
if not data:
return # thespacedevs API call failed
# Identify test-flight slugs present in the current data
cur_test_slugs: set[str] = {
typing.cast(str, item["slug"])
for item in data.get("results", [])
if is_test_flight(typing.cast(StrDict, item))
}
# Add any test-flight slugs (whether old or new), excluding those we already
# explicitly follow.
extra_test_slugs = (prev_test_slugs | cur_test_slugs) - follow_slugs
# Final set of slugs to evaluate for changes
slugs_to_check = follow_slugs | extra_test_slugs
# Build prev/cur lookup dicts for all slugs we're checking
prev_launches = {
slug: get_launch_by_slug(existing_data, slug) for slug in slugs_to_check
}
cur_launches = {slug: get_launch_by_slug(data, slug) for slug in slugs_to_check}
# Emit reports when a launch appears/disappears or changes
for slug in slugs_to_check:
prev, cur = prev_launches.get(slug), cur_launches.get(slug)
if prev is None and cur is None:
continue
if prev and cur and prev.get("last_updated") == cur.get("last_updated"):
continue
report_space_launch_change(config, prev, cur)
time_taken = time() - t0
if not sys.stdin.isatty():
return
rockets = [agenda.thespacedevs.summarize_launch(item) for item in data["results"]]
print(len(rockets), "launches")
print(f"took {time_taken:.1f} seconds")
def update_gandi(config: flask.config.Config) -> None:
"""Retrieve list of domains from gandi.net."""
url = "https://api.gandi.net/v5/domain/domains"
headers = {"authorization": "Bearer " + config["GANDI_TOKEN"]}
filename = os.path.join(config["DATA_DIR"], "gandi_domains.json")
r = requests.request("GET", url, headers=headers)
items = r.json()
assert isinstance(items, list)
assert all(item["fqdn"] and item["dates"]["registry_ends_at"] for item in items)
with open(filename, "w") as out:
out.write(r.text)
def check_birthday_reminders(config: flask.config.Config) -> None:
"""Send at most one grouped birthday reminder email per day.
Collects birthdays in the next 7 days, groups them into sections
(Today/Tomorrow/In N days), and sends a single email.
"""
today = date.today()
data_dir = config["PERSONAL_DATA"]
entities_file = os.path.join(data_dir, "entities.yaml")
if not os.path.exists(entities_file):
return
birthdays = agenda.birthday.get_birthdays(today, entities_file)
# Collect next 7 days into a dict keyed by days-until
by_days: dict[int, list[Event]] = {}
for ev in birthdays:
days_until = (ev.as_date - today).days
if 0 <= days_until <= 7:
by_days.setdefault(days_until, []).append(ev)
if not by_days:
return
# Build subject
headings: list[str] = []
if 0 in by_days:
headings.append("today")
if 1 in by_days:
headings.append("tomorrow")
others = sum(1 for k in by_days.keys() if k not in (0, 1))
if others:
plural = "s" if others != 1 else ""
headings.append(f"{others} other{plural}")
subject = (
f"🎂 Birthday reminders ({', '.join(headings)})"
if headings
else "🎂 Birthday reminders"
)
# Build body (UK style dates)
lines: list[str] = ["Upcoming birthdays (next 7 days):", ""]
for delta in sorted(by_days.keys()):
if delta == 0:
lines.append("Today")
elif delta == 1:
lines.append("Tomorrow")
else:
lines.append(f"In {delta} days")
entries = sorted(
by_days[delta],
key=lambda e: (e.as_date, (e.title or e.name or "")),
)
for ev in entries:
d = ev.as_date
# Portable UK-style date: weekday, D Month YYYY
date_str = f"{d:%A}, {d.day} {d:%B %Y}"
label = ev.title or ev.name
lines.append(f" • {label} — {date_str}")
lines.append("")
lines.append("View all birthdays: https://edwardbetts.com/agenda/birthdays")
body = "\n".join(lines)
if sys.stdin.isatty():
print(f"Birthday reminder: {subject}\n{body}")
agenda.mail.send_mail(config, subject, body)
def main() -> None:
"""Update caches."""
now = datetime.now()
hour = now.hour
with app.app_context():
if hour % 3 == 0:
asyncio.run(update_bank_holidays(app.config))
asyncio.run(update_bristol_bins(app.config))
update_gwr_advance_ticket_date(app.config)
# TODO: debug why update gandi fails
# update_gandi(app.config)
agenda.geomob.update(app.config)
agenda.fx.get_rates(app.config)
update_thespacedevs(app.config)
# Check for birthday reminders daily at 9 AM
if hour == 9:
check_birthday_reminders(app.config)
if __name__ == "__main__":
main()

62
update_gwr_advance_ticket_date.py Executable file
View file

@ -0,0 +1,62 @@
#!/usr/bin/python3
"""Update GWR advance ticket date cache."""
import os.path
import smtplib
import sys
from email.message import EmailMessage
from email.utils import formatdate, make_msgid
import requests
from agenda import gwr
config = __import__("config.default", fromlist=[""])
def send_mail(subject: str, body: str) -> None:
"""Send an e-mail."""
msg = EmailMessage()
msg["Subject"] = subject
msg["To"] = f"{config.NAME} <{config.MAIL_TO}>"
msg["From"] = f"{config.NAME} <{config.MAIL_FROM}>"
msg["Date"] = formatdate()
msg["Message-ID"] = make_msgid()
msg.set_content(body)
s = smtplib.SMTP(config.SMTP_HOST)
s.sendmail(config.MAIL_TO, [config.MAIL_TO], msg.as_string())
s.quit()
def main() -> None:
"""Get date from web page and compare with existing."""
filename = os.path.join(config.DATA_DIR, "advance-tickets.html")
existing_html = open(filename).read()
existing_date = gwr.extract_weekday_date(existing_html)
new_html = requests.get(gwr.url).text
open(filename, "w").write(new_html)
new_date = gwr.extract_weekday_date(new_html)
if existing_date == new_date:
if sys.stdin.isatty():
print("date has't changed:", existing_date)
return
subject = f"New GWR advance ticket booking date: {new_date}"
body = f"""Old date: {existing_date}
New date: {new_date}
{gwr.url}
Agenda: https://edwardbetts.com/agenda/
"""
send_mail(subject, body)
if __name__ == "__main__":
main()

300
validate_yaml.py
View file

@ -1,300 +0,0 @@
#!/usr/bin/python3
"""Load YAML data to ensure validity."""
import os
import sys
import typing
from datetime import date, timedelta, datetime
import yaml
from rich.pretty import pprint
import agenda
import agenda.conference
import agenda.data
import agenda.travel
import agenda.trip
import agenda.types
config = __import__("config.default", fromlist=[""])
data_dir = config.PERSONAL_DATA
currencies = set(config.CURRENCIES + ["GBP"])
def check_currency(item: agenda.types.StrDict) -> None:
"""Throw error if currency is not in config."""
currency = item.get("currency")
if not currency or currency in currencies:
return None
pprint(item)
print(f"currency {currency!r} not in {currencies!r}")
sys.exit(-1)
def check_trips() -> None:
"""Check trips and ensure they are in chronological order."""
filepath = os.path.join(data_dir, "trips.yaml")
trips_data = yaml.safe_load(open(filepath, "r"))
prev_trip = None
prev_trip_data = None
for trip_data in trips_data:
current_trip = normalize_datetime(trip_data["trip"])
if prev_trip and current_trip < prev_trip:
print(f"Out of order trip found:")
print(
f" Previous: {prev_trip_data.get('trip')} - {prev_trip_data.get('name', 'No name')}"
)
print(
f" Current: {trip_data.get('trip')} - {trip_data.get('name', 'No name')}"
)
assert False, "Trips are not in chronological order by trip date."
prev_trip = current_trip
prev_trip_data = trip_data
trip_list = agenda.trip.build_trip_list(data_dir)
print(len(trip_list), "trips")
coords, routes = agenda.trip.get_coordinates_and_routes(trip_list, data_dir)
print(len(coords), "coords")
print(len(routes), "routes")
def check_flights(airlines: set[str]) -> None:
"""Check flights and ensure they are in chronological order."""
bookings = agenda.travel.parse_yaml("flights", data_dir)
flight_count = 0
co2_flight_count = 0
prev_first_depart = None
for booking in bookings:
if "trip" not in booking:
pprint(booking)
assert "trip" in booking
assert all(flight["airline"] in airlines for flight in booking["flights"])
flight_count += len(booking["flights"])
co2_flight_count += len(
[flight for flight in booking["flights"] if "co2_kg" in flight]
)
for flight in booking["flights"]:
if "co2_kg" not in flight:
pprint(booking)
check_currency(booking)
if prev_first_depart:
assert (
booking["flights"][0]["depart"] > prev_first_depart
), "Bookings are not in chronological order by first flight's departure."
prev_first_depart = booking["flights"][0]["depart"]
print(
f"{len(bookings)} flight bookings, {flight_count} flights, "
f"{co2_flight_count} with CO2 numbers"
)
def normalize_datetime(dt_value):
"""Convert date or datetime to datetime for comparison, removing timezone info."""
if isinstance(dt_value, date) and not isinstance(dt_value, datetime):
return datetime.combine(dt_value, datetime.min.time())
elif isinstance(dt_value, datetime):
# Remove timezone info to allow comparison between naive and aware datetimes
return dt_value.replace(tzinfo=None)
return dt_value
def check_trains() -> None:
"""Check trains and ensure they are in chronological order."""
trains = agenda.travel.parse_yaml("trains", data_dir)
prev_depart = None
prev_train = None
for train in trains:
current_depart = normalize_datetime(train["depart"])
if prev_depart and current_depart < prev_depart:
print(f"Out of order train found:")
print(
f" Previous: {prev_train.get('depart')} {prev_train.get('from', '')} -> {prev_train.get('to', '')}"
)
print(
f" Current: {train.get('depart')} {train.get('from', '')} -> {train.get('to', '')}"
)
assert False, "Trains are not in chronological order by departure time."
prev_depart = current_depart
prev_train = train
print(len(trains), "trains")
def check_conferences() -> None:
"""Check conferences and ensure they are in chronological order."""
filepath = os.path.join(data_dir, "conferences.yaml")
conferences_data = yaml.safe_load(open(filepath, "r"))
conferences = [agenda.conference.Conference(**conf) for conf in conferences_data]
prev_start = None
prev_conf_data = None
for i, conf_data in enumerate(conferences_data):
conf = conferences[i]
if not conf.currency or conf.currency in currencies:
pass
else:
pprint(conf)
print(f"currency {conf.currency!r} not in {currencies!r}")
sys.exit(-1)
current_start = normalize_datetime(conf_data["start"])
if prev_start and current_start < prev_start:
print(f"Out of order conference found:")
print(
f" Previous: {prev_conf_data.get('start')} - {prev_conf_data.get('name', 'No name')}"
)
print(
f" Current: {conf_data.get('start')} - {conf_data.get('name', 'No name')}"
)
assert False, "Conferences are not in chronological order by start time."
prev_start = current_start
prev_conf_data = conf_data
print(len(conferences), "conferences")
def check_events() -> None:
"""Check events."""
today = date.today()
last_year = today - timedelta(days=365)
next_year = today + timedelta(days=2 * 365)
events = agenda.events_yaml.read(data_dir, last_year, next_year)
print(len(events), "events")
def check_coordinates(item: agenda.types.StrDict) -> None:
"""Check coordinate are valid."""
if "latitude" not in item and "longitude" not in item:
return
assert "latitude" in item and "longitude" in item
assert all(isinstance(item[key], (int, float)) for key in ("latitude", "longitude"))
def check_accommodation() -> None:
"""Check accommodation and ensure they are in chronological order."""
filepath = os.path.join(data_dir, "accommodation.yaml")
accommodation_list = yaml.safe_load(open(filepath))
required_fields = ["type", "name", "country", "location", "trip", "from", "to"]
prev_from = None
prev_stay = None
for stay in accommodation_list:
try:
assert all(field in stay for field in required_fields)
check_coordinates(stay)
except AssertionError:
pprint(stay)
raise
check_currency(stay)
current_from = normalize_datetime(stay["from"])
if prev_from and current_from < prev_from:
print(f"Out of order accommodation found:")
print(
f" Previous: {prev_stay.get('from')} - {prev_stay.get('name', 'No name')} ({prev_stay.get('location', '')})"
)
print(
f" Current: {stay.get('from')} - {stay.get('name', 'No name')} ({stay.get('location', '')})"
)
assert (
False
), "Accommodation is not in chronological order by check-in time."
prev_from = current_from
prev_stay = stay
print(len(accommodation_list), "stays")
def check_airports() -> None:
"""Check airports."""
airports = typing.cast(
dict[str, agenda.types.StrDict], agenda.travel.parse_yaml("airports", data_dir)
)
print(len(airports), "airports")
for airport in airports.values():
assert "country" in airport
assert agenda.get_country(airport["country"])
def check_stations() -> None:
"""Check stations."""
stations = agenda.travel.parse_yaml("stations", data_dir)
print(len(stations), "stations")
for station in stations:
assert "country" in station
assert agenda.get_country(station["country"])
def check_ferries() -> None:
"""Check ferries and ensure they are in chronological order."""
ferries = agenda.travel.parse_yaml("ferries", data_dir)
prev_depart = None
prev_ferry = None
for ferry in ferries:
current_depart = normalize_datetime(ferry["depart"])
if prev_depart and current_depart < prev_depart:
print(f"Out of order ferry found:")
print(
f" Previous: {prev_ferry.get('depart')} {prev_ferry.get('from', '')} -> {prev_ferry.get('to', '')}"
)
print(
f" Current: {ferry.get('depart')} {ferry.get('from', '')} -> {ferry.get('to', '')}"
)
assert False, "Ferries are not in chronological order by departure time."
prev_depart = current_depart
prev_ferry = ferry
check_currency(ferry)
print(len(ferries), "ferries")
def check_airlines() -> list[agenda.types.StrDict]:
"""Check airlines."""
airlines = agenda.travel.parse_yaml("airlines", data_dir)
print(len(airlines), "airlines")
for airline in airlines:
try:
keys = set(airline.keys())
keys.discard("flight_number_prefer_icao")
assert keys == {"icao", "iata", "name"}
iata, icao = airline["iata"], airline["icao"]
assert iata[0].isupper() and iata[1].isupper() or iata[1].isdigit()
assert icao.isupper()
assert len(iata) == 2 and len(icao) == 3
if "flight_number_prefer_icao" in airline:
assert isinstance(airline["flight_number_prefer_icao"], bool)
except AssertionError:
print(yaml.dump([airline]))
raise
return airlines
def check() -> None:
"""Validate personal data YAML files."""
airlines = check_airlines()
check_trips()
check_flights({airline["iata"] for airline in airlines})
check_trains()
check_ferries()
check_conferences()
check_events()
check_accommodation()
check_airports()
check_stations()
if __name__ == "__main__":
check()

686
web_view.py
View file

@ -2,35 +2,22 @@
"""Web page to show upcoming events."""
import decimal
import inspect
import json
import operator
import os.path
import sys
import time
import traceback
from collections import defaultdict
from datetime import date, datetime, timedelta
from datetime import date, datetime
import flask
import UniAuth.auth
import werkzeug
import werkzeug.debug.tbtools
import yaml
import agenda.data
import agenda.error_mail
import agenda.fx
import agenda.holidays
import agenda.meteors
import agenda.stats
import agenda.thespacedevs
import agenda.trip
import agenda.trip_schengen
import agenda.utils
from agenda import calendar, format_list_with_ampersand, travel, uk_tz
from agenda.types import StrDict, Trip
import agenda.travel
app = flask.Flask(__name__)
app.debug = False
@ -39,12 +26,6 @@ app.config.from_object("config.default")
agenda.error_mail.setup_error_mail(app)
@app.before_request
def handle_auth() -> None:
"""Handle authentication and set global user."""
flask.g.user = UniAuth.auth.get_current_user()
@app.errorhandler(werkzeug.exceptions.InternalServerError)
def exception_handler(e: werkzeug.exceptions.InternalServerError) -> tuple[str, int]:
"""Handle exception."""
@ -72,306 +53,73 @@ def exception_handler(e: werkzeug.exceptions.InternalServerError) -> tuple[str,
)
def get_current_trip(today: date) -> Trip | None:
"""Get current trip."""
trip_list = get_trip_list(route_distances=None)
current = [
item
for item in trip_list
if item.start <= today and (item.end or item.start) >= today
]
assert len(current) < 2
return current[0] if current else None
@app.route("/")
async def index() -> str:
"""Index page."""
t0 = time.time()
now = datetime.now()
data = await agenda.data.get_data(now, app.config)
events = data.pop("events")
today = now.date()
markets_arg = flask.request.args.get("markets")
if markets_arg == "hide":
events = [e for e in events if e.name != "market"]
if markets_arg != "show":
agenda.data.hide_markets_while_away(events, data["accommodation_events"])
return flask.render_template(
"event_list.html",
today=today,
events=events,
get_country=agenda.get_country,
current_trip=get_current_trip(today),
start_event_list=date.today() - timedelta(days=1),
end_event_list=date.today() + timedelta(days=365 * 2),
render_time=(time.time() - t0),
**data,
)
@app.route("/calendar")
async def calendar_page() -> str:
"""Index page."""
now = datetime.now()
data = await agenda.data.get_data(now, app.config)
events = data.pop("events")
markets_arg = flask.request.args.get("markets")
if markets_arg == "hide":
events = [e for e in events if e.name != "market"]
if markets_arg != "show":
agenda.data.hide_markets_while_away(events, data["accommodation_events"])
# Use the new function to build events and pass both calendars and events
return flask.render_template(
"calendar.html",
today=now.date(),
events=events,
toastui_events=calendar.build_toastui_events(events),
toastui_calendars=calendar.toastui_calendars,
**data,
)
@app.route("/recent")
async def recent() -> str:
"""Index page."""
t0 = time.time()
now = datetime.now()
data = await agenda.data.get_data(now, app.config)
events = data.pop("events")
markets_arg = flask.request.args.get("markets")
if markets_arg == "hide":
events = [e for e in events if e.name != "market"]
if markets_arg != "show":
agenda.data.hide_markets_while_away(events, data["accommodation_events"])
return flask.render_template(
"event_list.html",
today=now.date(),
events=events,
start_event_list=date.today() - timedelta(days=14),
end_event_list=date.today(),
render_time=(time.time() - t0),
**data,
)
return flask.render_template("index.html", today=now.date(), **data)
@app.route("/launches")
def launch_list() -> str:
async def launch_list() -> str:
"""Web page showing List of space launches."""
now = datetime.now()
data_dir = app.config["DATA_DIR"]
rocket_dir = os.path.join(data_dir, "thespacedevs")
launches = agenda.thespacedevs.get_launches(rocket_dir, limit=100)
assert launches
rockets = await agenda.thespacedevs.get_launches(rocket_dir, limit=100)
mission_type_filter = flask.request.args.get("type")
rocket_filter = flask.request.args.get("rocket")
orbit_filter = flask.request.args.get("orbit")
mission_types = {
launch["mission"]["type"] for launch in launches if launch["mission"]
}
orbits = {
(launch["orbit"]["name"], launch["orbit"]["abbrev"])
for launch in launches
if launch.get("orbit")
}
rockets = {launch["rocket"]["full_name"] for launch in launches}
launches = [
launch
for launch in launches
if (
not mission_type_filter
or (launch["mission"] and launch["mission"]["type"] == mission_type_filter)
)
and (not rocket_filter or launch["rocket"]["full_name"] == rocket_filter)
and (
not orbit_filter
or (launch.get("orbit") and launch["orbit"]["abbrev"] == orbit_filter)
)
]
return flask.render_template(
"launches.html",
launches=launches,
rockets=rockets,
now=now,
get_country=agenda.get_country,
mission_types=mission_types,
orbits=orbits,
)
@app.route("/meteors")
def meteor_list() -> str:
"""Web page showing meteor shower information."""
meteors = agenda.meteors.get_meteor_data()
return flask.render_template(
"meteors.html",
meteors=meteors,
today=date.today(),
)
return flask.render_template("launches.html", rockets=rockets, now=now)
@app.route("/gaps")
async def gaps_page() -> str:
"""List of available gaps."""
now = datetime.now()
trip_list = agenda.trip.build_trip_list()
busy_events = agenda.busy.get_busy_events(now.date(), app.config, trip_list)
gaps = agenda.busy.find_gaps(busy_events)
return flask.render_template("gaps.html", today=now.date(), gaps=gaps)
@app.route("/weekends")
async def weekends() -> str:
"""List of available weekends using an optional date, week, or year parameter."""
today = datetime.now().date()
date_str = flask.request.args.get("date")
week_str = flask.request.args.get("week")
year_str = flask.request.args.get("year")
if date_str:
try:
start = datetime.strptime(date_str, "%Y-%m-%d").date()
except ValueError:
return flask.abort(400, description="Invalid date format. Use YYYY-MM-DD.")
elif week_str:
try:
week = int(week_str)
year = int(year_str) if year_str else today.year
if week < 1 or week > 53:
return flask.abort(
400, description="Week number must be between 1 and 53."
)
# Calculate the date of the first day of the given week
jan_1 = date(year, 1, 1)
week_1_start = jan_1 - timedelta(days=jan_1.weekday())
start = week_1_start + timedelta(weeks=week - 1)
except ValueError:
return flask.abort(
400, description="Invalid week or year format. Use integers."
)
else:
start = date(today.year, 1, 1)
current_week_number = today.isocalendar().week
trip_list = agenda.trip.build_trip_list()
busy_events = agenda.busy.get_busy_events(start, app.config, trip_list)
weekends = agenda.busy.weekends(
start, busy_events, trip_list, app.config["PERSONAL_DATA"]
)
return flask.render_template(
"weekends.html",
items=weekends,
current_week_number=current_week_number,
today=today,
)
data = await agenda.data.get_data(now, app.config)
return flask.render_template("gaps.html", today=now.date(), gaps=data["gaps"])
@app.route("/travel")
def travel_list() -> str:
"""Page showing a list of upcoming travel."""
data_dir = app.config["PERSONAL_DATA"]
flights = agenda.trip.load_flight_bookings(data_dir)
trains = [
item
for item in travel.parse_yaml("trains", data_dir)
if isinstance(item["depart"], datetime)
]
flights = agenda.travel.parse_yaml("flights", data_dir)
trains = agenda.travel.parse_yaml("trains", data_dir)
route_distances = agenda.travel.load_route_distances(app.config["DATA_DIR"])
for train in trains:
for leg in train["legs"]:
agenda.travel.add_leg_route_distance(leg, route_distances)
if all("distance" in leg for leg in train["legs"]):
train["distance"] = sum(leg["distance"] for leg in train["legs"])
return flask.render_template(
"travel.html",
flights=flights,
trains=trains,
fx_rate=agenda.fx.get_rates(app.config),
)
return flask.render_template("travel.html", flights=flights, trains=trains)
def build_conference_list() -> list[StrDict]:
"""Build conference list."""
data_dir = app.config["PERSONAL_DATA"]
filepath = os.path.join(data_dir, "conferences.yaml")
items: list[StrDict] = yaml.safe_load(open(filepath))
conference_trip_lookup = {}
for trip in agenda.trip.build_trip_list():
for trip_conf in trip.conferences:
key = (trip_conf["start"], trip_conf["name"])
conference_trip_lookup[key] = trip
for conf in items:
conf["start_date"] = agenda.utils.as_date(conf["start"])
conf["end_date"] = agenda.utils.as_date(conf["end"])
price = conf.get("price")
if price:
conf["price"] = decimal.Decimal(price)
key = (conf["start"], conf["name"])
if this_trip := conference_trip_lookup.get(key):
conf["linked_trip"] = this_trip
items.sort(key=operator.itemgetter("start_date"))
return items
def as_date(d: date | datetime) -> date:
"""Date of event."""
return d.date() if isinstance(d, datetime) else d
@app.route("/conference")
def conference_list() -> str:
"""Page showing a list of conferences."""
data_dir = app.config["PERSONAL_DATA"]
filepath = os.path.join(data_dir, "conferences.yaml")
item_list = yaml.safe_load(open(filepath))["conferences"]
today = date.today()
items = build_conference_list()
for conf in item_list:
conf["start_date"] = as_date(conf["start"])
conf["end_date"] = as_date(conf["end"])
item_list.sort(key=operator.itemgetter("start_date"))
current = [
conf
for conf in items
for conf in item_list
if conf["start_date"] <= today and conf["end_date"] >= today
]
future = [conf for conf in items if conf["start_date"] > today]
past = [conf for conf in item_list if conf["end_date"] < today]
future = [conf for conf in item_list if conf["start_date"] > today]
return flask.render_template(
"conference_list.html",
current=current,
future=future,
today=today,
get_country=agenda.get_country,
fx_rate=agenda.fx.get_rates(app.config),
)
@app.route("/conference/past")
def past_conference_list() -> str:
"""Page showing a list of conferences."""
today = date.today()
return flask.render_template(
"conference_list.html",
past=[conf for conf in build_conference_list() if conf["end_date"] < today],
today=today,
get_country=agenda.get_country,
fx_rate=agenda.fx.get_rates(app.config),
"conference_list.html", current=current, past=past, future=future, today=today
)
@ -379,382 +127,26 @@ def past_conference_list() -> str:
def accommodation_list() -> str:
"""Page showing a list of past, present and future accommodation."""
data_dir = app.config["PERSONAL_DATA"]
items = travel.parse_yaml("accommodation", data_dir)
items = agenda.travel.parse_yaml("accommodation", data_dir)
# Create a dictionary to hold stats for each year
year_stats = defaultdict(lambda: {"total_nights": 0, "nights_abroad": 0})
# Calculate stats for each year
for stay in items:
current_date = stay["from"].date()
end_date = stay["to"].date()
while current_date < end_date:
year = current_date.year
year_stats[year]["total_nights"] += 1
if stay.get("country") != "gb":
year_stats[year]["nights_abroad"] += 1
current_date += timedelta(days=1)
# Sort the stats by year in descending order
sorted_year_stats = sorted(
year_stats.items(), key=lambda item: item[0], reverse=True
stays_in_2024 = [item for item in items if item["from"].year == 2024]
total_nights_2024 = sum(
(stay["to"].date() - stay["from"].date()).days for stay in stays_in_2024
)
trip_lookup = {}
for trip in agenda.trip.build_trip_list():
for trip_stay in trip.accommodation:
key = (trip_stay["from"], trip_stay["name"])
trip_lookup[key] = trip
for item in items:
key = (item["from"], item["name"])
if this_trip := trip_lookup.get(key):
item["linked_trip"] = this_trip
now = uk_tz.localize(datetime.now())
past = [conf for conf in items if conf["to"] < now]
current = [conf for conf in items if conf["from"] <= now and conf["to"] >= now]
future = [conf for conf in items if conf["from"] > now]
nights_abroad_2024 = sum(
(stay["to"].date() - stay["from"].date()).days
for stay in stays_in_2024
if stay["country"] != "gb"
)
return flask.render_template(
"accommodation.html",
past=past,
current=current,
future=future,
year_stats=sorted_year_stats,
get_country=agenda.get_country,
fx_rate=agenda.fx.get_rates(app.config),
items=items,
total_nights_2024=total_nights_2024,
nights_abroad_2024=nights_abroad_2024,
)
def get_trip_list(
route_distances: agenda.travel.RouteDistances | None = None,
) -> list[Trip]:
"""Get list of trips respecting current authentication status."""
trips = [
trip
for trip in agenda.trip.build_trip_list(route_distances=route_distances)
if flask.g.user.is_authenticated or not trip.private
]
# Add Schengen compliance information to each trip
for trip in trips:
agenda.trip_schengen.add_schengen_compliance_to_trip(trip)
return trips
@app.route("/trip")
def trip_list() -> werkzeug.Response:
"""Trip list to redirect to future trip list."""
return flask.redirect(flask.url_for("trip_future_list"))
def calc_total_distance(trips: list[Trip]) -> float:
"""Total distance for trips."""
total = 0.0
for item in trips:
if dist := item.total_distance():
total += dist
return total
def calc_total_co2_kg(trips: list[Trip]) -> float:
"""Total CO₂ for trips."""
return sum(item.total_co2_kg() for item in trips)
def sum_distances_by_transport_type(trips: list[Trip]) -> list[tuple[str, float]]:
"""Sum distances by transport type."""
distances_by_transport_type: defaultdict[str, float] = defaultdict(float)
for trip in trips:
for transport_type, dist in trip.distances_by_transport_type():
distances_by_transport_type[transport_type] += dist
return list(distances_by_transport_type.items())
@app.route("/trip/past")
def trip_past_list() -> str:
"""Page showing a list of past trips."""
route_distances = agenda.travel.load_route_distances(app.config["DATA_DIR"])
trip_list = get_trip_list(route_distances)
today = date.today()
past = [item for item in trip_list if (item.end or item.start) < today]
coordinates, routes = agenda.trip.get_coordinates_and_routes(past)
return flask.render_template(
"trip/list.html",
heading="Past trips",
trips=reversed(past),
coordinates=coordinates,
routes=routes,
today=today,
get_country=agenda.get_country,
format_list_with_ampersand=format_list_with_ampersand,
fx_rate=agenda.fx.get_rates(app.config),
total_distance=calc_total_distance(past),
total_co2_kg=calc_total_co2_kg(past),
distances_by_transport_type=sum_distances_by_transport_type(past),
)
@app.route("/trip/future")
def trip_future_list() -> str:
"""Page showing a list of future trips."""
route_distances = agenda.travel.load_route_distances(app.config["DATA_DIR"])
trip_list = get_trip_list(route_distances)
today = date.today()
current = [
item
for item in trip_list
if item.start <= today and (item.end or item.start) >= today
]
future = [item for item in trip_list if item.start > today]
coordinates, routes = agenda.trip.get_coordinates_and_routes(current + future)
return flask.render_template(
"trip/list.html",
heading="Future trips",
trips=current + future,
coordinates=coordinates,
routes=routes,
today=today,
get_country=agenda.get_country,
format_list_with_ampersand=format_list_with_ampersand,
fx_rate=agenda.fx.get_rates(app.config),
total_distance=calc_total_distance(current + future),
total_co2_kg=calc_total_co2_kg(current + future),
distances_by_transport_type=sum_distances_by_transport_type(current + future),
)
@app.route("/trip/text")
def trip_list_text() -> str:
"""Page showing a list of trips."""
trip_list = get_trip_list()
today = date.today()
future = [item for item in trip_list if item.start > today]
return flask.render_template(
"trip_list_text.html",
future=future,
today=today,
get_country=agenda.get_country,
format_list_with_ampersand=format_list_with_ampersand,
)
def get_prev_current_and_next_trip(
start: str, trip_list: list[Trip]
) -> tuple[Trip | None, Trip | None, Trip | None]:
"""Get previous trip, this trip and next trip."""
trip_iter = iter(trip_list)
prev_trip = None
current_trip = None
for trip in trip_iter:
if trip.start.isoformat() == start:
current_trip = trip
break
prev_trip = trip
next_trip = next(trip_iter, None)
return (prev_trip, current_trip, next_trip)
@app.route("/trip/<start>")
def trip_page(start: str) -> str:
"""Individual trip page."""
route_distances = agenda.travel.load_route_distances(app.config["DATA_DIR"])
trip_list = get_trip_list(route_distances)
prev_trip, trip, next_trip = get_prev_current_and_next_trip(start, trip_list)
if not trip:
flask.abort(404)
# Add Schengen compliance information
trip = agenda.trip_schengen.add_schengen_compliance_to_trip(trip)
coordinates = agenda.trip.collect_trip_coordinates(trip)
routes = agenda.trip.get_trip_routes(trip, app.config["PERSONAL_DATA"])
agenda.trip.add_coordinates_for_unbooked_flights(routes, coordinates)
for route in routes:
if "geojson_filename" in route:
route["geojson"] = agenda.trip.read_geojson(
app.config["PERSONAL_DATA"], route.pop("geojson_filename")
)
return flask.render_template(
"trip_page.html",
trip=trip,
prev_trip=prev_trip,
next_trip=next_trip,
today=date.today(),
coordinates=coordinates,
routes=routes,
get_country=agenda.get_country,
format_list_with_ampersand=format_list_with_ampersand,
holidays=agenda.holidays.get_trip_holidays(trip),
human_readable_delta=agenda.utils.human_readable_delta,
)
@app.route("/trip/<start>/debug")
def trip_debug_page(start: str) -> str:
"""Trip debug page showing raw trip object data."""
if not flask.g.user.is_authenticated:
flask.abort(401)
route_distances = agenda.travel.load_route_distances(app.config["DATA_DIR"])
trip_list = get_trip_list(route_distances)
prev_trip, trip, next_trip = get_prev_current_and_next_trip(start, trip_list)
if not trip:
flask.abort(404)
# Add Schengen compliance information
trip = agenda.trip_schengen.add_schengen_compliance_to_trip(trip)
# Convert trip object to dictionary for display
trip_dict = {
"start": trip.start.isoformat(),
"name": trip.name,
"private": trip.private,
"travel": trip.travel,
"accommodation": trip.accommodation,
"conferences": trip.conferences,
"events": trip.events,
"flight_bookings": trip.flight_bookings,
"computed_properties": {
"title": trip.title,
"end": trip.end.isoformat() if trip.end else None,
"countries": [
{"name": c.name, "alpha_2": c.alpha_2, "flag": c.flag}
for c in trip.countries
],
"locations": [
{
"location": loc,
"country": {"name": country.name, "alpha_2": country.alpha_2},
}
for loc, country in trip.locations()
],
"total_distance": trip.total_distance(),
"total_co2_kg": trip.total_co2_kg(),
"distances_by_transport_type": trip.distances_by_transport_type(),
"co2_by_transport_type": trip.co2_by_transport_type(),
},
"schengen_compliance": (
{
"total_days_used": trip.schengen_compliance.total_days_used,
"days_remaining": trip.schengen_compliance.days_remaining,
"is_compliant": trip.schengen_compliance.is_compliant,
"current_180_day_period": [
trip.schengen_compliance.current_180_day_period[0].isoformat(),
trip.schengen_compliance.current_180_day_period[1].isoformat(),
],
"days_over_limit": trip.schengen_compliance.days_over_limit,
}
if trip.schengen_compliance
else None
),
}
# Convert to JSON for pretty printing
trip_json = json.dumps(trip_dict, indent=2, default=str)
return flask.render_template(
"trip_debug.html",
trip=trip,
trip_json=trip_json,
start=start,
)
@app.route("/holidays")
def holiday_list() -> str:
"""List of holidays."""
today = date.today()
data_dir = app.config["DATA_DIR"]
next_year = today + timedelta(days=1 * 365)
items = agenda.holidays.get_all(today - timedelta(days=2), next_year, data_dir)
items.sort(key=lambda item: (item.date, item.country))
return flask.render_template(
"holiday_list.html", items=items, get_country=agenda.get_country, today=today
)
@app.route("/birthdays")
def birthday_list() -> str:
"""List of birthdays."""
today = date.today()
if not flask.g.user.is_authenticated:
flask.abort(401)
data_dir = app.config["PERSONAL_DATA"]
entities_file = os.path.join(data_dir, "entities.yaml")
items = agenda.birthday.get_birthdays(today - timedelta(days=2), entities_file)
items.sort(key=lambda item: item.date)
return flask.render_template("birthday_list.html", items=items, today=today)
@app.route("/trip/stats")
def trip_stats() -> str:
"""Travel stats: distance and price by year and travel type."""
route_distances = agenda.travel.load_route_distances(app.config["DATA_DIR"])
trip_list = get_trip_list(route_distances)
conferences = sum(len(item.conferences) for item in trip_list)
yearly_stats = agenda.stats.calculate_yearly_stats(trip_list)
return flask.render_template(
"trip/stats.html",
count=len(trip_list),
total_distance=calc_total_distance(trip_list),
distances_by_transport_type=sum_distances_by_transport_type(trip_list),
yearly_stats=yearly_stats,
conferences=conferences,
previously_visited=app.config.get("PREVIOUSLY_VISITED", set),
)
@app.route("/schengen")
def schengen_report() -> str:
"""Schengen compliance report."""
return agenda.trip_schengen.flask_route_schengen_report()
@app.route("/callback")
def auth_callback() -> tuple[str, int] | werkzeug.Response:
"""Process the authentication callback."""
return UniAuth.auth.auth_callback()
@app.route("/login")
def login() -> werkzeug.Response:
"""Login."""
next_url = flask.request.args["next"]
return UniAuth.auth.redirect_to_login(next_url)
@app.route("/logout")
def logout() -> werkzeug.Response:
"""Logout."""
return UniAuth.auth.redirect_to_logout(flask.request.args["next"])
if __name__ == "__main__":
app.run(host="0.0.0.0")

18
webpack.config.js
View file

@ -1,18 +0,0 @@
const path = require('path');
const CopyPlugin = require('copy-webpack-plugin');
module.exports = {
mode: 'development',
entry: './frontend/index.js', // Ensure this entry point exists and is valid.
plugins: [
new CopyPlugin({
patterns: [
// Copy Bootstrap's CSS and JS from node_modules to your desired location
{ from: 'node_modules/bootstrap/dist', to: path.resolve(__dirname, 'static/bootstrap5') },
{ from: 'node_modules/leaflet/dist', to: path.resolve(__dirname, 'static/leaflet') },
{ from: 'node_modules/leaflet.geodesic/dist', to: path.resolve(__dirname, 'static/leaflet-geodesic'), },
{ from: 'node_modules/es-module-shims/dist', to: path.resolve(__dirname, 'static/es-module-shims') }
],
}),
]
};