fixes runtime issues

Author: GabrielBarberini

lib/controllers/environment.py

@@ -20,7 +20,7 @@ def __init__(self):
         super().__init__(models=[EnvironmentModel])
 
     @controller_exception_handler
-    async def get_rocketpy_env_binary(
+    async def get_rocketpy_environment_binary(
         self,
         env_id: str,
     ) -> bytes:
@@ -36,8 +36,10 @@ async def get_rocketpy_env_binary(
         Raises:
             HTTP 404 Not Found: If the env is not found in the database.
         """
-        env = await self.get_environment_by_id(env_id)
-        env_service = EnvironmentService.from_env_model(env)
+        env_retrieved = await self.get_environment_by_id(env_id)
+        env_service = EnvironmentService.from_env_model(
+            env_retrieved.environment
+        )
         return env_service.get_environment_binary()
 
     @controller_exception_handler
@@ -56,6 +58,8 @@ async def get_environment_simulation(
         Raises:
             HTTP 404 Not Found: If the env does not exist in the database.
         """
-        env = await self.get_environment_by_id(env_id)
-        env_service = EnvironmentService.from_env_model(env)
+        env_retrieved = await self.get_environment_by_id(env_id)
+        env_service = EnvironmentService.from_env_model(
+            env_retrieved.environment
+        )
         return env_service.get_environment_simulation()

lib/controllers/flight.py

@@ -82,8 +82,10 @@ async def get_rocketpy_flight_binary(
         Raises:
             HTTP 404 Not Found: If the flight is not found in the database.
         """
-        flight = await self.get_flight_by_id(flight_id)
-        flight_service = FlightService.from_flight_model(flight)
+        flight_retrieved = await self.get_flight_by_id(flight_id)
+        flight_service = FlightService.from_flight_model(
+            flight_retrieved.flight
+        )
         return flight_service.get_flight_binary()
 
     @controller_exception_handler
@@ -103,6 +105,8 @@ async def get_flight_simulation(
         Raises:
             HTTP 404 Not Found: If the flight does not exist in the database.
         """
-        flight = await self.get_flight_by_id(flight_id=flight_id)
-        flight_service = FlightService.from_flight_model(flight)
+        flight_retrieved = await self.get_flight_by_id(flight_id=flight_id)
+        flight_service = FlightService.from_flight_model(
+            flight_retrieved.flight
+        )
         return flight_service.get_flight_simmulation()

lib/controllers/motor.py

@@ -36,8 +36,8 @@ async def get_rocketpy_motor_binary(
         Raises:
             HTTP 404 Not Found: If the motor is not found in the database.
         """
-        motor = await self.get_motor_by_id(motor_id)
-        motor_service = MotorService.from_motor_model(motor)
+        motor_retrieved = await self.get_motor_by_id(motor_id)
+        motor_service = MotorService.from_motor_model(motor_retrieved.motor)
         return motor_service.get_motor_binary()
 
     @controller_exception_handler
@@ -54,6 +54,6 @@ async def get_motor_simulation(self, motor_id: str) -> MotorSimulation:
         Raises:
             HTTP 404 Not Found: If the motor does not exist in the database.
         """
-        motor = await self.get_motor_by_id(motor_id)
-        motor_service = MotorService.from_motor_model(motor)
+        motor_retrieved = await self.get_motor_by_id(motor_id)
+        motor_service = MotorService.from_motor_model(motor_retrieved.motor)
         return motor_service.get_motor_simulation()

lib/controllers/rocket.py

@@ -33,8 +33,10 @@ async def get_rocketpy_rocket_binary(self, rocket_id: str) -> bytes:
         Raises:
             HTTP 404 Not Found: If the rocket is not found in the database.
         """
-        rocket = await self.get_rocket_by_id(rocket_id)
-        rocket_service = RocketService.from_rocket_model(rocket)
+        rocket_retrieved = await self.get_rocket_by_id(rocket_id)
+        rocket_service = RocketService.from_rocket_model(
+            rocket_retrieved.rocket
+        )
         return rocket_service.get_rocket_binary()
 
     @controller_exception_handler
@@ -54,6 +56,8 @@ async def get_rocket_simulation(
         Raises:
             HTTP 404 Not Found: If the rocket does not exist in the database.
         """
-        rocket = await self.get_rocket_by_id(rocket_id)
-        rocket_service = RocketService.from_rocket_model(rocket)
+        rocket_retrieved = await self.get_rocket_by_id(rocket_id)
+        rocket_service = RocketService.from_rocket_model(
+            rocket_retrieved.rocket
+        )
         return rocket_service.get_rocket_simulation()

lib/models/interface.py

@@ -10,7 +10,6 @@
 class ApiBaseModel(BaseModel, ABC):
     _id: Optional[str] = PrivateAttr(default=None)
     model_config = ConfigDict(
-        extra="allow",
         use_enum_values=True,
         validate_default=True,
         validate_all_in_root=True,

lib/views/environment.py

@@ -6,6 +6,7 @@
 
 
 class EnvironmentSimulation(ApiBaseView):
+    message: str = "Environment successfully simulated"
     latitude: Optional[float] = None
     longitude: Optional[float] = None
     elevation: Optional[float] = 1

lib/views/flight.py

@@ -7,6 +7,7 @@
 
 
 class FlightSimulation(RocketSimulation, EnvironmentSimulation):
+    message: str = "Flight successfully simulated"
     name: Optional[str] = None
     max_time: Optional[int] = None
     min_time_step: Optional[int] = None

lib/views/motor.py

@@ -6,6 +6,7 @@
 
 
 class MotorSimulation(BaseModel):
+    message: str = "Motor successfully simulated"
     average_thrust: Optional[float] = None
     burn_duration: Optional[float] = None
     burn_out_time: Optional[float] = None

lib/views/rocket.py

@@ -6,6 +6,7 @@
 
 
 class RocketSimulation(MotorSimulation):
+    message: str = "Rocket successfully simulated"
     area: Optional[float] = None
     coordinate_system_orientation: str = 'tail_to_nose'
     center_of_mass_without_motor: Optional[float] = None