🚀 Auto-deploy backend from GitHub (c322c5f)

rag/firebase_storage_loader.py

@@ -17,6 +17,7 @@ _FIREBASE_INITIALIZED = False
 
 def _init_firebase_storage() -> Tuple[any, any]:
     global _FIREBASE_INITIALIZED
+
     if _FIREBASE_INITIALIZED:
         try:
             from firebase_admin import storage as fb_storage
@@ -24,6 +25,7 @@ def _init_firebase_storage() -> Tuple[any, any]:
             return fb_storage, bucket
         except Exception as e:
             logger.warning("Firebase storage unavailable: %s", e)
+            _FIREBASE_INITIALIZED = False
             return None, None
 
     try:
@@ -35,8 +37,12 @@ def _init_firebase_storage() -> Tuple[any, any]:
 
     if firebase_admin._apps:
         _FIREBASE_INITIALIZED = True
-        bucket = storage.bucket()
-        return storage, bucket
+        try:
+            bucket = storage.bucket()
+            return storage, bucket
+        except Exception as e:
+            logger.warning("Firebase storage bucket unavailable: %s", e)
+            return None, None
 
     sa_json = os.getenv("FIREBASE_SERVICE_ACCOUNT_JSON")
     sa_file = os.getenv("FIREBASE_SERVICE_ACCOUNT_FILE")

scripts/download_vectorstore_from_firebase.py

@@ -1,10 +1,11 @@
 """
 Download vectorstore directory from Firebase Storage at container startup.
-Run: python -m backend.scripts.download_vectorstore_from_firebase
+Run: python /app/scripts/download_vectorstore_from_firebase.py
 """
 
 from __future__ import annotations
 
+import json
 import logging
 import os
 import sys
@@ -12,11 +13,55 @@ from pathlib import Path
 
 logger = logging.getLogger("mathpulse.download_vectorstore")
 
-sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
+REMOTE_PREFIX = "vectorstore/"
+_FIREBASE_INITIALIZED = False
 
-from backend.rag.firebase_storage_loader import _init_firebase_storage
 
-REMOTE_PREFIX = "vectorstore/"
+def _init_firebase() -> any | None:
+    global _FIREBASE_INITIALIZED
+
+    if _FIREBASE_INITIALIZED:
+        try:
+            from firebase_admin import storage as fb_storage
+            return fb_storage.bucket()
+        except Exception as e:
+            logger.warning("Firebase storage unavailable: %s", e)
+            _FIREBASE_INITIALIZED = False
+            return None
+
+    try:
+        import firebase_admin
+        from firebase_admin import credentials, storage
+    except ImportError:
+        logger.warning("firebase_admin not installed")
+        return None
+
+    if firebase_admin._apps:
+        _FIREBASE_INITIALIZED = True
+        try:
+            return storage.bucket()
+        except Exception as e:
+            logger.warning("Firebase storage bucket unavailable: %s", e)
+            return None
+
+    sa_json = os.getenv("FIREBASE_SERVICE_ACCOUNT_JSON")
+    sa_file = os.getenv("FIREBASE_SERVICE_ACCOUNT_FILE")
+    bucket_name = os.getenv("FIREBASE_STORAGE_BUCKET", "mathpulse-ai-2026.firebasestorage.app")
+
+    try:
+        if sa_json:
+            creds = credentials.Certificate(json.loads(sa_json))
+        elif sa_file and Path(sa_file).exists():
+            creds = credentials.Certificate(sa_file)
+        else:
+            creds = credentials.ApplicationDefault()
+
+        firebase_admin.initialize_app(creds, {"storageBucket": bucket_name})
+        _FIREBASE_INITIALIZED = True
+        return storage.bucket()
+    except Exception as e:
+        logger.error("Firebase init failed: %s", e)
+        return None
 
 
 def _resolve_dest_dir() -> Path:
@@ -27,8 +72,7 @@ def _resolve_dest_dir() -> Path:
 
 
 def download_vectorstore(dest_dir: Path, prefix: str = REMOTE_PREFIX):
-    """Download all files under a prefix from Firebase Storage, preserving structure."""
-    _, bucket = _init_firebase_storage()
+    bucket = _init_firebase()
     if bucket is None:
         logger.warning("Firebase Storage not available, vectorstore download skipped")
         return False
@@ -41,6 +85,7 @@ def download_vectorstore(dest_dir: Path, prefix: str = REMOTE_PREFIX):
         return False
 
     downloaded = 0
+    skipped = 0
     errors = 0
 
     for blob in blobs:
@@ -54,6 +99,7 @@ def download_vectorstore(dest_dir: Path, prefix: str = REMOTE_PREFIX):
         try:
             if local_path.exists() and blob.size is not None and local_path.stat().st_size == blob.size:
                 logger.info("Skipped (already up-to-date): %s", blob.name)
+                skipped += 1
                 continue
             blob.download_to_filename(str(local_path))
             logger.info("Downloaded: %s (%d bytes)", blob.name, blob.size or 0)
