Google Flights MCP, CLI and Python Library
Create shared requests client
Punit Aranif0895fdffdfc
diff --git a/fli/search/client.py b/fli/search/client.pynew file mode 100644index 0000000..0cbadc7--- /dev/null+++ b/fli/search/client.py@@ -0,0 +1,79 @@+from curl_cffi import requests+from ratelimit import limits, sleep_and_retry+from tenacity import retry, stop_after_attempt, wait_exponential++client = None+++class Client:+ """Base HTTP client with rate limiting and retry functionality."""++ DEFAULT_HEADERS = {+ "content-type": "application/x-www-form-urlencoded;charset=UTF-8",+ }++ def __init__(self):+ """Initialize the client."""+ self._client = requests.Session()+ self._client.headers.update(self.DEFAULT_HEADERS)++ def __del__(self):+ """Cleanup client session."""+ if hasattr(self, "_client"):+ self._client.close()++ @sleep_and_retry+ @limits(calls=10, period=1)+ @retry(stop=stop_after_attempt(3), wait=wait_exponential(), reraise=True)+ def get(self, url: str, **kwargs) -> requests.Response:+ """+ Make a rate-limited GET request with automatic retries.++ Args:+ url: The URL to request.+ **kwargs: Additional arguments to pass to the request.++ Returns:+ The response from the server.++ Raises:+ Exception: If the request fails after retries.+ """+ try:+ response = self._client.get(url, **kwargs)+ response.raise_for_status()+ return response+ except Exception as e:+ raise Exception(f"GET request failed: {str(e)}") from e++ @sleep_and_retry+ @limits(calls=10, period=1)+ @retry(stop=stop_after_attempt(3), wait=wait_exponential(), reraise=True)+ def post(self, url: str, **kwargs) -> requests.Response:+ """+ Make a rate-limited POST request with automatic retries.++ Args:+ url: The URL to request.+ **kwargs: Additional arguments to pass to the request.++ Returns:+ The response from the server.++ Raises:+ Exception: If the request fails after retries.+ """+ try:+ response = self._client.post(url, **kwargs)+ response.raise_for_status()+ return response+ except Exception as e:+ raise Exception(f"POST request failed: {str(e)}") from e+++def get_client() -> Client:+ """Get the shared HTTP client instance."""+ global client+ if not client:+ client = Client()+ return clientdiff --git a/fli/search/dates.py b/fli/search/dates.pyindex cf42148..2b13ed0 100644--- a/fli/search/dates.py+++ b/fli/search/dates.py@@ -3,12 +3,10 @@import jsonfrom datetime import datetime-from curl_cffi import requestsfrom pydantic import BaseModel-from ratelimit import limits, sleep_and_retry-from tenacity import retry, stop_after_attempt, wait_exponentialfrom fli.models import DateSearchFilters+from fli.search.client import get_clientclass DatePrice(BaseModel):@@ -26,17 +24,8 @@ class SearchDates:def __init__(self):"""Initialize the search client."""- self._client = requests.Session()- self._client.headers.update(self.DEFAULT_HEADERS)+ self.client = get_client()- def __del__(self):- """Cleanup client session."""- if hasattr(self, "_client"):- self._client.close()-- @sleep_and_retry- @limits(calls=10, period=1)- @retry(stop=stop_after_attempt(1), wait=wait_exponential(), reraise=True)def search(self, filters: DateSearchFilters) -> list[DatePrice] | None:"""Perform the date search using the search parameters.@@ -51,7 +40,7 @@ class SearchDates:try:# Debugging- response = self._client.post(+ response = self.client.post(url=self.BASE_URL,data=f"f.req={encoded_filters}",impersonate="chrome",diff --git a/fli/search/flights.py b/fli/search/flights.pyindex cfb7956..63b64df 100644--- a/fli/search/flights.py+++ b/fli/search/flights.py@@ -1,11 +1,8 @@import jsonfrom datetime import datetime-from typing import Dict, List+from typing import List-from curl_cffi import requestsfrom pydantic import BaseModel-from ratelimit import limits, sleep_and_retry-from tenacity import retry, stop_after_attempt, wait_exponentialfrom fli.models import (Airline,@@ -19,6 +16,7 @@ from fli.models import (SeatType,SortBy,)+from fli.search.client import get_clientclass SearchFlightsFilters(BaseModel):@@ -41,17 +39,8 @@ class SearchFlights:def __init__(self):"""Initialize the search client."""- self._client = requests.Session()- self._client.headers.update(self.DEFAULT_HEADERS)+ self.client = get_client()- def __del__(self):- """Cleanup client session."""- if hasattr(self, "_client"):- self._client.close()-- @sleep_and_retry- @limits(calls=10, period=1)- @retry(stop=stop_after_attempt(3), wait=wait_exponential(), reraise=True)def search(self, filters: SearchFlightsFilters) -> List[FlightResult] | None:"""Perform the flight search using the new simplified parameters.@@ -60,7 +49,7 @@ class SearchFlights:encoded_filters = search_filters.encode()try:- response = self._client.post(+ response = self.client.post(url=self.BASE_URL,data=f"f.req={encoded_filters}",impersonate="chrome",