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

backend/api/routes/file_upload.py

@@ -15,7 +15,6 @@ import json
 import logging
 import tempfile
 import os
-from dataclasses import dataclass
 from fastapi import APIRouter, UploadFile, File, Form, HTTPException, BackgroundTasks, Request, Body, Depends
 from pathlib import Path
 from typing import Optional, List, Dict, Any, Tuple
@@ -29,11 +28,17 @@ from backend.services.storage_service import StorageService
 from backend.services.worker_service import get_worker_service
 from backend.services.credential_manager import get_credential_manager, CredentialStatus
 from backend.services.theme_service import get_theme_service
+from backend.services.job_defaults_service import (
+    get_effective_distribution_settings,
+    resolve_cdg_txt_defaults,
+    EffectiveDistributionSettings,
+)
 from backend.config import get_settings
 from backend.version import VERSION
 from backend.services.metrics import metrics
 from backend.api.dependencies import require_auth
 from backend.services.auth_service import UserType, AuthResult
+from backend.middleware.tenant import get_tenant_config_from_request
 
 logger = logging.getLogger(__name__)
 router = APIRouter(tags=["jobs"])
@@ -263,75 +268,6 @@ async def _trigger_audio_worker_only(job_id: str) -> None:
     await worker_service.trigger_audio_worker(job_id)
 
 
