No valid journeys found.
+
No valid journeys found.
+
{% if gwr_count == 0 and eurostar_count == 0 %}
Could not retrieve train data. Check your network connection or try again.
{% elif gwr_count == 0 %}
diff --git a/tests/test_app.py b/tests/test_app.py
index fd06a8d..d4de5c2 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -16,21 +16,25 @@ def _stub_data(monkeypatch, prices=None):
{'depart_bristol': '07:00', 'arrive_paddington': '08:45', 'headcode': '1A23'},
],
)
- p = (prices or {}).get('10:01', {})
monkeypatch.setattr(
app_module.eurostar_scraper,
'fetch',
- lambda destination, travel_date: [
+ lambda destination, travel_date, user_agent: [
{
'depart_st_pancras': '10:01',
'arrive_destination': '13:34',
'destination': destination,
'train_number': 'ES 9014',
- 'price': p.get('price') if isinstance(p, dict) else None,
- 'seats': p.get('seats') if isinstance(p, dict) else None,
},
],
)
+ monkeypatch.setattr(
+ app_module.eurostar_scraper,
+ 'timetable_url',
+ lambda destination: f'https://example.test/{destination.lower().replace(" ", "-")}',
+ )
+ _prices = prices if prices is not None else {}
+ monkeypatch.setattr(app_module, 'fetch_eurostar_prices', lambda dest, date: _prices)
def test_index_shows_fixed_departure_and_destination_radios():
@@ -92,6 +96,7 @@ def test_results_title_and_social_meta_include_destination(monkeypatch):
def test_results_marks_trips_within_five_minutes_of_fastest_and_slowest(monkeypatch):
monkeypatch.setattr(app_module, 'get_cached', lambda key, ttl=None: None)
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
+ monkeypatch.setattr(app_module, 'fetch_eurostar_prices', lambda dest, date: {})
monkeypatch.setattr(
app_module.rtt_scraper,
'fetch',
@@ -106,14 +111,44 @@ def test_results_marks_trips_within_five_minutes_of_fastest_and_slowest(monkeypa
monkeypatch.setattr(
app_module.eurostar_scraper,
'fetch',
- lambda destination, travel_date: [
- {'depart_st_pancras': '09:30', 'arrive_destination': '11:50', 'destination': destination, 'train_number': 'ES 1001', 'price': None, 'seats': None},
- {'depart_st_pancras': '09:40', 'arrive_destination': '12:00', 'destination': destination, 'train_number': 'ES 1002', 'price': None, 'seats': None},
- {'depart_st_pancras': '09:50', 'arrive_destination': '12:20', 'destination': destination, 'train_number': 'ES 1003', 'price': None, 'seats': None},
- {'depart_st_pancras': '10:00', 'arrive_destination': '12:35', 'destination': destination, 'train_number': 'ES 1004', 'price': None, 'seats': None},
- {'depart_st_pancras': '10:10', 'arrive_destination': '12:45', 'destination': destination, 'train_number': 'ES 1005', 'price': None, 'seats': None},
+ lambda destination, travel_date, user_agent: [
+ {
+ 'depart_st_pancras': '09:30',
+ 'arrive_destination': '11:50',
+ 'destination': destination,
+ 'train_number': 'ES 1001',
+ },
+ {
+ 'depart_st_pancras': '09:40',
+ 'arrive_destination': '12:00',
+ 'destination': destination,
+ 'train_number': 'ES 1002',
+ },
+ {
+ 'depart_st_pancras': '09:50',
+ 'arrive_destination': '12:20',
+ 'destination': destination,
+ 'train_number': 'ES 1003',
+ },
+ {
+ 'depart_st_pancras': '10:00',
+ 'arrive_destination': '12:35',
+ 'destination': destination,
+ 'train_number': 'ES 1004',
+ },
+ {
+ 'depart_st_pancras': '10:10',
+ 'arrive_destination': '12:45',
+ 'destination': destination,
+ 'train_number': 'ES 1005',
+ },
],
)
+ monkeypatch.setattr(
+ app_module.eurostar_scraper,
+ 'timetable_url',
+ lambda destination: f'https://example.test/{destination.lower().replace(" ", "-")}',
+ )
client = _client()
resp = client.get('/results/paris/2026-04-10?min_connection=60&max_connection=120')
@@ -133,6 +168,7 @@ def test_results_marks_trips_within_five_minutes_of_fastest_and_slowest(monkeypa
def test_results_shows_unreachable_morning_eurostar_services(monkeypatch):
monkeypatch.setattr(app_module, 'get_cached', lambda key, ttl=None: None)
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
+ monkeypatch.setattr(app_module, 'fetch_eurostar_prices', lambda dest, date: {})
monkeypatch.setattr(
app_module.rtt_scraper,
'fetch',
@@ -143,12 +179,32 @@ def test_results_shows_unreachable_morning_eurostar_services(monkeypatch):
monkeypatch.setattr(
app_module.eurostar_scraper,
'fetch',
- lambda destination, travel_date: [
- {'depart_st_pancras': '09:30', 'arrive_destination': '12:00', 'destination': destination, 'train_number': 'ES 9001', 'price': None, 'seats': None},
- {'depart_st_pancras': '10:15', 'arrive_destination': '13:40', 'destination': destination, 'train_number': 'ES 9002', 'price': None, 'seats': None},
- {'depart_st_pancras': '12:30', 'arrive_destination': '15:55', 'destination': destination, 'train_number': 'ES 9003', 'price': None, 'seats': None},
+ lambda destination, travel_date, user_agent: [
+ {
+ 'depart_st_pancras': '09:30',
+ 'arrive_destination': '12:00',
+ 'destination': destination,
+ 'train_number': 'ES 9001',
+ },
+ {
+ 'depart_st_pancras': '10:15',
+ 'arrive_destination': '13:40',
+ 'destination': destination,
+ 'train_number': 'ES 9002',
+ },
+ {
+ 'depart_st_pancras': '12:30',
+ 'arrive_destination': '15:55',
+ 'destination': destination,
+ 'train_number': 'ES 9003',
+ },
],
)
+ monkeypatch.setattr(
+ app_module.eurostar_scraper,
+ 'timetable_url',
+ lambda destination: f'https://example.test/{destination.lower().replace(" ", "-")}',
+ )
client = _client()
resp = client.get('/results/paris/2026-04-10?min_connection=60&max_connection=120')
@@ -158,13 +214,13 @@ def test_results_shows_unreachable_morning_eurostar_services(monkeypatch):
assert '2 Eurostar services unavailable from Bristol' in html
assert '09:30' in html
assert 'ES 9001' in html
- assert 'Too early' in html
+ assert 'Unavailable from Bristol' in html
assert html.index('09:30') < html.index('10:15')
def test_results_shows_eurostar_price_and_total(monkeypatch):
# 07:00 on Friday 2026-04-10 → Anytime £138.70 (weekday, 05:05–08:25 window)
- _stub_data(monkeypatch, prices={'10:01': {'price': 59, 'seats': 42}})
+ _stub_data(monkeypatch, prices={'10:01': 59})
client = _client()
resp = client.get('/results/paris/2026-04-10?min_connection=60&max_connection=120')
@@ -178,6 +234,7 @@ def test_results_shows_eurostar_price_and_total(monkeypatch):
def test_results_can_show_only_unreachable_morning_services(monkeypatch):
monkeypatch.setattr(app_module, 'get_cached', lambda key, ttl=None: None)
monkeypatch.setattr(app_module, 'set_cached', lambda key, data: None)
+ monkeypatch.setattr(app_module, 'fetch_eurostar_prices', lambda dest, date: {})
monkeypatch.setattr(
app_module.rtt_scraper,
'fetch',
@@ -188,10 +245,20 @@ def test_results_can_show_only_unreachable_morning_services(monkeypatch):
monkeypatch.setattr(
app_module.eurostar_scraper,
'fetch',
- lambda destination, travel_date: [
- {'depart_st_pancras': '09:30', 'arrive_destination': '12:00', 'destination': destination, 'train_number': 'ES 9001', 'price': None, 'seats': None},
+ lambda destination, travel_date, user_agent: [
+ {
+ 'depart_st_pancras': '09:30',
+ 'arrive_destination': '12:00',
+ 'destination': destination,
+ 'train_number': 'ES 9001',
+ },
],
)
+ monkeypatch.setattr(
+ app_module.eurostar_scraper,
+ 'timetable_url',
+ lambda destination: f'https://example.test/{destination.lower().replace(" ", "-")}',
+ )
client = _client()
resp = client.get('/results/paris/2026-04-10?min_connection=60&max_connection=120')
@@ -201,4 +268,4 @@ def test_results_can_show_only_unreachable_morning_services(monkeypatch):
assert 'No valid journeys found.' not in html
assert '1 Eurostar service unavailable from Bristol' in html
assert '09:30' in html
- assert 'Too early' in html
+ assert 'Unavailable from Bristol' in html
diff --git a/tests/test_eurostar_scraper.py b/tests/test_eurostar_scraper.py
index ed82358..1015b8a 100644
--- a/tests/test_eurostar_scraper.py
+++ b/tests/test_eurostar_scraper.py
@@ -1,92 +1,97 @@
+import json
import pytest
-from scraper.eurostar import _parse_graphql, search_url
+from scraper.eurostar import _hhmm, _parse, timetable_url
-def _gql_response(journeys: list) -> dict:
- return {'data': {'journeySearch': {'outbound': {'journeys': journeys}}}}
+# ---------------------------------------------------------------------------
+# _hhmm
+# ---------------------------------------------------------------------------
+
+def test_hhmm_parses_datetime_string():
+ assert _hhmm('2026-03-30 09:34:00') == '09:34'
+
+def test_hhmm_none_input():
+ assert _hhmm(None) is None
+
+def test_hhmm_empty_string():
+ assert _hhmm('') is None
-def _journey(departs: str, arrives: str, price=None, seats=None, service_name='', carrier='ES') -> dict:
+# ---------------------------------------------------------------------------
+# _parse
+# ---------------------------------------------------------------------------
+
+def _make_next_data(departures: list) -> str:
+ data = {
+ 'props': {
+ 'pageProps': {
+ 'pageData': {
+ 'liveDepartures': departures
+ }
+ }
+ }
+ }
+ return f''
+
+
+def _departure(dep_dt: str, arr_dt: str) -> dict:
return {
- 'timing': {'departureTime': departs, 'arrivalTime': arrives},
- 'fares': [{
- 'classOfService': {'code': 'STANDARD'},
- 'prices': {'displayPrice': price},
- 'seats': seats,
- 'legs': [{'serviceName': service_name, 'serviceType': {'code': carrier}}]
- if service_name else [],
- }],
+ 'origin': {'model': {'scheduledDepartureDateTime': dep_dt}},
+ 'destination': {'model': {'scheduledArrivalDateTime': arr_dt}},
}
-# ---------------------------------------------------------------------------
-# _parse_graphql
-# ---------------------------------------------------------------------------
-
-def test_parse_graphql_single_journey():
- data = _gql_response([_journey('09:31', '12:55', price=156, seats=37, service_name='9014')])
- services = _parse_graphql(data, 'Paris Gare du Nord')
+def test_parse_single_departure():
+ html = _make_next_data([_departure('2026-03-30 06:01:00', '2026-03-30 09:34:00')])
+ services = _parse(html, 'Paris Gare du Nord')
assert len(services) == 1
- s = services[0]
- assert s['depart_st_pancras'] == '09:31'
- assert s['arrive_destination'] == '12:55'
- assert s['destination'] == 'Paris Gare du Nord'
- assert s['train_number'] == 'ES 9014'
- assert s['price'] == 156.0
- assert s['seats'] == 37
+ assert services[0] == {
+ 'depart_st_pancras': '06:01',
+ 'arrive_destination': '09:34',
+ 'destination': 'Paris Gare du Nord',
+ 'train_number': '',
+ }
-def test_parse_graphql_half_pound_price():
- data = _gql_response([_journey('09:01', '14:20', price=192.5, seats=25, service_name='9116')])
- services = _parse_graphql(data, 'Amsterdam Centraal')
- assert services[0]['price'] == 192.5
-
-
-def test_parse_graphql_null_price():
- data = _gql_response([_journey('06:16', '11:09', price=None, seats=0)])
- services = _parse_graphql(data, 'Amsterdam Centraal')
- assert services[0]['price'] is None
- assert services[0]['seats'] == 0
-
-
-def test_parse_graphql_sorted_by_departure():
- data = _gql_response([
- _journey('10:31', '13:55'),
- _journey('07:31', '10:59'),
+def test_parse_results_sorted_by_departure():
+ html = _make_next_data([
+ _departure('2026-03-30 10:00:00', '2026-03-30 13:00:00'),
+ _departure('2026-03-30 07:00:00', '2026-03-30 10:00:00'),
])
- services = _parse_graphql(data, 'Paris Gare du Nord')
- assert services[0]['depart_st_pancras'] == '07:31'
- assert services[1]['depart_st_pancras'] == '10:31'
+ services = _parse(html, 'Paris Gare du Nord')
+ assert services[0]['depart_st_pancras'] == '07:00'
+ assert services[1]['depart_st_pancras'] == '10:00'
-def test_parse_graphql_deduplicates_same_departure_time():
- data = _gql_response([
- _journey('06:16', '11:09', price=None, seats=0),
- _journey('06:16', '11:09', price=None, seats=0),
- _journey('06:16', '11:09', price=None, seats=0),
+def test_parse_skips_entries_with_missing_times():
+ html = _make_next_data([
+ _departure(None, '2026-03-30 09:34:00'),
+ _departure('2026-03-30 08:00:00', None),
+ _departure('2026-03-30 09:00:00', '2026-03-30 12:00:00'),
])
- services = _parse_graphql(data, 'Amsterdam Centraal')
+ services = _parse(html, 'Paris Gare du Nord')
assert len(services) == 1
+ assert services[0]['depart_st_pancras'] == '09:00'
-def test_parse_graphql_no_legs_gives_empty_train_number():
- data = _gql_response([_journey('09:31', '12:55', price=156, seats=37, service_name='')])
- services = _parse_graphql(data, 'Paris Gare du Nord')
- assert services[0]['train_number'] == ''
+def test_parse_no_next_data_returns_empty():
+ assert _parse('
nothing here', 'Paris Gare du Nord') == []
-def test_parse_graphql_empty_journeys():
- data = _gql_response([])
- assert _parse_graphql(data, 'Paris Gare du Nord') == []
+def test_parse_empty_departures():
+ html = _make_next_data([])
+ assert _parse(html, 'Paris Gare du Nord') == []
-# ---------------------------------------------------------------------------
-# search_url
-# ---------------------------------------------------------------------------
-
-def test_search_url():
- url = search_url('Paris Gare du Nord', '2026-04-10')
- assert url == (
- 'https://www.eurostar.com/search/uk-en'
- '?adult=1&origin=7015400&destination=8727100&outbound=2026-04-10'
+def test_timetable_url_uses_station_id_table():
+ assert timetable_url('Paris Gare du Nord') == (
+ 'https://www.eurostar.com/uk-en/travel-info/timetable/'
+ '7015400/8727100/london-st-pancras-intl/paris-gare-du-nord'
+ )
+
+
+def test_timetable_url_slugifies_destination_name():
+ assert timetable_url('Rotterdam Centraal') == (
+ 'https://www.eurostar.com/uk-en/travel-info/timetable/'
+ '7015400/8400530/london-st-pancras-intl/rotterdam-centraal'
)
diff --git a/trip_planner.py b/trip_planner.py
index 5a0b718..c7e3286 100644
--- a/trip_planner.py
+++ b/trip_planner.py
@@ -3,17 +3,12 @@ Combine GWR Bristol→Paddington trains with Eurostar St Pancras→destination t
"""
from datetime import datetime, timedelta, time as _time
-import circle_line
-
MIN_CONNECTION_MINUTES = 50
MAX_CONNECTION_MINUTES = 110
MAX_GWR_MINUTES = 110
DATE_FMT = '%Y-%m-%d'
TIME_FMT = '%H:%M'
-PAD_WALK_TO_UNDERGROUND_MINUTES = 7 # GWR platform → Paddington (H&C Line) platform
-KX_WALK_TO_CHECKIN_MINUTES = 8 # King's Cross St Pancras platform → St Pancras check-in
-
# Bristol Temple Meads → London Paddington walk-on single fares.
# Weekday restrictions (Mon–Fri only):
@@ -50,24 +45,6 @@ def _parse_dt(date: str, time: str) -> datetime:
return datetime.strptime(f"{date} {time}", f"{DATE_FMT} {TIME_FMT}")
-def _circle_line_times(arrive_paddington: datetime) -> tuple[str, str] | tuple[None, None]:
- """
- Given GWR arrival at Paddington, return (circle_line_depart_str, arrive_checkin_str).
-
- Adds PAD_WALK_TO_UNDERGROUND_MINUTES to get the earliest boarding time, looks up
- the next real Circle Line service from the timetable, then adds KX_WALK_TO_CHECKIN_MINUTES
- to the Kings Cross arrival to give an estimated St Pancras check-in time.
- Returns (None, None) if no service is found.
- """
- earliest_board = arrive_paddington + timedelta(minutes=PAD_WALK_TO_UNDERGROUND_MINUTES)
- result = circle_line.next_service(earliest_board)
- if result is None:
- return None, None
- circle_depart, arrive_kx = result
- arrive_checkin = arrive_kx + timedelta(minutes=KX_WALK_TO_CHECKIN_MINUTES)
- return circle_depart.strftime(TIME_FMT), arrive_checkin.strftime(TIME_FMT)
-
-
def _fmt_duration(minutes: int) -> str:
h, m = divmod(minutes, 60)
if h and m:
@@ -144,10 +121,7 @@ def combine_trips(
dep_bri, arr_pad, dep_stp, arr_dest = connection
total_mins = int((arr_dest - dep_bri).total_seconds() / 60)
- # Destination time is CET/CEST, departure is GMT/BST; Europe is always 1h ahead.
- eurostar_mins = int((arr_dest - dep_stp).total_seconds() / 60) - 60
ticket = cheapest_gwr_ticket(gwr['depart_bristol'], travel_date)
- circle_depart, arrive_checkin = _circle_line_times(arr_pad)
trips.append({
'depart_bristol': gwr['depart_bristol'],
'arrive_paddington': gwr['arrive_paddington'],
@@ -155,11 +129,8 @@ def combine_trips(
'gwr_duration': _fmt_duration(int((arr_pad - dep_bri).total_seconds() / 60)),
'connection_minutes': int((dep_stp - arr_pad).total_seconds() / 60),
'connection_duration': _fmt_duration(int((dep_stp - arr_pad).total_seconds() / 60)),
- 'circle_line_depart': circle_depart,
- 'circle_arrive_checkin': arrive_checkin,
'depart_st_pancras': es['depart_st_pancras'],
'arrive_destination': es['arrive_destination'],
- 'eurostar_duration': _fmt_duration(eurostar_mins),
'train_number': es.get('train_number', ''),
'total_duration': _fmt_duration(total_mins),
'total_minutes': total_mins,
@@ -196,11 +167,6 @@ def find_unreachable_morning_eurostars(
):
continue
- dep_stp = _parse_dt(travel_date, es['depart_st_pancras'])
- arr_dest = _parse_dt(travel_date, es['arrive_destination'])
- if arr_dest < dep_stp:
- arr_dest += timedelta(days=1)
- eurostar_mins = int((arr_dest - dep_stp).total_seconds() / 60) - 60
- unreachable.append({**es, 'eurostar_duration': _fmt_duration(eurostar_mins)})
+ unreachable.append(es)
return sorted(unreachable, key=lambda s: s['depart_st_pancras'])