Final production push with CORS, model, and video fixes

.gitattributes

@@ -0,0 +1,7 @@
+*.png filter=xet diff=xet merge=xet
+*.jpg filter=xet diff=xet merge=xet
+*.jpeg filter=xet diff=xet merge=xet
+*.gif filter=xet diff=xet merge=xet
+*.pt filter=xet diff=xet merge=xet
+*.pth filter=xet diff=xet merge=xet
+*.weights filter=xet diff=xet merge=xet

DEPLOYMENT.md

@@ -0,0 +1,39 @@
+# BAKO-AI Deployment Guide
+
+This guide explains how to manage and deploy the BAKO-AI analysis pipeline to Hugging Face.
+
+## 🏗 Architecture Overview
+- **Application**: Hosted on Hugging Face Spaces (`icanedit2/BakoAI`).
+- **Models**: Hosted on a dedicated Hugging Face Model Repository (`icanedit2/bakoai-models`).
+- **Storage/DB**: Managed via Supabase.
+
+## 🚀 Deployment Workflow
+
+### 1. Push Code Changes
+To push local changes from the `back-end` folder to the Hugging Face Space root:
+```bash
+# From the root directory:
+git subtree split --prefix back-end -b hf-production-build
+git push hf hf-production-build:main --force
+git branch -D hf-production-build
+```
+
+### 🧠 2. Managing Models
+Models are stored in the `icanedit2/bakoai-models` repository to prevent `git push` from deleting them.
+- To add a new model, upload it to the `bakoai-models` repo.
+- Update `download_models.py` in the Space repo to include the new filename.
+- The build process will automatically download models into `/home/user/app/models/`.
+
+### 🔐 3. Security (Hugging Face Secrets)
+Ensure the following Secrets are set in your Space Settings:
+- `HF_TOKEN`: Required for downloading models from private repositories.
+- `SUPABASE_URL`: Your Supabase project URL.
+- `SUPABASE_KEY`: Your Supabase anonymous/service key.
+- `JWT_SECRET`: For authentication.
+
+## 🎬 Video Playback Optimization
+All annotated videos are processed through FFmpeg with the following settings for maximum browser compatibility:
+- **Codec**: libx264
+- **Pixel Format**: yuv420p
+- **Dimensions**: Forced to even values (H.264 requirement)
+- **Streaming**: `+faststart` enabled for instant playback.

app/api/admin.py

