Update app.py

app.py

@@ -2,9 +2,13 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 import requests
 import json
+import logging
 
 app = FastAPI()
 
+# Set up basic logging
+logging.basicConfig(level=logging.INFO)
+
 # Allow all CORS so browser apps can call this API
 app.add_middleware(
     CORSMiddleware,
@@ -65,7 +69,7 @@ def get_asset_urls(base_url: str, guids: list):
     response = requests.post(url, headers=headers, data=data)
     return response.json().get("items", {})
 
-# Main endpoint to extract videos with enhanced checks
+# Main endpoint to extract videos with extensive fallback checks
 @app.get("/album/{token}")
 def get_album(token: str):
     try:
@@ -80,40 +84,64 @@ def get_album(token: str):
         for photo in metadata:
             best_video = None
             best_size = 0
-            # First, check the derivatives field
-            for derivative in photo.get("derivatives", {}).values():
-                if (
-                    derivative.get("mediaAssetType") == "video" or
+
+            # Check derivatives first
+            derivatives = photo.get("derivatives", {})
+            for key, derivative in derivatives.items():
+                # Log the derivative keys for debugging
+                logging.info(f"Photo {photo.get('photoGuid')} derivative key: {key} | content: {list(derivative.keys())}")
+
+                # Standard checks
+                if (derivative.get("mediaAssetType") == "video" or
                     derivative.get("type", "").startswith("video") or
-                    derivative.get("filename", "").endswith(".mp4")
-                ):
+                    derivative.get("filename", "").lower().endswith(".mp4")):
                     try:
                         file_size = int(derivative.get("fileSize", 0))
-                    except ValueError:
+                    except (ValueError, TypeError):
                         file_size = 0
                     if file_size > best_size:
                         best_size = file_size
                         best_video = derivative
-            # If no derivative qualifies, check a potential 'movies' field
+                else:
+                    # Fallback: Check if any value in the derivative JSON contains "mp4"
+                    derivative_str = json.dumps(derivative).lower()
+                    if "mp4" in derivative_str:
+                        try:
+                            file_size = int(derivative.get("fileSize", 0))
+                        except (ValueError, TypeError):
+                            file_size = 0
+                        if file_size > best_size:
+                            best_size = file_size
+                            best_video = derivative
+
+            # Fallback to 'movies' field if present
             if not best_video and "movies" in photo:
                 for movie in photo["movies"]:
-                    if movie.get("filename", "").endswith(".mp4"):
+                    logging.info(f"Photo {photo.get('photoGuid')} movie entry keys: {list(movie.keys())}")
+                    if movie.get("filename", "").lower().endswith(".mp4"):
                         try:
                             file_size = int(movie.get("fileSize", 0))
-                        except ValueError:
+                        except (ValueError, TypeError):
                             file_size = 0
                         if file_size > best_size:
                             best_size = file_size
                             best_video = movie
-            # Build the video URL if found and if its checksum is in the asset_urls
-            if best_video and best_video.get("checksum") in asset_urls:
-                url_info = asset_urls[best_video["checksum"]]
-                video_url = f"https://{url_info['url_location']}{url_info['url_path']}"
-                video_list.append({
-                    "caption": photo.get("caption", ""),
-                    "url": video_url
-                })
 
+            # Build the video URL if found
+            if best_video:
+                checksum = best_video.get("checksum")
+                if checksum in asset_urls:
+                    url_info = asset_urls[checksum]
+                    video_url = f"https://{url_info['url_location']}{url_info['url_path']}"
+                    video_list.append({
+                        "caption": photo.get("caption", ""),
+                        "url": video_url
+                    })
+                else:
+                    logging.info(f"Checksum {checksum} not found in asset URLs for photo {photo.get('photoGuid')}")
+            else:
+                logging.info(f"No video derivative found for photo {photo.get('photoGuid')}")
+        
         return {"videos": video_list}
     except Exception as e:
         return {"error": str(e)}