Implements rocket route tests

.github/workflows/pylint.yml

@@ -21,4 +21,4 @@ jobs:
         pip install -r requirements.txt
     - name: Analysing the code with pylint
       run: |
-        pylint -d C0200,C0301,C0114,R0903,C0115,W0246,R0914,C0209,E1121,C0103,C2801,R0801,E1101,E0401,E0611,R0911,C0116,W0212,W0719,W0601,W1203,W0123,W0511,W0621 $(git ls-files '*.py')
+        pylint -d C0200,C0301,C0114,R0903,C0115,W0246,R0914,C0209,E1121,C0103,C2801,R0801,E1101,E0401,E0611,R0911,C0116,W0212,W0719,W0601,W1203,W0123,W0511,W0621,R0913,R0917 $(git ls-files '*.py')

Makefile

@@ -1,4 +1,5 @@
-format: black flake8 pylint ruff
+format: black ruff
+lint: flake8 pylint
 
 black:
 	black ./lib || true
@@ -10,7 +11,7 @@ flake8:
 
 pylint:
 	pylint ./lib || true
-	pylint --disable=E0401,W0621 ./tests || true
+	pylint ./tests || true
 
 ruff:
 	ruff check --fix ./lib || true

README.md

@@ -174,7 +174,7 @@ sequenceDiagram
     Rocketpy lib -->> API:  Simulation Results
     API -->> User: Simulation Results
 
-    User ->> API: POST /rocketpy/model/:id
+    User ->> API: POST /model/:id/rocketpy
     API -->> MongoDB: Retrieve Rocketpy Model
     MongoDB -->> API: Rocketpy Model
     API ->> Rocketpy lib: Rocketpy Model

lib/controllers/flight.py

@@ -183,7 +183,7 @@ async def get_rocketpy_flight_binary(
 
     @classmethod
     async def update_flight_by_id(
-        cls, flight: Flight, flight_id: str
+        cls, flight_id: str, flight: Flight
     ) -> Union[FlightUpdated, HTTPException]:
         """
         Update a models.Flight in the database.

lib/controllers/rocket.py

@@ -170,7 +170,7 @@ async def get_rocketpy_rocket_binary(
 
     @classmethod
     async def update_rocket_by_id(
-        cls, rocket: Rocket, rocket_id: str
+        cls, rocket_id: str, rocket: Rocket
     ) -> Union[RocketUpdated, HTTPException]:
         """
         Update a models.Rocket in the database.

lib/models/aerosurfaces.py

@@ -1,6 +1,15 @@
 from enum import Enum
-from typing import Optional, Tuple, List
-from pydantic import BaseModel
+from typing import Optional, Tuple, List, Union
+from pydantic import BaseModel, Field
+
+
+class Parachute(BaseModel):
+    name: str
+    cd_s: float = Field(..., ge=0, description="Must be non-negative")
+    sampling_rate: float = Field(..., gt=0, description="Must be positive")
+    lag: float = Field(..., ge=0, description="Must be non-negative")
+    trigger: Union[str, float]
+    noise: Tuple[float, float, float]
 
 
 class RailButtons(BaseModel):

lib/models/rocket.py

@@ -7,6 +7,7 @@
     NoseCone,
     Tail,
     RailButtons,
+    Parachute,
 )
 
 
@@ -15,15 +16,6 @@ class CoordinateSystemOrientation(str, Enum):
     NOSE_TO_TAIL: str = "NOSE_TO_TAIL"
 
 
-class Parachute(BaseModel):
-    name: str
-    cd_s: float
-    sampling_rate: int
-    lag: float
-    trigger: Union[str, float]
-    noise: Tuple[float, float, float]
-
-
 class Rocket(BaseModel):
     # Required parameters
     motor: Motor

lib/routes/flight.py

@@ -59,7 +59,7 @@ async def read_flight(flight_id: str) -> FlightView:
 
 
 @router.get(
-    "/rocketpy/{flight_id}",
+    "/{flight_id}/rocketpy",
     responses={
         203: {
             "description": "Binary file download",
@@ -146,7 +146,7 @@ async def update_flight(
     """
     with tracer.start_as_current_span("update_flight"):
         flight.rocket.motor.set_motor_kind(motor_kind)
-        return await FlightController.update_flight_by_id(flight, flight_id)
+        return await FlightController.update_flight_by_id(flight_id, flight)
 
 
 @router.get("/{flight_id}/summary")

lib/routes/rocket.py

@@ -73,11 +73,11 @@ async def update_rocket(
     """
     with tracer.start_as_current_span("update_rocket"):
         rocket.motor.set_motor_kind(motor_kind)
-        return await RocketController.update_rocket_by_id(rocket, rocket_id)
+        return await RocketController.update_rocket_by_id(rocket_id, rocket)
 
 
 @router.get(
-    "/rocketpy/{rocket_id}",
+    "/{rocket_id}/rocketpy",
     responses={
         203: {
             "description": "Binary file download",

pyproject.toml

@@ -43,6 +43,11 @@ disable = """
     broad-exception-caught,
     raise-missing-from,
     too-many-instance-attributes,
+    redefined-outer-name,
+    import-error,
+    too-many-arguments,
+    redefined-outer-name,
+    too-many-positional-arguments,
 """
 
 [tool.ruff]