@@ -62,15 +108,11 @@ def download_vectorstore(dest_dir: Path, prefix: str = REMOTE_PREFIX):
             logger.error("Failed to download %s: %s", blob.name, e)
             errors += 1
 
-    logger.info("Download complete: %d files downloaded, %d errors", downloaded, errors)
+    logger.info("Download complete: %d downloaded, %d skipped, %d errors", downloaded, skipped, errors)
     return errors == 0
 
 
 if __name__ == "__main__":
-    import firebase_admin
-    print("DEBUG: firebase_admin location:", firebase_admin.__file__)
-    print("DEBUG: firebase_admin apps:", firebase_admin._apps)
-    print("DEBUG: FIREBASE_SERVICE_ACCOUNT_JSON set:", bool(firebase_admin._GLOBAL_APP is None))
     logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
     dest_dir = _resolve_dest_dir()
     print(f"INFO: Using vectorstore destination: {dest_dir}")

startup.sh

@@ -18,13 +18,11 @@ echo "MathPulse AI Startup"
 echo "=========================================="
 echo "VECTORSTORE_DIR=${VECTORSTORE_DIR}"
 echo "CURRICULUM_VECTORSTORE_DIR=${CURRICULUM_VECTORSTORE_DIR}"
+echo "CURRICULUM_SOURCE_REPO_ID set: $(if [ -n "${CURRICULUM_SOURCE_REPO_ID:-}" ]; then echo YES; else echo NO; fi)"
 echo "FIREBASE_SERVICE_ACCOUNT_JSON set: $(if [ -n "${FIREBASE_SERVICE_ACCOUNT_JSON:-}" ]; then echo YES; else echo NO; fi)"
 echo "FIREBASE_STORAGE_BUCKET=${FIREBASE_STORAGE_BUCKET:-not set}"
 echo "=========================================="
 
-echo "Resolved VECTORSTORE_DIR=${VECTORSTORE_DIR}"
-echo "Resolved CURRICULUM_VECTORSTORE_DIR=${CURRICULUM_VECTORSTORE_DIR}"
-
 mkdir -p "${CURRICULUM_DIR}" "${VECTORSTORE_DIR}"
 
 _vectorstore_cache_dir="${VECTORSTORE_DIR}/.chroma"
@@ -35,7 +33,11 @@ fi
 
 _ingest_script="/app/scripts/ingest_curriculum.py"
 if [ -f "${_ingest_script}" ]; then
-    if [ -n "${CURRICULUM_SOURCE_REPO_ID:-}" ] || find "${CURRICULUM_DIR}" -type f -name '*.pdf' -print -quit >/dev/null 2>&1; then
+    _has_pdfs=false
+    if [ -d "${CURRICULUM_DIR}" ] && find "${CURRICULUM_DIR}" -type f -name '*.pdf' -print -quit >/dev/null 2>&1; then
+        _has_pdfs=true
+    fi
+    if [ "${_has_pdfs}" = true ] || [ -n "${CURRICULUM_SOURCE_REPO_ID:-}" ]; then
         echo "INFO: Running curriculum ingestion (optional)..."
         python "${_ingest_script}" && echo "INFO: Curriculum ingestion completed" || echo "WARNING: Curriculum ingestion failed, continuing anyway"
     else
@@ -47,12 +49,15 @@ fi
 
 _vectorstore_download_script="/app/scripts/download_vectorstore_from_firebase.py"
 if [ -f "${_vectorstore_download_script}" ]; then
-echo "INFO: Vectorstore files present before download:"
+    echo "INFO: Vectorstore files present before download:"
     ls -la "${VECTORSTORE_DIR}/"
-    echo "INFO: Vectorstore download script path: ${_vectorstore_download_script}"
-    echo "INFO: CURRICULUM_VECTORSTORE_DIR at download time: ${CURRICULUM_VECTORSTORE_DIR}"
     echo "INFO: Downloading vectorstore from Firebase Storage..."
-    python "${_vectorstore_download_script}" || echo "WARNING: Vectorstore download failed, continuing anyway"
+    python "${_vectorstore_download_script}" && _result=0 || _result=1
+    if [ $_result -eq 0 ]; then
+        echo "INFO: Vectorstore download succeeded"
+    else
+        echo "WARNING: Vectorstore download failed, continuing anyway"
+    fi
     echo "INFO: Vectorstore files present after download:"
     ls -la "${VECTORSTORE_DIR}/"
     _vectorstore_summary_file="${VECTORSTORE_DIR}/ingest_summary.json"
@@ -65,4 +70,4 @@ else
     echo "INFO: Vectorstore download script not found at ${_vectorstore_download_script}; skipping"
 fi
 
-exec uvicorn main:app --host 0.0.0.0 --port 7860 --workers 1
+exec uvicorn main:app --host 0.0.0.0 --port 7860 --workers 1