fix: remove MCP integration from main.py to restore backend stability; update docker-compose volumes and labels
This commit is contained in:
+5
-50
@@ -9,7 +9,6 @@ from app.config import get_settings
|
||||
from app.database import engine, init_db, async_session
|
||||
from app.cache import cache
|
||||
from app.routers import equipment, health, admin, rental_requests, contact
|
||||
from app.mcp_server import get_mcp_app, mcp_session_manager
|
||||
from app.services.sync_service import SyncService
|
||||
from app.services.email_service import EmailService
|
||||
|
||||
@@ -17,7 +16,6 @@ logger = logging.getLogger(__name__)
|
||||
settings = get_settings()
|
||||
|
||||
scheduler = AsyncIOScheduler()
|
||||
_mcp_lifespan_cm = None # MCP session manager context manager
|
||||
|
||||
|
||||
async def run_equipment_sync() -> None:
|
||||
@@ -40,71 +38,28 @@ async def run_email_retry() -> None:
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
"""Application lifespan: init DB, start scheduler, connect cache."""
|
||||
global _mcp_lifespan_cm
|
||||
# Create tables (for dev/testing; production uses Alembic)
|
||||
await init_db()
|
||||
|
||||
# Connect Redis cache
|
||||
await cache.connect()
|
||||
|
||||
# Start APScheduler
|
||||
scheduler.add_job(
|
||||
run_equipment_sync,
|
||||
trigger="cron",
|
||||
hour="*/6",
|
||||
id="equipment_sync",
|
||||
replace_existing=True,
|
||||
)
|
||||
scheduler.add_job(
|
||||
run_email_retry,
|
||||
trigger="cron",
|
||||
minute="*/15",
|
||||
id="email_retry",
|
||||
replace_existing=True,
|
||||
)
|
||||
scheduler.add_job(run_equipment_sync, trigger="cron", hour="*/6", id="equipment_sync", replace_existing=True)
|
||||
scheduler.add_job(run_email_retry, trigger="cron", minute="*/15", id="email_retry", replace_existing=True)
|
||||
scheduler.start()
|
||||
logger.info("APScheduler started with equipment_sync (every 6h) and email_retry (every 15min)")
|
||||
|
||||
# Start MCP session manager (required for streamable HTTP transport)
|
||||
# run() can only be called once, so store the context manager
|
||||
_mcp_lifespan_cm = mcp_session_manager.run()
|
||||
await _mcp_lifespan_cm.__aenter__()
|
||||
logger.info("MCP session manager started")
|
||||
logger.info("APScheduler started")
|
||||
|
||||
yield
|
||||
|
||||
# Shutdown
|
||||
# Stop MCP session manager
|
||||
if _mcp_lifespan_cm:
|
||||
await _mcp_lifespan_cm.__aexit__(None, None, None)
|
||||
_mcp_lifespan_cm = None
|
||||
scheduler.shutdown(wait=False)
|
||||
await cache.disconnect()
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
app = FastAPI(
|
||||
title="HMS Licht & Ton API",
|
||||
version="1.0.0",
|
||||
lifespan=lifespan,
|
||||
)
|
||||
app = FastAPI(title="HMS Licht & Ton API", version="1.0.0", lifespan=lifespan)
|
||||
|
||||
# CORS
|
||||
origins = [o.strip() for o in settings.cors_origins.split(",") if o.strip()]
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=origins,
|
||||
allow_methods=["GET", "POST"],
|
||||
allow_headers=["*"],
|
||||
allow_credentials=True,
|
||||
)
|
||||
app.add_middleware(CORSMiddleware, allow_origins=origins, allow_methods=["GET", "POST"], allow_headers=["*"], allow_credentials=True)
|
||||
|
||||
# Routers
|
||||
app.include_router(equipment.router)
|
||||
app.include_router(health.router)
|
||||
app.include_router(admin.router)
|
||||
app.include_router(rental_requests.router)
|
||||
app.include_router(contact.router)
|
||||
|
||||
# MCP Server (streamable HTTP at /mcp)
|
||||
app.mount("/mcp", get_mcp_app())
|
||||
|
||||
Reference in New Issue
Block a user