MNT: adapt discretization schema to RocketPy encoder.

Author: phmbressan

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 rocketpy_encoder
 
 
 class EnvironmentService:
@@ -50,9 +50,7 @@ def get_environment_simulation(self) -> EnvironmentSimulation:
             EnvironmentSimulation
         """
 
-        attributes = rocketpy_encoder(
-            self.environment, DiscretizeConfig.for_environment()
-        )
+        attributes = rocketpy_encoder(self.environment)
         env_simulation = EnvironmentSimulation(**attributes)
         return env_simulation
 

src/services/flight.py

@@ -8,7 +8,7 @@
 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.utils import rocketpy_encoder
 
 
 class FlightService:
@@ -55,9 +55,7 @@ def get_flight_simulation(self) -> FlightSimulation:
         Returns:
             FlightSimulation
         """
-        attributes = rocketpy_encoder(
-            self.flight, DiscretizeConfig.for_flight()
-        )
+        attributes = rocketpy_encoder(self.flight)
         flight_simulation = FlightSimulation(**attributes)
         return flight_simulation
 

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 rocketpy_encoder
 
 
 class MotorService:
@@ -140,7 +140,7 @@ def get_motor_simulation(self) -> MotorSimulation:
         Returns:
             MotorSimulation
         """
-        attributes = rocketpy_encoder(self.motor, DiscretizeConfig.for_motor())
+        attributes = rocketpy_encoder(self.motor)
         motor_simulation = MotorSimulation(**attributes)
         return motor_simulation
 

src/services/rocket.py

@@ -17,7 +17,7 @@
 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.utils import rocketpy_encoder
 
 
 class RocketService:
@@ -107,9 +107,7 @@ def get_rocket_simulation(self) -> RocketSimulation:
         Returns:
             RocketSimulation
         """
-        attributes = rocketpy_encoder(
-            self.rocket, DiscretizeConfig.for_rocket()
-        )
+        attributes = rocketpy_encoder(self.rocket)
         rocket_simulation = RocketSimulation(**attributes)
         return rocket_simulation
 

src/utils.py

@@ -2,112 +2,39 @@
 import io
 import logging
 import json
-import copy
 
-from typing import NoReturn, Tuple
+from typing import NoReturn
 
-from rocketpy import Function
 from rocketpy._encoders import RocketPyEncoder
 from starlette.datastructures import Headers, MutableHeaders
 from starlette.types import ASGIApp, Message, Receive, Scope, Send
 
 logger = logging.getLogger(__name__)
 
 
-class DiscretizeConfig:
-    """
-    Configuration class for RocketPy function discretization.
-
-    This class allows easy configuration of discretization parameters
-    for different types of RocketPy objects and their callable attributes.
-    """
-
-    def __init__(
-        self, bounds: Tuple[float, float] = (0, 10), samples: int = 200
-    ):
-        self.bounds = bounds
-        self.samples = samples
-
-    @classmethod
-    def for_environment(cls) -> 'DiscretizeConfig':
-        return cls(bounds=(0, 50000), samples=100)
-
-    @classmethod
-    def for_motor(cls) -> 'DiscretizeConfig':
-        return cls(bounds=(0, 10), samples=150)
-
-    @classmethod
-    def for_rocket(cls) -> 'DiscretizeConfig':
-        return cls(bounds=(0, 1), samples=100)
-
-    @classmethod
-    def for_flight(cls) -> 'DiscretizeConfig':
-        return cls(bounds=(0, 30), samples=200)
-
-
-def rocketpy_encoder(obj, config: DiscretizeConfig = DiscretizeConfig()):
+def rocketpy_encoder(obj):
     """
     Encode a RocketPy object using official RocketPy encoders.
 
-    This function creates a copy of the object, discretizes callable Function
-    attributes on the copy, and then uses RocketPy's official RocketPyEncoder for
-    complete object serialization. The original object remains unchanged.
+    This function uses RocketPy's official RocketPyEncoder for complete
+    object serialization.
 
     Args:
         obj: RocketPy object (Environment, Motor, Rocket, Flight)
-        config: DiscretizeConfig object with discretization parameters (optional)
 
     Returns:
         Dictionary of encoded attributes
     """
 
