added branch

backend/.gitignore

@@ -1,6 +1,9 @@
 # osm-cache
 cache_XML/
 
+# secrets
+*secrets.yaml
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

backend/src/main.py

@@ -1,9 +1,10 @@
 """Main app for backend api"""
-
+import json
 import logging
 import time
 from contextlib import asynccontextmanager
 from fastapi import FastAPI, HTTPException, BackgroundTasks, Query
+from fastapi.encoders import jsonable_encoder
 
 from .logging_config import configure_logging
 from .structs.landmark import Landmark, Toilets
@@ -96,6 +97,11 @@ def new_trip(preferences: Preferences,
     if len(landmarks) == 0 :
         raise HTTPException(status_code=500, detail="No landmarks were found.")
 
+    # store landmarks in json file for debug
+    landmarks_list = [jsonable_encoder(item) for item in landmarks]        
+    with open('landmarks.json', 'w+') as file:
+        json.dump(landmarks_list, file, indent=4)
+
     # insert start and finish to the landmarks list
     landmarks_short.insert(0, start_landmark)
     landmarks_short.append(end_landmark)

backend/src/structs/landmark.py

@@ -1,6 +1,6 @@
 """Definition of the Landmark class to handle visitable objects across the world."""
 
-from typing import Optional, Literal
+from typing import Optional, Literal, List
 from uuid import uuid4, UUID
 from pydantic import BaseModel, ConfigDict, Field
 
@@ -50,7 +50,7 @@ class Landmark(BaseModel) :
     image_url : Optional[str] = None
     website_url : Optional[str] = None
     wiki_url : Optional[str] = None
-    description : Optional[str] = None                          # TODO future
+    description : Optional[str] = None
     duration : Optional[int] = 5
     name_en : Optional[str] = None
 
@@ -69,6 +69,12 @@ class Landmark(BaseModel) :
     is_viewpoint : Optional[bool] = False
     is_place_of_worship : Optional[bool] = False
 
+
+    class Config:
+        json_encoders = {
+            UUID: lambda v: str(v)  # Ensure UUID is serialized as a string
+        }
+
     def __str__(self) -> str:
         """
         String representation of the Landmark object.

backend/src/tests/test_main.py

@@ -11,7 +11,7 @@ def client():
     """Client used to call the app."""
     return TestClient(app)
 
-
+'''
 def test_turckheim(client, request):    # pylint: disable=redefined-outer-name
     """
     Test n°1 : Custom test in Turckheim to ensure small villages are also supported.
@@ -46,8 +46,6 @@ def test_turckheim(client, request):    # pylint: disable=redefined-outer-name
     # Add details to report
     log_trip_details(request, landmarks, result['total_time'], duration_minutes)
 
-    # for elem in landmarks :
-    #     print(elem)
 
     # checks :
     assert response.status_code == 200  # check for successful planning
@@ -221,7 +219,7 @@ def test_zurich(client, request) :   # pylint: disable=redefined-outer-name
     assert duration_minutes*0.8 < result['total_time'], f"Trip too short: {result['total_time']} instead of {duration_minutes}"
     assert duration_minutes*1.2 > result['total_time'], f"Trip too long: {result['total_time']} instead of {duration_minutes}"
 
-
+'''
 def test_paris(client, request) :   # pylint: disable=redefined-outer-name
     """
     Test n°6 : Custom test in Paris (les Halles) centre to ensure proper decision making in crowded area.
@@ -261,7 +259,7 @@ def test_paris(client, request) :   # pylint: disable=redefined-outer-name
     assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
     assert duration_minutes*0.8 < result['total_time'], f"Trip too short: {result['total_time']} instead of {duration_minutes}"
     assert duration_minutes*1.2 > result['total_time'], f"Trip too long: {result['total_time']} instead of {duration_minutes}"
-
+'''
 
 def test_new_york(client, request) :   # pylint: disable=redefined-outer-name
     """
@@ -342,4 +340,6 @@ def test_shopping(client, request) :   # pylint: disable=redefined-outer-name
     assert response.status_code == 200  # check for successful planning
     assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
     assert duration_minutes*0.8 < result['total_time'], f"Trip too short: {result['total_time']} instead of {duration_minutes}"
-    assert duration_minutes*1.2 > result['total_time'], f"Trip too long: {result['total_time']} instead of {duration_minutes}"
+    assert duration_minutes*1.2 > result['total_time'], f"Trip too long: {result['total_time']} instead of {duration_minutes}"
+    
+    '''