@@ -59,7 +59,7 @@ async def update_organization(
 async def update_user_role(
     user_id: str,
     role_data: dict,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -83,7 +83,7 @@ async def update_user_role(
 @router.get("/users")
 async def get_users(
     role: Optional[str] = None,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -146,7 +146,7 @@ async def get_users(
 @router.post("/players")
 async def create_player(
     player_data: PlayerCreate,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -177,7 +177,7 @@ async def create_player(
 async def update_player(
     player_id: str,
     player_data: PlayerUpdate,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -210,7 +210,7 @@ async def update_player(
 
 @router.get("/players")
 async def get_roster(
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -222,7 +222,7 @@ async def get_roster(
 async def update_player_status(
     player_id: str,
     status_data: dict,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -253,7 +253,7 @@ async def update_player_status(
 @router.delete("/players/{player_id}")
 async def delete_player(
     player_id: str,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -294,7 +294,7 @@ async def delete_player(
 async def link_player_account(
     player_id: str,
     link_data: dict,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -438,7 +438,7 @@ async def link_player_account(
 
 @router.get("/staff")
 async def get_staff(
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -462,8 +462,8 @@ async def get_staff(
 @router.post("/staff-link")
 @router.post("/staff-link/")
 async def link_staff_member(
-    link_data: dict, # email, role
-    current_user: dict = Depends(require_organization_admin),
+    link_data: StaffLinkRequest,
+    current_user: dict = Depends(require_team_account),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """
@@ -583,7 +583,7 @@ async def remove_staff_member(
 
 @router.get("/schedule")
 async def get_schedule(
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """Get team schedule."""
@@ -663,7 +663,7 @@ async def delete_schedule_event(
 
 @router.get("/matches")
 async def get_matches(
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """Get matches for the current user's organization (Owner or Staff)."""
@@ -733,7 +733,7 @@ async def delete_match(
 @router.get("/matches/{match_id}/player-stats")
 async def get_match_player_stats(
     match_id: str,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     """Get all player stats for a specific match, enriched with player name/jersey info."""
@@ -795,7 +795,7 @@ async def get_notifications(
 @router.post("/notifications")
 async def create_notification(
     notif_data: NotificationCreate,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     notif_dict = notif_data.model_dump()
@@ -828,7 +828,7 @@ async def mark_all_notifications_read(
 async def update_notification(
     notification_id: str,
     notification_data: NotificationCreate,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     update_dict = notification_data.model_dump(exclude_unset=True)
@@ -847,7 +847,7 @@ async def delete_notification(
 
 @router.get("/stats")
 async def get_stats(
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     # Mock aggregation or real counts
@@ -894,7 +894,7 @@ async def get_stats(
 
 @router.get("/profile")
 async def get_profile(
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     # Get user info and associated organization
@@ -915,7 +915,7 @@ async def get_profile(
 @router.put("/profile")
 async def update_profile(
     profile_data: dict,
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(require_staff_member),
     supabase: SupabaseService = Depends(get_supabase),
 ):
     # Update user or org

app/dependencies.py

@@ -192,7 +192,7 @@ async def require_linked_account(
 
 
 async def require_staff_member(
-    current_user: dict = Depends(require_team_account),
+    current_user: dict = Depends(get_current_user_with_db),
 ) -> dict:
     """
     Dependency that requires the user to be a COACH or TEAM owner who is linked to an organization.

app/main.py

@@ -54,6 +54,26 @@ async def lifespan(app: FastAPI):
     # Ensure upload directory exists
     os.makedirs(settings.upload_dir, exist_ok=True)
     
+    # Check for required models
+    required_models = [
+        settings.player_detector_path,
+        settings.ball_detector_path,
+        settings.court_keypoint_detector_path,
+        settings.swish_ball_rim_model,
+        settings.swish_pose_model
+    ]
+    
+    missing_models = []
+    for model_path in required_models:
+        if not os.path.exists(model_path):
+            missing_models.append(model_path)
+            
+    if missing_models:
+        print(f"❌ CRITICAL: Missing models: {', '.join(missing_models)}")
+        print("   Please run 'python download_models.py' to fetch them.")
+    else:
+        print("✅ All required models are present.")
+    
     # Check GPU availability
     if settings.gpu_enabled:
         try:
@@ -106,12 +126,11 @@ def create_app() -> FastAPI:
     app.add_middleware(SlowAPIMiddleware)
 
     # Configure CORS
-    # - In production, require explicit origins (settings.cors_origins)
-    # - In debug, allow "*" but disable credentials to avoid insecure/invalid combo
     cors_origins = settings.cors_origins_list
-    if settings.debug and not cors_origins:
+    if not cors_origins:
+        # Permissive for development/unconfigured production
         allow_origins = ["*"]
-        allow_credentials = False
+        allow_credentials = False # Cannot use credentials with "*"
     else:
         allow_origins = cors_origins
         allow_credentials = True

debug_path.py

@@ -10,7 +10,20 @@ def _resolve_model_path(path: str) -> str:
     """Safely resolve model path relative to backend root."""
     if os.path.isabs(path):
         return path
-    return os.path.abspath(os.path.join(_BACKEND_ROOT, path))
+    
+    # Anchor to the backend root (directory containing this script)
+    candidate = os.path.abspath(os.path.join(_BACKEND_ROOT, path))
+    
+    if os.path.exists(candidate):
+        return candidate
+
+    # Robust fallback for 'DON'T TOUCH' mangled environments
+    if "OKIDI-DONT TOUCH" in candidate:
+        healed = candidate.replace("OKIDI-DONT TOUCH", "OKIDI-DON'T TOUCH")
+        if os.path.exists(healed):
+            return healed
+            
+    return candidate
 
 res_rim = _resolve_model_path(settings.swish_ball_rim_model)
 res_pose = _resolve_model_path(settings.swish_pose_model)

download_models.py

@@ -1,49 +1,41 @@
 import os
-import requests
-from tqdm import tqdm
+from huggingface_hub import hf_hub_download
 
-def download_file(url, dest):
-    if os.path.exists(dest):
-        print(f"✅ {dest} already exists.")
-        return
+def download_models():
+    """Download all models from the dedicated Model Repo using huggingface_hub."""
+    repo_id = "icanedit2/bakoai-models"
+    models_to_download = [
+        "player_detector.pt",
+        "ball_detector.pt",
+        "court_keypoint_detector.pt",
+        "swish_ball_rim.pt",
+        "swish_pose.pt",
+        "yolov8n-pose.pt"
+    ]
     
-    print(f"Downloading {os.path.basename(dest)}...")
+    os.makedirs("models", exist_ok=True)
     
-    # Handle Google Drive direct download links
-    if "drive.google.com" in url:
-        if "id=" in url:
-            file_id = url.split("id=")[1].split("&")[0]
-        else:
-            file_id = url.split("/")[-2]
-        url = f"https://drive.google.com/uc?export=download&id={file_id}"
-
-    response = requests.get(url, stream=True)
-    total_size = int(response.headers.get('content-length', 0))
-    
-    os.makedirs(os.path.dirname(dest), exist_ok=True)
+    token = os.environ.get("HF_TOKEN")
     
-    with open(dest, 'wb') as file, tqdm(
-        desc=dest,
-        total=total_size,
-        unit='iB',
-        unit_scale=True,
-        unit_divisor=1024,
-    ) as bar:
-        for data in response.iter_content(chunk_size=1024):
-            size = file.write(data)
-            bar.update(size)
-
-if __name__ == "__main__":
-    MODELS = {
-        "models/sam2.1_hiera_tiny.pt": "https://github.com/ultralytics/assets/releases/download/v8.3.0/sam2.1_hiera_tiny.pt",
-        "models/player_detector.pt": "https://drive.google.com/uc?export=download&id=1fVBLZtPy9Yu6Tf186oS4siotkioHBLHy",
-        "models/ball_detector.pt": "https://drive.google.com/uc?export=download&id=1KejdrcEnto2AKjdgdo1U1syr5gODp6EL",
-        "models/court_keypoint_detector.pt": "https://drive.google.com/uc?export=download&id=1nGoG-pUkSg4bWAUIeQ8aN6n7O1fOkXU0",
-        "models/yolov8n-pose.pt": "https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n-pose.pt"
-    }
-    
-    for path, url in MODELS.items():
+    for model_file in models_to_download:
+        dest_path = os.path.join("models", model_file)
+        if os.path.exists(dest_path):
+            print(f"✅ {dest_path} already exists.")
+            continue
+            
+        print(f"⏳ Downloading {model_file} from {repo_id}...")
         try:
-            download_file(url, path)
+            # hf_hub_download automatically handles LFS, Xet, and auth
+            path = hf_hub_download(
+                repo_id=repo_id,
+                filename=model_file,
+                local_dir="models",
+                token=token
+            )
+            print(f"✅ Successfully downloaded {model_file} to {path}")
         except Exception as e:
-            print(f"❌ Failed to download {path}: {e}")
+            print(f"❌ Failed to download {model_file}: {e}")
+            raise
+
+if __name__ == "__main__":
+    download_models()

personal_analysis/pipeline.py

@@ -30,50 +30,58 @@ from app.api.videos import get_video_info
 # ── Model paths ──────────────────────────────────────────────────────────────
 settings = get_settings()
 
-# ---------------------------------------------------------------------------
-# Backend root — computed from __file__ then immediately healed.
-#
-# When the FastAPI process is launched from a shell that strips the apostrophe
-# in "DON'T TOUCH", Python's __file__ itself arrives mangled (without the ').
-# We detect that case and swap in the correct character so that every
-# subsequent model path built from _BACKEND_ROOT is already correct.
-# ---------------------------------------------------------------------------
-def _heal_path(p: str) -> str:
-    """Return the real on-disk path by fixing the apostrophe-mangling."""
-    if os.path.exists(p):
-        return p
-    fixed = p.replace("OKIDI-DONT TOUCH", "OKIDI-DON'T TOUCH")
-    if os.path.exists(fixed):
-        return fixed
-    return p  # give up – let the caller handle it
-
-_BACKEND_ROOT = _heal_path(
-    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-)
-print(f"DEBUG: _BACKEND_ROOT = {_BACKEND_ROOT}", file=sys.stderr)
-
-
 def _resolve_model_path(path: str) -> str:
     """
-    Resolve a model path relative to the (already-healed) backend root.
-
-    • Absolute paths are used as-is (after one heal attempt).
-    • Relative paths are anchored to _BACKEND_ROOT — never to CWD.
+    Resolve a model path relative to the backend root.
+    
+    • Absolute paths are used as-is.
+    • Relative paths are anchored to the directory containing 'app/'.
     """
     if os.path.isabs(path):
-        return _heal_path(path)
+        return path
 
-    # Anchor to the healed backend root
+    # Anchor to the backend root (parent of 'personal_analysis/')
+    backend_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     candidate = os.path.abspath(os.path.join(_BACKEND_ROOT, path))
+    
     if os.path.exists(candidate):
         return candidate
 
-    # One more heal attempt (shouldn't be needed after root fix, but be safe)
-    healed = _heal_path(candidate)
-    if os.path.exists(healed):
-        return healed
-
-    logger.warning(f"Model file not found at {candidate!r} — check model paths")
+    # --- DIAGNOSTIC LOGGING ---
+    logger.error(f"❌ Model file MISSING: {candidate}")
+    logger.info(f"DEBUG: Current Working Directory: {os.getcwd()}")
+    logger.info(f"DEBUG: Backend Root: {_BACKEND_ROOT}")
+    
+    models_dir = os.path.join(_BACKEND_ROOT, "models")
+    if os.path.exists(models_dir):
+        try:
+            files = os.listdir(models_dir)
+            logger.info(f"DEBUG: Contents of {models_dir}: {files}")
+        except Exception as e:
+            logger.error(f"DEBUG: Could not list {models_dir}: {e}")
+    else:
+        logger.error(f"DEBUG: Directory {models_dir} does not even exist!")
+
+    # Search for the file anywhere in /home/user/app
+    logger.info(f"DEBUG: Searching for {os.path.basename(path)} in /home/user/app...")
+    found_paths = []
+    for root, dirs, files in os.walk("/home/user/app"):
+        if os.path.basename(path) in files:
+            found_paths.append(os.path.join(root, os.path.basename(path)))
+    
+    if found_paths:
+        logger.info(f"✅ FOUND at alternative locations: {found_paths}")
+        return found_paths[0]
+    # ---------------------------
+
+    # Robust fallback: check if we are in a 'DON'T TOUCH' mangled path environment
+    # but only if the candidate doesn't exist.
+    if "OKIDI-DONT TOUCH" in candidate:
+        healed = candidate.replace("OKIDI-DONT TOUCH", "OKIDI-DON'T TOUCH")
+        if os.path.exists(healed):
+            return healed
+
+    logger.warning(f"Model file not found at {candidate!r} — ensure 'python download_models.py' has been run.")
     return candidate
 
 BALL_RIM_MODEL = _resolve_model_path(settings.swish_ball_rim_model)
@@ -133,6 +141,7 @@ def _write_video(frames: list, out_path: str, fps: float = 30.0):
         os.rename(out_path, tmp_path)
         result = subprocess.run(
             ["ffmpeg", "-y", "-i", tmp_path,
+             "-vf", "pad=ceil(iw/2)*2:ceil(ih/2)*2",
              "-c:v", "libx264", "-preset", "fast", "-movflags", "+faststart",
              "-pix_fmt", "yuv420p", "-an", out_path],
             capture_output=True, timeout=300

personal_analysis/test_resolve.py

@@ -12,17 +12,20 @@ print(f"DEBUG: _BACKEND_ROOT = {_BACKEND_ROOT}")
 def _resolve_model_path(path: str) -> str:
     if os.path.isabs(path):
         return path
-    full_path = os.path.abspath(os.path.join(_BACKEND_ROOT, path))
-    print(f"DEBUG: checking {full_path} -> {os.path.exists(full_path)}")
-    if os.path.exists(full_path):
-        return full_path
     
-    hardcoded_root = "/home/student/Music/OKIDI-DON'T TOUCH/BAKO-AI-V0.0/back-end"
-    safe_path = os.path.abspath(os.path.join(hardcoded_root, path))
-    print(f"DEBUG: checking fallback {safe_path} -> {os.path.exists(safe_path)}")
-    if os.path.exists(safe_path):
-        return safe_path
-    return full_path
+    # Anchor to the backend root (parent of personal_analysis/)
+    candidate = os.path.abspath(os.path.join(_BACKEND_ROOT, path))
+    
+    if os.path.exists(candidate):
+        return candidate
+
+    # Robust fallback for 'DON'T TOUCH' mangled environments
+    if "OKIDI-DONT TOUCH" in candidate:
+        healed = candidate.replace("OKIDI-DONT TOUCH", "OKIDI-DON'T TOUCH")
+        if os.path.exists(healed):
+            return healed
+            
+    return candidate
 
 rim = _resolve_model_path(settings.swish_ball_rim_model)
 print(f"FINAL RESOLVED: {rim}")