adapts selected motor kind to new API interface

Author: GabrielBarberini

lib/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
+from pydantic import PrivateAttr, model_validator, computed_field
 
 from lib.models.interface import ApiBaseModel
 from lib.models.sub.tanks import MotorTank
@@ -65,9 +65,10 @@ def validate_motor_kind(self):
             raise ValueError("Tanks must be provided for liquid and hybrid motors.")
         return self
 
+    @computed_field
     @property
-    def motor_kind(self) -> MotorKinds:
-        return self._motor_kind
+    def selected_motor_kind(self) -> str:
+        return self._motor_kind.value
 
     def set_motor_kind(self, motor_kind: MotorKinds):
         self._motor_kind = motor_kind

lib/services/flight.py

@@ -7,7 +7,8 @@
 
 from lib.services.environment import EnvironmentService
 from lib.services.rocket import RocketService
-from lib.views.flight import FlightSummary, FlightView
+from lib.models.flight import FlightModel
+from lib.views.flight import FlightSummary
 
 
 class FlightService:
@@ -17,7 +18,7 @@ def __init__(self, flight: RocketPyFlight = None):
         self._flight = flight
 
     @classmethod
-    def from_flight_model(cls, flight: FlightView) -> Self:
+    def from_flight_model(cls, flight: FlightModel) -> Self:
         """
         Get the rocketpy flight object.
 

lib/services/motor.py

@@ -16,8 +16,8 @@
 )
 
 from lib.models.sub.tanks import TankKinds
-from lib.models.motor import MotorKinds
-from lib.views.motor import MotorSummary, MotorView
+from lib.models.motor import MotorKinds, MotorModel
+from lib.views.motor import MotorSummary
 
 
 class MotorService:
@@ -27,7 +27,7 @@ def __init__(self, motor: RocketPyMotor = None):
         self._motor = motor
 
     @classmethod
-    def from_motor_model(cls, motor: MotorView) -> Self:
+    def from_motor_model(cls, motor: MotorModel) -> Self:
         """
         Get the rocketpy motor object.
 

lib/services/rocket.py

@@ -14,10 +14,10 @@
 from rocketpy.utilities import get_instance_attributes
 
 from lib import logger
-from lib.models.rocket import Parachute
+from lib.models.rocket import RocketModel, Parachute
 from lib.models.sub.aerosurfaces import NoseCone, Tail, Fins
 from lib.services.motor import MotorService
-from lib.views.rocket import RocketView, RocketSummary
+from lib.views.rocket import RocketSummary
 
 
 class RocketService:
@@ -27,7 +27,7 @@ def __init__(self, rocket: RocketPyRocket = None):
         self._rocket = rocket
 
     @classmethod
-    def from_rocket_model(cls, rocket: RocketView) -> Self:
+    def from_rocket_model(cls, rocket: RocketModel) -> Self:
         """
         Get the rocketpy rocket object.
 

lib/views/motor.py

@@ -73,7 +73,7 @@ class MotorSummary(BaseModel):
 
 class MotorView(MotorModel):
     motor_id: Optional[str] = None
-    selected_motor_kind: MotorKinds
+    selected_motor_kind: str
 
 
 class MotorCreated(ApiBaseView):