Google Flights MCP, CLI and Python Library
Update SearchFlights and SearchDates to not use global search models
Punit Arani23d0351bd2c6
diff --git a/fli/app/main.py b/fli/app/main.pyindex 0ed45f5..3fb623f 100644--- a/fli/app/main.py+++ b/fli/app/main.py@@ -7,14 +7,16 @@ from fli.app.utils import format_enumfrom fli.models import (Airport,DateSearchFilters,+ FlightSearchFilters,FlightSegment,MaxStops,PassengerInfo,SeatType,SortBy,+ TimeRestrictions,)from fli.search.dates import SearchDates-from fli.search.flights import SearchFlights, SearchFlightsFilters+from fli.search.flights import SearchFlights# Set page configst.set_page_config(page_title="Fli", page_icon=":airplane:", layout="wide")@@ -74,6 +76,42 @@ with col6:# Sort criteriasort_by = st.selectbox("Sort Results By", options=list(SortBy), format_func=format_enum)+# Advanced options dropdown+advanced_options = st.expander("Advanced Options", expanded=False)++with advanced_options:+ # Departure time range slider+ departure_time_range = st.slider(+ "Departure Time Range",+ min_value=0,+ max_value=24,+ value=(0, 24),+ format="%d:00",+ help="Filter flights by departure time (24h format)",+ )++ # Arrival time range slider+ arrival_time_range = st.slider(+ "Arrival Time Range",+ min_value=0,+ max_value=24,+ value=(0, 24),+ format="%d:00",+ help="Filter flights by arrival time (24h format)",+ )++# Create TimeRestrictions object+time_restrictions = (+ TimeRestrictions(+ earliest_departure=departure_time_range[0] if departure_time_range[0] != 0 else None,+ latest_departure=departure_time_range[1] if departure_time_range[1] != 24 else None,+ earliest_arrival=arrival_time_range[0] if arrival_time_range[0] != 0 else None,+ latest_arrival=arrival_time_range[1] if arrival_time_range[1] != 24 else None,+ )+ if departure_time_range != (0, 24) or arrival_time_range != (0, 24)+ else None+)+# Search buttonif st.button("Search Flights", type="primary"):# Input validation@@ -82,42 +120,46 @@ if st.button("Search Flights", type="primary"):else:try:# Create search filters- filters = SearchFlightsFilters(- departure_airport=departure_airport,- arrival_airport=arrival_airport,- departure_date=departure_date.strftime("%Y-%m-%d"),+ flights_filters = FlightSearchFilters(passenger_info=PassengerInfo(adults=num_adults),- seat_type=seat_type,+ flight_segments=[+ FlightSegment(+ departure_airport=[[departure_airport, 0]],+ arrival_airport=[[arrival_airport, 0]],+ travel_date=departure_date.strftime("%Y-%m-%d"),+ time_restrictions=time_restrictions,+ )+ ],stops=stops,+ seat_type=seat_type,sort_by=sort_by,)- # Show searching message+ # Search for date prices (4 weeks before and after)+ date_from = departure_date - timedelta(weeks=4)+ date_to = departure_date + timedelta(weeks=4)++ # Create date search filters+ date_filters = DateSearchFilters(+ passenger_info=PassengerInfo(adults=num_adults),+ flight_segments=[+ FlightSegment(+ departure_airport=[[departure_airport, 0]],+ arrival_airport=[[arrival_airport, 0]],+ travel_date=date_from.strftime("%Y-%m-%d"),+ time_restrictions=time_restrictions,+ )+ ],+ stops=stops,+ seat_type=seat_type,+ from_date=date_from.strftime("%Y-%m-%d"),+ to_date=date_to.strftime("%Y-%m-%d"),+ )+with st.spinner("Searching for flights..."):# Perform searchsearch = SearchFlights()- results = search.search(filters)-- # Search for date prices (4 weeks before and after)- date_from = departure_date - timedelta(weeks=4)- date_to = departure_date + timedelta(weeks=4)-- date_filters = DateSearchFilters(- departure_airport=departure_airport,- arrival_airport=arrival_airport,- from_date=date_from.strftime("%Y-%m-%d"),- to_date=date_to.strftime("%Y-%m-%d"),- passenger_info=PassengerInfo(adults=num_adults),- seat_type=seat_type,- stops=stops,- flight_segments=[- FlightSegment(- departure_airport=[[departure_airport, 0]],- arrival_airport=[[arrival_airport, 0]],- travel_date=date_from.strftime("%Y-%m-%d"),- )- ],- )+ results = search.search(flights_filters)date_search = SearchDates()date_results = date_search.search(date_filters)diff --git a/fli/cli/commands/search.py b/fli/cli/commands/search.pyindex c2aa970..4dcc973 100644--- a/fli/cli/commands/search.py+++ b/fli/cli/commands/search.py@@ -11,8 +11,15 @@ from fli.cli.utils import (validate_date,validate_time_range,)-from fli.models import Airport, PassengerInfo, SeatType, SortBy-from fli.search import SearchFlights, SearchFlightsFilters+from fli.models import (+ Airport,+ FlightSearchFilters,+ FlightSegment,+ PassengerInfo,+ SeatType,+ SortBy,+)+from fli.search import SearchFlightsdef search_flights(@@ -35,11 +42,15 @@ def search_flights(sort_by = getattr(SortBy, sort.upper())# Create search filters- filters = SearchFlightsFilters(- departure_airport=departure_airport,- arrival_airport=arrival_airport,- departure_date=date,+ filters = FlightSearchFilters(passenger_info=PassengerInfo(adults=1),+ flight_segments=[+ FlightSegment(+ departure_airport=[[departure_airport, 0]],+ arrival_airport=[[arrival_airport, 0]],+ travel_date=date,+ )+ ],seat_type=seat_type,stops=max_stops,sort_by=sort_by,diff --git a/fli/models/google_flights.py b/fli/models/google_flights.pyindex 8735345..4226984 100644--- a/fli/models/google_flights.py+++ b/fli/models/google_flights.py@@ -144,7 +144,7 @@ class FlightSearchFilters(BaseModel):seat_type: SeatType = SeatType.ECONOMYprice_limit: PriceLimit | None = Noneairlines: list[Airline] | None = None- max_duration: PositiveInt | None = None # in minutes+ max_duration: PositiveInt | None = Nonelayover_restrictions: LayoverRestrictions | None = Nonesort_by: SortBy = SortBy.NONE@@ -301,10 +301,10 @@ class DateSearchFilters(BaseModel):seat_type: SeatType = SeatType.ECONOMYprice_limit: PriceLimit | None = Noneairlines: list[Airline] | None = None- max_duration: PositiveInt | None = None # in minutes+ max_duration: PositiveInt | None = Nonelayover_restrictions: LayoverRestrictions | None = None- from_date: str # YYYY-MM-DD format- to_date: str # YYYY-MM-DD format+ from_date: str+ to_date: strdef format(self) -> list:"""Format filters into Google Flights API structure.diff --git a/fli/search/__init__.py b/fli/search/__init__.pyindex 9f406f3..826e263 100644--- a/fli/search/__init__.py+++ b/fli/search/__init__.py@@ -1,8 +1,7 @@from .dates import SearchDates-from .flights import SearchFlights, SearchFlightsFilters+from .flights import SearchFlights__all__ = [- "SearchDates","SearchFlights",- "SearchFlightsFilters",+ "SearchDates",]diff --git a/fli/search/dates.py b/fli/search/dates.pyindex 162a1a6..d91cb4b 100644--- a/fli/search/dates.py+++ b/fli/search/dates.py@@ -42,7 +42,6 @@ class SearchDates:def search(self, filters: DateSearchFilters) -> list[DatePrice] | None:"""Search for flight prices across a date range and search parameters.- For date ranges larger than 92 days, splits into multiple searches.Args:filters: Search parameters including date range, airports, and preferencesdiff --git a/fli/search/flights.py b/fli/search/flights.pyindex 56e344e..7061a70 100644--- a/fli/search/flights.py+++ b/fli/search/flights.py@@ -9,49 +9,16 @@ Currently only supports one-way flights.import jsonfrom datetime import datetime-from pydantic import BaseModel-from fli.models import (Airline,Airport,FlightLeg,FlightResult,FlightSearchFilters,- FlightSegment,- MaxStops,- PassengerInfo,- SeatType,- SortBy,)from fli.search.client import get_client-class SearchFlightsFilters(BaseModel):- """Simplified search filters for flight searches.-- This model provides a simpler interface compared to the full FlightSearchFilters,- focusing on the most common search parameters.-- Attributes:- departure_airport: Origin airport- arrival_airport: Destination airport- departure_date: Date in YYYY-MM-DD format- passenger_info: Passenger configuration (defaults to 1 adult)- seat_type: Cabin class (defaults to economy)- stops: Maximum stops allowed (defaults to any)- sort_by: Sort criteria (defaults to cheapest)-- """-- departure_airport: Airport- arrival_airport: Airport- departure_date: str- passenger_info: PassengerInfo = PassengerInfo(adults=1)- seat_type: SeatType = SeatType.ECONOMY- stops: MaxStops = MaxStops.ANY- sort_by: SortBy = SortBy.CHEAPEST--class SearchFlights:"""Flight search implementation using Google Flights' API.@@ -70,11 +37,11 @@ class SearchFlights:"""Initialize the search client for flight searches."""self.client = get_client()- def search(self, filters: SearchFlightsFilters) -> list[FlightResult] | None:- """Search for flights using the provided filters.+ def search(self, filters: FlightSearchFilters) -> list[FlightResult] | None:+ """Search for flights using the given FlightSearchFilters.Args:- filters: Search parameters including airports, dates, and preferences+ filters: Full flight search object including airports, dates, and preferencesReturns:List of FlightResult objects containing flight details, or None if no results@@ -83,8 +50,7 @@ class SearchFlights:Exception: If the search fails or returns invalid data"""- search_filters = self._create_flight_search_data(filters)- encoded_filters = search_filters.encode()+ encoded_filters = filters.encode()try:response = self.client.post(@@ -112,31 +78,6 @@ class SearchFlights:except Exception as e:raise Exception(f"Search failed: {str(e)}") from e- @staticmethod- def _create_flight_search_data(params: SearchFlightsFilters) -> FlightSearchFilters:- """Convert simplified filters to full API filters.-- Args:- params: Simplified search parameters-- Returns:- Complete FlightSearchFilters object ready for API use-- """- return FlightSearchFilters(- passenger_info=params.passenger_info,- flight_segments=[- FlightSegment(- departure_airport=[[params.departure_airport, 0]],- arrival_airport=[[params.arrival_airport, 0]],- travel_date=params.departure_date,- )- ],- stops=params.stops,- seat_type=params.seat_type,- sort_by=params.sort_by,- )-@staticmethoddef _parse_flights_data(data: list) -> FlightResult:"""Parse raw flight data into a structured FlightResult.diff --git a/tests/search/test_search_flights.py b/tests/search/test_search_flights.pyindex b00f187..e94a446 100644--- a/tests/search/test_search_flights.py+++ b/tests/search/test_search_flights.py@@ -6,12 +6,14 @@ import pytestfrom fli.models import (Airport,+ FlightSearchFilters,+ FlightSegment,MaxStops,PassengerInfo,SeatType,SortBy,)-from fli.search import SearchFlights, SearchFlightsFilters+from fli.search import SearchFlights@pytest.fixture@@ -25,18 +27,23 @@ def basic_search_params():"""Create basic search params for testing."""today = datetime.now()future_date = today + timedelta(days=30)- return SearchFlightsFilters(- departure_airport=Airport.PHX,- arrival_airport=Airport.SFO,- departure_date=future_date.strftime("%Y-%m-%d"),+ return FlightSearchFilters(passenger_info=PassengerInfo(adults=1,children=0,infants_in_seat=0,infants_on_lap=0,),+ flight_segments=[+ FlightSegment(+ departure_airport=[[Airport.PHX, 0]],+ arrival_airport=[[Airport.SFO, 0]],+ travel_date=future_date.strftime("%Y-%m-%d"),+ )+ ],stops=MaxStops.NON_STOP,seat_type=SeatType.ECONOMY,+ sort_by=SortBy.CHEAPEST,)@@ -45,19 +52,23 @@ def complex_search_params():"""Create more complex search params for testing."""today = datetime.now()future_date = today + timedelta(days=60)- return SearchFlightsFilters(- departure_airport=Airport.JFK,- arrival_airport=Airport.LAX,- departure_date=future_date.strftime("%Y-%m-%d"),+ return FlightSearchFilters(passenger_info=PassengerInfo(adults=2,children=1,infants_in_seat=0,infants_on_lap=1,),- stops=MaxStops.TWO_OR_FEWER_STOPS,- seat_type=SeatType.PREMIUM_ECONOMY,- sort_by=SortBy.CHEAPEST,+ flight_segments=[+ FlightSegment(+ departure_airport=[[Airport.JFK, 0]],+ arrival_airport=[[Airport.LAX, 0]],+ travel_date=future_date.strftime("%Y-%m-%d"),+ )+ ],+ stops=MaxStops.ONE_STOP_OR_FEWER,+ seat_type=SeatType.FIRST,+ sort_by=SortBy.TOP_FLIGHTS,)diff --git a/tests/search/test_search_flights_fuzz.py b/tests/search/test_search_flights_fuzz.pyindex d940ecd..ac14919 100644--- a/tests/search/test_search_flights_fuzz.py+++ b/tests/search/test_search_flights_fuzz.py@@ -7,12 +7,14 @@ import pytestfrom fli.models import (Airport,+ FlightSearchFilters,+ FlightSegment,MaxStops,PassengerInfo,SeatType,SortBy,)-from fli.search import SearchFlights, SearchFlightsFilters+from fli.search import SearchFlights@pytest.fixture@@ -109,13 +111,17 @@ def test_search_fuzz(infants_in_seat=infants_in_seat,)- search_filters = SearchFlightsFilters(- departure_airport=dep_airport,- arrival_airport=arr_airport,- departure_date=dep_date.strftime("%Y-%m-%d"),+ search_filters = FlightSearchFilters(passenger_info=passenger_info,- seat_type=seat_type,+ flight_segments=[+ FlightSegment(+ departure_airport=[[dep_airport, 0]],+ arrival_airport=[[arr_airport, 0]],+ travel_date=dep_date.strftime("%Y-%m-%d"),+ )+ ],stops=stops,+ seat_type=seat_type,sort_by=sort_by,)