Updated main file

app/main.py

@@ -1,6 +1,7 @@
 """
 Main FastAPI application module.
 """
+import os
 import time
 import logging
 import json
@@ -9,6 +10,7 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 from contextlib import asynccontextmanager
+import warnings
 
 from app.page_speed.config import settings
 from app.page_speed.models import HealthResponse
@@ -19,19 +21,16 @@ from app.content_relevence import routes as content_relevance_routes
 from app.keywords.routes import router as keywords_router
 from app.uiux import routes as uiux_routes
 from app.mobile_usability import routes as mobile_usability
-# app/suppress_warnings.py
-
-import warnings
 
-# Suppress Pydantic config change warning
+# ─────────────────────────────────────────────
+# Suppress warnings
+# ─────────────────────────────────────────────
 warnings.filterwarnings(
     "ignore",
     message="Valid config keys have changed in V2:*",
     category=UserWarning,
     module="pydantic._internal._config",
 )
-
-# Suppress other optional warnings
 warnings.filterwarnings("ignore", category=FutureWarning)
 try:
     from langchain_core._api.deprecation import LangChainDeprecationWarning
@@ -39,13 +38,11 @@ try:
 except ImportError:
     pass
 
-
-# ------------------------
-# Configure root logger
-# ------------------------
+# ─────────────────────────────────────────────
+# Logging setup
+# ─────────────────────────────────────────────
 logger = logging.getLogger("app")
 logger.setLevel(logging.INFO)
-
 handler = logging.StreamHandler()
 formatter = logging.Formatter(
     "%(asctime)s | %(levelname)s | %(name)s | %(message)s",
@@ -54,20 +51,20 @@ formatter = logging.Formatter(
 handler.setFormatter(formatter)
 logger.addHandler(handler)
 
-# Global variable to track startup time
 startup_time = None
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    """Application lifespan manager."""
     global startup_time
     startup_time = time.time()
     logger.info("🚀 Starting %s v%s", settings.app_name, settings.app_version)
-    logger.info("📊 Server running on %s:%s", settings.host, settings.port)
+    logger.info("📊 Server will run on %s:%s", settings.host, settings.port)
     yield
     logger.info("📊 Shutting down %s", settings.app_name)
 
-# Create FastAPI app instance
+# ─────────────────────────────────────────────
+# FastAPI app creation
+# ─────────────────────────────────────────────
 app = FastAPI(
     title=settings.app_name,
     description=settings.app_description,
@@ -77,36 +74,29 @@ app = FastAPI(
     redoc_url="/redoc"
 )
 
-# Mount RAG router
+# Include routers
 app.include_router(rag_router)
-
 app.include_router(seo_routes.router)
-
 app.include_router(content_relevance_routes.router)
-
-# Mount PageSpeed router
 app.include_router(page_speed_routes.router)
-
-# Mount the keywords router
 app.include_router(keywords_router)
-
-# Mount UI/UX router
 app.include_router(uiux_routes.router)
-
 app.include_router(mobile_usability.router)
 
-# Add CORS middleware
+# CORS
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["*"],  # In production, specify exact origins
+    allow_origins=["*"],  # TODO: Restrict in production
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
 )
 
+# ─────────────────────────────────────────────
+# Routes
+# ─────────────────────────────────────────────
 @app.get("/", response_model=dict)
 async def root():
-    """Root endpoint with API information."""
     return {
         "message": f"Welcome to {settings.app_name}",
         "version": settings.app_version,
@@ -115,28 +105,22 @@ async def root():
         "health": "/health"
     }
 
-
 @app.get("/health", response_model=HealthResponse)
 async def health_check():
-    """Health check endpoint."""
-    global startup_time
-    
     if startup_time:
         uptime_seconds = time.time() - startup_time
         uptime_str = f"{uptime_seconds:.2f} seconds"
     else:
         uptime_str = "Unknown"
-    
+
     return HealthResponse(
         status="healthy",
         version=settings.app_version,
         uptime=uptime_str
     )
 
-
 @app.exception_handler(404)
 async def not_found_handler(request, exc):
-    """Custom 404 handler."""
     logger.warning("404 Not Found: %s %s", request.method, request.url.path)
     return JSONResponse(
         status_code=404,
@@ -149,7 +133,6 @@ async def not_found_handler(request, exc):
 
 @app.exception_handler(500)
 async def internal_error_handler(request, exc):
-    """Custom 500 handler."""
     logger.error("500 Internal Server Error: %s %s -> %s", request.method, request.url.path, exc, exc_info=True)
     return JSONResponse(
         status_code=500,
@@ -160,13 +143,20 @@ async def internal_error_handler(request, exc):
         }
     )
 
-
+# ─────────────────────────────────────────────
+# Entrypoint
+# ─────────────────────────────────────────────
 if __name__ == "__main__":
     import uvicorn
-    # When running directly, uvicorn will print its own logs. We just start it here.
+
+    # Force Cloud Run compatible host/port
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", settings.port if settings.port else 8080))
+
+    logger.info(f"Starting Uvicorn with host={host}, port={port}")
     uvicorn.run(
         "app.main:app",
-        host=settings.host,
-        port=settings.port,
+        host=host,
+        port=port,
         reload=settings.debug
     )