Google Flights MCP, CLI and Python Library
Create DateSearchFilters
Punit Aranic40f07ef72e0
diff --git a/fli/models/__init__.py b/fli/models/__init__.pyindex 7f09e50..fcadf3f 100644--- a/fli/models/__init__.py+++ b/fli/models/__init__.py@@ -1,6 +1,7 @@from .airline import Airlinefrom .airport import Airportfrom .google_flights import (+ DateSearchFilters,FlightLeg,FlightResult,FlightSearchFilters,@@ -17,6 +18,7 @@ from .google_flights import (__all__ = ["Airline","Airport",+ "DateSearchFilters","FlightLeg","FlightResult","FlightSearchFilters",diff --git a/fli/models/google_flights.py b/fli/models/google_flights.pyindex 59ce471..a8854c3 100644--- a/fli/models/google_flights.py+++ b/fli/models/google_flights.py@@ -230,3 +230,142 @@ class FlightSearchFilters(BaseModel):wrapped_filters = [None, formatted_json]# Finally, encode the whole thingreturn urllib.parse.quote(json.dumps(wrapped_filters, separators=(",", ":")))+++class DateSearchFilters(BaseModel):+ trip_type: TripType = TripType.ONE_WAY+ passenger_info: PassengerInfo+ flight_segments: List[FlightSegment]+ stops: MaxStops = MaxStops.ANY+ seat_type: SeatType = SeatType.ECONOMY+ price_limit: Optional[PriceLimit] = None+ airlines: Optional[List[Airline]] = None+ max_duration: Optional[PositiveInt] = None+ layover_restrictions: Optional[LayoverRestrictions] = None+ from_date: str+ to_date: str++ def format(self) -> list:+ def serialize(obj):+ if isinstance(obj, Airport) or isinstance(obj, Airline):+ return obj.name+ if isinstance(obj, Enum):+ return obj.value+ if isinstance(obj, list):+ return [serialize(item) for item in obj]+ if isinstance(obj, dict):+ return {key: serialize(value) for key, value in obj.items()}+ if isinstance(obj, BaseModel):+ return serialize(obj.dict(exclude_none=True))+ return obj++ # Format flight segments+ formatted_segments = []+ for segment in self.flight_segments:+ # Format airport codes with correct nesting+ segment_filters = [+ [+ [+ [serialize(airport[0]), serialize(airport[1])]+ for airport in segment.departure_airport+ ]+ ],+ [+ [+ [serialize(airport[0]), serialize(airport[1])]+ for airport in segment.arrival_airport+ ]+ ],+ ]++ # Time restrictions+ if segment.time_restrictions:+ time_filters = [+ segment.time_restrictions.earliest_departure,+ segment.time_restrictions.latest_departure,+ segment.time_restrictions.earliest_arrival,+ segment.time_restrictions.latest_arrival,+ ]+ else:+ time_filters = None++ # Airlines+ airlines_filters = None+ if self.airlines:+ sorted_airlines = sorted(self.airlines, key=lambda x: x.value)+ airlines_filters = [serialize(airline) for airline in sorted_airlines]++ # Layover restrictions+ layover_airports = (+ [serialize(a) for a in self.layover_restrictions.airports]+ if self.layover_restrictions and self.layover_restrictions.airports+ else None+ )+ layover_duration = (+ self.layover_restrictions.max_duration if self.layover_restrictions else None+ )++ segment_formatted = [+ segment_filters[0], # departure airport+ segment_filters[1], # arrival airport+ time_filters, # time restrictions+ serialize(self.stops.value), # stops+ airlines_filters, # airlines+ None, # placeholder+ segment.travel_date, # travel date+ [self.max_duration] if self.max_duration else None, # max duration+ None, # placeholder+ layover_airports, # layover airports+ None, # placeholder+ None, # placeholder+ layover_duration, # layover duration+ None, # emissions+ 3, # constant value+ ]+ formatted_segments.append(segment_formatted)++ # Create the main filters structure+ filters = [+ None, # placeholder+ [+ None, # placeholder+ None, # placeholder+ serialize(self.trip_type.value),+ None, # placeholder+ [], # empty array+ serialize(self.seat_type.value),+ [+ self.passenger_info.adults,+ self.passenger_info.children,+ self.passenger_info.infants_on_lap,+ self.passenger_info.infants_in_seat,+ ],+ [None, self.price_limit.max_price] if self.price_limit else None,+ None, # placeholder+ None, # placeholder+ None, # placeholder+ None, # placeholder+ None, # placeholder+ formatted_segments,+ None, # placeholder+ None, # placeholder+ None, # placeholder+ 1, # placeholder (hardcoded to 1)+ ],+ [+ serialize(self.from_date),+ serialize(self.to_date),+ ],+ ]++ return filters++ def encode(self) -> str:+ """Format and URL encode the filters."""+ formatted_filters = self.format()+ # First convert the formatted filters to a JSON string+ formatted_json = json.dumps(formatted_filters, separators=(",", ":"))+ # Then wrap it in a list with null+ wrapped_filters = [None, formatted_json]+ # Finally, encode the whole thing+ return urllib.parse.quote(json.dumps(wrapped_filters, separators=(",", ":")))diff --git a/tests/models/test_date_search_filters.py b/tests/models/test_date_search_filters.pynew file mode 100644index 0000000..1e18f07--- /dev/null+++ b/tests/models/test_date_search_filters.py@@ -0,0 +1,249 @@+import pytest++from fli.models import (+ Airline,+ Airport,+ DateSearchFilters,+ FlightSegment,+ LayoverRestrictions,+ MaxStops,+ PassengerInfo,+ PriceLimit,+ SeatType,+ TimeRestrictions,+)++TEST_CASES = [+ {+ "name": "Test 1: Flight Search Data",+ "search": DateSearchFilters(+ 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]],+ time_restrictions=None,+ travel_date="2025-06-01",+ )+ ],+ price_limit=None,+ stops=MaxStops.NON_STOP,+ seat_type=SeatType.PREMIUM_ECONOMY,+ from_date="2025-05-20",+ to_date="2025-06-10",+ ),+ "formatted": [+ None,+ [+ None,+ None,+ 2,+ None,+ [],+ 2,+ [1, 0, 0, 0],+ None,+ None,+ None,+ None,+ None,+ None,+ [+ [+ [[["PHX", 0]]],+ [[["SFO", 0]]],+ None,+ 1,+ None,+ None,+ "2025-06-01",+ None,+ None,+ None,+ None,+ None,+ None,+ None,+ 3,+ ]+ ],+ None,+ None,+ None,+ 1,+ ],+ [+ "2025-05-20",+ "2025-06-10",+ ],+ ],+ "encoded": None,+ },+ {+ "name": "Test 2: Flight Search Data",+ "search": DateSearchFilters(+ passenger_info=PassengerInfo(+ adults=2,+ children=1,+ infants_in_seat=3,+ infants_on_lap=1,+ ),+ flight_segments=[+ FlightSegment(+ departure_airport=[[Airport.PHX, 0]],+ arrival_airport=[[Airport.SFO, 0]],+ time_restrictions=None,+ travel_date="2025-06-01",+ ),+ ],+ price_limit=None,+ stops=MaxStops.ONE_STOP_OR_FEWER,+ seat_type=SeatType.FIRST,+ from_date="2025-05-07",+ to_date="2025-06-25",+ ),+ "formatted": [+ None,+ [+ None,+ None,+ 2,+ None,+ [],+ 4,+ [2, 1, 1, 3],+ None,+ None,+ None,+ None,+ None,+ None,+ [+ [+ [[["PHX", 0]]],+ [[["SFO", 0]]],+ None,+ 2,+ None,+ None,+ "2025-06-01",+ None,+ None,+ None,+ None,+ None,+ None,+ None,+ 3,+ ],+ ],+ None,+ None,+ None,+ 1,+ ],+ [+ "2025-05-07",+ "2025-06-25",+ ],+ ],+ "encoded": None,+ },+ {+ "name": "Test 3: Flight Search Data",+ "search": DateSearchFilters(+ passenger_info=PassengerInfo(+ adults=2,+ children=3,+ infants_in_seat=0,+ infants_on_lap=1,+ ),+ price_limit=PriceLimit(+ max_price=900,+ ),+ flight_segments=[+ FlightSegment(+ departure_airport=[[Airport.PHX, 0]],+ arrival_airport=[[Airport.SFO, 0]],+ time_restrictions=TimeRestrictions(+ earliest_departure=9,+ latest_departure=20,+ earliest_arrival=13,+ latest_arrival=21,+ ),+ travel_date="2025-06-01",+ )+ ],+ stops=MaxStops.ANY,+ airlines=[Airline.AA, Airline.F9, Airline.UA],+ max_duration=660,+ layover_restrictions=LayoverRestrictions(+ airports=[Airport.LAX],+ max_duration=420,+ ),+ from_date="2025-05-01",+ to_date="2025-07-01",+ ),+ "formatted": [+ None,+ [+ None,+ None,+ 2,+ None,+ [],+ 1,+ [2, 3, 1, 0],+ [None, 900],+ None,+ None,+ None,+ None,+ None,+ [+ [+ [[["PHX", 0]]],+ [[["SFO", 0]]],+ [9, 20, 13, 21],+ 0,+ ["AA", "F9", "UA"],+ None,+ "2025-06-01",+ [660],+ None,+ ["LAX"],+ None,+ None,+ 420,+ None,+ 3,+ ]+ ],+ None,+ None,+ None,+ 1,+ ],+ [+ "2025-05-01",+ "2025-07-01",+ ],+ ],+ },+]++[email protected]("test_case", TEST_CASES, ids=[tc["name"] for tc in TEST_CASES])+def test_date_search_filters(test_case):+ """Test date search filters conversion to DateSearchFilters."""+ search_filters = test_case["search"]+ expected_formatted = test_case["formatted"]++ # Test conversion to DateSearchFilters+ formatted_filters = DateSearchFilters.format(search_filters)+ assert formatted_filters == expected_formatted