Merge pull request #57 from AyushDharDubey/fix/issue_54-add-error-handling-for-model-file-retrieval

Add error handling for model file retrieval

Author: lonvia

mainapp/api.py

@@ -1,9 +1,10 @@
 import math
 import json
+import os
 
 from django.conf import settings
 from django.shortcuts import get_object_or_404
-from django.http import JsonResponse, FileResponse, Http404, HttpResponseBadRequest
+from django.http import JsonResponse, FileResponse, Http404, HttpResponseBadRequest, HttpResponseServerError
 from django.core.paginator import Paginator, EmptyPage
 from .models import Model
 from .utils import get_kv, admin
@@ -80,8 +81,12 @@ def get_model(request, model_id, revision=None):
     if model.is_hidden and not admin(request):
         raise Http404('Model does not exist.')
 
+    model_path = '{}/{}/{}.glb'.format(settings.MODEL_DIR, model_id, revision)
 
-    response = FileResponse(open('{}/{}/{}.glb'.format(settings.MODEL_DIR, model_id, revision), 'rb'))
+    if not os.path.isfile(model_path):
+        return HttpResponseServerError('Model file not found on the server')
+    
+    response = FileResponse(open(model_path, 'rb'))
     response['Content-Disposition'] = 'attachment; filename={}_{}.glb'.format(model_id, revision)
     response['Content-Type'] = 'model/gltf-binary'
     response['Cache-Control'] = 'public, max-age=86400'

mainapp/management/commands/nightly.py

@@ -1,10 +1,15 @@
+import os
+import logging
+
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.utils.dateformat import format
 from mainapp.models import Model
 from json import dumps
 from zipfile import ZipFile
 
+logger = logging.getLogger(__name__)
+
 class Command(BaseCommand):
     help = 'Updates the nightly dump'
 
@@ -54,8 +59,14 @@ def handle(self, *args, **options):
                 ]
             })
 
+            model_path = '{}/{}/{}.glb'.format(settings.MODEL_DIR, model_id, model.revision)
+
+            if not os.path.isfile(model_path):
+                logging.error(f"model_id: {model_id}, {model.title}'s model file not found at: {model_path}.")
+                continue
+
             info_file.write('"{}": {}\n'.format(model_id, output))
-            zip_file.write('{}/{}/{}.glb'.format(settings.MODEL_DIR, model_id, model.revision), 'models/{}.glb'.format(model_id))
+            zip_file.write(model_path, 'models/{}.glb'.format(model_id))
 
         info_file.write('}')
         info_file.close()