Google Flights MCP, CLI and Python Library
feat: add ICAO airport code support (#111)
Trevin Chow1496c732fe35
diff --git a/fli/core/parsers.py b/fli/core/parsers.pyindex fceebca..596b727 100644--- a/fli/core/parsers.py+++ b/fli/core/parsers.py@@ -4,6 +4,8 @@ This module provides parsing functions used by both the CLI and MCP interfacesto convert user input into domain model objects."""+import csv+import importlib.resourcesimport refrom enum import Enumfrom typing import TypeVar@@ -22,6 +24,7 @@ from fli.models import (_AIRLINE_SEPARATORS = re.compile(r"[,\s]+")T = TypeVar("T", bound=Enum)+_icao_to_iata: dict[str, str] | None = Noneclass ParseError(ValueError):@@ -30,6 +33,20 @@ class ParseError(ValueError):pass+def _load_icao_mapping() -> dict[str, str]:+ """Load ICAO-to-IATA airport mappings lazily."""+ global _icao_to_iata++ if _icao_to_iata is None:+ ref = importlib.resources.files("fli") / "data" / "icao_to_iata.csv"+ with importlib.resources.as_file(ref) as p:+ with open(p, newline="") as f:+ reader = csv.reader(f)+ _icao_to_iata = {icao.upper(): iata.upper() for icao, iata in reader}++ return _icao_to_iata++def resolve_enum(enum_cls: type[T], name: str) -> T:"""Resolve an enum member by name with normalized errors.@@ -57,7 +74,7 @@ def resolve_airport(code: str) -> Airport:"""Resolve an airport code to an Airport enum.Args:- code: IATA airport code (e.g., 'JFK', 'LHR')+ code: IATA or ICAO airport code (e.g., 'JFK', 'LHR', 'KJFK', 'EGLL')Returns:The corresponding Airport enum member@@ -66,8 +83,18 @@ def resolve_airport(code: str) -> Airport:ParseError: If the code is not a valid airport"""+ airport_code = code.upper()++ if len(airport_code) == 4 and airport_code.isalpha():+ mapped = _load_icao_mapping().get(airport_code)+ if mapped is None:+ raise ParseError(+ f"Unknown ICAO code: '{code}'. Not found in the ICAO-to-IATA mapping table."+ )+ airport_code = mapped+try:- return getattr(Airport, code.upper())+ return getattr(Airport, airport_code)except AttributeError as e:raise ParseError(f"Invalid airport code: '{code}'") from ediff --git a/fli/data/icao_to_iata.csv b/fli/data/icao_to_iata.csvnew file mode 100644index 0000000..4ac08e7--- /dev/null+++ b/fli/data/icao_to_iata.csv@@ -0,0 +1,281 @@+KJFK,JFK+KLAX,LAX+KORD,ORD+KSFO,SFO+KATL,ATL+KMIA,MIA+KBOS,BOS+KDEN,DEN+KDFW,DFW+KIAH,IAH+KLAS,LAS+KPHX,PHX+KSEA,SEA+KEWR,EWR+KLGA,LGA+KMSP,MSP+KDTW,DTW+KIAD,IAD+KDCA,DCA+KBWI,BWI+KPHL,PHL+KCLT,CLT+KMCO,MCO+KFLL,FLL+KTPA,TPA+KSAN,SAN+KSJC,SJC+KOAK,OAK+KSLC,SLC+KPDX,PDX+KHNL,HNL+KANC,ANC+KABQ,ABQ+KAUS,AUS+KSAT,SAT+KDAL,DAL+KHOU,HOU+KMDW,MDW+KCLE,CLE+KCVG,CVG+KPIT,PIT+KCMH,CMH+KIND,IND+KMKE,MKE+KMEM,MEM+KBNA,BNA+KMSY,MSY+KRDU,RDU+KJAX,JAX+KPBI,PBI+KSNA,SNA+KSMF,SMF+KMCI,MCI+KSTL,STL+KOMA,OMA+KOKC,OKC+KTUL,TUL+KRSW,RSW+KSRQ,SRQ+KRIC,RIC+KORF,ORF+KBUF,BUF+KROC,ROC+KSYR,SYR+KALB,ALB+KBDL,BDL+KCHS,CHS+KSAV,SAV+KMYR,MYR+KILM,ILM+KPWM,PWM+KMHT,MHT+KPVD,PVD+KHPN,HPN+KISP,ISP+KBUR,BUR+KLGB,LGB+KONT,ONT+KPNS,PNS+KECP,ECP+KLIT,LIT+KXNA,XNA+CYYZ,YYZ+CYVR,YVR+CYUL,YUL+CYOW,YOW+CYYC,YYC+CYEG,YEG+CYHZ,YHZ+CYQB,YQB+CYWG,YWG+CYXE,YXE+CYHM,YHM+CYKF,YKF+CYTZ,YTZ+CYLW,YLW+CYXC,YXC+MMMX,MEX+MMUN,CUN+MMGL,GDL+MMMY,MTY+MMPR,PVR+MMSD,SJD+MMTJ,TIJ+MMMD,MID+MMQT,QRO+MMTO,TLC+EGLL,LHR+EGKK,LGW+EGSS,STN+EGBB,BHX+EGCC,MAN+EGPH,EDI+EGNX,EMA+EGGW,LTN+EGGD,BRS+EGAA,BFS+EGPF,GLA+EGPD,ABZ+EGNS,IOM+EICK,ORK+EIDW,DUB+EINN,SNN+EIWF,WAT+LFPG,CDG+LFPO,ORY+LFMN,NCE+LFML,MRS+LFBO,TLS+LFLL,LYS+LFSB,BSL+EDDF,FRA+EDDM,MUC+EDDB,BER+EDDH,HAM+EDDL,DUS+EDDK,CGN+EDDS,STR+EDDP,LEJ+EDDV,HAJ+EDDC,DRS+EHAM,AMS+EHRD,RTM+EHEH,EIN+LEMD,MAD+LEBL,BCN+LEPA,PMI+GCTS,TFS+GCXO,TFN+LIRF,FCO+LIMC,MXP+LIML,LIN+LICC,CTA+LIPZ,VCE+LIEE,CAG+LSZH,ZRH+LSGG,GVA+LSZA,LUG+LOWW,VIE+LOWI,INN+LOWS,SZG+EKCH,CPH+EKBI,BLL+ENGM,OSL+ENBR,BGO+ESSA,ARN+ESGG,GOT+EFHK,HEL+LPPT,LIS+LPPR,OPO+LPMA,FNC+EPWA,WAW+EPKK,KRK+LKPR,PRG+LHBP,BUD+LROP,OTP+LGAV,ATH+LGIR,HER+LTFM,IST+LTBA,ISL+LTBJ,ADB+LTAI,AYT+LTBS,DLM+UUEE,SVO+UUDD,DME+UUWW,VKO+ULLI,LED+VHHH,HKG+VTBS,BKK+VTSP,HKT+VTBD,DMK+WSSS,SIN+WIII,CGK+WADD,DPS+WIMM,KNO+WMKK,KUL+WMKP,PEN+RPLL,MNL+RPVM,CEB+VABB,BOM+VIDP,DEL+VOBL,BLR+VOMM,MAA+VECC,CCU+VOCI,COK+VOHS,HYD+RJTT,HND+RJAA,NRT+RJBB,KIX+RJOO,ITM+RJCC,CTS+RJFF,FUK+RKSI,ICN+RKPC,CJU+RCTP,TPE+RCSS,TSA+ZBAA,PEK+ZSPD,PVG+ZSSS,SHA+ZGGG,CAN+ZUUU,CTU+ZSHC,HGH+ZPPP,KMG+ZGSZ,SZX+ZSNJ,NKG+ZBAD,PKX+OMDB,DXB+OMAA,AUH+OMSJ,SHJ+OEJN,JED+OERK,RUH+OTHH,DOH+OBBI,BAH+OIIE,IKA+OKBK,KWI+LLBG,TLV+OJAI,AMM+YSSY,SYD+YMML,MEL+YBBN,BNE+YPPH,PER+YPAD,ADL+YBCS,CNS+YBTL,TSV+YSCB,CBR+YMHB,HBA+NZAA,AKL+NZCH,CHC+NZWN,WLG+NZQN,ZQN+FAOR,JNB+FACT,CPT+FALE,DUR+FAJS,QRA+HKJK,NBO+HKMO,MBA+HAAB,ADD+DNMM,LOS+GMMN,CMN+GMAD,AGA+HECA,CAI+HESH,SSH+SAEZ,EZE+SABE,AEP+SACO,COR+SANT,TUC+SBGR,GRU+SBGL,GIG+SBBR,BSB+SBRJ,SDU+SBPA,POA+SBCF,CNF+SBRF,REC+SCEL,SCL+SCTE,PMC+SKBO,BOG+SKRG,MDE+SEQM,UIO+SEGU,GYE+SPJC,LIM+SPQT,IQT\ No newline at end of filediff --git a/tests/core/test_parsers.py b/tests/core/test_parsers.pyindex f9b1256..fd72fbf 100644--- a/tests/core/test_parsers.py+++ b/tests/core/test_parsers.py@@ -2,8 +2,14 @@import pytest-from fli.core.parsers import ParseError, parse_airlines, parse_emissions, parse_sort_by-from fli.models import Airline, EmissionsFilter, SortBy+from fli.core.parsers import (+ ParseError,+ parse_airlines,+ parse_emissions,+ parse_sort_by,+ resolve_airport,+)+from fli.models import Airline, Airport, EmissionsFilter, SortByclass TestParseEmissions:@@ -119,3 +125,29 @@ def test_parse_sort_by(value, expected):def test_parse_sort_by_invalid():with pytest.raises(ParseError, match="Invalid sort_by value"):parse_sort_by("NONE")+++class TestResolveAirportICAO:+ """Tests for ICAO airport resolution."""++ def test_icao_kjfk(self):+ assert resolve_airport("KJFK") == Airport.JFK++ def test_icao_vtbs(self):+ assert resolve_airport("VTBS") == Airport.BKK++ def test_icao_egll(self):+ assert resolve_airport("EGLL") == Airport.LHR++ def test_icao_case_insensitive(self):+ assert resolve_airport("kjfk") == Airport.JFK++ def test_iata_still_works(self):+ assert resolve_airport("JFK") == Airport.JFK++ def test_unknown_icao_raises(self):+ with pytest.raises(ParseError, match="Unknown ICAO code"):+ resolve_airport("ZZZZ")++ def test_three_letter_not_icao(self):+ assert resolve_airport("AAA") == Airport.AAA