ENH: class encoding refactor for large sims

src/models/rocket.py

@@ -19,7 +19,7 @@ class RocketModel(ApiBaseModel):
     radius: float
     mass: float
     motor_position: float
-    center_of_mass_without_motor: int
+    center_of_mass_without_motor: float
     inertia: Union[
         Tuple[float, float, float],
         Tuple[float, float, float, float, float, float],

src/models/sub/aerosurfaces.py

@@ -34,14 +34,15 @@ class Fins(BaseModel):
     root_chord: float
     span: float
     position: float
-
     # Optional parameters
     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
+    sweep_length: Optional[float] = None
+    sweep_angle: Optional[float] = None
 
     def get_additional_parameters(self):
         return {

src/services/environment.py

@@ -5,7 +5,7 @@
 from rocketpy.environment.environment import Environment as RocketPyEnvironment
 from src.models.environment import EnvironmentModel
 from src.views.environment import EnvironmentSimulation
-from src.utils import rocketpy_encoder, DiscretizeConfig
+from src.utils import collect_attributes
 
 
 class EnvironmentService:
@@ -54,10 +54,11 @@ def get_environment_simulation(self) -> EnvironmentSimulation:
             EnvironmentSimulation
         """
 
-        attributes = rocketpy_encoder(
-            self.environment, DiscretizeConfig.for_environment()
+        encoded_attributes = collect_attributes(
+            self.environment,
+            [EnvironmentSimulation],
         )
-        env_simulation = EnvironmentSimulation(**attributes)
+        env_simulation = EnvironmentSimulation(**encoded_attributes)
         return env_simulation
 
     def get_environment_binary(self) -> bytes:

src/services/flight.py

@@ -8,7 +8,10 @@
 from src.services.rocket import RocketService
 from src.models.flight import FlightModel
 from src.views.flight import FlightSimulation
-from src.utils import rocketpy_encoder, DiscretizeConfig
+from src.views.rocket import RocketSimulation
+from src.views.motor import MotorSimulation
+from src.views.environment import EnvironmentSimulation
+from src.utils import collect_attributes
 
 
 class FlightService:
@@ -55,10 +58,16 @@ def get_flight_simulation(self) -> FlightSimulation:
         Returns:
             FlightSimulation
         """
-        attributes = rocketpy_encoder(
-            self.flight, DiscretizeConfig.for_flight()
+        encoded_attributes = collect_attributes(
+            self.flight,
+            [
+                FlightSimulation,
+                RocketSimulation,
+                MotorSimulation,
+                EnvironmentSimulation,
+            ],
         )
-        flight_simulation = FlightSimulation(**attributes)
+        flight_simulation = FlightSimulation(**encoded_attributes)
         return flight_simulation
 
     def get_flight_binary(self) -> bytes:

src/services/motor.py

@@ -17,7 +17,7 @@
 from src.models.sub.tanks import TankKinds
 from src.models.motor import MotorKinds, MotorModel
 from src.views.motor import MotorSimulation
-from src.utils import rocketpy_encoder, DiscretizeConfig
+from src.utils import collect_attributes
 
 
 class MotorService:
@@ -140,8 +140,11 @@ def get_motor_simulation(self) -> MotorSimulation:
         Returns:
             MotorSimulation
         """
-        attributes = rocketpy_encoder(self.motor, DiscretizeConfig.for_motor())
-        motor_simulation = MotorSimulation(**attributes)
+        encoded_attributes = collect_attributes(
+            self.motor,
+            [MotorSimulation],
+        )
+        motor_simulation = MotorSimulation(**encoded_attributes)
         return motor_simulation
 
     def get_motor_binary(self) -> bytes:

src/services/rocket.py

@@ -17,7 +17,8 @@
 from src.models.sub.aerosurfaces import NoseCone, Tail, Fins
 from src.services.motor import MotorService
 from src.views.rocket import RocketSimulation
-from src.utils import rocketpy_encoder, DiscretizeConfig
+from src.views.motor import MotorSimulation
+from src.utils import collect_attributes
 
 
 class RocketService:
@@ -107,10 +108,10 @@ def get_rocket_simulation(self) -> RocketSimulation:
         Returns:
             RocketSimulation
         """
-        attributes = rocketpy_encoder(
-            self.rocket, DiscretizeConfig.for_rocket()
+        encoded_attributes = collect_attributes(
+            self.rocket, [RocketSimulation, MotorSimulation]
         )
-        rocket_simulation = RocketSimulation(**attributes)
+        rocket_simulation = RocketSimulation(**encoded_attributes)
         return rocket_simulation
 
     def get_rocket_binary(self) -> bytes: