404 for api

Author: durandom

api/telemetry_loader.py

@@ -7,7 +7,7 @@
 
 from telemetry.analyzer import Analyzer
 from telemetry.influx import Influx
-from telemetry.models import Lap
+from telemetry.models import Lap, Session
 
 
 class TelemetryLoader:
@@ -72,8 +72,11 @@ def process_dataframe(self, df):
     def get_lap_df(self, lap_id, measurement="laps_cc", bucket="racing"):
         # make sure the lap_id is an integer
         lap_id = int(lap_id)
-        # fetch the lap from the database
-        lap = Lap.objects.get(id=lap_id)
+        try:
+            # fetch the lap from the database
+            lap = Lap.objects.get(id=lap_id)
+        except Lap.DoesNotExist:
+            return None
 
         influx = Influx()
 
@@ -95,6 +98,13 @@ def get_lap_df(self, lap_id, measurement="laps_cc", bucket="racing"):
     def get_session_df(self, session_id, measurement="laps_cc", bucket="racing"):
         # make sure the session_id is an integer
         session_id = int(session_id)
+
+        # First check if session exists in database
+        try:
+            Session.objects.get(id=session_id)
+        except Session.DoesNotExist:
+            return None
+
         file_path = f"{self.temp_dir}/session_{session_id}_df.csv.gz"
 
         if self.caching and os.path.exists(file_path):

api/views.py

@@ -13,15 +13,16 @@ class SessionView(View):
     def get(self, request, session_id=0, *args, **kwargs):
         df = self.telemetry_loader.get_session_df(session_id)
 
+        if df is None:
+            return JsonResponse({"error": f"Session with ID {session_id} does not exist"}, status=404)
+
         # Compression:
         # Compress the JSON response. Django can be configured to gzip responses, which can significantly reduce the response size.
         # Make sure your frontend can handle the decompression, which is typically handled automatically by modern browsers.
 
         # render the dataframe as json
         df_json = df.to_json(orient="split", date_format="iso")
-
         df_dict = json.loads(df_json)
-
         return JsonResponse(df_dict, safe=False)
 
 
@@ -32,8 +33,9 @@ class LapView(View):
     def get(self, request, lap_id=0, *args, **kwargs):
         df = self.telemetry_loader.get_lap_df(lap_id)
 
-        df_json = df.to_json(orient="split", date_format="iso")
+        if df is None:
+            return JsonResponse({"error": f"Lap with ID {lap_id} does not exist"}, status=404)
 
+        df_json = df.to_json(orient="split", date_format="iso")
         df_dict = json.loads(df_json)
-
         return JsonResponse(df_dict, safe=False)