Skip to content

armgit / fli

Public Imported from GitHub
0

Google Flights MCP, CLI and Python Library

Rename Search to SearchFlights and search.py to flights.py

Punit Arani4b8a632bba60
diff --git a/README.md b/README.md
index f71a06b..53e437d 100644
--- a/README.md
+++ b/README.md
@@ -59,40 +59,40 @@ You can also use the package programmatically:
```python
from datetime import datetime, timedelta
from fli.models import (
- Airport,
- FlightSegment,
- MaxStops,
- PassengerInfo,
- SeatType,
- SortBy,
+ Airport,
+ FlightSegment,
+ MaxStops,
+ PassengerInfo,
+ SeatType,
+ SortBy,
)
-from fli.search import Search, SearchFilters
+from fli.search import SearchFlights, SearchFlightsFilters
# Create search filters
-filters = SearchFilters(
- departure_airport=Airport.JFK,
- arrival_airport=Airport.LAX,
- departure_date=(datetime.now() + timedelta(days=30)).strftime("%Y-%m-%d"),
- passenger_info=PassengerInfo(adults=1),
- seat_type=SeatType.ECONOMY,
- stops=MaxStops.NON_STOP,
- sort_by=SortBy.CHEAPEST,
+filters = SearchFlightsFilters(
+ departure_airport=Airport.JFK,
+ arrival_airport=Airport.LAX,
+ departure_date=(datetime.now() + timedelta(days=30)).strftime("%Y-%m-%d"),
+ passenger_info=PassengerInfo(adults=1),
+ seat_type=SeatType.ECONOMY,
+ stops=MaxStops.NON_STOP,
+ sort_by=SortBy.CHEAPEST,
)
# Search flights
-search = Search()
+search = SearchFlights()
flights = search.search(filters)
# Process results
for flight in flights:
- print(f"Price: ${flight.price}")
- print(f"Duration: {flight.duration} minutes")
- print(f"Stops: {flight.stops}")
-
- for leg in flight.legs:
- print(f"\nFlight: {leg.airline.value} {leg.flight_number}")
- print(f"From: {leg.departure_airport.value} at {leg.departure_datetime}")
- print(f"To: {leg.arrival_airport.value} at {leg.arrival_datetime}")
+ print(f"Price: ${flight.price}")
+ print(f"Duration: {flight.duration} minutes")
+ print(f"Stops: {flight.stops}")
+
+ for leg in flight.legs:
+ print(f"\nFlight: {leg.airline.value} {leg.flight_number}")
+ print(f"From: {leg.departure_airport.value} at {leg.departure_datetime}")
+ print(f"To: {leg.arrival_airport.value} at {leg.arrival_datetime}")
```
## Features
diff --git a/fli/cli.py b/fli/cli.py
index 3e3e6c2..7c5f538 100644
--- a/fli/cli.py
+++ b/fli/cli.py
@@ -13,7 +13,7 @@ from rich.text import Text
from typing_extensions import Annotated
from fli.models import Airline, Airport, MaxStops, PassengerInfo, SeatType, SortBy
-from fli.search import Search, SearchFilters
+from fli.search import SearchFlights, SearchFlightsFilters
app = typer.Typer(
help="Search for flights using Google Flights data",
@@ -206,7 +206,7 @@ def search(
sort_by = getattr(SortBy, sort.upper())
# Create search filters
- filters = SearchFilters(
+ filters = SearchFlightsFilters(
departure_airport=departure_airport,
arrival_airport=arrival_airport,
departure_date=date,
@@ -217,7 +217,7 @@ def search(
)
# Perform search
- search_client = Search()
+ search_client = SearchFlights()
flights = search_client.search(filters)
if not flights:
diff --git a/fli/search/__init__.py b/fli/search/__init__.py
index ace428c..9331e85 100644
--- a/fli/search/__init__.py
+++ b/fli/search/__init__.py
@@ -1,6 +1,6 @@
-from .search import Search, SearchFilters
+from .flights import SearchFlights, SearchFlightsFilters
__all__ = [
- "Search",
- "SearchFilters",
+ "SearchFlights",
+ "SearchFlightsFilters",
]
diff --git a/fli/search/search.py b/fli/search/flights.py
similarity index 88%
rename from fli/search/search.py
rename to fli/search/flights.py
index e8b186e..cfb7956 100644
--- a/fli/search/search.py
+++ b/fli/search/flights.py
@@ -21,7 +21,7 @@ from fli.models import (
)
-class SearchFilters(BaseModel):
+class SearchFlightsFilters(BaseModel):
departure_airport: Airport
arrival_airport: Airport
departure_date: str
@@ -31,7 +31,7 @@ class SearchFilters(BaseModel):
sort_by: SortBy = SortBy.CHEAPEST
-class Search:
+class SearchFlights:
"""Flight search implementation."""
BASE_URL = "https://www.google.com/_/FlightsFrontendUi/data/travel.frontend.flights.FlightsFrontendService/GetShoppingResults"
@@ -52,7 +52,7 @@ class Search:
@sleep_and_retry
@limits(calls=10, period=1)
@retry(stop=stop_after_attempt(3), wait=wait_exponential(), reraise=True)
- def search(self, filters: SearchFilters) -> List[FlightResult] | None:
+ def search(self, filters: SearchFlightsFilters) -> List[FlightResult] | None:
"""
Perform the flight search using the new simplified parameters.
"""
@@ -86,7 +86,7 @@ class Search:
raise Exception(f"Search failed: {str(e)}") from e
@staticmethod
- def _create_flight_search_data(params: SearchFilters) -> FlightSearchFilters:
+ def _create_flight_search_data(params: SearchFlightsFilters) -> FlightSearchFilters:
"""
Helper function to convert from our simpler param model to the existing FlightSearchFilters model.
"""
@@ -112,12 +112,12 @@ class Search:
stops=len(data[0][2]) - 1,
legs=[
FlightLeg(
- airline=Search._parse_airline(fl[22][0]),
+ airline=SearchFlights._parse_airline(fl[22][0]),
flight_number=fl[22][1],
- departure_airport=Search._parse_airport(fl[3]),
- arrival_airport=Search._parse_airport(fl[6]),
- departure_datetime=Search._parse_datetime(fl[20], fl[8]),
- arrival_datetime=Search._parse_datetime(fl[21], fl[10]),
+ departure_airport=SearchFlights._parse_airport(fl[3]),
+ arrival_airport=SearchFlights._parse_airport(fl[6]),
+ departure_datetime=SearchFlights._parse_datetime(fl[20], fl[8]),
+ arrival_datetime=SearchFlights._parse_datetime(fl[21], fl[10]),
duration=fl[11],
)
for fl in data[0][2]
diff --git a/tests/test_search.py b/tests/test_search.py
index c54361a..b00f187 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -11,13 +11,13 @@ from fli.models import (
SeatType,
SortBy,
)
-from fli.search import Search, SearchFilters
+from fli.search import SearchFlights, SearchFlightsFilters
@pytest.fixture
def search():
"""Create a reusable Search instance."""
- return Search()
+ return SearchFlights()
@pytest.fixture
@@ -25,7 +25,7 @@ def basic_search_params():
"""Create basic search params for testing."""
today = datetime.now()
future_date = today + timedelta(days=30)
- return SearchFilters(
+ return SearchFlightsFilters(
departure_airport=Airport.PHX,
arrival_airport=Airport.SFO,
departure_date=future_date.strftime("%Y-%m-%d"),
@@ -45,7 +45,7 @@ def complex_search_params():
"""Create more complex search params for testing."""
today = datetime.now()
future_date = today + timedelta(days=60)
- return SearchFilters(
+ return SearchFlightsFilters(
departure_airport=Airport.JFK,
arrival_airport=Airport.LAX,
departure_date=future_date.strftime("%Y-%m-%d"),
diff --git a/tests/test_search_fuzz.py b/tests/test_search_fuzz.py
index dfd1d48..bc0b8bf 100644
--- a/tests/test_search_fuzz.py
+++ b/tests/test_search_fuzz.py
@@ -13,13 +13,13 @@ from fli.models import (
SeatType,
SortBy,
)
-from fli.search import Search, SearchFilters
+from fli.search import SearchFlights, SearchFlightsFilters
@pytest.fixture
def search():
"""Create a reusable Search instance."""
- return Search()
+ return SearchFlights()
def generate_test_id(val, argname=None, idx=None) -> str:
@@ -87,7 +87,7 @@ def generate_random_test_cases(num_tests: int) -> List[Tuple]:
ids=generate_test_id,
)
def test_search_fuzz(
- search: Search,
+ search: SearchFlights,
dep_airport: Airport,
arr_airport: Airport,
dep_date: datetime,
@@ -110,7 +110,7 @@ def test_search_fuzz(
infants_in_seat=infants_in_seat,
)
- search_filters = SearchFilters(
+ search_filters = SearchFlightsFilters(
departure_airport=dep_airport,
arrival_airport=arr_airport,
departure_date=dep_date.strftime("%Y-%m-%d"),