📡 feat: redirect / to /mcp or /sse by Accept header & load settings from TOML

- Added root route redirecting to MCP or SSE endpoints based on Accept header (fixed MCP Clients usage).
- Centralized pyproject.toml value loading for VERSION, and description.

✅ Local Tests: all 116 tests passed successfully.

Author: Falamarcao

config.yaml

@@ -1,5 +1,4 @@
-project_name: MCP Selenium Server
-version: 0.1.0
+project_name: MCP Selenium Grid
 deployment_mode: docker # one of: docker, kubernetes (DeploymentMode enum values)
 api_v1_str: /api/v1
 api_token: CHANGE_ME

pyproject.toml

@@ -13,8 +13,8 @@
 
 [project]
 name = "mcp-selenium-grid"
-version = "0.1.0.dev2"
-description = "MCP Server for managing Selenium Grid instances"
+version = "0.1.0.dev3"
+description = "MCP Server for managing Selenium Grid"
 readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.12"
@@ -25,7 +25,7 @@ dependencies = [
     "fastapi[standard]>=0.115.14", # Web framework
     "fastapi-cli[standard-no-fastapi-cloud-cli]>=0.0.8",
     "fastapi-mcp>=0.3.4", # MCP integration for FastAPI
-    "pydantic[email]>=2.11.7", # Data validation, email support
+    "pydantic>=2.11.7", # Data validation
     "pydantic-settings>=2.10.1", # Settings management (latest is 2.2.1)
     "docker>=7.1.0", # Docker API client
     "kubernetes>=33.1.0", # Kubernetes API client3

src/app/common/toml.py

@@ -0,0 +1,43 @@
+from os import getcwd
+from pathlib import Path
+from tomllib import load
+from typing import Any
+
+ROOT_DIR = Path(getcwd()).resolve()
+
+
+def load_value_from_toml(
+    keys: list[str], file_path: Path = ROOT_DIR / "pyproject.toml", default: Any = None
+) -> Any:
+    """
+    Load a nested value from a TOML file.
+
+    Args:
+        keys: List of nested keys to traverse.
+        file_path: Path to the TOML file.
+        default: Value to return if keys not found.
+
+    Returns:
+        The value from the TOML file.
+
+    Raises:
+        FileNotFoundError: If the file doesn't exist and no default is provided.
+        ValueError: If the keys are missing and no default is provided.
+    """
+    if not file_path.exists():
+        if default is not None:
+            return default
+        raise FileNotFoundError(f"{file_path} not found")
+
+    try:
+        with file_path.open("rb") as f:
+            data = load(f)
+        for key in keys:
+            data = data[key]
+        return data
+    except KeyError:
+        if default is not None:
+            return default
+        raise ValueError(f"Keys {'.'.join(keys)} not found in {file_path}")
+    except Exception as e:
+        raise ValueError(f"Error reading {file_path}: {e}") from e

src/app/core/settings.py

@@ -1,20 +1,27 @@
 """Core settings for MCP Server."""
 
-from pydantic import Field, SecretStr
+from pydantic import Field, SecretStr, field_validator
 
+from app.common.toml import load_value_from_toml
 from app.services.selenium_hub.models.general_settings import SeleniumHubGeneralSettings
 
 
 class Settings(SeleniumHubGeneralSettings):
     """MCP Server settings."""
 
     # API Settings
-    PROJECT_NAME: str = Field(default="MCP Selenium Server")
-    VERSION: str = Field(default="0.1.0")
-    API_V1_STR: str = Field(default="/api/v1")
+    PROJECT_NAME: str = "MCP Selenium Grid"
+    VERSION: str = ""
+
+    @field_validator("VERSION", mode="before")
+    @classmethod
+    def load_version_from_pyproject(cls, v: str) -> str:
+        return v or load_value_from_toml(["project", "version"])
+
+    API_V1_STR: str = "/api/v1"
 
     # API Token
-    API_TOKEN: SecretStr = Field(default=SecretStr("CHANGE_ME"))
+    API_TOKEN: SecretStr = SecretStr("CHANGE_ME")
 
     # Security Settings
     BACKEND_CORS_ORIGINS: list[str] = Field(

src/app/main.py

@@ -1,18 +1,21 @@
-"""MCP Server for managing Selenium Grid instances."""
+"""MCP Server for managing Selenium Grid."""
 
 import asyncio
 from contextlib import asynccontextmanager
 from typing import Any, AsyncGenerator
 
 from fastapi import Depends, FastAPI, HTTPException, Request, status
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse, RedirectResponse
 from fastapi.security import HTTPAuthorizationCredentials
 from fastapi_mcp import FastApiMCP
 from prometheus_client import generate_latest
 from prometheus_fastapi_instrumentator import Instrumentator
 from starlette.responses import Response
 
+from app.common.toml import load_value_from_toml
 from app.dependencies import get_settings, verify_token
+from app.logger import logger
 from app.models import HealthCheckResponse, HealthStatus, HubStatusResponse
 from app.routers.browsers import router as browsers_router
 from app.routers.selenium_proxy import router as selenium_proxy_router
@@ -23,6 +26,7 @@ def create_application() -> FastAPI:
     """Create FastAPI application for MCP."""
     # Initialize settings once at the start
     settings = get_settings()
+    DESCRIPTION = load_value_from_toml(["project", "description"])
 
     @asynccontextmanager
     async def lifespan(app: FastAPI) -> AsyncGenerator[None, Any]:
@@ -52,14 +56,12 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, Any]:
         yield
 
         # --- Server shutdown: remove Selenium Hub resources (Docker or Kubernetes) ---
-        # manager = SeleniumHubManager(settings)
-        # manager.cleanup()
         hub.cleanup()
 
     app = FastAPI(
         title=settings.PROJECT_NAME,
         version=settings.VERSION,
-        description="MCP Server for managing Selenium Grid instances",
+        description=DESCRIPTION,
         lifespan=lifespan,
     )
 
@@ -77,7 +79,9 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, Any]:
 
     # Prometheus metrics endpoint
     @app.get("/metrics")
