Compare commits
1 Commits
codex/wrap
...
codex/ensu
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d13cce7a46 |
@@ -16,15 +16,22 @@ class RouterManager:
|
|||||||
self.app = app
|
self.app = app
|
||||||
self.included_routers = []
|
self.included_routers = []
|
||||||
self.failed_routers = []
|
self.failed_routers = []
|
||||||
|
self._included_router_names = set()
|
||||||
|
|
||||||
def include_router_safely(self, router, router_name: str = None) -> bool:
|
def include_router_safely(self, router, router_name: str = None) -> bool:
|
||||||
"""Include a router safely with error handling."""
|
"""Include a router safely with error handling."""
|
||||||
verbose = os.getenv("ALWRITY_VERBOSE", "false").lower() == "true"
|
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:
|
try:
|
||||||
self.app.include_router(router)
|
self.app.include_router(router)
|
||||||
router_name = router_name or getattr(router, 'prefix', 'unknown')
|
|
||||||
self.included_routers.append(router_name)
|
self.included_routers.append(router_name)
|
||||||
|
self._included_router_names.add(router_name)
|
||||||
if verbose:
|
if verbose:
|
||||||
logger.info(f"✅ Router included successfully: {router_name}")
|
logger.info(f"✅ Router included successfully: {router_name}")
|
||||||
return True
|
return True
|
||||||
@@ -40,19 +47,21 @@ class RouterManager:
|
|||||||
# Import os locally to avoid UnboundLocalError if it's shadowed
|
# Import os locally to avoid UnboundLocalError if it's shadowed
|
||||||
import os
|
import os
|
||||||
verbose = os.getenv("ALWRITY_VERBOSE", "false").lower() == "true"
|
verbose = os.getenv("ALWRITY_VERBOSE", "false").lower() == "true"
|
||||||
|
demo_mode = os.getenv("ALWRITY_DEMO_MODE", "false").lower() == "true"
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if verbose:
|
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
|
# Component logic router
|
||||||
from api.component_logic import router as component_logic_router
|
from api.component_logic import router as component_logic_router
|
||||||
self.include_router_safely(component_logic_router, "component_logic")
|
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)
|
# Step 3 Research router (core onboarding functionality)
|
||||||
from api.onboarding_utils.step3_routes import router as step3_research_router
|
from api.onboarding_utils.step3_routes import router as step3_research_router
|
||||||
self.include_router_safely(step3_research_router, "step3_research")
|
self.include_router_safely(step3_research_router, "step3_research")
|
||||||
|
|||||||
@@ -48,8 +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()
|
||||||
@@ -112,8 +110,7 @@ from services.startup_health import (
|
|||||||
# Import OAuth token monitoring routes
|
# Import OAuth token monitoring routes
|
||||||
from api.oauth_token_monitoring_routes import router as oauth_token_monitoring_router
|
from api.oauth_token_monitoring_routes import router as oauth_token_monitoring_router
|
||||||
|
|
||||||
if not PODCAST_ONLY_DEMO_MODE:
|
# Import SEO Dashboard endpoints
|
||||||
# Import SEO Dashboard endpoints only when non-demo features are enabled
|
|
||||||
from api.seo_dashboard import (
|
from api.seo_dashboard import (
|
||||||
get_seo_dashboard_data,
|
get_seo_dashboard_data,
|
||||||
get_seo_health_score,
|
get_seo_health_score,
|
||||||
@@ -262,17 +259,15 @@ async def onboarding_status():
|
|||||||
return onboarding_manager.get_onboarding_status()
|
return onboarding_manager.get_onboarding_status()
|
||||||
|
|
||||||
# Include routers using modular utilities
|
# Include routers using modular utilities
|
||||||
if not PODCAST_ONLY_DEMO_MODE:
|
|
||||||
router_manager.include_core_routers()
|
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()
|
router_manager.include_optional_routers()
|
||||||
else:
|
|
||||||
logger.info("PODCAST_ONLY_DEMO_MODE enabled: including only podcast and subscription feature routers.")
|
|
||||||
app.include_router(subscription_router)
|
|
||||||
|
|
||||||
# Include assets serving router (must be mounted to serve generated images)
|
# Include assets serving router (must be mounted to serve generated images)
|
||||||
app.include_router(assets_serving_router)
|
app.include_router(assets_serving_router)
|
||||||
|
|
||||||
if not PODCAST_ONLY_DEMO_MODE:
|
|
||||||
# SEO Dashboard endpoints
|
# SEO Dashboard endpoints
|
||||||
@app.get("/api/seo-dashboard/data")
|
@app.get("/api/seo-dashboard/data")
|
||||||
async def seo_dashboard_data():
|
async def seo_dashboard_data():
|
||||||
@@ -340,6 +335,8 @@ if not PODCAST_ONLY_DEMO_MODE:
|
|||||||
"""Refresh analytics data by invalidating cache and fetching fresh data."""
|
"""Refresh analytics data by invalidating cache and fetching fresh data."""
|
||||||
return await refresh_analytics_data(current_user, site_url)
|
return await refresh_analytics_data(current_user, site_url)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/api/seo-dashboard/onboarding-task-health")
|
@app.get("/api/seo-dashboard/onboarding-task-health")
|
||||||
async def onboarding_task_health_endpoint(current_user: dict = Depends(get_current_user), site_url: str = None):
|
async def onboarding_task_health_endpoint(current_user: dict = Depends(get_current_user), site_url: str = None):
|
||||||
"""Get consolidated health for onboarding-scheduled SEO tasks."""
|
"""Get consolidated health for onboarding-scheduled SEO tasks."""
|
||||||
@@ -353,17 +350,31 @@ if not PODCAST_ONLY_DEMO_MODE:
|
|||||||
# Phase 2B: Semantic health monitoring endpoint (24-hour polling)
|
# Phase 2B: Semantic health monitoring endpoint (24-hour polling)
|
||||||
@app.get("/api/seo-dashboard/semantic-health")
|
@app.get("/api/seo-dashboard/semantic-health")
|
||||||
async def semantic_health_endpoint(current_user: dict = Depends(get_current_user)):
|
async def semantic_health_endpoint(current_user: dict = Depends(get_current_user)):
|
||||||
"""Get real-time semantic health metrics for content and competitors."""
|
"""
|
||||||
|
Get real-time semantic health metrics for content and competitors.
|
||||||
|
This endpoint provides Phase 2B semantic intelligence monitoring data.
|
||||||
|
|
||||||
|
Returns semantic health score, status, and recommendations.
|
||||||
|
Data is cached and updated every 24 hours via scheduler.
|
||||||
|
"""
|
||||||
return await get_semantic_health(current_user)
|
return await get_semantic_health(current_user)
|
||||||
|
|
||||||
|
|
||||||
@app.get("/api/seo-dashboard/cache-stats")
|
@app.get("/api/seo-dashboard/cache-stats")
|
||||||
async def semantic_cache_stats_endpoint(current_user: dict = Depends(get_current_user)):
|
async def semantic_cache_stats_endpoint(current_user: dict = Depends(get_current_user)):
|
||||||
"""Get semantic cache performance statistics."""
|
"""
|
||||||
|
Get semantic cache performance statistics.
|
||||||
|
Returns hit rate, memory usage, and eviction counts.
|
||||||
|
"""
|
||||||
return await get_semantic_cache_stats(current_user)
|
return await get_semantic_cache_stats(current_user)
|
||||||
|
|
||||||
|
|
||||||
@app.get("/api/seo-dashboard/sif-health")
|
@app.get("/api/seo-dashboard/sif-health")
|
||||||
async def sif_indexing_health_endpoint(current_user: dict = Depends(get_current_user)):
|
async def sif_indexing_health_endpoint(current_user: dict = Depends(get_current_user)):
|
||||||
"""Get SIF indexing health summary for the current user."""
|
"""
|
||||||
|
Get SIF indexing health summary for the current user.
|
||||||
|
Used by the Semantic Indexing Status widget on the dashboard.
|
||||||
|
"""
|
||||||
return await get_sif_indexing_health(current_user)
|
return await get_sif_indexing_health(current_user)
|
||||||
|
|
||||||
# Comprehensive SEO Analysis endpoints
|
# Comprehensive SEO Analysis endpoints
|
||||||
@@ -416,7 +427,6 @@ if not PODCAST_ONLY_DEMO_MODE:
|
|||||||
from api.podcast.router import router as podcast_router
|
from api.podcast.router import router as podcast_router
|
||||||
app.include_router(podcast_router)
|
app.include_router(podcast_router)
|
||||||
|
|
||||||
if not PODCAST_ONLY_DEMO_MODE:
|
|
||||||
# Include YouTube Creator Studio router
|
# Include YouTube Creator Studio router
|
||||||
from api.youtube.router import router as youtube_router
|
from api.youtube.router import router as youtube_router
|
||||||
app.include_router(youtube_router, prefix="/api")
|
app.include_router(youtube_router, prefix="/api")
|
||||||
|
|||||||
@@ -244,6 +244,9 @@ async def onboarding_status():
|
|||||||
|
|
||||||
# Include routers using modular utilities
|
# Include routers using modular utilities
|
||||||
router_manager.include_core_routers()
|
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()
|
router_manager.include_optional_routers()
|
||||||
|
|
||||||
# SEO Dashboard endpoints
|
# SEO Dashboard endpoints
|
||||||
|
|||||||
Reference in New Issue
Block a user