FlightRadarAPI 1.5.2__tar.gz → 1.5.3__tar.gz

{flightradarapi-1.5.2 → flightradarapi-1.5.3}/FlightRadarAPI/__init__.py

@@ -12,7 +12,7 @@ https://www.flightradar24.com/terms-and-conditions
 """
 
 __author__ = "Jean Loui Bernard Silva de Jesus"
-__version__ = "1.5.2"
+__version__ = "1.5.3"
 
 from .api import FlightRadar24API
 from .core import Countries

{flightradarapi-1.5.2 → flightradarapi-1.5.3}/FlightRadarAPI/api.py

@@ -3,7 +3,7 @@
 import dataclasses
 import math
 from concurrent.futures import ThreadPoolExecutor, as_completed
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, Iterable, List, Optional, Tuple, Union
 from urllib.parse import quote
 
 from .core import Core, Countries
@@ -11,7 +11,7 @@ from .entities.airport import Airport
 from .entities.flight import Flight
 from .errors import AirportNotFoundError, LoginError
 from .flight_tracker_config import FlightTrackerConfig
-from .parsers import parse_airlines_html, parse_airports_html
+from .parsers import country_to_slug, parse_airlines_html, parse_airports_json
 from .request import APIClient, RetryPolicy
 
 # Some FR24 live-feed backends answer 200 with a well-formed envelope but no
@@ -187,21 +187,33 @@ class FlightRadar24API:
         )
         return response.get_json_content()
 
-    def get_airports(self, countries: List[Countries]) -> List[Airport]:
+    def get_airports(
+        self, countries: Optional[Union[Iterable[Union[Countries, str]], Countries, str]] = None,
+    ) -> List[Airport]:
         """
-        Return a list with all airports for specified countries.
+        Return a list with all airports, optionally narrowed to some countries.
 
-        :param countries: List of country names from Countries enum.
+        :param countries: Country names from the Countries enum, or their slug strings,
+            as any iterable or a single value. Every country when omitted.
         """
-        def _fetch(country):
-            href = Core.airports_data_url + "/" + country.value
-            response = self.__client.request_standalone(href, headers=Core.html_headers, timeout=self.timeout)
-            return parse_airports_html(response.get_bytes_content(), href)
+        wanted: Optional[List[Union[Countries, str]]] = None
 
-        with ThreadPoolExecutor(max_workers=self.max_workers) as executor:
-            results = executor.map(_fetch, countries)
+        if isinstance(countries, (Countries, str)):
+            wanted = [countries]
+        elif countries is not None:
+            # Materialised: a generator has no len() and is consumed once.
+            wanted = list(countries)
 
-        return [airport for result in results for airport in result]
+        if wanted is not None and len(wanted) == 0:
+            return []
+
+        response = self.__client.request(
+            Core.airports_json_url, headers=Core.json_headers, timeout=self.timeout,
+        )
+
+        # get_content(), not get_json_content(): an html body reaches the parser's
+        # guard; a malformed JSON body still raises. The parser slugifies `wanted`.
+        return parse_airports_json(response.get_content(), wanted)
 
     def get_bookmarks(self) -> Dict:
         """
