extends parachute input types

Author: GabrielBarberini

lib/models/rocket.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Optional, Tuple, List
+from typing import Optional, Tuple, List, Union
 from pydantic import BaseModel
 from lib.models.motor import Motor
 from lib.models.aerosurfaces import (
@@ -21,7 +21,7 @@ class Parachute(BaseModel):
     cd_s: float = 10
     sampling_rate: int = 105
     lag: float = 1.5
-    trigger: str = "lambda p, h, y: y[5] < 0 and h < 800"
+    trigger: Union[str, float] = "lambda p, h, y: y[5] < 0 and h < 800"
     noise: Tuple[float, float, float] = (0, 8.3, 0.5)
 
 

lib/services/rocket.py

@@ -21,6 +21,10 @@
 from lib.views.rocket import RocketSummary
 
 
+class InvalidParachuteTrigger(Exception):
+    """Exception raised for invalid parachute trigger expressions."""
+
+
 class RocketService:
     _rocket: RocketPyRocket
 
@@ -85,7 +89,9 @@ def from_rocket_model(cls, rocket: Rocket) -> Self:
                 trigger_expression := parachute.trigger
             ):
                 parachute.trigger = eval(  # pylint: disable=eval-used
-                    trigger_expression, {"__builtins__": None}, {}
+                    trigger_expression,
+                    {"__builtins__": None},
+                    {"apogee": "apogee"},
                 )
                 rocketpy_parachute = cls.get_rocketpy_parachute(parachute)
                 rocketpy_rocket.parachutes.append(rocketpy_parachute)
@@ -217,7 +223,7 @@ def get_rocketpy_parachute(parachute: Parachute) -> RocketPyParachute:
         return rocketpy_parachute
 
     @staticmethod
-    def check_parachute_trigger(expression: str) -> bool:
+    def check_parachute_trigger(expression) -> bool:
         """
         Check if the trigger expression is valid.
 
@@ -228,9 +234,6 @@ def check_parachute_trigger(expression: str) -> bool:
             bool: True if the expression is valid, False otherwise.
         """
 
-        class InvalidParachuteTrigger(Exception):
-            pass
-
         # Parsing the expression into an AST
         try:
             parsed_expression = ast.parse(expression, mode="eval")