Compare commits
1 Commits
codex/ensu
...
codex/guar
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d948e0222 |
@@ -16,22 +16,15 @@ 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
|
||||
@@ -47,21 +40,19 @@ 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(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")
|
||||
logger.info("Including core routers...")
|
||||
|
||||
# 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")
|
||||
|
||||
@@ -48,6 +48,13 @@ load_dotenv(backend_dir / '.env') # backend/.env
|
||||
load_dotenv(project_root / '.env') # root .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
|
||||
from logging_config import setup_clean_logging
|
||||
setup_clean_logging()
|
||||
@@ -183,7 +190,9 @@ rate_limiter = RateLimiter(window_seconds=60, max_requests=200)
|
||||
frontend_serving = FrontendServing(app)
|
||||
router_manager = RouterManager(app)
|
||||
|
||||
onboarding_manager = OnboardingManager(app)
|
||||
onboarding_manager = None
|
||||
if not PODCAST_ONLY_DEMO_MODE:
|
||||
onboarding_manager = OnboardingManager(app)
|
||||
|
||||
# Middleware Order (FastAPI executes in REVERSE order of registration - LIFO):
|
||||
# Registration order: 1. Monitoring 2. Rate Limit 3. API Key Injection
|
||||
@@ -255,14 +264,18 @@ async def router_status():
|
||||
# Onboarding management endpoints
|
||||
@app.get("/api/onboarding/status")
|
||||
async def onboarding_status():
|
||||
"""Get onboarding manager status."""
|
||||
"""Get onboarding manager status (or demo-mode disabled state)."""
|
||||
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()
|
||||
|
||||
# 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)
|
||||
|
||||
@@ -244,9 +244,6 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user