karaoke-gen 0.99.3__py3-none-any.whl → 0.101.0__py3-none-any.whl

backend/api/routes/jobs.py

@@ -11,7 +11,7 @@ import asyncio
 import logging
 import httpx
 from typing import List, Optional, Dict, Any, Tuple
-from fastapi import APIRouter, HTTPException, BackgroundTasks, Depends
+from fastapi import APIRouter, HTTPException, BackgroundTasks, Depends, Request
 
 from backend.models.job import Job, JobCreate, JobResponse, JobStatus
 from backend.models.requests import (
@@ -30,6 +30,7 @@ from backend.config import get_settings
 from backend.api.dependencies import require_admin, require_auth, require_instrumental_auth
 from backend.services.auth_service import UserType, AuthResult
 from backend.services.metrics import metrics
+from backend.middleware.tenant import get_tenant_from_request
 from backend.utils.test_data import is_test_email
 
 
@@ -190,6 +191,7 @@ def _check_job_ownership(job: Job, auth_result: AuthResult) -> bool:
 
 @router.get("", response_model=List[Job])
 async def list_jobs(
+    request: Request,
     status: Optional[JobStatus] = None,
     environment: Optional[str] = None,
     client_id: Optional[str] = None,
@@ -203,6 +205,7 @@ async def list_jobs(
     List jobs with optional filters.
 
     Regular users only see their own jobs. Admins see all jobs.
+    Users on tenant portals only see jobs from their tenant.
 
     Args:
         status: Filter by job status (pending, complete, failed, etc.)
@@ -247,6 +250,10 @@ async def list_jobs(
                 logger.warning("Non-admin auth without user_email, returning empty job list")
                 return []
 
+        # Get tenant_id from request for portal scoping
+        # Tenant users only see jobs from their tenant
+        tenant_id = get_tenant_from_request(request)
+
         jobs = job_manager.list_jobs(
             status=status,
             environment=environment,
@@ -254,6 +261,7 @@ async def list_jobs(
             created_after=created_after_dt,
             created_before=created_before_dt,
             user_email=user_email_filter,
+            tenant_id=tenant_id,
             limit=limit
         )
 

backend/api/routes/review.py

@@ -412,7 +412,10 @@ async def generate_preview_video(
 
     # Check if GCE preview encoding is enabled
     use_gce_preview = encoding_service.is_preview_enabled
-    logger.info(f"Job {job_id}: Generating preview video (GCE preview: {use_gce_preview})")
+
+    # Check if user wants theme background image (slower) or black background (faster, default)
+    use_background_image = updated_data.get("use_background_image", False)
+    logger.info(f"Job {job_id}: Generating preview video (GCE: {use_gce_preview}, background image: {use_background_image})")
 
     # Use tracing and job_log_context for full observability
     with create_span("generate-preview-video", {"job_id": job_id, "use_gce": use_gce_preview}) as span:
@@ -498,12 +501,16 @@ async def generate_preview_video(
                                 # Get background image and font from style assets if available
                                 style_assets = job.style_assets or {}
 
+                                # Only use background image if user explicitly requested it
+                                # Default is black background for faster preview generation (~10s vs ~30-60s)
                                 background_image_gcs_path = None
-                                for key in ["karaoke_background", "style_karaoke_background"]:
-                                    if key in style_assets:
-                                        background_image_gcs_path = f"gs://{bucket_name}/{style_assets[key]}"
-                                        gce_span.set_attribute("background_image", background_image_gcs_path)
-                                        break
+                                if use_background_image:
+                                    for key in ["karaoke_background", "style_karaoke_background"]:
+                                        if key in style_assets:
+                                            background_image_gcs_path = f"gs://{bucket_name}/{style_assets[key]}"
+                                            gce_span.set_attribute("background_image", background_image_gcs_path)
+                                            break
+                                gce_span.set_attribute("use_background_image", use_background_image)
 
                                 font_gcs_path = None
                                 for key in ["font", "style_font"]:

backend/api/routes/tenant.py

@@ -0,0 +1,120 @@
+"""
+Tenant API routes for white-label portal configuration.
+
+These endpoints are public (no auth required) since the frontend needs
+to fetch tenant branding before the user logs in.
+"""
+
+import logging
+from typing import Optional
+
+from fastapi import APIRouter, Query, Request
+
+from backend.models.tenant import TenantConfigResponse, TenantPublicConfig
+from backend.services.tenant_service import get_tenant_service
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/api/tenant", tags=["tenant"])
+
+
+@router.get("/config", response_model=TenantConfigResponse)
+async def get_tenant_config(
+    request: Request,
+    tenant: Optional[str] = Query(
+        None,
+        description="Tenant ID override (for development). If not provided, detected from subdomain.",
+    ),
+):
+    """
+    Get tenant configuration for the current portal.
+
+    This endpoint detects the tenant from:
+    1. Query parameter `tenant` (for development/testing)
+    2. X-Tenant-ID header (set by frontend)
+    3. Host header subdomain
+
+    Returns the public tenant configuration (branding, features, defaults)
+    or indicates this is the default Nomad Karaoke portal.
+    """
+    tenant_service = get_tenant_service()
+
+    # Priority 1: Query parameter (for dev/testing)
+    tenant_id = tenant
+
+    # Priority 2: X-Tenant-ID header
+    if not tenant_id:
+        tenant_id = request.headers.get("X-Tenant-ID")
+
+    # Priority 3: Detect from Host header
+    if not tenant_id:
+        host = request.headers.get("Host", "")
+        # Check if this is a tenant subdomain
+        # Pattern: {tenant}.nomadkaraoke.com or {tenant}.gen.nomadkaraoke.com
+        if host and "nomadkaraoke.com" in host.lower():
+            parts = host.lower().split(".")
+            # Skip known non-tenant subdomains
+            if parts[0] not in ["gen", "api", "www", "buy", "admin"]:
+                potential_tenant = parts[0]
+                if tenant_service.tenant_exists(potential_tenant):
+                    tenant_id = potential_tenant
+
+    # If no tenant detected, return default config
+    if not tenant_id:
+        logger.debug("No tenant detected, returning default config")
+        return TenantConfigResponse(tenant=None, is_default=True)
+
+    # Load tenant config
+    public_config = tenant_service.get_public_config(tenant_id)
+
+    if not public_config:
+        logger.warning(f"Tenant not found: {tenant_id}")
+        return TenantConfigResponse(tenant=None, is_default=True)
+
+    if not public_config.is_active:
+        logger.warning(f"Tenant is inactive: {tenant_id}")
+        return TenantConfigResponse(tenant=None, is_default=True)
+
+    logger.info(f"Returning config for tenant: {tenant_id}")
+    return TenantConfigResponse(tenant=public_config, is_default=False)
+
+
+@router.get("/config/{tenant_id}", response_model=TenantConfigResponse)
+async def get_tenant_config_by_id(tenant_id: str):
+    """
+    Get tenant configuration by explicit tenant ID.
+
+    This is useful for admin tools or debugging.
+    """
+    tenant_service = get_tenant_service()
+    public_config = tenant_service.get_public_config(tenant_id)
+
+    if not public_config:
+        return TenantConfigResponse(tenant=None, is_default=True)
+
+    # Check if tenant is active
+    if not public_config.is_active:
+        logger.warning(f"Tenant is inactive: {tenant_id}")
+        return TenantConfigResponse(tenant=None, is_default=True)
+
+    return TenantConfigResponse(tenant=public_config, is_default=False)
+
+
+@router.get("/asset/{tenant_id}/{asset_name}")
+async def get_tenant_asset(tenant_id: str, asset_name: str):
+    """
+    Get a signed URL for a tenant asset (logo, favicon, etc.).
+
+    This redirects to the signed GCS URL for the asset.
+    """
+    from fastapi.responses import RedirectResponse
+
+    tenant_service = get_tenant_service()
+    url = tenant_service.get_asset_url(tenant_id, asset_name)
+
+    if not url:
+        from fastapi import HTTPException
+
+        raise HTTPException(status_code=404, detail="Asset not found")
+
+    return RedirectResponse(url=url)