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

backend/api/routes/audio_search.py

@@ -15,7 +15,7 @@ import asyncio
 import logging
 import os
 import tempfile
-from typing import Optional, List, Dict, Any, Tuple
+from typing import Optional, List, Dict, Any
 
 from fastapi import APIRouter, HTTPException, BackgroundTasks, Request, Depends
 from pydantic import BaseModel, Field, validator
@@ -34,6 +34,7 @@ from backend.services.audio_search_service import (
     DownloadError,
 )
 from backend.services.theme_service import get_theme_service
+from backend.services.job_defaults_service import resolve_cdg_txt_defaults
 from backend.config import get_settings
 from backend.version import VERSION
 from backend.api.dependencies import require_auth
@@ -201,35 +202,6 @@ class AudioSelectResponse(BaseModel):
     selected_provider: str
 
 
-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
-
-    # Explicit values override defaults, None uses default
-    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
-
-
 def extract_request_metadata(request: Request, created_from: str = "audio_search") -> Dict[str, Any]:
     """Extract metadata from request for job tracking."""
     headers = dict(request.headers)
@@ -554,7 +526,7 @@ async def search_audio(
                 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
         )
 
@@ -597,7 +569,7 @@ async def search_audio(
             # 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
 
         logger.info(f"Created job {job_id} for audio search: {body.artist} - {body.title}")

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,6 +28,11 @@ 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
@@ -264,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,
@@ -503,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,
@@ -581,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
         )
 
@@ -644,7 +579,7 @@ async def upload_and_create_job(
             # 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
@@ -1077,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,
@@ -1135,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
         )
 
@@ -1175,7 +1110,7 @@ async def create_job_with_upload_urls(
             # 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
@@ -1519,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,
@@ -1578,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
         )
 
@@ -1615,7 +1550,7 @@ async def create_job_from_url(
             # 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
@@ -1635,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}")
@@ -1789,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,
@@ -1844,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
         )
 
@@ -1876,7 +1811,7 @@ async def create_finalise_only_job(
             # 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/jobs.py

@@ -118,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")