Compare commits
1 Commits
codex/guar
...
codex/refa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
27c167ebe8 |
@@ -29,16 +29,45 @@ from ..models import (
|
|||||||
VoiceCloneResult,
|
VoiceCloneResult,
|
||||||
)
|
)
|
||||||
from services.dubbing import AudioDubbingService
|
from services.dubbing import AudioDubbingService
|
||||||
|
from ..constants import get_podcast_media_read_dirs, get_podcast_media_dir
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
_dubbing_executor = ThreadPoolExecutor(max_workers=4, thread_name_prefix="podcast_dubbing")
|
_dubbing_executor = ThreadPoolExecutor(max_workers=4, thread_name_prefix="podcast_dubbing")
|
||||||
|
|
||||||
DUBBED_AUDIO_DIR = Path(__file__).resolve().parents[3] / "data" / "media" / "dubbed_audio"
|
_DUBBED_AUDIO_SUBDIR = Path("dubbed_audio")
|
||||||
|
_LEGACY_DUBBED_AUDIO_DIR = Path(__file__).resolve().parents[3] / "data" / "media" / "dubbed_audio"
|
||||||
|
|
||||||
|
|
||||||
def _ensure_dubbed_audio_dir():
|
def _get_dubbed_audio_dir(user_id: str, *, ensure_exists: bool = False) -> Path:
|
||||||
DUBBED_AUDIO_DIR.mkdir(parents=True, exist_ok=True)
|
"""Resolve tenant-scoped dubbed audio directory under podcast audio media."""
|
||||||
|
base_dir = get_podcast_media_dir("audio", user_id, ensure_exists=ensure_exists)
|
||||||
|
dubbed_dir = (base_dir / _DUBBED_AUDIO_SUBDIR).resolve()
|
||||||
|
if ensure_exists:
|
||||||
|
dubbed_dir.mkdir(parents=True, exist_ok=True)
|
||||||
|
return dubbed_dir
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_dubbed_audio_file(filename: str, user_id: str) -> Path:
|
||||||
|
"""Resolve dubbed audio with traversal-safe checks (tenant first, then legacy fallback)."""
|
||||||
|
clean_filename = filename.split("?", 1)[0].strip()
|
||||||
|
if not clean_filename:
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid filename")
|
||||||
|
|
||||||
|
candidate_dirs: list[Path] = []
|
||||||
|
for base_dir in get_podcast_media_read_dirs("audio", user_id):
|
||||||
|
candidate_dirs.append((base_dir / _DUBBED_AUDIO_SUBDIR).resolve())
|
||||||
|
candidate_dirs.append(_LEGACY_DUBBED_AUDIO_DIR.resolve())
|
||||||
|
|
||||||
|
for target_dir in candidate_dirs:
|
||||||
|
candidate = (target_dir / clean_filename).resolve()
|
||||||
|
if not str(candidate).startswith(str(target_dir)):
|
||||||
|
logger.error(f"[Podcast][Dubbing] Attempted path traversal: {filename}")
|
||||||
|
raise HTTPException(status_code=403, detail="Invalid audio path")
|
||||||
|
if candidate.exists():
|
||||||
|
return candidate
|
||||||
|
|
||||||
|
raise HTTPException(status_code=404, detail="Audio file not found")
|
||||||
|
|
||||||
|
|
||||||
def _execute_dubbing_task(
|
def _execute_dubbing_task(
|
||||||
@@ -62,9 +91,8 @@ def _execute_dubbing_task(
|
|||||||
message="Starting audio dubbing..."
|
message="Starting audio dubbing..."
|
||||||
)
|
)
|
||||||
|
|
||||||
_ensure_dubbed_audio_dir()
|
dubbed_audio_dir = _get_dubbed_audio_dir(user_id, ensure_exists=True)
|
||||||
|
service = AudioDubbingService(output_dir=dubbed_audio_dir)
|
||||||
service = AudioDubbingService(output_dir=DUBBED_AUDIO_DIR)
|
|
||||||
|
|
||||||
def progress_callback(progress: float, message: str):
|
def progress_callback(progress: float, message: str):
|
||||||
task_manager.update_task_status(
|
task_manager.update_task_status(
|
||||||
@@ -136,9 +164,8 @@ def _execute_voice_clone_task(
|
|||||||
message="Starting voice cloning..."
|
message="Starting voice cloning..."
|
||||||
)
|
)
|
||||||
|
|
||||||
_ensure_dubbed_audio_dir()
|
dubbed_audio_dir = _get_dubbed_audio_dir(user_id, ensure_exists=True)
|
||||||
|
service = AudioDubbingService(output_dir=dubbed_audio_dir)
|
||||||
service = AudioDubbingService(output_dir=DUBBED_AUDIO_DIR)
|
|
||||||
|
|
||||||
task_manager.update_task_status(
|
task_manager.update_task_status(
|
||||||
task_id, "processing", progress=30.0,
|
task_id, "processing", progress=30.0,
|
||||||
@@ -301,12 +328,7 @@ async def serve_dubbed_audio(
|
|||||||
"""
|
"""
|
||||||
user_id = require_authenticated_user(current_user)
|
user_id = require_authenticated_user(current_user)
|
||||||
|
|
||||||
_ensure_dubbed_audio_dir()
|
audio_path = _resolve_dubbed_audio_file(filename, user_id)
|
||||||
|
|
||||||
audio_path = DUBBED_AUDIO_DIR / filename
|
|
||||||
|
|
||||||
if not audio_path.exists():
|
|
||||||
raise HTTPException(status_code=404, detail="Audio file not found")
|
|
||||||
|
|
||||||
return FileResponse(
|
return FileResponse(
|
||||||
path=audio_path,
|
path=audio_path,
|
||||||
@@ -327,7 +349,8 @@ async def estimate_dubbing_cost(
|
|||||||
"""
|
"""
|
||||||
user_id = require_authenticated_user(current_user)
|
user_id = require_authenticated_user(current_user)
|
||||||
|
|
||||||
service = AudioDubbingService(output_dir=DUBBED_AUDIO_DIR)
|
dubbed_audio_dir = _get_dubbed_audio_dir(user_id, ensure_exists=True)
|
||||||
|
service = AudioDubbingService(output_dir=dubbed_audio_dir)
|
||||||
|
|
||||||
cost_estimate = service.estimate_cost(
|
cost_estimate = service.estimate_cost(
|
||||||
audio_duration_seconds=request.audio_duration_seconds,
|
audio_duration_seconds=request.audio_duration_seconds,
|
||||||
@@ -479,12 +502,12 @@ async def serve_voice_audio(
|
|||||||
"""
|
"""
|
||||||
user_id = require_authenticated_user(current_user)
|
user_id = require_authenticated_user(current_user)
|
||||||
|
|
||||||
_ensure_dubbed_audio_dir()
|
try:
|
||||||
|
audio_path = _resolve_dubbed_audio_file(filename, user_id)
|
||||||
audio_path = DUBBED_AUDIO_DIR / filename
|
except HTTPException as exc:
|
||||||
|
if exc.status_code == 404:
|
||||||
if not audio_path.exists():
|
raise HTTPException(status_code=404, detail="Voice audio file not found") from exc
|
||||||
raise HTTPException(status_code=404, detail="Voice audio file not found")
|
raise
|
||||||
|
|
||||||
return FileResponse(
|
return FileResponse(
|
||||||
path=audio_path,
|
path=audio_path,
|
||||||
|
|||||||
@@ -48,13 +48,6 @@ load_dotenv(backend_dir / '.env') # backend/.env
|
|||||||
load_dotenv(project_root / '.env') # root .env (fallback)
|
load_dotenv(project_root / '.env') # root .env (fallback)
|
||||||
load_dotenv() # CWD .env (fallback)
|
load_dotenv() # CWD .env (fallback)
|
||||||
|
|
||||||
PODCAST_ONLY_DEMO_MODE = os.getenv("PODCAST_ONLY_DEMO_MODE", "false").lower() in {
|
|
||||||
"1",
|
|
||||||
"true",
|
|
||||||
"yes",
|
|
||||||
"on",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Set up clean logging for end users
|
# Set up clean logging for end users
|
||||||
from logging_config import setup_clean_logging
|
from logging_config import setup_clean_logging
|
||||||
setup_clean_logging()
|
setup_clean_logging()
|
||||||
@@ -190,9 +183,7 @@ rate_limiter = RateLimiter(window_seconds=60, max_requests=200)
|
|||||||
frontend_serving = FrontendServing(app)
|
frontend_serving = FrontendServing(app)
|
||||||
router_manager = RouterManager(app)
|
router_manager = RouterManager(app)
|
||||||
|
|
||||||
onboarding_manager = None
|
onboarding_manager = OnboardingManager(app)
|
||||||
if not PODCAST_ONLY_DEMO_MODE:
|
|
||||||
onboarding_manager = OnboardingManager(app)
|
|
||||||
|
|
||||||
# Middleware Order (FastAPI executes in REVERSE order of registration - LIFO):
|
# Middleware Order (FastAPI executes in REVERSE order of registration - LIFO):
|
||||||
# Registration order: 1. Monitoring 2. Rate Limit 3. API Key Injection
|
# Registration order: 1. Monitoring 2. Rate Limit 3. API Key Injection
|
||||||
@@ -264,14 +255,7 @@ async def router_status():
|
|||||||
# Onboarding management endpoints
|
# Onboarding management endpoints
|
||||||
@app.get("/api/onboarding/status")
|
@app.get("/api/onboarding/status")
|
||||||
async def onboarding_status():
|
async def onboarding_status():
|
||||||
"""Get onboarding manager status (or demo-mode disabled state)."""
|
"""Get onboarding manager status."""
|
||||||
if PODCAST_ONLY_DEMO_MODE:
|
|
||||||
return {
|
|
||||||
"enabled": False,
|
|
||||||
"status": "disabled",
|
|
||||||
"message": "Onboarding is disabled for podcast-only demo mode.",
|
|
||||||
"demo_mode": "podcast_only",
|
|
||||||
}
|
|
||||||
return onboarding_manager.get_onboarding_status()
|
return onboarding_manager.get_onboarding_status()
|
||||||
|
|
||||||
# Include routers using modular utilities
|
# Include routers using modular utilities
|
||||||
|
|||||||
Reference in New Issue
Block a user