fixes tests and runs formatting

Author: GabrielBarberini

lib/controllers/environment.py

@@ -2,7 +2,7 @@
     ControllerInterface,
     controller_exception_handler,
 )
-from lib.views.environment import EnvironmentSummary
+from lib.views.environment import EnvironmentSimulation
 from lib.models.environment import EnvironmentModel
 from lib.services.environment import EnvironmentService
 
@@ -36,26 +36,26 @@ async def get_rocketpy_env_binary(
         Raises:
             HTTP 404 Not Found: If the env is not found in the database.
         """
-        env = await self.get_env_by_id(env_id)
+        env = await self.get_environment_by_id(env_id)
         env_service = EnvironmentService.from_env_model(env)
-        return env_service.get_env_binary()
+        return env_service.get_environment_binary()
 
     @controller_exception_handler
     async def get_environment_simulation(
         self, env_id: str
-    ) -> EnvironmentSummary:
+    ) -> EnvironmentSimulation:
         """
         Simulate a rocket environment.
 
         Args:
             env_id: str.
 
         Returns:
-            EnvironmentSummary
+            EnvironmentSimulation
 
         Raises:
             HTTP 404 Not Found: If the env does not exist in the database.
         """
-        env = await self.get_env_by_id(env_id)
+        env = await self.get_environment_by_id(env_id)
         env_service = EnvironmentService.from_env_model(env)
-        return env_service.get_env_summary()
+        return env_service.get_environment_simulation()

lib/controllers/flight.py

@@ -2,7 +2,7 @@
     ControllerInterface,
     controller_exception_handler,
 )
-from lib.views.flight import FlightSummary, FlightUpdated
+from lib.views.flight import FlightSimulation, FlightUpdated
 from lib.models.flight import FlightModel
 from lib.models.environment import EnvironmentModel
 from lib.models.rocket import RocketModel
@@ -87,22 +87,22 @@ async def get_rocketpy_flight_binary(
         return flight_service.get_flight_binary()
 
     @controller_exception_handler
-    async def simulate_flight(
+    async def get_flight_simulation(
         self,
         flight_id: str,
-    ) -> FlightSummary:
+    ) -> FlightSimulation:
         """
         Simulate a rocket flight.
 
         Args:
             flight_id: str
 
         Returns:
-            Flight summary view.
+            Flight simulation view.
 
         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)
-        return flight_service.get_flight_summary()
+        return flight_service.get_flight_simmulation()

lib/controllers/motor.py

@@ -2,7 +2,7 @@
     ControllerInterface,
     controller_exception_handler,
 )
-from lib.views.motor import MotorSummary
+from lib.views.motor import MotorSimulation
 from lib.models.motor import MotorModel
 from lib.services.motor import MotorService
 
