Compare commits
1 Commits
codex/wrap
...
codex/down
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
11966cf341 |
@@ -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,12 @@ 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()
|
||||||
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 +332,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 +347,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 +424,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")
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ IMPORTANT: This is a compatibility layer. For new code, use UserAPIKeyContext di
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
import time
|
||||||
from fastapi import Request
|
from fastapi import Request
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
from typing import Callable
|
from typing import Callable
|
||||||
@@ -20,9 +21,62 @@ class APIKeyInjectionMiddleware:
|
|||||||
for the duration of each request.
|
for the duration of each request.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
# Shared across middleware instances (module currently instantiates per request)
|
||||||
|
_missing_keys_log_timestamps = {}
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.original_keys = {}
|
self.original_keys = {}
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _should_skip_missing_key_warning(request: Request) -> bool:
|
||||||
|
"""
|
||||||
|
Optionally suppress missing-key warnings for non-AI/internal routes.
|
||||||
|
Controlled by API_KEY_INJECTION_SKIP_NON_AI_WARNINGS (default: true).
|
||||||
|
"""
|
||||||
|
skip_non_ai_warnings = os.getenv('API_KEY_INJECTION_SKIP_NON_AI_WARNINGS', 'true').lower() in ('1', 'true', 'yes')
|
||||||
|
if not skip_non_ai_warnings:
|
||||||
|
return False
|
||||||
|
|
||||||
|
path_lower = (request.url.path or '').lower()
|
||||||
|
return (
|
||||||
|
path_lower.startswith('/api/subscription/')
|
||||||
|
or path_lower.startswith('/api/onboarding/')
|
||||||
|
or path_lower.endswith('/status')
|
||||||
|
or path_lower.endswith('/health')
|
||||||
|
or path_lower == '/health'
|
||||||
|
or path_lower == '/status'
|
||||||
|
)
|
||||||
|
|
||||||
|
def _log_missing_keys_non_blocking(self, request: Request, user_id: str) -> None:
|
||||||
|
"""
|
||||||
|
Log missing API keys without interrupting request flow.
|
||||||
|
- Defaults to debug-level logging.
|
||||||
|
- Optional warn once-per-user-per-interval via env:
|
||||||
|
API_KEY_INJECTION_MISSING_KEYS_LOG_MODE=warn_once
|
||||||
|
API_KEY_INJECTION_MISSING_KEYS_LOG_INTERVAL_SECONDS=900
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
if self._should_skip_missing_key_warning(request):
|
||||||
|
logger.debug(f"[API Key Injection] Missing keys for user {user_id} on non-AI route; skipping warning")
|
||||||
|
return
|
||||||
|
|
||||||
|
log_mode = os.getenv('API_KEY_INJECTION_MISSING_KEYS_LOG_MODE', 'debug').lower()
|
||||||
|
if log_mode != 'warn_once':
|
||||||
|
logger.debug(f"No API keys found for user {user_id}")
|
||||||
|
return
|
||||||
|
|
||||||
|
interval_seconds = int(os.getenv('API_KEY_INJECTION_MISSING_KEYS_LOG_INTERVAL_SECONDS', '900'))
|
||||||
|
now = time.time()
|
||||||
|
last_logged_at = self._missing_keys_log_timestamps.get(user_id, 0)
|
||||||
|
if (now - last_logged_at) >= max(interval_seconds, 1):
|
||||||
|
logger.warning(f"No API keys found for user {user_id}")
|
||||||
|
self._missing_keys_log_timestamps[user_id] = now
|
||||||
|
else:
|
||||||
|
logger.debug(f"No API keys found for user {user_id} (warning suppressed by interval)")
|
||||||
|
except Exception as log_error:
|
||||||
|
# Logging should never block request processing
|
||||||
|
logger.debug(f"[API Key Injection] Failed to log missing keys state for user {user_id}: {log_error}")
|
||||||
|
|
||||||
async def __call__(self, request: Request, call_next: Callable):
|
async def __call__(self, request: Request, call_next: Callable):
|
||||||
"""
|
"""
|
||||||
Inject user-specific API keys before processing request,
|
Inject user-specific API keys before processing request,
|
||||||
@@ -68,7 +122,7 @@ class APIKeyInjectionMiddleware:
|
|||||||
# Get user-specific API keys from database
|
# Get user-specific API keys from database
|
||||||
with user_api_keys(user_id) as user_keys:
|
with user_api_keys(user_id) as user_keys:
|
||||||
if not user_keys:
|
if not user_keys:
|
||||||
logger.warning(f"No API keys found for user {user_id}")
|
self._log_missing_keys_non_blocking(request, user_id)
|
||||||
return await call_next(request)
|
return await call_next(request)
|
||||||
|
|
||||||
# Save original environment values
|
# Save original environment values
|
||||||
@@ -120,4 +174,3 @@ async def api_key_injection_middleware(request: Request, call_next: Callable):
|
|||||||
"""
|
"""
|
||||||
middleware = APIKeyInjectionMiddleware()
|
middleware = APIKeyInjectionMiddleware()
|
||||||
return await middleware(request, call_next)
|
return await middleware(request, call_next)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user