Fixes runtime errors

Author: GabrielBarberini

lib/controllers/environment.py

@@ -2,7 +2,7 @@
     ControllerInterface,
     controller_exception_handler,
 )
-from lib.views.environment import EnvSummary
+from lib.views.environment import EnvironmentSummary
 from lib.models.environment import EnvironmentModel
 from lib.services.environment import EnvironmentService
 
@@ -43,15 +43,15 @@ async def get_rocketpy_env_binary(
     @controller_exception_handler
     async def simulate_env(
         self, env_id: str
-    ) -> EnvSummary:
+    ) -> EnvironmentSummary:
         """
         Simulate a rocket environment.
 
         Args:
             env_id: str.
 
         Returns:
-            EnvSummary
+            EnvironmentSummary
 
         Raises:
             HTTP 404 Not Found: If the env does not exist in the database.

lib/models/motor.py

@@ -1,8 +1,16 @@
+from enum import Enum
 from typing import Optional, Tuple, List, Union, Self, ClassVar
 from pydantic import PrivateAttr, model_validator
 
 from lib.models.interface import ApiBaseModel
-from lib.models.sub.tanks import MotorTank, TankFluids, TankKinds, InterpolationMethods, TankCoordinateSystemOrientation, MotorKinds, MotorTank
+from lib.models.sub.tanks import MotorTank, TankFluids, TankKinds, InterpolationMethods, TankCoordinateSystemOrientation, MotorTank
+
+
+class MotorKinds(str, Enum):
+    HYBRID: str = "HYBRID"
+    SOLID: str = "SOLID"
+    GENERIC: str = "GENERIC"
+    LIQUID: str = "LIQUID"
 
 
 class MotorModel(ApiBaseModel):

lib/models/sub/tanks.py

@@ -3,13 +3,6 @@
 from pydantic import BaseModel
 
 
-class MotorKinds(str, Enum):
-    HYBRID: str = "HYBRID"
-    SOLID: str = "SOLID"
-    GENERIC: str = "GENERIC"
-    LIQUID: str = "LIQUID"
-
-
 class TankKinds(str, Enum):
     LEVEL: str = "LEVEL"
     MASS: str = "MASS"

lib/routes/flight.py

@@ -12,9 +12,9 @@
     FlightUpdated,
     FlightDeleted,
 )
-from lib.models.environment import Env
+from lib.models.environment import EnvironmentModel
 from lib.models.flight import FlightModel
-from lib.models.rocket import Rocket
+from lib.models.rocket import RocketModel
 from lib.models.motor import MotorKinds
 from lib.controllers.flight import FlightController
 
@@ -121,7 +121,7 @@ async def read_rocketpy_flight(flight_id: str):
 
 
 @router.put("/{flight_id}/env")
-async def update_flight_env(flight_id: str, env: Env) -> FlightUpdated:
+async def update_flight_env(flight_id: str, env: EnvironmentModel) -> FlightUpdated:
     """
     Updates flight environment
 
@@ -141,7 +141,7 @@ async def update_flight_env(flight_id: str, env: Env) -> FlightUpdated:
 @router.put("/{flight_id}/rocket")
 async def update_flight_rocket(
     flight_id: str,
-    rocket: Rocket,
+    rocket: RocketModel,
     motor_kind: MotorKinds,
 ) -> FlightUpdated:
     """
@@ -150,7 +150,7 @@ async def update_flight_rocket(
     ## Args
     ```
         flight_id: Flight ID
-        rocket: Rocket object as JSON
+        rocket: RocketModel object as JSON
     ```
     """
     with tracer.start_as_current_span("update_flight_rocket"):

lib/services/environment.py

@@ -4,8 +4,8 @@
 
 from rocketpy.environment.environment import Environment as RocketPyEnvironment
 from rocketpy.utilities import get_instance_attributes
-from lib.models.environment import Env
-from lib.views.environment import EnvSummary
+from lib.models.environment import EnvironmentModel
+from lib.views.environment import EnvironmentSummary
 
 
 class EnvironmentService:
