Compare commits

..

1 Commits

Author SHA1 Message Date
ي
cadcb8077d Add mode-aware pricing redirect for podcast demo flow 2026-03-30 07:48:00 +05:30
2 changed files with 65 additions and 58 deletions

View File

@@ -29,45 +29,16 @@ from ..models import (
VoiceCloneResult,
)
from services.dubbing import AudioDubbingService
from ..constants import get_podcast_media_read_dirs, get_podcast_media_dir
router = APIRouter()
_dubbing_executor = ThreadPoolExecutor(max_workers=4, thread_name_prefix="podcast_dubbing")
_DUBBED_AUDIO_SUBDIR = Path("dubbed_audio")
_LEGACY_DUBBED_AUDIO_DIR = Path(__file__).resolve().parents[3] / "data" / "media" / "dubbed_audio"
DUBBED_AUDIO_DIR = Path(__file__).resolve().parents[3] / "data" / "media" / "dubbed_audio"
def _get_dubbed_audio_dir(user_id: str, *, ensure_exists: bool = False) -> Path:
"""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 _ensure_dubbed_audio_dir():
DUBBED_AUDIO_DIR.mkdir(parents=True, exist_ok=True)
def _execute_dubbing_task(
@@ -91,8 +62,9 @@ def _execute_dubbing_task(
message="Starting audio dubbing..."
)
dubbed_audio_dir = _get_dubbed_audio_dir(user_id, ensure_exists=True)
service = AudioDubbingService(output_dir=dubbed_audio_dir)
_ensure_dubbed_audio_dir()
service = AudioDubbingService(output_dir=DUBBED_AUDIO_DIR)
def progress_callback(progress: float, message: str):
task_manager.update_task_status(
@@ -164,8 +136,9 @@ def _execute_voice_clone_task(
message="Starting voice cloning..."
)
dubbed_audio_dir = _get_dubbed_audio_dir(user_id, ensure_exists=True)
service = AudioDubbingService(output_dir=dubbed_audio_dir)
_ensure_dubbed_audio_dir()
service = AudioDubbingService(output_dir=DUBBED_AUDIO_DIR)
task_manager.update_task_status(
task_id, "processing", progress=30.0,
@@ -328,7 +301,12 @@ async def serve_dubbed_audio(
"""
user_id = require_authenticated_user(current_user)
audio_path = _resolve_dubbed_audio_file(filename, user_id)
_ensure_dubbed_audio_dir()
audio_path = DUBBED_AUDIO_DIR / filename
if not audio_path.exists():
raise HTTPException(status_code=404, detail="Audio file not found")
return FileResponse(
path=audio_path,
@@ -349,8 +327,7 @@ async def estimate_dubbing_cost(
"""
user_id = require_authenticated_user(current_user)
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)
cost_estimate = service.estimate_cost(
audio_duration_seconds=request.audio_duration_seconds,
@@ -502,12 +479,12 @@ async def serve_voice_audio(
"""
user_id = require_authenticated_user(current_user)
try:
audio_path = _resolve_dubbed_audio_file(filename, user_id)
except HTTPException as exc:
if exc.status_code == 404:
raise HTTPException(status_code=404, detail="Voice audio file not found") from exc
raise
_ensure_dubbed_audio_dir()
audio_path = DUBBED_AUDIO_DIR / filename
if not audio_path.exists():
raise HTTPException(status_code=404, detail="Voice audio file not found")
return FileResponse(
path=audio_path,

View File

@@ -72,6 +72,39 @@ const PricingPage: React.FC = () => {
fetchPlans();
}, []);
const isPodcastOnlyDemoMode = () => {
const appMode = (localStorage.getItem('app_mode') || '').toLowerCase();
const demoMode = (localStorage.getItem('demo_mode') || '').toLowerCase();
const podcastOnlyDemoMode = (localStorage.getItem('podcast_only_demo_mode') || '').toLowerCase();
const envAppMode = (process.env.REACT_APP_APP_MODE || '').toLowerCase();
const envDemoMode = (process.env.REACT_APP_DEMO_MODE || '').toLowerCase();
return (
podcastOnlyDemoMode === 'true' ||
appMode === 'podcast-only' ||
demoMode === 'podcast-only' ||
envAppMode === 'podcast-only' ||
envDemoMode === 'podcast-only'
);
};
const redirectAfterSubscription = () => {
// In podcast-only demo mode, always force users into podcast flow.
// Never send demo users to onboarding.
if (isPodcastOnlyDemoMode()) {
navigate('/podcast-maker');
return;
}
// Full mode keeps existing onboarding redirect behavior.
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
if (onboardingComplete) {
navigate('/dashboard');
} else {
navigate('/onboarding');
}
};
const fetchPlans = async () => {
try {
setLoading(true);
@@ -133,14 +166,7 @@ const PricingPage: React.FC = () => {
// Refresh subscription status
window.dispatchEvent(new CustomEvent('subscription-updated'));
// After subscription, check if onboarding is complete
// If not complete, redirect to onboarding; otherwise to dashboard
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
if (onboardingComplete) {
navigate('/dashboard');
} else {
navigate('/onboarding');
}
redirectAfterSubscription();
} catch (err) {
console.error('Error subscribing:', err);
setError('Failed to process subscription');
@@ -240,10 +266,13 @@ const PricingPage: React.FC = () => {
setTimeout(() => {
clearInterval(countdownInterval);
// After subscription, check if onboarding is complete
// If not complete, redirect to onboarding; otherwise to dashboard
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
if (onboardingComplete) {
// In podcast-only demo mode, always route users to podcast flow.
if (isPodcastOnlyDemoMode()) {
navigate('/podcast-maker');
} else {
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
if (onboardingComplete) {
// Restore navigation state (path, phase, tool) if available
const navState = restoreNavigationState();
@@ -266,7 +295,8 @@ const PricingPage: React.FC = () => {
}
}
} else {
navigate('/onboarding');
navigate('/onboarding');
}
}
}, 3000);
} catch (err) {