persistence for recurring api calls

backend/src/main.py

@@ -1,12 +1,14 @@
 import logging
-from fastapi import FastAPI, Query, Body
+from fastapi import FastAPI, Query, Body, HTTPException
 
 from structs.landmark import Landmark
 from structs.preferences import Preferences
 from structs.linked_landmarks import LinkedLandmarks
+from structs.trip import Trip
 from utils.landmarks_manager import LandmarkManager
 from utils.optimizer import Optimizer
 from utils.refiner import Refiner
+from persistence import client as cache_client
 
 
 logger = logging.getLogger(__name__)
@@ -17,8 +19,8 @@ optimizer = Optimizer()
 refiner = Refiner(optimizer=optimizer)
 
 
-@app.post("/route/new")
-def get_route(preferences: Preferences, start: tuple[float, float], end: tuple[float, float] | None = None) -> str:
+@app.post("/trip/new")
+def new_trip(preferences: Preferences, start: tuple[float, float], end: tuple[float, float] | None = None) -> Trip:
     '''
     Main function to call the optimizer.
     :param preferences: the preferences specified by the user as the post body
@@ -47,22 +49,32 @@ def get_route(preferences: Preferences, start: tuple[float, float], end: tuple[f
     landmarks_short.insert(0, start_landmark)
     landmarks_short.append(end_landmark)
     
-    # TODO infer these parameters from the preferences
-    max_walking_time = 4    # hours
-    detour = 30             # minutes
-
     # First stage optimization
-    base_tour = optimizer.solve_optimization(max_walking_time*60, landmarks_short)
+    base_tour = optimizer.solve_optimization(preferences.max_time_minute, landmarks_short)
     
     # Second stage optimization
-    refined_tour = refiner.refine_optimization(landmarks, base_tour, max_walking_time*60, detour)
+    refined_tour = refiner.refine_optimization(landmarks, base_tour, preferences.max_time_minute, preferences.detour_tolerance_minute)
 
     linked_tour = LinkedLandmarks(refined_tour)
-    return linked_tour[0].uuid
+    # upon creation of the trip, persistence of both the trip and its landmarks is ensured. Ca
+    trip = Trip.from_linked_landmarks(linked_tour, cache_client)
+    return trip
 
 
+#### For already existing trips/landmarks
+@app.get("/trip/{trip_uuid}")
+def get_trip(trip_uuid: str) -> Trip:
+    try:
+        trip = cache_client.get(f"trip_{trip_uuid}")
+        return trip
+    except KeyError:
+        raise HTTPException(status_code=404, detail="Trip not found")
+
 
 @app.get("/landmark/{landmark_uuid}")
 def get_landmark(landmark_uuid: str) -> Landmark:
-    #cherche dans linked_tour et retourne le landmark correspondant
-    pass
+    try:
+        landmark = cache_client.get(f"landmark_{landmark_uuid}")
+        return landmark
+    except KeyError:
+        raise HTTPException(status_code=404, detail="Landmark not found")