@@ -15,7 +15,7 @@ def __init__(self, environment: RocketPyEnvironment = None):
         self._environment = environment
 
     @classmethod
-    def from_env_model(cls, env: Env) -> Self:
+    def from_env_model(cls, env: EnvironmentModel) -> Self:
         """
         Get the rocketpy env object.
 
@@ -42,16 +42,16 @@ def environment(self) -> RocketPyEnvironment:
     def environment(self, environment: RocketPyEnvironment):
         self._environment = environment
 
-    def get_env_summary(self) -> EnvSummary:
+    def get_env_summary(self) -> EnvironmentSummary:
         """
         Get the summary of the environment.
 
         Returns:
-            EnvSummary
+            EnvironmentSummary
         """
 
         attributes = get_instance_attributes(self.environment)
-        env_summary = EnvSummary(**attributes)
+        env_summary = EnvironmentSummary(**attributes)
         return env_summary
 
     def get_env_binary(self) -> bytes:

lib/views/environment.py

@@ -1,6 +1,7 @@
 from typing import Optional, Any
 from datetime import datetime, timedelta
-from pydantic import ApiBaseView, ConfigDict
+from pydantic import ConfigDict
+from lib.views.interface import ApiBaseView
 from lib.models.environment import AtmosphericModelTypes, EnvironmentModel
 from lib.utils import to_python_primitive
 

lib/views/flight.py

@@ -3,11 +3,11 @@
 from lib.models.flight import FlightModel
 from lib.views.interface import ApiBaseView
 from lib.views.rocket import RocketView, RocketSummary
-from lib.views.environment import EnvSummary
+from lib.views.environment import EnvironmentSummary
 from lib.utils import to_python_primitive
 
 
-class FlightSummary(RocketSummary, EnvSummary):
+class FlightSummary(RocketSummary, EnvironmentSummary):
     name: Optional[str] = None
     max_time: Optional[int] = None
     min_time_step: Optional[int] = None

lib/views/motor.py

@@ -1,7 +1,8 @@
 from typing import List, Any, Optional
 from pydantic import BaseModel, ConfigDict
 from lib.views.interface import ApiBaseView
-from lib.models.sub.motor import MotorModel, MotorKinds, MotorCoordinateSystemOrientation
+from lib.models.sub.tanks import TankCoordinateSystemOrientation
+from lib.models.motor import MotorModel, MotorKinds
 from lib.utils import to_python_primitive
 
 
@@ -12,7 +13,7 @@ class MotorSummary(BaseModel):
     burn_start_time: Optional[float] = None
     center_of_dry_mass_position: Optional[float] = None
     coordinate_system_orientation: str = (
-        MotorCoordinateSystemOrientation.NOZZLE_TO_COMBUSTION_CHAMBER.value
+        TankCoordinateSystemOrientation.NOZZLE_TO_COMBUSTION_CHAMBER.value
     )
     dry_I_11: Optional[float] = None
     dry_I_12: Optional[float] = None

tests/test_routes/test_environments_route.py

@@ -9,7 +9,7 @@
     EnvCreated,
     EnvUpdated,
     EnvDeleted,
-    EnvSummary,
+    EnvironmentSummary,
 )
 from lib import app
 
@@ -18,7 +18,7 @@
 
 @pytest.fixture
 def stub_env_summary():
-    env_summary = EnvSummary()
+    env_summary = EnvironmentSummary()
     env_summary_json = env_summary.model_dump_json()
     return json.loads(env_summary_json)
 
@@ -190,7 +190,7 @@ def test_simulate_env(stub_env_summary):
     with patch.object(
         EnvController,
         'simulate_env',
-        return_value=EnvSummary(**stub_env_summary),
+        return_value=EnvironmentSummary(**stub_env_summary),
     ) as mock_simulate_env:
         response = client.get('/environments/123/summary')
         assert response.status_code == 200