Marty/nightjetter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add typer options for connection search

Browse source
This commit is contained in:
Marty Oehme 2025-08-12 11:18:21 +02:00
parent 48fbba60fa
commit 1c7738f1c0
Signed by: Marty
GPG key ID: 4E535BC19C61886E
1 changed files with 42 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

54
main.py
View file

@ -6,6 +6,7 @@ from pathlib import Path
from typing import Any from typing import Any
import requests import requests
import typer
BASE_URL = "https://www.nightjet.com" BASE_URL = "https://www.nightjet.com"
BASE_DIR = "out" BASE_DIR = "out"
@ -13,6 +14,10 @@ CSV_LOWEST_FILE = f"{BASE_DIR}/lowest.csv"
CSV_ALL_PRICES_PATTERN = f"{BASE_DIR}/%%DATE%%_all_prices.csv" CSV_ALL_PRICES_PATTERN = f"{BASE_DIR}/%%DATE%%_all_prices.csv"
NOTIFICATION_CHANNEL = "nightjet-price-notifier" NOTIFICATION_CHANNEL = "nightjet-price-notifier"
START_STATION = "8096003" # BerlinHBF
END_STATION = "8796001" # Paris Est
TRAVEL_DATE = "2025-10-14"
def dprint(txt) -> None: def dprint(txt) -> None:
print(f"{datetime.now()}: {txt}") print(f"{datetime.now()}: {txt}")
@ -33,15 +38,14 @@ def request_init_token(endpoint: str = "/nj-booking-ocp/init/start") -> str:
return token return token
START_STATION = "8096003" # BerlinHBF
END_STATION = "8796001" # Paris Est
TRAVEL_DATE = "2025-10-14"
def request_connections( def request_connections(
token: str, endpoint: str = "/nj-booking-ocp/connection" token: str,
start_station: int,
end_station: int,
travel_date: datetime,
endpoint: str = "/nj-booking-ocp/connection",
) -> list[Any]: ) -> list[Any]:
uri = f"{BASE_URL}{endpoint}/{START_STATION}/{END_STATION}/{TRAVEL_DATE}" uri = f"{BASE_URL}{endpoint}/{start_station}/{end_station}/{travel_date.strftime('%Y-%m-%d')}"
headers = { headers = {
"Accept": "application/json", "Accept": "application/json",
"Accept-Language": "en-US,en;q=0.5", "Accept-Language": "en-US,en;q=0.5",
@ -170,7 +174,8 @@ def extract_prices(bookings_dict: list[dict[Any, Any]]) -> list[Price]:
"%Y-%m-%dT%H:%M:%S.%f%z", "%Y-%m-%dT%H:%M:%S.%f%z",
), ),
dt_to=datetime.strptime( dt_to=datetime.strptime(
offer["validityPeriodTo"], "%Y-%m-%dT%H:%M:%S.%f%z" offer["validityPeriodTo"],
"%Y-%m-%dT%H:%M:%S.%f%z",
), ),
) )
) )
@ -242,9 +247,13 @@ def notify_user(previous: Price, new: Price, channel: str) -> None:
) )
def main(): def main(start_station: int, end_station: int, travel_date: datetime):
Path(BASE_DIR).mkdir(exist_ok=True, parents=True)
print(start_station, end_station, travel_date)
# return
token = request_init_token() token = request_init_token()
connections = request_connections(token) connections = request_connections(token, start_station, end_station, travel_date)
booking_requests = connection_data_to_booking_requests(connections) booking_requests = connection_data_to_booking_requests(connections)
bookings = [request_bookings(token, req) for req in booking_requests] bookings = [request_bookings(token, req) for req in booking_requests]
prices = extract_prices(bookings) prices = extract_prices(bookings)
@ -274,6 +283,27 @@ def main():
add_to_csv(new) add_to_csv(new)
## CLI
app = typer.Typer()
@app.command()
def search(
start_station: int = typer.Option(
START_STATION, help="Departure station number. (default: Berlin Hbf)"
),
end_station: int = typer.Option(
END_STATION, help="Destination station number. (default: Paris Est)"
),
travel_date: str = typer.Option(help="Travel day to search from. (YYYY-MM-DD)"),
):
try:
date_obj = datetime.strptime(travel_date, "%Y-%m-%d")
except ValueError:
typer.echo(f"Invalid date format: {travel_date}. Use YYYY-MM-DD", err=True)
raise typer.Exit(1)
main(start_station=start_station, end_station=end_station, travel_date=date_obj)
if __name__ == "__main__": if __name__ == "__main__":
Path(BASE_DIR).mkdir(exist_ok=True, parents=True) app()
main()