Update app.py

app.py

@@ -26,6 +26,31 @@ app.add_middleware(
 # ==================================================
 # CONFIG
 # ==================================================
+ALL_TOURS = [
+    "Benelux",
+    "Epic Rail 1", "Epic Rail 2", "Epic Rail 3",
+    "Haida Gwaii 1", "Haida Gwaii 2", "Haida Gwaii 3",
+    "Haida Gwaii 4", "Haida Gwaii 5", "Haida Gwaii 6", "Haida Gwaii 7",
+    "Harrison",
+    "Ireland",
+    "Island Hopping", "Island Hopping 2",
+    "Kootenays",
+    "Maritimes 1", "Maritimes 2",
+    "New Zealand",
+    "Newfoundland 1", "Newfoundland 2", "Newfoundland 3", "Newfoundland 4",
+    "Okanagan",
+    "Portugal",
+    "Quebec",
+    "Quebec Holiday",
+    "Scotland",
+    "Sea to Sky",
+    "Skeena",
+    "Tofino 1", "Tofino 2",
+    "Van Isle",
+    "Yukon 1", "Yukon 2", "Yukon 3", "Yukon 4",
+    "Yukon Winter",
+]
+
 ADMIN_TOKEN = os.environ.get("ADMIN_TOKEN")
 GOOGLE_KEY  = os.environ.get("GOOGLE_KEY")
 HF_TOKEN    = os.environ.get("HF_TOKEN")
@@ -91,6 +116,41 @@ scheduler = CommitScheduler(
 # ==================================================
 # HELPERS
 # ==================================================
+import re
+
+def has_images(data: dict) -> bool:
+    imgs = data.get("images", {})
+    return bool(
+        imgs.get("banner") or
+        imgs.get("cover") or
+        imgs.get("carousel")
+    )
+
+
+def get_fallback_tours(requested: str) -> list[str]:
+    """
+    If 'Maritimes' is requested → returns ['Maritimes 1', 'Maritimes 2']
+    If 'Haida Gwaii' → ['Haida Gwaii 1' ...]
+    Otherwise empty list
+    """
+    base = requested.strip()
+
+    # If request already ends in a number, don't fallback
+    if re.search(r"\s\d+$", base):
+        return []
+
+    matches = []
+    for t in ALL_TOURS:
+        if t.startswith(base + " "):
+            matches.append(t)
+
+    # Sort numerically (1,2,3 not 1,10,2)
+    def tour_num(name):
+        m = re.search(r"(\d+)$", name)
+        return int(m.group(1)) if m else 0
+
+    return sorted(matches, key=tour_num)
+
 def empty_structure():
     return {
         "images": {
@@ -123,18 +183,35 @@ def require_admin(token: str):
 @app.get("/imageget/{tour}.json")
 async def get_images(tour: str):
     tour = normalize_tour(tour)
-    path = tour_path(tour)
 
+    # 1️⃣ Try exact match first (current behavior)
+    path = tour_path(tour)
     if path.exists():
-        return load_json(path)
+        data = load_json(path)
+        if has_images(data):
+            return data
 
     data = await fetch_from_hf(tour)
+    if data and has_images(data):
+        save_json(path, data)
+        return data
 
-    if data is None:
-        return empty_structure()
+    # 2️⃣ Fallback to numbered tours (NEW)
+    for alt in get_fallback_tours(tour):
+        alt_path = tour_path(alt)
+
+        if alt_path.exists():
+            alt_data = load_json(alt_path)
+            if has_images(alt_data):
+                return alt_data
+
+        alt_data = await fetch_from_hf(alt)
+        if alt_data and has_images(alt_data):
+            save_json(alt_path, alt_data)
+            return alt_data
 
-    save_json(path, data)
-    return data
+    # 3️⃣ Nothing found
+    return empty_structure()
 
 @app.get("/")
 async def root_status():