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/app.py

@@ -48,9 +48,6 @@ load_dotenv(backend_dir / '.env')  # backend/.env
 load_dotenv(project_root / '.env')  # root .env (fallback)
 load_dotenv()  # CWD .env (fallback)
 
-# Feature flags (read early so app wiring can rely on a single source of truth)
-PODCAST_ONLY_DEMO_MODE = os.getenv("PODCAST_ONLY_DEMO_MODE", "false").lower() == "true"
-
 # Set up clean logging for end users
 from logging_config import setup_clean_logging
 setup_clean_logging()
@@ -263,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)
@@ -408,62 +408,48 @@ async def analyze_urls_ai_endpoint(request: AnalyzeURLsRequest, current_user: di
     """Run AI-powered SEO analysis on selected URLs."""
     return await analyze_urls_ai(request, current_user)
 
-# Centralized mode helpers for router wiring.
-# Keep all mode decisions in this section to avoid scattered env checks.
-def is_podcast_only_demo_mode() -> bool:
-    return PODCAST_ONLY_DEMO_MODE
+# Include platform analytics router
+from routers.platform_analytics import router as platform_analytics_router
+app.include_router(platform_analytics_router)
+# Include Bing Analytics Storage router to expose storage-backed endpoints
+from routers.bing_analytics_storage import router as bing_analytics_storage_router
+app.include_router(bing_analytics_storage_router)
+app.include_router(images_router)
+app.include_router(image_studio_router)
+app.include_router(product_marketing_router)
+app.include_router(campaign_creator_router)
 
+# Include content assets router
+from api.content_assets.router import router as content_assets_router
+app.include_router(content_assets_router)
 
-def should_include_non_podcast_routers() -> bool:
-    return not is_podcast_only_demo_mode()
-
-
-# Include Podcast Maker router (available in all modes)
+# Include Podcast Maker router
 from api.podcast.router import router as podcast_router
 app.include_router(podcast_router)
 
-if should_include_non_podcast_routers():
-    # Include platform analytics router
-    from routers.platform_analytics import router as platform_analytics_router
-    app.include_router(platform_analytics_router)
+# Include YouTube Creator Studio router
+from api.youtube.router import router as youtube_router
+app.include_router(youtube_router, prefix="/api")
 
-    # Include Bing Analytics Storage router to expose storage-backed endpoints
-    from routers.bing_analytics_storage import router as bing_analytics_storage_router
-    app.include_router(bing_analytics_storage_router)
-    app.include_router(images_router)
-    app.include_router(image_studio_router)
-    app.include_router(product_marketing_router)
-    app.include_router(campaign_creator_router)
+# Include research configuration router
+app.include_router(research_config_router, prefix="/api/research", tags=["research"])
 
-    # Include content assets router
-    from api.content_assets.router import router as content_assets_router
-    app.include_router(content_assets_router)
+# Include Research Engine router (standalone AI research module)
+from api.research.router import router as research_engine_router
+app.include_router(research_engine_router, tags=["Research Engine"])
 
-    # Include YouTube Creator Studio router
-    from api.youtube.router import router as youtube_router
-    app.include_router(youtube_router, prefix="/api")
+# Scheduler dashboard routes
+from api.scheduler_dashboard import router as scheduler_dashboard_router
+app.include_router(scheduler_dashboard_router)
+app.include_router(oauth_token_monitoring_router)
 
-    # Include research configuration router
-    app.include_router(research_config_router, prefix="/api/research", tags=["research"])
+# Autonomous Agents API routes (Phase 3A)
+from api.agents_api import router as agents_router
+app.include_router(agents_router)
 
-    # Include Research Engine router (standalone AI research module)
-    from api.research.router import router as research_engine_router
-    app.include_router(research_engine_router, tags=["Research Engine"])
-
-    # Scheduler dashboard routes
-    from api.scheduler_dashboard import router as scheduler_dashboard_router
-    app.include_router(scheduler_dashboard_router)
-    app.include_router(oauth_token_monitoring_router)
-
-    # Autonomous Agents API routes (Phase 3A)
-    from api.agents_api import router as agents_router
-    app.include_router(agents_router)
-
-    # Today workflow routes
-    from api.today_workflow import router as today_workflow_router
-    app.include_router(today_workflow_router)
-else:
-    logger.info("PODCAST_ONLY_DEMO_MODE is enabled: non-podcast routers are not registered.")
+# Today workflow routes
+from api.today_workflow import router as today_workflow_router
+app.include_router(today_workflow_router)
 
 # Setup frontend serving using modular utilities
 frontend_serving.setup_frontend_serving()

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

backend/start_alwrity_backend.py

@@ -298,11 +298,6 @@ def main():
     parser.add_argument("--dev", action="store_true", help="Enable development mode (auto-reload)")
     parser.add_argument("--production", action="store_true", help="Enable production mode (optimized for deployment)")
     parser.add_argument("--verbose", action="store_true", help="Enable verbose logging for debugging")
-    parser.add_argument(
-        "--podcast-only-demo",
-        action="store_true",
-        help="Enable podcast-only demo mode (sets PODCAST_ONLY_DEMO_MODE=true before app startup)",
-    )
     args = parser.parse_args()
     
     # Determine mode
@@ -312,8 +307,6 @@ def main():
     
     # Set global verbose flag for utilities
     os.environ["ALWRITY_VERBOSE"] = "true" if verbose_mode else "false"
-    if args.podcast_only_demo:
-        os.environ["PODCAST_ONLY_DEMO_MODE"] = "true"
     
     print("[*] ALwrity Backend Server")
     print("=" * 40)
@@ -321,8 +314,6 @@ def main():
     print(f"Auto-reload: {'ENABLED' if enable_reload else 'DISABLED'}")
     if verbose_mode:
         print("Verbose logging: ENABLED")
-    if args.podcast_only_demo:
-        print("Podcast-only demo mode: ENABLED")
     print("=" * 40)
     
     # Check if we're in the right directory
@@ -410,4 +401,4 @@ def main():
 if __name__ == "__main__":
     success = main()
     if not success:
-        sys.exit(1)
+        sys.exit(1)