cleanup in view of docker builds

backend/src/constants.py

@@ -1,6 +1,6 @@
+import logging.config
 from pathlib import Path
 import os
-import logging
 
 PARAMETERS_DIR = Path('src/parameters')
 AMENITY_SELECTORS_PATH = PARAMETERS_DIR / 'amenity_selectors.yaml'
@@ -12,8 +12,15 @@ OPTIMIZER_PARAMETERS_PATH = PARAMETERS_DIR / 'optimizer_parameters.yaml'
 cache_dir_string = os.getenv('OSM_CACHE_DIR', './cache')
 OSM_CACHE_DIR = Path(cache_dir_string)
 
-logger = logging.getLogger(__name__)
-logging.basicConfig(
-    level = logging.INFO,
-    format = '%(asctime)s - %(name)s\t- %(levelname)s\t- %(message)s'
-)
+
+import logging
+import yaml
+
+LOGGING_CONFIG = Path('log_config.yaml')
+config = yaml.safe_load(LOGGING_CONFIG.read_text())
+
+logging.config.dictConfig(config)
+
+# if we are in a debug session, set the log level to debug
+if os.getenv('DEBUG', False):
+    logging.getLogger().setLevel(logging.DEBUG)

backend/src/main.py

@@ -18,7 +18,7 @@ refiner = Refiner(optimizer=optimizer)
 
 
 @app.post("/route/new")
-def main1(preferences: Preferences, start: tuple[float, float], end: tuple[float, float] = None) -> str:
+def get_route(preferences: Preferences, start: tuple[float, float], end: tuple[float, float] | None = None) -> str:
     '''
     Main function to call the optimizer.
     :param preferences: the preferences specified by the user as the post body
@@ -35,7 +35,7 @@ def main1(preferences: Preferences, start: tuple[float, float], end: tuple[float
         logger.info("No end coordinates provided. Using start=end.")
 
     start_landmark = Landmark(name='start', type='start', location=(start[0], start[1]), osm_type='start', osm_id=0, attractiveness=0, must_do=True, n_tags = 0)
-    end_landmark = Landmark(name='end', type='end', location=(end[0], end[1]), osm_type='end', osm_id=0, attractiveness=0, must_do=True, n_tags = 0)
+    end_landmark = Landmark(name='end', type='finish', location=(end[0], end[1]), osm_type='end', osm_id=0, attractiveness=0, must_do=True, n_tags = 0)
 
     # Generate the landmarks from the start location
     landmarks, landmarks_short = manager.generate_landmarks_list(

backend/src/structs/linked_landmarks.py

@@ -1,5 +1,4 @@
 import uuid
-
 from .landmark import Landmark
 from utils.get_time_separation import get_time
 
@@ -45,4 +44,18 @@ class LinkedLandmarks:
     
 
     def __str__(self) -> str:
-        return f"LinkedLandmarks, total time: {self.total_time} minutes, {len(self._landmarks)} stops: [\n\t{'\n\t'.join([str(landmark) for landmark in self._landmarks])}\n]"
+        return f"LinkedLandmarks, total time: {self.total_time} minutes, {len(self._landmarks)} stops: [{','.join([str(landmark) for landmark in self._landmarks])}]"
+    
+
+    def asdict(self) -> dict:
+        """
+        Convert the linked landmarks to a json serializable dictionary.
+        
+        Returns:
+            dict: A dictionary representation of the linked landmarks.
+        """
+        return {
+            'uuid': self.uuid,
+            'total_time': self.total_time,
+            'landmarks': [landmark.dict() for landmark in self._landmarks]
+        }

backend/src/tester.py

@@ -1,6 +1,5 @@
-import pandas as pd
 import logging
-from fastapi.encoders import jsonable_encoder
+import yaml
 
 from utils.landmarks_manager import LandmarkManager
 from utils.optimizer import Optimizer
@@ -12,17 +11,6 @@ from structs.preferences import Preferences, Preference
 
 logger = logging.getLogger(__name__)
 
-# Helper function to create a .txt file with results
-def write_data(L: list[Landmark], file_name: str): 
-
-    data = pd.DataFrame()
-    i = 0
-
-    for landmark in L :
-        data[i] = jsonable_encoder(landmark)
-        i += 1
-
-    data.to_json(file_name, indent = 2, force_ascii=False)
 
 
 def test(start_coords: tuple[float, float], finish_coords: tuple[float, float] = None) -> list[Landmark]:
@@ -83,6 +71,9 @@ def test(start_coords: tuple[float, float], finish_coords: tuple[float, float] =
     linked_tour = LinkedLandmarks(refined_tour)
     logger.info(f"Optimized route: {linked_tour}")
 
+    # with open('linked_tour.yaml', 'w') as f:
+    #     yaml.dump(linked_tour.asdict(), f)
+
     return linked_tour