* fix: tree editor authoring blockers - scroll trap, form density, branching hint - Replace fixed viewport height with flex layout in NodeEditorPanel - Make footer sticky so Save/Cancel always reachable - Compact root node banner to single-line with InfoTip tooltip - Reduce resolution note from callout box to inline text - Add answer-first branching hint below options label Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: broken functionality - auth errors, toast logic, role update, routing, step library - Extract backend error detail in auth store login/register - Fix inverted 4xx toast logic and add 429 rate limit handling - Send account_role field to match backend schema in role update - Use type-aware routing for Repeat Last Session button - Add step library placeholder page and route, remove dot badge Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: navigation correctness - back buttons, exit dialog, dedup nav, redirects - Standardize all procedural back/exit paths to /trees (not /my-trees) - Add exit button with ConfirmDialog to procedural session top bar - Consolidate duplicate account links in sidebar and topbar - Auto-redirect non-owners to personal analytics - Add toast feedback before silent permission redirects in tree editor - Delete orphaned AdminCategoriesPage Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: shared components, ConfirmDialog migration, pinned flow fixes - Create shared Spinner component with sm/md/lg sizes - Migrate 13 page-level spinners to shared Spinner - Promote EmptyState to shared component, adopt in MyShares and SessionHistory - Replace window.confirm with ConfirmDialog in 3 files - Fix PinnedFlow.tree_type to include maintenance, update emoji display - Verify sidebar unpin handler already correct (no-op) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: visual consistency - toasts, typography, focus rings, container padding - Remove richColors from Sonner toasts, limit stacking to 3 - Add font-heading to all page H1s (7 files) - Add font-label (Outfit) to TagBadges component - Fix focus ring tokens on analytics pages - Replace deprecated glass-stat with design system tokens - Standardize container padding on analytics pages Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: backend alignment - remove drafts toggle, clean dead code, truncation indicator - Remove non-functional drafts toggle and clean TreeFilters type - Fix AccountInvite type to match backend schema - Remove dead API methods: pinnedFlows.pin/reorder, trees.getSharedTree - Remove unused types: SessionListResponse, RatingCreate.is_verified_use - Add session list truncation indicator with size=51 lookahead Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: remove bg-black from PageLoader and RouteError, fix PageLoader height PageLoader used h-screen inside a grid cell, causing it to overflow. Changed to h-full so it fits within the main-content area. Removed bg-black from both PageLoader and RouteError in favor of theme-aware bg-background to prevent black flash during lazy loading. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: guard against Pydantic validation error objects in toast/error messages FastAPI returns `detail` as an array of objects for 422 validation errors, not a string. Passing these objects to toast.error() or rendering them in JSX crashes React with Error #31 ("Objects are not valid as a React child"). Now checks typeof detail === 'string' before using it. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: toast styling, node editor first-click, action node placeholder pattern 1. Toast fixes: Add theme="dark" to Sonner, use !important CSS overrides instead of zero-specificity :where() selectors, suppress noisy 4xx global toasts (pages handle their own errors) 2. Node editor first-click: Add node.type to draft initialization useEffect deps so draft resets when answer stub converts to real type 3. Action node redesign: Remove NodePicker dropdown, auto-create answer placeholder on save (matching decision node pattern). Users click the placeholder on canvas to choose type and fill in details. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: auto-seed test users when release command fails on PR envs The background seeder now creates users directly via DB if login fails, instead of silently aborting. This handles Railway PR environments where the releaseCommand may not execute properly. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: remove categories/tags from sidebar to prevent footer clipping Categories and Tags sections were pushing Feedback, Account, and Collapse off-screen when All Flows expanded its children. These filters already exist on the TreeLibraryPage, so the sidebar duplicates were removed. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
196 lines
7.3 KiB
Python
196 lines
7.3 KiB
Python
import asyncio
|
|
import logging
|
|
import os
|
|
from contextlib import asynccontextmanager
|
|
from fastapi import FastAPI
|
|
from fastapi.middleware.cors import CORSMiddleware
|
|
from slowapi import _rate_limit_exceeded_handler
|
|
from slowapi.errors import RateLimitExceeded
|
|
|
|
from app.core.config import settings
|
|
from app.core.database import init_db, async_session_maker
|
|
from app.core.logging_config import setup_logging
|
|
from app.core.middleware import RequestLoggingMiddleware, ErrorLoggingMiddleware
|
|
from app.core.rate_limit import limiter
|
|
from app.api.router import api_router
|
|
from app.core.scheduler import scheduler, load_all_schedules
|
|
|
|
# Initialize logging configuration
|
|
setup_logging()
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _configure_seed_module(mod: object, api_url: str, email: str, password: str) -> None:
|
|
"""Set globals on a seed script module."""
|
|
mod.API_BASE_URL = api_url # type: ignore[attr-defined]
|
|
mod.ADMIN_EMAIL = email # type: ignore[attr-defined]
|
|
mod.ADMIN_PASSWORD = password # type: ignore[attr-defined]
|
|
|
|
|
|
async def _seed_users_directly() -> None:
|
|
"""Seed test users directly via DB if they don't exist yet."""
|
|
try:
|
|
from scripts.seed_test_users import main as seed_users
|
|
logger.info("[seed] Seeding test users directly via DB...")
|
|
await seed_users()
|
|
logger.info("[seed] Test users seeded!")
|
|
except Exception as e:
|
|
logger.warning(f"[seed] User seeding failed: {e}")
|
|
raise
|
|
|
|
|
|
async def _seed_trees_background() -> None:
|
|
"""Background task: seed test users + all flows after server is ready."""
|
|
await asyncio.sleep(5) # Wait for server to be fully ready
|
|
port = os.environ.get("PORT", "8000")
|
|
api_url = f"http://127.0.0.1:{port}/api/v1"
|
|
email = "admin@resolutionflow.example.com"
|
|
password = "TestPass123!"
|
|
|
|
try:
|
|
import httpx
|
|
# Try to login — if it fails, seed users first
|
|
async with httpx.AsyncClient(base_url=api_url, timeout=30) as client:
|
|
login_resp = await client.post("/auth/login/json", json={"email": email, "password": password})
|
|
if login_resp.status_code != 200:
|
|
logger.warning("[seed] Admin login failed — seeding users first")
|
|
await _seed_users_directly()
|
|
# Retry login after seeding users
|
|
login_resp = await client.post("/auth/login/json", json={"email": email, "password": password})
|
|
if login_resp.status_code != 200:
|
|
logger.error(f"[seed] Admin login still failing after user seed (status={login_resp.status_code}) — aborting")
|
|
return
|
|
|
|
token = login_resp.json()["access_token"]
|
|
# Check if trees already exist
|
|
trees_resp = await client.get("/trees", headers={"Authorization": f"Bearer {token}"})
|
|
if trees_resp.status_code == 200 and len(trees_resp.json()) > 0:
|
|
logger.info(f"[seed] {len(trees_resp.json())} flows already exist — skipping flow seeding")
|
|
return
|
|
|
|
# No flows yet — run all seed scripts
|
|
seed_scripts = [
|
|
("seed_trees (Tier 1)", "scripts.seed_trees", "seed_database"),
|
|
("seed_trees_v2 (AD/M365/Networking)", "scripts.seed_trees_v2", "seed_database"),
|
|
("seed_procedural_flows", "scripts.seed_procedural_flows", "seed_procedural_flows"),
|
|
("seed_maintenance_flows", "scripts.seed_maintenance_flows", "seed_maintenance_flows"),
|
|
]
|
|
|
|
for label, module_path, func_name in seed_scripts:
|
|
try:
|
|
import importlib
|
|
mod = importlib.import_module(module_path)
|
|
_configure_seed_module(mod, api_url, email, password)
|
|
seed_fn = getattr(mod, func_name)
|
|
logger.info(f"[seed] Running {label}...")
|
|
await seed_fn()
|
|
logger.info(f"[seed] {label} complete!")
|
|
except Exception as e:
|
|
logger.warning(f"[seed] {label} failed (non-fatal): {e}")
|
|
|
|
logger.info("[seed] All flow seeding complete!")
|
|
except Exception as e:
|
|
logger.warning(f"[seed] Flow seeding failed (non-fatal): {e}")
|
|
|
|
|
|
@asynccontextmanager
|
|
async def lifespan(app: FastAPI):
|
|
"""Application lifespan handler."""
|
|
# Startup
|
|
logger.info("Starting ResolutionFlow API server...")
|
|
logger.info(f"Environment: {'Development' if settings.DEBUG else 'Production'}")
|
|
logger.info(f"ALLOW_RAILWAY_ORIGINS: {settings.ALLOW_RAILWAY_ORIGINS}")
|
|
# Note: In production, use Alembic migrations instead of init_db
|
|
# await init_db()
|
|
|
|
# Start maintenance schedule runner
|
|
scheduler.start()
|
|
async with async_session_maker() as db:
|
|
await load_all_schedules(db)
|
|
|
|
# Auto-seed trees in background on PR environments
|
|
seed_task = None
|
|
if settings.SEED_ON_DEPLOY:
|
|
logger.info("[seed] SEED_ON_DEPLOY=true — scheduling background tree seeding")
|
|
seed_task = asyncio.create_task(_seed_trees_background())
|
|
|
|
yield
|
|
|
|
# Shutdown
|
|
if seed_task and not seed_task.done():
|
|
seed_task.cancel()
|
|
scheduler.shutdown(wait=False)
|
|
logger.info("Shutting down ResolutionFlow API server...")
|
|
|
|
|
|
app = FastAPI(
|
|
title=settings.APP_NAME,
|
|
description="ResolutionFlow - Take the path MOST traveled. Guided troubleshooting with automatic documentation.",
|
|
version="1.0.0",
|
|
docs_url="/api/docs",
|
|
redoc_url="/api/redoc",
|
|
openapi_url="/api/openapi.json",
|
|
lifespan=lifespan
|
|
)
|
|
|
|
app.state.limiter = limiter
|
|
app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
|
|
|
|
# Add logging middleware (BEFORE CORS to log all requests)
|
|
app.add_middleware(ErrorLoggingMiddleware)
|
|
app.add_middleware(RequestLoggingMiddleware)
|
|
|
|
# Configure CORS
|
|
# Note: When ALLOW_RAILWAY_ORIGINS is True, we use allow_origin_regex for Railway domains
|
|
# PLUS the explicit allowed_origins list (for custom domains like app.resolutionflow.com)
|
|
if settings.ALLOW_RAILWAY_ORIGINS:
|
|
app.add_middleware(
|
|
CORSMiddleware,
|
|
allow_origins=settings.allowed_origins,
|
|
allow_origin_regex=r"https://.*\.up\.railway\.app",
|
|
allow_credentials=True,
|
|
allow_methods=["*"],
|
|
allow_headers=["*"],
|
|
expose_headers=["X-Redaction-Mode", "X-Redaction-Summary"],
|
|
)
|
|
else:
|
|
app.add_middleware(
|
|
CORSMiddleware,
|
|
allow_origins=settings.allowed_origins,
|
|
allow_credentials=True,
|
|
allow_methods=["*"],
|
|
allow_headers=["*"],
|
|
expose_headers=["X-Redaction-Mode", "X-Redaction-Summary"],
|
|
)
|
|
|
|
# Include API router
|
|
app.include_router(api_router, prefix=settings.API_V1_PREFIX)
|
|
|
|
|
|
@app.get("/")
|
|
async def root():
|
|
"""Root endpoint."""
|
|
return {
|
|
"message": "ResolutionFlow API",
|
|
"docs": "/api/docs",
|
|
"version": "1.0.0"
|
|
}
|
|
|
|
|
|
@app.get("/health")
|
|
async def health_check():
|
|
"""Health check endpoint."""
|
|
return {"status": "healthy"}
|
|
|
|
|
|
if settings.DEBUG:
|
|
@app.get("/debug/cors")
|
|
async def debug_cors():
|
|
"""Debug endpoint to check CORS configuration."""
|
|
return {
|
|
"allow_railway_origins": settings.ALLOW_RAILWAY_ORIGINS,
|
|
"cors_mode": "regex + list" if settings.ALLOW_RAILWAY_ORIGINS else "list",
|
|
"allowed_origins": settings.allowed_origins,
|
|
"railway_regex": r"https://.*\.up\.railway\.app" if settings.ALLOW_RAILWAY_ORIGINS else None
|
|
}
|