Skip to content

armgit / fli

Public Imported from GitHub
0

Google Flights MCP, CLI and Python Library

fix: strip underscore prefix from digit-starting codes in all serialization (#94)

ktrufanov-skycopfeccd44bcc17
diff --git a/fli/cli/utils.py b/fli/cli/utils.py
index c025198..1088d79 100644
--- a/fli/cli/utils.py
+++ b/fli/cli/utils.py
@@ -180,7 +180,7 @@ def serialize_airport(airport: Airport) -> dict[str, str]:
def serialize_airline(airline: Airline) -> dict[str, str]:
"""Serialize an airline for machine-readable output."""
- return {"code": airline.name.lstrip("_"), "name": airline.value}
+ return {"code": airline.name.removeprefix("_"), "name": airline.value}
def serialize_flight_leg(leg: Any) -> dict[str, Any]:
diff --git a/fli/models/google_flights/dates.py b/fli/models/google_flights/dates.py
index d0be906..4d284ae 100644
--- a/fli/models/google_flights/dates.py
+++ b/fli/models/google_flights/dates.py
@@ -151,7 +151,7 @@ class DateSearchFilters(BaseModel):
def serialize(obj):
if isinstance(obj, Airport) or isinstance(obj, Airline):
- return obj.name
+ return obj.name.removeprefix("_")
if isinstance(obj, Enum):
return obj.value
if isinstance(obj, list):
diff --git a/fli/models/google_flights/flights.py b/fli/models/google_flights/flights.py
index 245f367..4b0d153 100644
--- a/fli/models/google_flights/flights.py
+++ b/fli/models/google_flights/flights.py
@@ -60,7 +60,7 @@ class FlightSearchFilters(BaseModel):
def serialize(obj):
if isinstance(obj, Airport) or isinstance(obj, Airline):
- return obj.name
+ return obj.name.removeprefix("_")
if isinstance(obj, Enum):
return obj.value
if isinstance(obj, list):
@@ -123,11 +123,11 @@ class FlightSearchFilters(BaseModel):
if is_multi_leg and segment.selected_flight is not None:
selected_flights = [
[
- serialize(leg.departure_airport.name),
+ serialize(leg.departure_airport),
serialize(leg.departure_datetime.strftime("%Y-%m-%d")),
- serialize(leg.arrival_airport.name),
+ serialize(leg.arrival_airport),
None,
- serialize(leg.airline.name),
+ serialize(leg.airline),
serialize(leg.flight_number),
]
for leg in segment.selected_flight.legs
diff --git a/tests/cli/test_utils.py b/tests/cli/test_utils.py
index 8aefb40..62593c0 100644
--- a/tests/cli/test_utils.py
+++ b/tests/cli/test_utils.py
@@ -15,6 +15,7 @@ from fli.cli.utils import (
filter_flights_by_time,
parse_airlines,
parse_stops,
+ serialize_airline,
serialize_date_result,
serialize_flight_result,
validate_date,
@@ -115,6 +116,13 @@ def test_parse_airlines_numeric_prefix():
assert result == [Airline._3F]
+def test_serialize_airline_numeric_prefix():
+ """Test that serialized airline code strips underscore prefix."""
+ result = serialize_airline(Airline._3F)
+ assert result["code"] == "3F"
+ assert result["name"] == "FlyOne Armenia"
+
+
def test_parse_airlines_invalid():
"""Test parsing airlines with invalid code."""
with pytest.raises(BadParameter):