@@ -41,21 +41,19 @@ async def get_rocketpy_motor_binary(
         return motor_service.get_motor_binary()
 
     @controller_exception_handler
-    async def simulate_motor(
-        self, motor_id: str
-    ) -> MotorSummary:
+    async def get_motor_simulation(self, motor_id: str) -> MotorSimulation:
         """
         Simulate a rocketpy motor.
 
         Args:
             motor_id: str
 
         Returns:
-            views.MotorSummary
+            views.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)
-        return motor_service.get_motor_summary()
+        return motor_service.get_motor_simulation()

lib/controllers/rocket.py

@@ -2,7 +2,7 @@
     ControllerInterface,
     controller_exception_handler,
 )
-from lib.views.rocket import RocketSummary
+from lib.views.rocket import RocketSimulation
 from lib.models.rocket import RocketModel
 from lib.services.rocket import RocketService
 
@@ -20,9 +20,7 @@ def __init__(self):
         super().__init__(models=[RocketModel])
 
     @controller_exception_handler
-    async def get_rocketpy_rocket_binary(
-        self, rocket_id: str
-    ) -> bytes:
+    async def get_rocketpy_rocket_binary(self, rocket_id: str) -> bytes:
         """
         Get a rocketpy.Rocket object as dill binary.
 
@@ -40,22 +38,22 @@ async def get_rocketpy_rocket_binary(
         return rocket_service.get_rocket_binary()
 
     @controller_exception_handler
-    async def simulate_rocket(
+    async def get_rocket_simulation(
         self,
         rocket_id: str,
-    ) -> RocketSummary:
+    ) -> RocketSimulation:
         """
         Simulate a rocketpy rocket.
 
         Args:
             rocket_id: str
 
         Returns:
-            views.RocketSummary
+            views.RocketSimulation
 
         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)
-        return rocket_service.get_rocket_summary()
+        return rocket_service.get_rocket_simulation()

lib/models/environment.py

@@ -11,7 +11,14 @@ class EnvironmentModel(ApiBaseModel):
     elevation: Optional[int] = 1
 
     # Optional parameters
-    atmospheric_model_type: Literal['standard_atmosphere', 'custom_atmosphere', 'wyoming_sounding', 'forecast', 'reanalysis', 'ensemble'] = 'standard_atmosphere'
+    atmospheric_model_type: Literal[
+        'standard_atmosphere',
+        'custom_atmosphere',
+        'wyoming_sounding',
+        'forecast',
+        'reanalysis',
+        'ensemble',
+    ] = 'standard_atmosphere'
     atmospheric_model_file: Optional[str] = None
     date: Optional[datetime.datetime] = (
         datetime.datetime.today() + datetime.timedelta(days=1)

lib/models/interface.py

@@ -1,14 +1,18 @@
 from typing import Self, Optional
 from abc import abstractmethod, ABC
-from pydantic import BaseModel, PrivateAttr, ConfigDict
+from pydantic import (
+    BaseModel,
+    PrivateAttr,
+    ConfigDict,
+    model_validator,
+)
 from bson import ObjectId
 
 
 class ApiBaseModel(BaseModel, ABC):
     _id: Optional[ObjectId] = PrivateAttr(default=None)
     model_config = ConfigDict(
         extra="allow",
-        json_encoders={ObjectId: str},
         use_enum_values=True,
         validate_default=True,
         validate_all_in_root=True,
@@ -21,6 +25,17 @@ def set_id(self, value):
     def get_id(self):
         return self._id
 
+    @model_validator(mode='after')
+    def validate_computed_id(self):
+        """Validate _id after model instantiation"""
+        if self._id is not None:
+            if not isinstance(self._id, ObjectId):
+                try:
+                    self._id = ObjectId(str(self._id))
+                except Exception as e:
+                    raise ValueError(f"Invalid ObjectId: {e}")
+        return self
+
     @property
     @abstractmethod
     def NAME():  # pylint: disable=invalid-name, no-method-argument

lib/models/motor.py

@@ -48,8 +48,12 @@ class MotorModel(ApiBaseModel):
     throat_radius: Optional[float] = None
 
     # Optional parameters
-    interpolation_method: Literal['linear', 'spline', 'akima', 'polynomial', 'shepard', 'rbf'] = 'linear'
-    coordinate_system_orientation: Literal['nozzle_to_combustion_chamber', 'combustion_chamber_to_nozzle'] = 'nose_to_combustion_chamber'
+    interpolation_method: Literal[
+        'linear', 'spline', 'akima', 'polynomial', 'shepard', 'rbf'
+    ] = 'linear'
+    coordinate_system_orientation: Literal[
+        'nozzle_to_combustion_chamber', 'combustion_chamber_to_nozzle'
+    ] = 'nozzle_to_combustion_chamber'
     reshape_thrust_curve: Union[bool, tuple] = False
 
     # Computed parameters
@@ -62,7 +66,9 @@ def validate_motor_kind(self):
             self._motor_kind not in (MotorKinds.SOLID, MotorKinds.GENERIC)
             and self.tanks is None
         ):
-            raise ValueError("Tanks must be provided for liquid and hybrid motors.")
+            raise ValueError(
+                "Tanks must be provided for liquid and hybrid motors."
+            )
         return self
 
     @computed_field

lib/models/rocket.py

@@ -26,7 +26,9 @@ class RocketModel(ApiBaseModel):
     ] = (0, 0, 0)
     power_off_drag: List[Tuple[float, float]] = [(0, 0)]
     power_on_drag: List[Tuple[float, float]] = [(0, 0)]
-    coordinate_system_orientation: Literal['tail_to_nose', 'nose_to_tail'] = 'tail_to_nose'
+    coordinate_system_orientation: Literal['tail_to_nose', 'nose_to_tail'] = (
+        'tail_to_nose'
+    )
     nose: NoseCone
     fins: List[Fins]
 

lib/models/sub/aerosurfaces.py

@@ -39,7 +39,9 @@ class Fins(BaseModel):
     tip_chord: Optional[float] = None
     cant_angle: Optional[float] = None
     rocket_radius: Optional[float] = None
-    airfoil: Optional[Tuple[List[Tuple[float, float]], Literal['radians', 'degrees']]] = None
+    airfoil: Optional[
+        Tuple[List[Tuple[float, float]], Literal['radians', 'degrees']]
+    ] = None
 
     def get_additional_parameters(self):
         return {

lib/repositories/environment.py

@@ -22,12 +22,18 @@ async def create_environment(self, environment: EnvironmentModel) -> str:
         return await self.insert(environment.model_dump())
 
     @repository_exception_handler
-    async def read_environment_by_id(self, environment_id: str) -> Optional[EnvironmentModel]:
+    async def read_environment_by_id(
+        self, environment_id: str
+    ) -> Optional[EnvironmentModel]:
         return await self.find_by_id(data_id=environment_id)
 
     @repository_exception_handler
-    async def update_environment_by_id(self, environment_id: str, environment: EnvironmentModel):
-        await self.update_by_id(environment.model_dump(), data_id=environment_id)
+    async def update_environment_by_id(
+        self, environment_id: str, environment: EnvironmentModel
+    ):
+        await self.update_by_id(
+            environment.model_dump(), data_id=environment_id
+        )
 
     @repository_exception_handler
     async def delete_environment_by_id(self, environment_id: str):

lib/repositories/interface.py

@@ -40,9 +40,12 @@ async def wrapper(self, *args, **kwargs):
             return await method(self, *args, **kwargs)
         except PyMongoError as e:
             logger.exception(f"{method.__name__} - caught PyMongoError: {e}")
-            raise e from e
+            raise
         except RepositoryNotInitializedException as e:
-            raise e from e
+            logger.exception(
+                f"{method.__name__} - Repository not initialized: {e}"
+            )
+            raise
         except Exception as e:
             logger.exception(
                 f"{method.__name__} - caught unexpected error: {e}"

lib/routes/environment.py

@@ -6,7 +6,7 @@
 from opentelemetry import trace
 
 from lib.views.environment import (
-    EnvironmentSummary,
+    EnvironmentSimulation,
     EnvironmentCreated,
     EnvironmentRetrieved,
     EnvironmentUpdated,
@@ -29,7 +29,9 @@
 
 
 @router.post("/")
-async def create_environment(environment: EnvironmentModel) -> EnvironmentCreated:
+async def create_environment(
+    environment: EnvironmentModel,
+) -> EnvironmentCreated:
     """
     Creates a new environment
 
@@ -55,7 +57,9 @@ async def read_environment(environment_id: str) -> EnvironmentRetrieved:
 
 
 @router.put("/{environment_id}")
-async def update_environment(environment_id: str, environment: EnvironmentModel) -> EnvironmentUpdated:
+async def update_environment(
+    environment_id: str, environment: EnvironmentModel
+) -> EnvironmentUpdated:
     """
     Updates an existing environment
 
@@ -67,7 +71,9 @@ async def update_environment(environment_id: str, environment: EnvironmentModel)
     """
     with tracer.start_as_current_span("update_becho"):
         controller = EnvironmentController()
-        return await controller.put_environment_by_id(environment_id, environment)
+        return await controller.put_environment_by_id(
+            environment_id, environment
+        )
 
 
 @router.delete("/{environment_id}")
@@ -107,7 +113,9 @@ async def get_rocketpy_environment_binary(environment_id: str):
             'Content-Disposition': f'attachment; filename="rocketpy_environment_{environment_id}.dill"'
         }
         controller = EnvironmentController()
-        binary = await controller.get_rocketpy_environment_binary(environment_id)
+        binary = await controller.get_rocketpy_environment_binary(
+            environment_id
+        )
         return Response(
             content=binary,
             headers=headers,
@@ -116,14 +124,16 @@ async def get_rocketpy_environment_binary(environment_id: str):
         )
 
 
-@router.get("/{environment_id}/summary")
-async def get_environment_simulation(environment_id: str) -> EnvironmentSummary:
+@router.get("/{environment_id}/simulate")
+async def get_environment_simulation(
+    environment_id: str,
+) -> EnvironmentSimulation:
     """
-    Loads rocketpy.environment simulation
+    Simulates an environment
 
     ## Args
-    ``` environment_id: str ```
+    ``` environment_id: Environment ID```
     """
     with tracer.start_as_current_span("get_environment_simulation"):
         controller = EnvironmentController()
-        return await controller.get_environment_summary(environment_id)
+        return await controller.get_environment_simulation(environment_id)