-def _resolve_cdg_txt_defaults(
-    theme_id: Optional[str],
-    enable_cdg: Optional[bool],
-    enable_txt: Optional[bool]
-) -> Tuple[bool, bool]:
-    """
-    Resolve CDG/TXT settings based on theme and explicit settings.
-
-    When a theme is selected, CDG and TXT are enabled by default.
-    Explicit True/False values always override the default.
-
-    Args:
-        theme_id: Theme identifier (if any)
-        enable_cdg: Explicit CDG setting (None means use default)
-        enable_txt: Explicit TXT setting (None means use default)
-
-    Returns:
-        Tuple of (resolved_enable_cdg, resolved_enable_txt)
-    """
-    # Default based on whether theme is set
-    default_enabled = theme_id is not None
-
-    # Resolve with explicit override taking precedence
-    resolved_cdg = enable_cdg if enable_cdg is not None else default_enabled
-    resolved_txt = enable_txt if enable_txt is not None else default_enabled
-
-    return resolved_cdg, resolved_txt
-
-
-@dataclass
-class EffectiveDistributionSettings:
-    """Settings with defaults applied from environment variables."""
-    dropbox_path: Optional[str]
-    gdrive_folder_id: Optional[str]
-    discord_webhook_url: Optional[str]
-    brand_prefix: Optional[str]
-
-
-def _get_effective_distribution_settings(
-    dropbox_path: Optional[str] = None,
-    gdrive_folder_id: Optional[str] = None,
-    discord_webhook_url: Optional[str] = None,
-    brand_prefix: Optional[str] = None,
-) -> EffectiveDistributionSettings:
-    """
-    Get distribution settings with defaults applied from environment variables.
-
-    This ensures consistent handling of defaults across all job creation endpoints.
-    Each parameter, if not provided (None), falls back to the corresponding
-    environment variable configured in settings.
-
-    Args:
-        dropbox_path: Explicit Dropbox path or None for default
-        gdrive_folder_id: Explicit Google Drive folder ID or None for default
-        discord_webhook_url: Explicit Discord webhook URL or None for default
-        brand_prefix: Explicit brand prefix or None for default
-
-    Returns:
-        EffectiveDistributionSettings with defaults applied
-    """
-    settings = get_settings()
-    return EffectiveDistributionSettings(
-        dropbox_path=dropbox_path or settings.default_dropbox_path,
-        gdrive_folder_id=gdrive_folder_id or settings.default_gdrive_folder_id,
-        discord_webhook_url=discord_webhook_url or settings.default_discord_webhook_url,
-        brand_prefix=brand_prefix or settings.default_brand_prefix,
-    )
-
-
 def _prepare_theme_for_job(
     job_id: str,
     theme_id: str,
@@ -446,6 +382,14 @@ async def upload_and_create_job(
     The style_params JSON can reference the uploaded images/fonts by their original
     filenames, and the backend will update the paths to GCS locations.
     """
+    # Check tenant feature flag
+    tenant_config = get_tenant_config_from_request(request)
+    if tenant_config and not tenant_config.features.file_upload:
+        raise HTTPException(
+            status_code=403,
+            detail="File upload is not available for this portal"
+        )
+
     try:
         # Validate main audio file type
         file_ext = Path(file.filename).suffix.lower()
@@ -494,7 +438,7 @@ async def upload_and_create_job(
                 )
         
         # Apply default distribution settings from environment if not provided
-        dist = _get_effective_distribution_settings(
+        dist = get_effective_distribution_settings(
             dropbox_path=dropbox_path,
             gdrive_folder_id=gdrive_folder_id,
             discord_webhook_url=discord_webhook_url,
@@ -572,7 +516,7 @@ async def upload_and_create_job(
                 logger.info(f"Applying default theme: {effective_theme_id}")
 
         # Resolve CDG/TXT defaults based on theme
-        resolved_cdg, resolved_txt = _resolve_cdg_txt_defaults(
+        resolved_cdg, resolved_txt = resolve_cdg_txt_defaults(
             effective_theme_id, enable_cdg, enable_txt
         )
 
@@ -632,10 +576,12 @@ async def upload_and_create_job(
             request_metadata=request_metadata,
             # Non-interactive mode
             non_interactive=non_interactive,
+            # Tenant scoping
+            tenant_id=tenant_config.id if tenant_config else None,
         )
-        job = job_manager.create_job(job_create)
+        job = job_manager.create_job(job_create, is_admin=auth_result.is_admin)
         job_id = job.job_id
-        
+
         # Record job creation metric
         metrics.record_job_created(job_id, source="upload")
 
@@ -1029,6 +975,14 @@ async def create_job_with_upload_urls(
     - Works with any HTTP client (no HTTP/2 required)
     - Resumable uploads possible with GCS
     """
+    # Check tenant feature flag
+    tenant_config = get_tenant_config_from_request(request)
+    if tenant_config and not tenant_config.features.file_upload:
+        raise HTTPException(
+            status_code=403,
+            detail="File upload is not available for this portal"
+        )
+
     try:
         # Validate files list
         if not body.files:
@@ -1058,7 +1012,7 @@ async def create_job_with_upload_urls(
                 )
 
         # Apply default distribution settings from environment if not provided
-        dist = _get_effective_distribution_settings(
+        dist = get_effective_distribution_settings(
             dropbox_path=body.dropbox_path,
             gdrive_folder_id=body.gdrive_folder_id,
             discord_webhook_url=body.discord_webhook_url,
@@ -1116,7 +1070,7 @@ async def create_job_with_upload_urls(
                 logger.info(f"Applying default theme: {effective_theme_id}")
 
         # Resolve CDG/TXT defaults based on theme
-        resolved_cdg, resolved_txt = _resolve_cdg_txt_defaults(
+        resolved_cdg, resolved_txt = resolve_cdg_txt_defaults(
             effective_theme_id, body.enable_cdg, body.enable_txt
         )
 
@@ -1153,8 +1107,10 @@ async def create_job_with_upload_urls(
             other_stems_models=body.other_stems_models,
             request_metadata=request_metadata,
             non_interactive=body.non_interactive,
+            # Tenant scoping
+            tenant_id=tenant_config.id if tenant_config else None,
         )
-        job = job_manager.create_job(job_create)
+        job = job_manager.create_job(job_create, is_admin=auth_result.is_admin)
         job_id = job.job_id
 
         # Record job creation metric
@@ -1481,6 +1437,14 @@ async def create_job_from_url(
     Note: YouTube rate limiting may cause occasional download failures.
     The backend will retry automatically.
     """
+    # Check tenant feature flag
+    tenant_config = get_tenant_config_from_request(request)
+    if tenant_config and not tenant_config.features.youtube_url:
+        raise HTTPException(
+            status_code=403,
+            detail="URL-based job creation is not available for this portal"
+        )
+
     try:
         # Validate URL
         if not _validate_url(body.url):
@@ -1490,7 +1454,7 @@ async def create_job_from_url(
             )
 
         # Apply default distribution settings from environment if not provided
-        dist = _get_effective_distribution_settings(
+        dist = get_effective_distribution_settings(
             dropbox_path=body.dropbox_path,
             gdrive_folder_id=body.gdrive_folder_id,
             discord_webhook_url=body.discord_webhook_url,
@@ -1549,7 +1513,7 @@ async def create_job_from_url(
                 logger.info(f"Applying default theme: {effective_theme_id}")
 
         # Resolve CDG/TXT defaults based on theme
-        resolved_cdg, resolved_txt = _resolve_cdg_txt_defaults(
+        resolved_cdg, resolved_txt = resolve_cdg_txt_defaults(
             effective_theme_id, body.enable_cdg, body.enable_txt
         )
 
@@ -1583,8 +1547,10 @@ async def create_job_from_url(
             other_stems_models=body.other_stems_models,
             request_metadata=request_metadata,
             non_interactive=body.non_interactive,
+            # Tenant scoping
+            tenant_id=tenant_config.id if tenant_config else None,
         )
-        job = job_manager.create_job(job_create)
+        job = job_manager.create_job(job_create, is_admin=auth_result.is_admin)
         job_id = job.job_id
 
         # Record job creation metric
@@ -1604,7 +1570,7 @@ async def create_job_from_url(
                 update_data['youtube_description_template'] = youtube_desc
             job_manager.update_job(job_id, update_data)
             logger.info(f"Applied theme '{effective_theme_id}' to job {job_id}")
-        
+
         logger.info(f"Created URL-based job {job_id} for URL: {body.url}")
         if artist:
             logger.info(f"  Artist: {artist}")
@@ -1703,6 +1669,14 @@ async def create_finalise_only_job(
     
     The endpoint returns signed URLs for uploading all the prep files.
     """
+    # Check tenant feature flag - finalise-only requires file upload capability
+    tenant_config = get_tenant_config_from_request(request)
+    if tenant_config and not tenant_config.features.file_upload:
+        raise HTTPException(
+            status_code=403,
+            detail="File upload is not available for this portal"
+        )
+
     try:
         # Validate files list
         if not body.files:
@@ -1750,7 +1724,7 @@ async def create_finalise_only_job(
                 )
         
         # Apply default distribution settings
-        dist = _get_effective_distribution_settings(
+        dist = get_effective_distribution_settings(
             dropbox_path=body.dropbox_path,
             gdrive_folder_id=body.gdrive_folder_id,
             discord_webhook_url=body.discord_webhook_url,
@@ -1805,7 +1779,7 @@ async def create_finalise_only_job(
                 logger.info(f"Applying default theme: {effective_theme_id}")
 
         # Resolve CDG/TXT defaults based on theme
-        resolved_cdg, resolved_txt = _resolve_cdg_txt_defaults(
+        resolved_cdg, resolved_txt = resolve_cdg_txt_defaults(
             effective_theme_id, body.enable_cdg, body.enable_txt
         )
 
@@ -1834,8 +1808,10 @@ async def create_finalise_only_job(
             finalise_only=True,
             keep_brand_code=body.keep_brand_code,
             request_metadata=request_metadata,
+            # Tenant scoping
+            tenant_id=tenant_config.id if tenant_config else None,
         )
-        job = job_manager.create_job(job_create)
+        job = job_manager.create_job(job_create, is_admin=auth_result.is_admin)
         job_id = job.job_id
 
         # Record job creation metric

backend/api/routes/internal.py

@@ -371,6 +371,12 @@ async def check_idle_reminder(
         add_span_event("already_sent")
         return {"status": "already_sent", "job_id": job_id, "message": "Reminder already sent"}
 
+    # Skip reminders for made-for-you jobs (admin handles these directly, no intermediate customer emails)
+    if getattr(job, 'made_for_you', False):
+        logger.info(f"[job:{job_id}] Made-for-you job, skipping customer reminder (admin handles)")
+        add_span_event("made_for_you_skip")
+        return {"status": "skipped", "job_id": job_id, "message": "Made-for-you job - admin handles directly"}
+
     # Check if user has an email
     if not job.user_email:
         logger.warning(f"[job:{job_id}] No user email, cannot send reminder")

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
 
 
@@ -117,8 +118,8 @@ async def create_job(
             webhook_url=request.webhook_url,
             user_email=user_email
         )
-        job = job_manager.create_job(job_create)
-        
+        job = job_manager.create_job(job_create, is_admin=auth_result.is_admin)
+
         # Record job creation metric
         metrics.record_job_created(job.job_id, source="url")
         
@@ -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
         )