Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/fr24sdk/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# SPDX-License-Identifier: MIT
"""Exposes data models for the Flightradar24 SDK."""

from .flight_category import FlightCategory
from .airline import AirlineLight
from .airport import AirportFull, AirportLight, Country, Timezone
from .flight import (
Expand All @@ -27,6 +28,7 @@

__all__ = [
"AirlineLight",
"FlightCategory",
"AirportFull",
"AirportLight",
"Country",
Expand Down
30 changes: 30 additions & 0 deletions src/fr24sdk/models/flight_category.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# SPDX-FileCopyrightText: Copyright Flightradar24
#
# SPDX-License-Identifier: MIT
"""Flight category enumeration for the Flightradar24 SDK."""

from enum import Enum


class FlightCategory(str, Enum):
"""Enumeration of FlightRadar24 flight categories.

Maps character literals used by the FR24 API to identify different
types of aircraft and flight operations.
"""

PASSENGER = "P"
CARGO = "C"
MILITARY_AND_GOVERNMENT = "M"
BUSINESS_JETS = "J"
GENERAL_AVIATION = "T"
HELICOPTERS = "H"
LIGHTER_THAN_AIR = "B"
GLIDERS = "G"
DRONES = "D"
GROUND_VEHICLES = "V"
OTHER = "O"
NON_CATEGORIZED = "N"

def __str__(self) -> str:
return self.value
9 changes: 5 additions & 4 deletions src/fr24sdk/resources/historic/positions.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
Boundary,
AltitudeRange,
)
from ...models.flight_category import FlightCategory
from ...models.regex_patterns import (
FLIGHT_NUMBER_PATTERN,
CALLSIGN_PATTERN,
Expand Down Expand Up @@ -73,7 +74,7 @@ class _HistoricPositionsParams(BaseModel):
list[Annotated[str, StringConstraints(pattern=SQUAWK_PATTERN)]]
] = Field(default=None, max_length=15)
categories: Optional[
list[Annotated[str, StringConstraints(pattern=SERVICE_TYPES_PATTERN)]]
list[Union[FlightCategory, Annotated[str, StringConstraints(pattern=SERVICE_TYPES_PATTERN)]]]
] = Field(default=None, max_length=15)
data_sources: Optional[
list[Annotated[str, StringConstraints(pattern=DATA_SOURCE_PATTERN)]]
Expand Down Expand Up @@ -136,7 +137,7 @@ def get_light(
aircraft: Optional[str] = None,
altitude_ranges: Optional[list[Union[AltitudeRange, str]]] = None,
squawks: Optional[list[str]] = None,
categories: Optional[list[str]] = None,
categories: Optional[list[Union[FlightCategory, str]]] = None,
data_sources: Optional[list[str]] = None,
gspeed: Optional[Union[int, str]] = None,
limit: Optional[int] = None,
Expand Down Expand Up @@ -183,7 +184,7 @@ def get_full(
aircraft: Optional[str] = None,
altitude_ranges: Optional[list[Union[AltitudeRange, str]]] = None,
squawks: Optional[list[str]] = None,
categories: Optional[list[str]] = None,
categories: Optional[list[Union[FlightCategory, str]]] = None,
data_sources: Optional[list[str]] = None,
gspeed: Optional[Union[int, str]] = None,
limit: Optional[int] = None,
Expand Down Expand Up @@ -230,7 +231,7 @@ def count(
aircraft: Optional[str] = None,
altitude_ranges: Optional[list[Union[AltitudeRange, str]]] = None,
squawks: Optional[list[str]] = None,
categories: Optional[list[str]] = None,
categories: Optional[list[Union[FlightCategory, str]]] = None,
data_sources: Optional[list[str]] = None,
gspeed: Optional[Union[int, str]] = None,
) -> CountResponse:
Expand Down
9 changes: 5 additions & 4 deletions src/fr24sdk/resources/live/positions.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
FlightPositionsFullResponse,
CountResponse,
)
from ...models.flight_category import FlightCategory
from ...models.geographic import (
Boundary,
AltitudeRange,
Expand Down Expand Up @@ -67,7 +68,7 @@ class _LivePositionsParams(BaseModel):
list[Annotated[str, StringConstraints(pattern=SQUAWK_PATTERN)]]
] = Field(default=None, max_length=15)
categories: Optional[
list[Annotated[str, StringConstraints(pattern=SERVICE_TYPES_PATTERN)]]
list[Union[FlightCategory, Annotated[str, StringConstraints(pattern=SERVICE_TYPES_PATTERN)]]]
] = Field(default=None, max_length=15)
data_sources: Optional[
list[Annotated[str, StringConstraints(pattern=DATA_SOURCE_PATTERN)]]
Expand Down Expand Up @@ -111,7 +112,7 @@ def get_light(
aircraft: Optional[str] = None,
altitude_ranges: Optional[list[Union[AltitudeRange, str]]] = None,
squawks: Optional[list[str]] = None,
categories: Optional[list[str]] = None,
categories: Optional[list[Union[FlightCategory, str]]] = None,
data_sources: Optional[list[str]] = None,
airspaces: Optional[list[str]] = None,
gspeed: Optional[Union[int, str]] = None,
Expand Down Expand Up @@ -156,7 +157,7 @@ def get_full(
aircraft: Optional[str] = None,
altitude_ranges: Optional[list[Union[AltitudeRange, str]]] = None,
squawks: Optional[list[str]] = None,
categories: Optional[list[str]] = None,
categories: Optional[list[Union[FlightCategory, str]]] = None,
data_sources: Optional[list[str]] = None,
airspaces: Optional[list[str]] = None,
gspeed: Optional[Union[int, str]] = None,
Expand Down Expand Up @@ -201,7 +202,7 @@ def count(
aircraft: Optional[str] = None,
altitude_ranges: Optional[list[Union[AltitudeRange, str]]] = None,
squawks: Optional[list[str]] = None,
categories: Optional[list[str]] = None,
categories: Optional[list[Union[FlightCategory, str]]] = None,
data_sources: Optional[list[str]] = None,
gspeed: Optional[Union[int, str]] = None,
) -> CountResponse:
Expand Down