-    def metrics(credentials: HTTPAuthorizationCredentials = Depends(verify_token)) -> Response:
+    async def metrics(
+        credentials: HTTPAuthorizationCredentials = Depends(verify_token),
+    ) -> Response:
         return Response(generate_latest(), media_type="text/plain")
 
     # Health check endpoint
@@ -127,8 +131,37 @@ async def get_hub_stats(
     app.include_router(selenium_proxy_router)
 
     # --- MCP Integration ---
-    mcp = FastApiMCP(app)
-    mcp.mount()  # Mounts at /mcp by default
+    mcp = FastApiMCP(
+        app,
+        name="MCP Selenium Grid",
+        description=DESCRIPTION,
+        describe_full_response_schema=True,
+        describe_all_responses=True,
+    )
+    MCP_HTTP_PATH = "/mcp"
+    MCP_SSE_PATH = "/sse"
+    mcp.mount_http(mount_path=MCP_HTTP_PATH)
+    mcp.mount_sse(mount_path=MCP_SSE_PATH)
+
+    @app.api_route("/", methods=["GET", "POST"], include_in_schema=False)
+    async def root_redirect(request: Request) -> Response:
+        accept: str = request.headers.get("accept", "").lower()
+        method: str = request.method.upper()
+
+        logger.info(f"Received {method=} with Accept: {accept}")
+
+        if "text/event-stream" in accept:
+            # MCP allows POST or GET here
+            logger.info(f"Redirecting to SSE endpoint /sse (method={method})")
+            return RedirectResponse(url="/sse")
+        elif "application/json" in accept:
+            # JSON RPC endpoint (usually POST)
+            logger.info(f"Redirecting to HTTP JSON RPC endpoint /mcp (method={method})")
+            return RedirectResponse(url="/mcp")
+        else:
+            logger.warning(f"Unsupported Accept header or method: method={method}, accept={accept}")
+            return JSONResponse({"detail": "Unsupported Accept header or method"}, status_code=405)
+
     # ----------------------
 
     return app