@@ -292,7 +304,12 @@ class FlightRadar24API:
 
         :param country: Country name
         """
-        slug = country.lower().replace(" ", "-")
+        # Same slugifier as the feed, which spells some names "Myanmar (Burma)".
+        slug = country_to_slug(country)
+
+        if not slug:
+            return None
+
         flag_url = Core.country_flag_url.format(slug)
         headers = Core.image_headers.copy()
 

{flightradarapi-1.5.2 → flightradarapi-1.5.3}/FlightRadarAPI/core.py

@@ -32,6 +32,9 @@ class Core:
     airport_data_url = flightradar_base_url + "/airports/traffic-stats/?airport={}"
     airports_data_url = flightradar_base_url + "/data/airports"
 
+    # Every airport in one payload; the per-country pages above are client-rendered.
+    airports_json_url = flightradar_base_url + "/_json/airports.php"
+
     # Airlines data URL.
     airlines_data_url = flightradar_base_url + "/data/airlines"
 

flightradarapi-1.5.3/FlightRadarAPI/parsers.py

@@ -0,0 +1,239 @@
+# -*- coding: utf-8 -*-
+
+import json
+import logging
+import math
+import re
+import unicodedata
+from enum import Enum
+from typing import Dict, Iterable, List, Optional, Union
+
+from bs4 import BeautifulSoup
+
+from .entities.airport import Airport
+
+_logger = logging.getLogger(__name__)
+
+# ASCII only: \d would otherwise match Unicode digits such as "٤٣".
+NUMERIC_PATTERN = re.compile(r"^[+-]?(\d+\.?\d*|\.\d+)([eE][+-]?\d+)?$", re.ASCII)
+
+# str.strip() and trim() disagree on U+001C-U+001F and U+FEFF: pick one set.
+SURROUNDING_SPACE = " \t\n\r\f\v"
+
+# Number.MAX_SAFE_INTEGER, the largest integer JavaScript holds exactly.
+MAX_EXACT_INTEGER = 2 ** 53 - 1
+
+
+def parse_airlines_html(html: bytes) -> List[Dict]:
+    """
+    Parse the airlines listing HTML page into a list of airline dicts.
+    """
+    soup = BeautifulSoup(html, "html.parser")
+    tbody = soup.find("tbody")
+
+    if not tbody:
+        _logger.warning(
+            "parse_airlines_html: no <tbody> in response — FR24 page layout may have changed."
+        )
+        return []
+
+    airlines = []
+
+    for tr in tbody.find_all("tr"):
+        td_notranslate = tr.find("td", class_="notranslate")
+
+        if not td_notranslate:
+            continue
+
+        a_element = td_notranslate.find("a", href=lambda href: href and href.startswith("/data/airlines"))
+
+        if not a_element:
+            continue
+
+        airline_name = a_element.get_text(strip=True)
+
+        if len(airline_name) < 2:
+            continue
+
+        td_elements = tr.find_all("td")
+        iata = None
+        icao = None
+
+        if len(td_elements) >= 4:
+            codes_text = td_elements[3].get_text(strip=True)
+
+            if " / " in codes_text:
+                parts = codes_text.split(" / ")
+                if len(parts) == 2:
+                    iata = parts[0].strip()
+                    icao = parts[1].strip()
+            elif len(codes_text) == 2:
+                iata = codes_text
+            elif len(codes_text) == 3:
+                icao = codes_text
+
+        n_aircrafts = None
+
+        if len(td_elements) >= 5:
+            aircrafts_text = td_elements[4].get_text(strip=True)
+            if aircrafts_text:
+                n_aircrafts = int(aircrafts_text.split(" ", maxsplit=1)[0].strip())
+
+        airlines.append({"Name": airline_name, "ICAO": icao, "IATA": iata, "n_aircrafts": n_aircrafts})
+
+    return airlines
+
+
+def country_to_slug(country: object) -> str:
+    """
+    Slugify a country name the way FR24 spells it in its data page URLs, so feed
+    rows can be matched against the Countries enum ("United States" -> "united-states").
+    """
+    # `.value` unwraps a Countries member, which str() would render as
+    # "Countries.BRAZIL". Diacritics are stripped so a future "Curaçao" still
+    # matches "curacao"; `is None` rather than truthiness because str(0 or "") is
+    # "" here while String(0 ?? "") is "0" in Node.
+    if isinstance(country, Enum):
+        country = country.value
+
+    decomposed = unicodedata.normalize("NFKD", "" if country is None else str(country))
+    ascii_only = "".join(char for char in decomposed if not unicodedata.combining(char))
+
+    # Punctuation becomes a hyphen rather than being deleted: FR24's own assets are
+    # named that way, e.g. flags-small/cote-d-ivoire.svg.
+    return re.sub(r"[^a-z0-9]+", "-", ascii_only.lower()).strip("-")
+
+
+def _to_text(value: object) -> str:
+    """
+    Keep a text field as a string, or "" when the feed sends anything else.
+
+    Airport documents these as strings and callers treat them as such:
+    get_country_flag(airport.country) would slugify a dict into "object-object"
+    and request that flag.
+    """
+    return value if isinstance(value, str) else ""
+
+
+def _to_number(value: object) -> Optional[Union[int, float]]:
+    """
+    Coerce a numeric feed field into a number, or None when it is unusable.
+
+    An unusable coordinate must not become 0.0: that would place the airport in
+    the Gulf of Guinea instead of marking its position as unknown.
+
+    Plain whole numbers stay ints, so an altitude reads 2436 in both ports rather
+    than 2436.0 here -- the feed sends `alt` as an int for most rows and as a
+    string ("-1") for the rest. Anything written with a decimal point or an
+    exponent stays a float: "2436.0" and "1e3" are floats here and integral
+    Numbers in Node, equal in value but not in type.
+    """
+    # bool is an int here, and str([43]) would invent a number.
+    if isinstance(value, bool) or not isinstance(value, (int, float, str)):
+        return None
+
+    if isinstance(value, str):
+        stripped = value.strip(SURROUNDING_SPACE)
+
+        if not NUMERIC_PATTERN.match(stripped):
+            return None
+
+        text: Union[int, float, str] = stripped
+    else:
+        text = value
+
+    # One conversion, so overflow is handled once: Python ints have no ceiling.
+    try:
+        number = float(text)
+    except OverflowError:
+        return None
+
+    if not math.isfinite(number):
+        return None
+
+    try:
+        exact = int(text)
+    except (ValueError, OverflowError):
+        return number
+
+    # int only when lossless (so -23.4 survives) and only where JavaScript is exact.
+    return exact if exact == number and abs(exact) <= MAX_EXACT_INTEGER else number
+
+
+def parse_airports_json(
+    payload: Union[bytes, str, Dict], countries: Optional[Iterable[object]] = None,
+) -> List[Airport]:
+    """
+    Parse the airports JSON feed into a list of Airport instances.
+
+    :param payload: Body of Core.airports_json_url.
+    :param countries: Country slugs, or Countries members. Every airport is kept when omitted.
+    """
+    if isinstance(payload, (bytes, str)):
+        try:
+            data = json.loads(payload)
+        except ValueError:
+            _logger.warning("parse_airports_json: response is not valid JSON — FR24 feed may have changed.")
+            return []
+    else:
+        data = payload
+
+    rows = data.get("rows") if isinstance(data, dict) else None
+
+    if not isinstance(rows, list):
+        _logger.warning('parse_airports_json: no "rows" array in response — FR24 feed may have changed.')
+        return []
+
+    wanted = {country_to_slug(country) for country in countries} if countries is not None else None
+    matched = set()
+    unpositioned = []
+    airports = []
+
+    for row in rows:
+        if not isinstance(row, dict):
+            continue
+
+        # Slugified only when filtering: it is otherwise unused, and this loop
+        # runs over every airport in the feed.
+        if wanted is not None:
+            slug = country_to_slug(row.get("country"))
+
+            if slug not in wanted:
+                continue
+            matched.add(slug)
+
+        latitude = _to_number(row.get("lat"))
+        longitude = _to_number(row.get("lon"))
+
+        # One bad coordinate drops both: half a position reads as located.
+        if latitude is None or longitude is None:
+            latitude = longitude = None
+            unpositioned.append(_to_text(row.get("name")))
+
+        airports.append(Airport(basic_info={
+            "name": _to_text(row.get("name")),
+            "icao": _to_text(row.get("icao")),
+            "iata": _to_text(row.get("iata")),
+            "lat": latitude,
+            "lon": longitude,
+            "alt": _to_number(row.get("alt")),
+            "country": _to_text(row.get("country")),
+        }))
+
+    # One line, not one per row: the feed carries every airport.
+    if unpositioned:
+        _logger.warning(
+            "parse_airports_json: %d airport(s) had unusable coordinates and carry no position (e.g. %s).",
+            len(unpositioned), ", ".join(repr(name) for name in unpositioned[:3]),
+        )
+
+    if wanted is not None:
+        missing = sorted(wanted - matched)
+
+        if missing:
+            _logger.warning(
+                "parse_airports_json: no airports found for %s — check the Countries enum.",
+                ", ".join(missing),
+            )
+
+    return airports

{flightradarapi-1.5.2 → flightradarapi-1.5.3}/FlightRadarAPI/request.py

@@ -233,7 +233,23 @@ class APIRequest:
         try:
             content = decode(content)
         except Exception as err:
-            _logger.warning(
+            # Decided by the body, not the header: undecodable text is genuinely
+            # broken and must warn, while binary bodies carry no such tell. Nothing
+            # here may raise, or it would replace `err` with its own failure.
+            if not isinstance(content, bytes):
+                transport_decoded = True
+            elif content_type.startswith(("application/json", "text/")):
+                try:
+                    content.decode("utf-8")
+                    transport_decoded = True
+                except UnicodeDecodeError:
+                    transport_decoded = False
+            else:
+                corrupt_gzip = content_encoding == "gzip" and content.startswith(b"\x1f\x8b")
+                transport_decoded = content_encoding in ("gzip", "br") and not corrupt_gzip
+
+            _logger.log(
+                logging.DEBUG if transport_decoded else logging.WARNING,
                 "APIRequest.get_content: failed to decode Content-Encoding=%r for %s (%s). "
                 "Assuming the transport already decompressed and returning raw bytes.",
                 content_encoding, self.url, err,

{flightradarapi-1.5.2 → flightradarapi-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: FlightRadarAPI
-Version: 1.5.2
+Version: 1.5.3
 Summary: SDK for FlightRadar24
 Project-URL: Homepage, https://github.com/JeanExtreme002/FlightRadarAPI
 Project-URL: Source Code, https://github.com/JeanExtreme002/FlightRadarAPI
@@ -58,6 +58,7 @@ flights = fr_api.get_flights(...)  # Returns a list of Flight objects
 **Getting airports list:**
 ```py
 airports = fr_api.get_airports(...)  # Returns a list of Airport objects
+all_airports = fr_api.get_airports()  # Omit the countries to get every airport
 ```
 **Getting airlines list:**
 ```py

{flightradarapi-1.5.2 → flightradarapi-1.5.3}/README.md

@@ -32,6 +32,7 @@ flights = fr_api.get_flights(...)  # Returns a list of Flight objects
 **Getting airports list:**
 ```py
 airports = fr_api.get_airports(...)  # Returns a list of Airport objects
+all_airports = fr_api.get_airports()  # Omit the countries to get every airport
 ```
 **Getting airlines list:**
 ```py

flightradarapi-1.5.2/FlightRadarAPI/parsers.py

@@ -1,143 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import logging
-from typing import Dict, List, Optional
-
-from bs4 import BeautifulSoup
-
-from .entities.airport import Airport
-
-_logger = logging.getLogger(__name__)
-
-
-def parse_airlines_html(html: bytes) -> List[Dict]:
-    """
-    Parse the airlines listing HTML page into a list of airline dicts.
-    """
-    soup = BeautifulSoup(html, "html.parser")
-    tbody = soup.find("tbody")
-
-    if not tbody:
-        _logger.warning(
-            "parse_airlines_html: no <tbody> in response — FR24 page layout may have changed."
-        )
-        return []
-
-    airlines = []
-
-    for tr in tbody.find_all("tr"):
-        td_notranslate = tr.find("td", class_="notranslate")
-
-        if not td_notranslate:
-            continue
-
-        a_element = td_notranslate.find("a", href=lambda href: href and href.startswith("/data/airlines"))
-
-        if not a_element:
-            continue
-
-        airline_name = a_element.get_text(strip=True)
-
-        if len(airline_name) < 2:
-            continue
-
-        td_elements = tr.find_all("td")
-        iata = None
-        icao = None
-
-        if len(td_elements) >= 4:
-            codes_text = td_elements[3].get_text(strip=True)
-
-            if " / " in codes_text:
-                parts = codes_text.split(" / ")
-                if len(parts) == 2:
-                    iata = parts[0].strip()
-                    icao = parts[1].strip()
-            elif len(codes_text) == 2:
-                iata = codes_text
-            elif len(codes_text) == 3:
-                icao = codes_text
-
-        n_aircrafts = None
-
-        if len(td_elements) >= 5:
-            aircrafts_text = td_elements[4].get_text(strip=True)
-            if aircrafts_text:
-                n_aircrafts = int(aircrafts_text.split(" ", maxsplit=1)[0].strip())
-
-        airlines.append({"Name": airline_name, "ICAO": icao, "IATA": iata, "n_aircrafts": n_aircrafts})
-
-    return airlines
-
-
-def parse_airports_html(html: bytes, country_href: str) -> List[Airport]:
-    """
-    Parse the airports listing HTML page for a country into a list of Airport instances.
-    """
-    soup = BeautifulSoup(html, "html.parser")
-    tbody = soup.find("tbody")
-
-    if not tbody:
-        _logger.warning(
-            "parse_airports_html: no <tbody> for %s — FR24 page layout may have changed.",
-            country_href,
-        )
-        return []
-
-    country_name = country_href.split("/")[-1].replace("-", " ").title()
-    airports = []
-
-    for tr in tbody.find_all("tr"):
-        a_elements = tr.find_all("a", attrs={"data-iata": True, "data-lat": True, "data-lon": True})
-
-        if not a_elements:
-            continue
-
-        a_element = a_elements[0]
-
-        icao = ""
-        iata = str(a_element.get("data-iata", "")).strip()
-        latitude = str(a_element.get("data-lat", "")).strip()
-        longitude = str(a_element.get("data-lon", "")).strip()
-        name_part = a_element.get_text(strip=True)
-
-        small_element = a_element.find("small")
-
-        if small_element:
-            codes_text = small_element.get_text(strip=True).lstrip("(").rstrip(")").strip()
-            name_part = name_part.replace(small_element.get_text(strip=True), "").replace("()", "").strip()
-
-            if "/" in codes_text:
-                code1, code2 = (s.strip() for s in codes_text.split("/", maxsplit=1))
-                if len(code1) == 3 and len(code2) == 4:
-                    iata, icao = code1, code2
-                elif len(code1) == 4 and len(code2) == 3:
-                    iata, icao = code2, code1
-            elif len(codes_text) == 3:
-                iata = codes_text
-            elif len(codes_text) == 4:
-                icao = codes_text
-
-        lat_float: Optional[float]
-        lon_float: Optional[float]
-        try:
-            lat_float = float(latitude) if latitude else None
-            lon_float = float(longitude) if longitude else None
-        except ValueError:
-            _logger.warning(
-                "parse_airports_html: invalid coordinates for airport %r (lat=%r, lon=%r) — skipping position.",
-                name_part, latitude, longitude,
-            )
-            lat_float, lon_float = None, None
-
-        airports.append(Airport(basic_info={
-            "name": name_part,
-            "icao": icao,
-            "iata": iata,
-            "lat": lat_float,
-            "lon": lon_float,
-            "alt": None,
-            "country": country_name,
-        }))
-
-    return airports