perf: servir fotos do disco local

app.py

@@ -18,7 +18,7 @@ from fastapi import Query
 from fastapi.staticfiles import StaticFiles
 
 from core.ai import AnimalAI
-from core.database import Database, DATA_DIR, PHOTOS_DIR
+from core.database import Database, DATA_DIR, PHOTOS_DIR, PHOTOS_CACHE
 from core.matcher import AnimalMatcher
 from core.seed import seed_if_empty
 from core.tracer import log_trace
@@ -53,8 +53,10 @@ _story_cache: dict[tuple[int, int], str] = {}
 app = Server()
 
 # Serve photos as static files at /photos/...
-PHOTOS_DIR.mkdir(parents=True, exist_ok=True)
-app.mount("/photos", StaticFiles(directory=str(PHOTOS_DIR)), name="photos")
+# Servimos do cache local rapido (PHOTOS_CACHE), nao do bucket FUSE (lento).
+# O bucket (PHOTOS_DIR) continua sendo a fonte de verdade para persistencia.
+PHOTOS_CACHE.mkdir(parents=True, exist_ok=True)
+app.mount("/photos", StaticFiles(directory=str(PHOTOS_CACHE)), name="photos")
 
 # Serve frontend assets (CSS, JS, images) at /static/...
 STATIC_DIR = Path(__file__).parent / "static"

core/database.py

@@ -3,7 +3,9 @@ database.py — SQLite CRUD para animais e avistamentos.
 Usa /data/ em producao (HF Storage Bucket) ou ./data/ localmente.
 """
 import json
+import logging
 import os
+import shutil
 import sqlite3
 import uuid
 from pathlib import Path
@@ -12,20 +14,52 @@ from typing import Optional
 import numpy as np
 from PIL import Image
 
+log = logging.getLogger(__name__)
+
 # ─── Paths ───────────────────────────────────────────────────────────────────
+# PHOTOS_DIR = fonte de verdade (bucket Xet montado em /data; lento por ser
+#   object storage sob demanda via FUSE).
+# PHOTOS_CACHE = disco local efemero do Space (rapido). Servimos as imagens daqui;
+#   o bucket continua sendo onde gravamos para persistir entre restarts.
 _hf_data = Path("/data")
-DATA_DIR   = _hf_data if (_hf_data.exists() and os.access(_hf_data, os.W_OK)) else Path("./data")
-DB_PATH    = DATA_DIR / "viralata.db"
-PHOTOS_DIR = DATA_DIR / "photos"
-SCHEMA     = Path(__file__).parent.parent / "db" / "schema.sql"
+DATA_DIR     = _hf_data if (_hf_data.exists() and os.access(_hf_data, os.W_OK)) else Path("./data")
+DB_PATH      = DATA_DIR / "viralata.db"
+PHOTOS_DIR   = DATA_DIR / "photos"
+PHOTOS_CACHE = Path(os.environ.get("PHOTOS_CACHE_DIR", "/tmp/pawmap_photos"))
+SCHEMA       = Path(__file__).parent.parent / "db" / "schema.sql"
 
 
 class Database:
     def __init__(self):
         DATA_DIR.mkdir(parents=True, exist_ok=True)
         PHOTOS_DIR.mkdir(parents=True, exist_ok=True)
+        PHOTOS_CACHE.mkdir(parents=True, exist_ok=True)
+        self._warm_photo_cache()
         self._init_db()
 
+    # ─── Photo cache ───────────────────────────────────────────────────────────
+
+    def _warm_photo_cache(self):
+        """Copia as fotos do bucket (PHOTOS_DIR) para o disco local (PHOTOS_CACHE)
+        no boot, para que o serving nao dependa do mount FUSE lento."""
+        if PHOTOS_DIR.resolve() == PHOTOS_CACHE.resolve():
+            return
+        copied = 0
+        try:
+            for src in PHOTOS_DIR.rglob("*"):
+                if not src.is_file():
+                    continue
+                dst = PHOTOS_CACHE / src.relative_to(PHOTOS_DIR)
+                if dst.exists() and dst.stat().st_size == src.stat().st_size:
+                    continue
+                dst.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(src, dst)
+                copied += 1
+        except Exception as e:
+            log.warning("Falha ao aquecer cache de fotos: %s", e)
+        if copied:
+            log.info("Cache de fotos aquecido: %d arquivos copiados do bucket.", copied)
+
     # ─── Internal ────────────────────────────────────────────────────────────
 
     def _conn(self) -> sqlite3.Connection:
@@ -86,7 +120,15 @@ class Database:
             subdir = PHOTOS_DIR / datetime.now().strftime("%Y-%m-%d")
         subdir.mkdir(parents=True, exist_ok=True)
         path = subdir / filename
-        image.save(str(path), format="JPEG", quality=85)
+        image.save(str(path), format="JPEG", quality=85)  # persiste no bucket
+        # Write-through: copia tambem pro cache local rapido (servido em /photos)
+        try:
+            rel_photo = path.relative_to(PHOTOS_DIR)
+            cache_path = PHOTOS_CACHE / rel_photo
+            cache_path.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copy2(path, cache_path)
+        except Exception as e:
+            log.warning("Falha ao copiar foto pro cache: %s", e)
         rel = path.relative_to(DATA_DIR)
         return str(rel).replace("\\", "/")
 

core/seed.py

@@ -144,15 +144,17 @@ def _random_embedding():
 
 def _copy_seed_photos():
     """Copia fotos de static/seed-photos/ (no repo) para DATA_DIR/photos/seed/ (runtime)."""
-    from core.database import DATA_DIR, PHOTOS_DIR
+    from core.database import PHOTOS_DIR, PHOTOS_CACHE
     src_dir = Path(__file__).parent.parent / "static" / "seed-photos"
-    dst_dir = PHOTOS_DIR / "seed"
-    dst_dir.mkdir(parents=True, exist_ok=True)
-    for src in src_dir.iterdir():
-        dst = dst_dir / src.name
-        if not dst.exists():
-            shutil.copy2(src, dst)
-            log.info("Foto copiada: %s", src.name)
+    # Copia para o bucket (persistencia) e para o cache local (serving rapido).
+    for base in (PHOTOS_DIR, PHOTOS_CACHE):
+        dst_dir = base / "seed"
+        dst_dir.mkdir(parents=True, exist_ok=True)
+        for src in src_dir.iterdir():
+            dst = dst_dir / src.name
+            if not dst.exists():
+                shutil.copy2(src, dst)
+                log.info("Foto copiada para %s: %s", base, src.name)
 
 
 def seed_if_empty(db):