diff --git a/lib/models/environment.py b/lib/models/environment.py index e007096..ce5e352 100644 --- a/lib/models/environment.py +++ b/lib/models/environment.py @@ -8,7 +8,6 @@ class AtmosphericModelTypes(str, Enum): STANDARD_ATMOSPHERE: str = "STANDARD_ATMOSPHERE" CUSTOM_ATMOSPHERE: str = "CUSTOM_ATMOSPHERE" WYOMING_SOUNDING: str = "WYOMING_SOUNDING" - NOAARUCSOUNDING: str = "NOAARUCSOUNDING" FORECAST: str = "FORECAST" REANALYSIS: str = "REANALYSIS" ENSEMBLE: str = "ENSEMBLE" @@ -17,7 +16,7 @@ class AtmosphericModelTypes(str, Enum): class Env(BaseModel): latitude: float longitude: float - elevation: Optional[int] = None + elevation: Optional[int] = 0 # Optional parameters atmospheric_model_type: Optional[AtmosphericModelTypes] = None diff --git a/lib/models/motor.py b/lib/models/motor.py index fe26293..1ef5bff 100644 --- a/lib/models/motor.py +++ b/lib/models/motor.py @@ -31,6 +31,9 @@ class InterpolationMethods(str, Enum): LINEAR: str = "LINEAR" SPLINE: str = "SPLINE" AKIMA: str = "AKIMA" + POLYNOMIAL: str = "POLYNOMIAL" + SHEPARD: str = "SHEPARD" + RBF: str = "RBF" class MotorTank(BaseModel): diff --git a/lib/models/rocket.py b/lib/models/rocket.py index 1f8dae3..593f889 100644 --- a/lib/models/rocket.py +++ b/lib/models/rocket.py @@ -31,7 +31,10 @@ class Rocket(BaseModel): mass: float motor_position: float center_of_mass_without_motor: int - inertia: Tuple[float, float, float] + inertia: Union[ + Tuple[float, float, float], + Tuple[float, float, float, float, float, float], + ] power_off_drag: List[Tuple[float, float]] power_on_drag: List[Tuple[float, float]] diff --git a/lib/views/flight.py b/lib/views/flight.py index fd5900a..5dc8133 100644 --- a/lib/views/flight.py +++ b/lib/views/flight.py @@ -151,8 +151,6 @@ class FlightSummary(RocketSummary, EnvSummary): z: Optional[Any] z_impact: Optional[Any] flight_phases: Optional[Any] - FlightPhases: Optional[Any] - TimeNodes: Optional[Any] class Config: json_encoders = {Any: to_python_primitive}