Skip to content

Commit

Permalink
types: use BaseModel everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
fpletz committed Jan 31, 2024
1 parent 596e1db commit 5925130
Showing 1 changed file with 10 additions and 21 deletions.
31 changes: 10 additions & 21 deletions vatsim/types.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import itertools
from dataclasses import dataclass
from datetime import datetime
from typing import Any, List, Optional

Expand Down Expand Up @@ -72,36 +71,31 @@ def atis_validator(cls, v: Optional[list[str]]) -> str:
return "\n".join(v)


@dataclass
class Facility:
class Facility(BaseModel):
id: int
short: str
long: str


@dataclass
class Rating:
class Rating(BaseModel):
id: int
short: str
long: str


@dataclass
class PilotRating:
class PilotRating(BaseModel):
id: int
short_name: str
long_name: str


@dataclass
class MilitaryRating:
class MilitaryRating(BaseModel):
id: int
short_name: str
long_name: str


@dataclass
class FlightPlan:
class FlightPlan(BaseModel):
flight_rules: str
aircraft: str
aircraft_faa: str
Expand All @@ -118,8 +112,7 @@ class FlightPlan:
assigned_transponder: str


@dataclass
class Pilot:
class Pilot(BaseModel):
cid: int
name: str
callsign: str
Expand All @@ -139,8 +132,7 @@ class Pilot:
last_updated: datetime


@dataclass
class Server:
class Server(BaseModel):
ident: str
hostname_or_ip: str
location: str
Expand All @@ -150,17 +142,15 @@ class Server:
is_sweatbox: bool


@dataclass
class Prefile:
class Prefile(BaseModel):
cid: int
name: str
callsign: str
flight_plan: FlightPlan
last_updated: datetime


@dataclass
class General:
class General(BaseModel):
version: int
reload: int
update: str
Expand All @@ -182,8 +172,7 @@ class VatsimData(BaseModel):
military_ratings: list[MilitaryRating]


@dataclass
class VatsimDataEndpoints:
class VatsimDataEndpoints(BaseModel):
v3: List[str]
transceivers: List[HttpUrl]
servers: List[HttpUrl]
Expand Down

0 comments on commit 5925130

Please sign in to comment.