Ensure subscription router is always mounted without duplicates

backend/alwrity_utils/router_manager.py

@@ -16,15 +16,22 @@ class RouterManager:
         self.app = app
         self.included_routers = []
         self.failed_routers = []
+        self._included_router_names = set()
     
     def include_router_safely(self, router, router_name: str = None) -> bool:
         """Include a router safely with error handling."""
         verbose = os.getenv("ALWRITY_VERBOSE", "false").lower() == "true"
+        router_name = router_name or getattr(router, 'prefix', 'unknown')
+
+        if router_name in self._included_router_names:
+            if verbose:
+                logger.info(f"↩️ Router already included, skipping duplicate: {router_name}")
+            return True
 
         try:
             self.app.include_router(router)
-            router_name = router_name or getattr(router, 'prefix', 'unknown')
             self.included_routers.append(router_name)
+            self._included_router_names.add(router_name)
             if verbose:
                 logger.info(f"✅ Router included successfully: {router_name}")
             return True
@@ -40,19 +47,21 @@ class RouterManager:
         # Import os locally to avoid UnboundLocalError if it's shadowed
         import os
         verbose = os.getenv("ALWRITY_VERBOSE", "false").lower() == "true"
+        demo_mode = os.getenv("ALWRITY_DEMO_MODE", "false").lower() == "true"
 
         try:
             if verbose:
-                logger.info("Including core routers...")
+                logger.info(f"Including core routers (demo_mode={demo_mode})...")
+
+            # Subscription router MUST always be included (including demo mode) so
+            # payment/preflight/subscription endpoints remain available.
+            from api.subscription import router as subscription_router
+            self.include_router_safely(subscription_router, "subscription")
 
             # Component logic router
             from api.component_logic import router as component_logic_router
             self.include_router_safely(component_logic_router, "component_logic")
             
-            # Subscription router
-            from api.subscription import router as subscription_router
-            self.include_router_safely(subscription_router, "subscription")
-            
             # Step 3 Research router (core onboarding functionality)
             from api.onboarding_utils.step3_routes import router as step3_research_router
             self.include_router_safely(step3_research_router, "step3_research")

backend/api/podcast/handlers/dubbing.py

@@ -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,

backend/app.py

@@ -260,6 +260,9 @@ async def onboarding_status():
 
 # Include routers using modular utilities
 router_manager.include_core_routers()
+# Safety net: keep subscription routes available even if core inclusion flow changes
+# in special modes (e.g., demo mode). De-dup is handled by RouterManager.
+router_manager.include_router_safely(subscription_router, "subscription")
 router_manager.include_optional_routers()
 
 # Include assets serving router (must be mounted to serve generated images)

backend/main.py

@@ -244,6 +244,9 @@ async def onboarding_status():
 
 # Include routers using modular utilities
 router_manager.include_core_routers()
+# Safety net: keep subscription routes available even if core inclusion flow changes
+# in special modes (e.g., demo mode). De-dup is handled by RouterManager.
+router_manager.include_router_safely(subscription_router, "subscription")
 router_manager.include_optional_routers()
 
 # SEO Dashboard endpoints