-    # Create a copy to avoid mutating the original object
-    obj_copy = copy.deepcopy(obj)
-
-    for attr_name in dir(obj_copy):
-        if attr_name.startswith('_'):
-            continue
-
-        try:
-            attr_value = getattr(obj_copy, attr_name)
-        except Exception:
-            continue
-
-        if callable(attr_value) and isinstance(attr_value, Function):
-            try:
-                discretized_func = Function(attr_value.source)
-                discretized_func.set_discrete(
-                    lower=config.bounds[0],
-                    upper=config.bounds[1],
-                    samples=config.samples,
-                    mutate_self=True,
-                )
-
-                setattr(obj_copy, attr_name, discretized_func)
-
-            except Exception as e:
-                logger.warning(f"Failed to discretize {attr_name}: {e}")
-
-    try:
-        json_str = json.dumps(
-            obj_copy,
-            cls=RocketPyEncoder,
-            include_outputs=True,
-            include_function_data=True,
-        )
-        return json.loads(json_str)
-    except Exception as e:
-        logger.warning(f"Failed to encode with RocketPyEncoder: {e}")
-        attributes = {}
-        for attr_name in dir(obj_copy):
-            if not attr_name.startswith('_'):
-                try:
-                    attr_value = getattr(obj_copy, attr_name)
-                    if not callable(attr_value):
-                        attributes[attr_name] = str(attr_value)
-                except Exception:
-                    continue
-        return attributes
+    json_str = json.dumps(
+        obj,
+        cls=RocketPyEncoder,
+        include_outputs=True,
+        include_function_data=True,
+        discretize=True,
+        pickle_callables=False,
+    )
+    return json.loads(json_str)
 
 
 class RocketPyGZipMiddleware:

src/views/environment.py

@@ -14,7 +14,7 @@ class EnvironmentSimulation(ApiBaseView):
     any new attributes that might be encoded.
     """
 
-    model_config = ConfigDict(extra='allow', arbitrary_types_allowed=True)
+    model_config = ConfigDict(extra='ignore', arbitrary_types_allowed=True)
 
     message: str = "Environment successfully simulated"
 
@@ -35,9 +35,9 @@ class EnvironmentSimulation(ApiBaseView):
     initial_hemisphere: Optional[str] = None
     initial_ew: Optional[str] = None
     max_expected_height: Optional[int] = None
-    date: Optional[datetime] = datetime.today() + timedelta(days=1)
-    local_date: Optional[datetime] = datetime.today() + timedelta(days=1)
-    datetime_date: Optional[datetime] = datetime.today() + timedelta(days=1)
+    date: Optional[Any] = datetime.today() + timedelta(days=1)
+    local_date: Optional[Any] = datetime.today() + timedelta(days=1)
+    datetime_date: Optional[Any] = datetime.today() + timedelta(days=1)
 
     # Function attributes (discretized by rocketpy_encoder, serialized by RocketPyEncoder)
     ellipsoid: Optional[Any] = None

src/views/flight.py

@@ -6,7 +6,7 @@
 from src.views.environment import EnvironmentSimulation
 
 
-class FlightSimulation(RocketSimulation, EnvironmentSimulation):
+class FlightSimulation(ApiBaseView):
     """
     Flight simulation view that handles dynamically encoded RocketPy Flight attributes.
 
@@ -16,7 +16,7 @@ class FlightSimulation(RocketSimulation, EnvironmentSimulation):
     any new attributes that might be encoded.
     """
 
-    model_config = ConfigDict(extra='allow', arbitrary_types_allowed=True)
+    model_config = ConfigDict(extra='ignore', arbitrary_types_allowed=True)
 
     message: str = "Flight successfully simulated"
 

src/views/motor.py

@@ -13,7 +13,7 @@ class MotorSimulation(ApiBaseView):
     any new attributes that might be encoded.
     """
 
-    model_config = ConfigDict(extra='allow', arbitrary_types_allowed=True)
+    model_config = ConfigDict(extra='ignore', arbitrary_types_allowed=True)
 
     message: str = "Motor successfully simulated"
 

src/views/rocket.py

@@ -1,11 +1,11 @@
-from typing import Optional, Any
+from typing import Optional, Any, List, Tuple
 from pydantic import ConfigDict
 from src.models.rocket import RocketModel
 from src.views.interface import ApiBaseView
 from src.views.motor import MotorView, MotorSimulation
 
 
-class RocketSimulation(MotorSimulation):
+class RocketSimulation(ApiBaseView):
     """
     Rocket simulation view that handles dynamically encoded RocketPy Rocket attributes.
 
@@ -15,16 +15,16 @@ class RocketSimulation(MotorSimulation):
     attributes that might be encoded.
     """
 
-    model_config = ConfigDict(extra='allow', arbitrary_types_allowed=True)
+    model_config = ConfigDict(extra='ignore', arbitrary_types_allowed=True)
 
     message: str = "Rocket successfully simulated"
 
     # Core Rocket attributes (always present)
     radius: Optional[float] = None
     mass: Optional[float] = None
     inertia: Optional[tuple] = None
-    power_off_drag: Optional[float] = None
-    power_on_drag: Optional[float] = None
+    power_off_drag: Optional[List[Tuple[float, float]]] = None
+    power_on_drag: Optional[List[Tuple[float, float]]] = None
     center_of_mass_without_motor: Optional[float] = None
     coordinate_system_orientation: Optional[str] = None
     parachutes: Optional[list] = None