adapts motor model

Author: GabrielBarberini

src/models/motor.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from typing import Optional, Tuple, List, Union, Self, ClassVar, Literal
-from pydantic import PrivateAttr, model_validator, computed_field
+from pydantic import model_validator
 
 from src.models.interface import ApiBaseModel
 from src.models.sub.tanks import MotorTank
@@ -24,6 +24,7 @@ class MotorModel(ApiBaseModel):
     dry_mass: float
     dry_inertia: Tuple[float, float, float] = (0, 0, 0)
     center_of_dry_mass_position: float
+    motor_kind: MotorKinds
 
     # Generic motor parameters
     chamber_radius: Optional[float] = None
@@ -56,30 +57,18 @@ class MotorModel(ApiBaseModel):
     ] = 'nozzle_to_combustion_chamber'
     reshape_thrust_curve: Union[bool, tuple] = False
 
-    # Computed parameters
-    _motor_kind: MotorKinds = PrivateAttr(default=MotorKinds.SOLID)
-
     @model_validator(mode='after')
     # TODO: extend guard to check motor kinds and tank kinds specifics
     def validate_motor_kind(self):
         if (
-            self._motor_kind not in (MotorKinds.SOLID, MotorKinds.GENERIC)
+            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."
             )
         return self
 
-    @computed_field
-    @property
-    def selected_motor_kind(self) -> str:
-        return self._motor_kind.value
-
-    def set_motor_kind(self, motor_kind: MotorKinds):
-        self._motor_kind = motor_kind
-        return self
-
     @staticmethod
     def UPDATED():
         return

src/routes/flight.py

@@ -13,7 +13,6 @@
 from src.models.environment import EnvironmentModel
 from src.models.flight import FlightModel
 from src.models.rocket import RocketModel
-from src.models.motor import MotorKinds
 from src.controllers.flight import FlightController
 
 router = APIRouter(
@@ -30,9 +29,7 @@
 
 
 @router.post("/", status_code=201)
-async def create_flight(
-    flight: FlightModel, motor_kind: MotorKinds
-) -> FlightCreated:
+async def create_flight(flight: FlightModel) -> FlightCreated:
     """
     Creates a new flight
 
@@ -41,7 +38,6 @@ async def create_flight(
     """
     with tracer.start_as_current_span("create_flight"):
         controller = FlightController()
-        flight.rocket.motor.set_motor_kind(motor_kind)
         return await controller.post_flight(flight)
 
 
@@ -59,9 +55,7 @@ async def read_flight(flight_id: str) -> FlightRetrieved:
 
 
 @router.put("/{flight_id}", status_code=204)
-async def update_flight(
-    flight_id: str, flight: FlightModel, motor_kind: MotorKinds
-) -> None:
+async def update_flight(flight_id: str, flight: FlightModel) -> None:
     """
     Updates an existing flight
 
@@ -73,7 +67,6 @@ async def update_flight(
     """
     with tracer.start_as_current_span("update_flight"):
         controller = FlightController()
-        flight.rocket.motor.set_motor_kind(motor_kind)
         return await controller.put_flight_by_id(flight_id, flight)
 
 
@@ -144,11 +137,7 @@ async def update_flight_environment(
 
 
 @router.put("/{flight_id}/rocket", status_code=204)
-async def update_flight_rocket(
-    flight_id: str,
-    rocket: RocketModel,
-    motor_kind: MotorKinds,
-) -> None:
+async def update_flight_rocket(flight_id: str, rocket: RocketModel) -> None:
     """
     Updates flight rocket.
 
@@ -160,7 +149,6 @@ async def update_flight_rocket(
     """
     with tracer.start_as_current_span("update_flight_rocket"):
         controller = FlightController()
-        rocket.motor.set_motor_kind(motor_kind)
         return await controller.update_rocket_by_flight_id(
             flight_id,
             rocket=rocket,

src/routes/motor.py

@@ -10,7 +10,7 @@
     MotorCreated,
     MotorRetrieved,
 )
-from src.models.motor import MotorModel, MotorKinds
+from src.models.motor import MotorModel
 from src.controllers.motor import MotorController
 
 router = APIRouter(
@@ -27,9 +27,7 @@
 
 
 @router.post("/", status_code=201)
-async def create_motor(
-    motor: MotorModel, motor_kind: MotorKinds
-) -> MotorCreated:
+async def create_motor(motor: MotorModel) -> MotorCreated:
     """
     Creates a new motor
 
@@ -38,7 +36,6 @@ async def create_motor(
     """
     with tracer.start_as_current_span("create_motor"):
         controller = MotorController()
-        motor.set_motor_kind(motor_kind)
         return await controller.post_motor(motor)
 
 
@@ -56,9 +53,7 @@ async def read_motor(motor_id: str) -> MotorRetrieved:
 
 
 @router.put("/{motor_id}", status_code=204)
-async def update_motor(
-    motor_id: str, motor: MotorModel, motor_kind: MotorKinds
-) -> None:
+async def update_motor(motor_id: str, motor: MotorModel) -> None:
     """
     Updates an existing motor
 
@@ -70,7 +65,6 @@ async def update_motor(
     """
     with tracer.start_as_current_span("update_motor"):
         controller = MotorController()
-        motor.set_motor_kind(motor_kind)
         return await controller.put_motor_by_id(motor_id, motor)
 
 

src/routes/rocket.py

@@ -11,7 +11,6 @@
     RocketRetrieved,
 )
 from src.models.rocket import RocketModel
-from src.models.motor import MotorKinds
 from src.controllers.rocket import RocketController
 
 router = APIRouter(
@@ -28,9 +27,7 @@
 
 
 @router.post("/", status_code=201)
-async def create_rocket(
-    rocket: RocketModel, motor_kind: MotorKinds
-) -> RocketCreated:
+async def create_rocket(rocket: RocketModel) -> RocketCreated:
     """
     Creates a new rocket
 
@@ -39,7 +36,6 @@ async def create_rocket(
     """
     with tracer.start_as_current_span("create_rocket"):
         controller = RocketController()
-        rocket.motor.set_motor_kind(motor_kind)
         return await controller.post_rocket(rocket)
 
 
@@ -57,9 +53,7 @@ async def read_rocket(rocket_id: str) -> RocketRetrieved:
 
 
 @router.put("/{rocket_id}", status_code=204)
-async def update_rocket(
-    rocket_id: str, rocket: RocketModel, motor_kind: MotorKinds
-) -> None:
+async def update_rocket(rocket_id: str, rocket: RocketModel) -> None:
     """
     Updates an existing rocket
 
@@ -71,7 +65,6 @@ async def update_rocket(
     """
     with tracer.start_as_current_span("update_rocket"):
         controller = RocketController()
-        rocket.motor.set_motor_kind(motor_kind)
         return await controller.put_rocket_by_id(rocket_id, rocket)
 
 

src/services/motor.py

@@ -47,7 +47,7 @@ def from_motor_model(cls, motor: MotorModel) -> Self:
             "reshape_thrust_curve": False or motor.reshape_thrust_curve,
         }
 
-        match MotorKinds(motor.selected_motor_kind):
+        match MotorKinds(motor.motor_kind):
             case MotorKinds.LIQUID:
                 rocketpy_motor = LiquidMotor(**motor_core)
             case MotorKinds.HYBRID:

tests/unit/test_routes/conftest.py

@@ -24,6 +24,7 @@ def stub_motor_dump():
         dry_mass=0,
         dry_inertia=[0, 0, 0],
         center_of_dry_mass_position=0,
+        motor_kind='GENERIC',
     )
     motor_json = motor.model_dump_json()
     return json.loads(motor_json)