Compare commits
1 Commits
codex/wrap
...
codex/remo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a92c4af1a |
@@ -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")
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ from services.database import (
|
|||||||
init_database,
|
init_database,
|
||||||
default_engine,
|
default_engine,
|
||||||
)
|
)
|
||||||
|
from services.user_api_key_context import get_user_api_keys
|
||||||
|
|
||||||
_REQUIRED_SCHEMA: Dict[str, List[str]] = {
|
_REQUIRED_SCHEMA: Dict[str, List[str]] = {
|
||||||
"onboarding_sessions": ["id", "user_id", "updated_at"],
|
"onboarding_sessions": ["id", "user_id", "updated_at"],
|
||||||
@@ -144,6 +145,62 @@ def _check_db_access(checks: List[Dict[str, Any]], errors: List[str], warnings:
|
|||||||
return candidate_user
|
return candidate_user
|
||||||
|
|
||||||
|
|
||||||
|
def _check_production_api_key_loading(
|
||||||
|
checks: List[Dict[str, Any]],
|
||||||
|
errors: List[str],
|
||||||
|
warnings: List[str],
|
||||||
|
) -> None:
|
||||||
|
deploy_env = os.getenv("DEPLOY_ENV", "local").strip().lower()
|
||||||
|
if deploy_env == "local":
|
||||||
|
_record_check(checks, "production_api_key_loading", True, "skipped in local deploy mode")
|
||||||
|
return
|
||||||
|
|
||||||
|
test_tenant_id = os.getenv("ALWRITY_STARTUP_TEST_TENANT_ID", "").strip()
|
||||||
|
if not test_tenant_id:
|
||||||
|
message = (
|
||||||
|
"Missing ALWRITY_STARTUP_TEST_TENANT_ID for production API key startup check."
|
||||||
|
)
|
||||||
|
errors.append(message)
|
||||||
|
_record_check(checks, "production_api_key_loading", False, message)
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
keys = get_user_api_keys(test_tenant_id)
|
||||||
|
except Exception as exc:
|
||||||
|
errors.append(
|
||||||
|
f"Failed to load API keys for startup test tenant '{test_tenant_id}': {exc}"
|
||||||
|
)
|
||||||
|
_record_check(checks, "production_api_key_loading", False, str(exc))
|
||||||
|
return
|
||||||
|
|
||||||
|
if not isinstance(keys, dict):
|
||||||
|
errors.append(
|
||||||
|
f"API key loader returned invalid payload type for startup test tenant '{test_tenant_id}'."
|
||||||
|
)
|
||||||
|
_record_check(checks, "production_api_key_loading", False, "invalid payload type")
|
||||||
|
return
|
||||||
|
|
||||||
|
non_empty_keys = [provider for provider, value in keys.items() if value]
|
||||||
|
if not non_empty_keys:
|
||||||
|
errors.append(
|
||||||
|
f"No API keys could be loaded for startup test tenant '{test_tenant_id}'."
|
||||||
|
)
|
||||||
|
_record_check(checks, "production_api_key_loading", False, "no non-empty keys loaded")
|
||||||
|
return
|
||||||
|
|
||||||
|
warning = None
|
||||||
|
if len(non_empty_keys) < len(keys):
|
||||||
|
warning = (
|
||||||
|
f"Startup test tenant '{test_tenant_id}' has {len(non_empty_keys)}/{len(keys)} non-empty API keys."
|
||||||
|
)
|
||||||
|
warnings.append(warning)
|
||||||
|
|
||||||
|
detail = f"loaded {len(non_empty_keys)} non-empty keys for tenant {test_tenant_id}"
|
||||||
|
if warning:
|
||||||
|
detail = f"{detail}; {warning}"
|
||||||
|
_record_check(checks, "production_api_key_loading", True, detail)
|
||||||
|
|
||||||
|
|
||||||
def run_startup_health_routine() -> Dict[str, Any]:
|
def run_startup_health_routine() -> Dict[str, Any]:
|
||||||
checks: List[Dict[str, Any]] = []
|
checks: List[Dict[str, Any]] = []
|
||||||
errors: List[str] = []
|
errors: List[str] = []
|
||||||
@@ -152,6 +209,8 @@ def run_startup_health_routine() -> Dict[str, Any]:
|
|||||||
_check_workspace_root(checks, errors)
|
_check_workspace_root(checks, errors)
|
||||||
if not errors:
|
if not errors:
|
||||||
_check_db_access(checks, errors, warnings)
|
_check_db_access(checks, errors, warnings)
|
||||||
|
if not errors:
|
||||||
|
_check_production_api_key_loading(checks, errors, warnings)
|
||||||
|
|
||||||
status = "healthy" if not errors else "failed"
|
status = "healthy" if not errors else "failed"
|
||||||
report = {
|
report = {
|
||||||
|
|||||||
@@ -71,10 +71,13 @@ class UserAPIKeyContext:
|
|||||||
"""Load API keys from database for specific user."""
|
"""Load API keys from database for specific user."""
|
||||||
try:
|
try:
|
||||||
from api.content_planning.services.content_strategy.onboarding import OnboardingDataIntegrationService
|
from api.content_planning.services.content_strategy.onboarding import OnboardingDataIntegrationService
|
||||||
from services.database import SessionLocal
|
from services.database import get_session_for_user
|
||||||
|
|
||||||
integration_service = OnboardingDataIntegrationService()
|
integration_service = OnboardingDataIntegrationService()
|
||||||
db = SessionLocal()
|
db = get_session_for_user(user_id)
|
||||||
|
if not db:
|
||||||
|
logger.error(f"Failed to create DB session for user {user_id}")
|
||||||
|
return {}
|
||||||
try:
|
try:
|
||||||
integrated_data = integration_service.get_integrated_data_sync(user_id, db)
|
integrated_data = integration_service.get_integrated_data_sync(user_id, db)
|
||||||
keys = integrated_data.get('api_keys_data', {})
|
keys = integrated_data.get('api_keys_data', {})
|
||||||
@@ -153,4 +156,3 @@ def get_tavily_key(user_id: Optional[str] = None) -> Optional[str]:
|
|||||||
def get_copilotkit_key(user_id: Optional[str] = None) -> Optional[str]:
|
def get_copilotkit_key(user_id: Optional[str] = None) -> Optional[str]:
|
||||||
"""Get CopilotKit API key for user."""
|
"""Get CopilotKit API key for user."""
|
||||||
return UserAPIKeyContext.get_user_key(user_id, 'copilotkit')
|
return UserAPIKeyContext.get_user_key(user_id, 'copilotkit')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user