First commit

Dockerfile

@@ -4,8 +4,7 @@ FROM python:3.11-slim
 # --- base env ---
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \
-    PIP_NO_CACHE_DIR=1 \
-    UVICORN_WORKERS=2
+    PIP_NO_CACHE_DIR=1
 
 # --- system deps ---
 RUN apt-get update \
@@ -15,21 +14,21 @@ RUN apt-get update \
 # --- app dir ---
 WORKDIR /app
 
-# --- python deps layer (better cache) ---
-COPY requirements.txt ./ 
+# --- python deps (cache friendly layer) ---
+COPY requirements.txt ./
 RUN pip install --upgrade pip && pip install -r requirements.txt
 
 # --- copy app ---
 COPY . .
 
-# --- Spaces sets $PORT dynamically; honor it ---
-ARG PORT=7860
-ENV PORT=${PORT}
-EXPOSE ${PORT}
+# Hugging Face sets $PORT at runtime; keep a sane default for local runs
+ENV PORT=7860
+EXPOSE 7860
 
-# Optional: run as non-root (safer)
+# Optional: run as non-root
 # RUN useradd -ms /bin/bash appuser && chown -R appuser:appuser /app
 # USER appuser
 
-# --- start ---
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "${PORT}"]
+# --- start (shell form so $PORT expands) ---
+# --proxy-headers is helpful behind HF’s proxy
+CMD uvicorn app.main:app --host 0.0.0.0 --port $PORT --proxy-headers

app/main.py

@@ -7,12 +7,22 @@ from contextlib import asynccontextmanager
 from typing import Any, Dict
 
 from fastapi import FastAPI
-from fastapi.responses import JSONResponse, RedirectResponse
+from fastapi.responses import RedirectResponse
 
-# Your existing middleware bundle (req id, rate limit, etag, etc.)
-from .middleware import attach_middlewares
-
-# Core API routers
+# --- Middlewares ---
+# Prefer the canonical package name; if your repo uses "middlewares/", this tries both.
+try:
+    from .middleware import attach_middlewares  # singular
+except Exception:
+    try:
+        from .middlewares import attach_middlewares  # plural
+    except Exception:
+        def attach_middlewares(app: FastAPI) -> None:  # no-op fallback
+            logging.getLogger("uvicorn.error").warning(
+                "attach_middlewares not found; continuing without custom middlewares."
+            )
+
+# --- Routers ---
 from .routers import health, plan, chat
 
 # Optional UI (Home/Chat/Dev). If missing, we gracefully fall back to a JSON root.
@@ -22,7 +32,6 @@ try:
 except Exception:  # pragma: no cover
     HAS_UI = False
 
-
 TAGS_METADATA = [
     {"name": "Health", "description": "Liveness / readiness probes and basic service metadata."},
     {"name": "Planning", "description": "AI plan generation for Matrix Guardian (/v1/plan)."},
@@ -30,17 +39,12 @@ TAGS_METADATA = [
     {"name": "UI", "description": "Minimal web UI (Home, Chat, Dev) if enabled."},
 ]
 
-
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    """
-    Lightweight startup/shutdown hooks.
-    Stores process start time for basic diagnostics and logs boot/shutdown.
-    """
     app.state.started_at = time.time()
     app.state.version = os.getenv("APP_VERSION", "1.0.0")
     logging.getLogger("uvicorn.error").info(
-        "matrix-ai starting (version=%s)", app.state.version
+        "matrix-ai starting (version=%s, port=%s)", app.state.version, os.getenv("PORT", "7860")
     )
     try:
         yield
@@ -50,9 +54,7 @@ async def lifespan(app: FastAPI):
             "matrix-ai shutting down (uptime=%.2fs)", uptime
         )
 
-
 def create_app() -> FastAPI:
-    """Create and configure the FastAPI application instance."""
     app = FastAPI(
         title="matrix-ai",
         version=os.getenv("APP_VERSION", "1.0.0"),
@@ -63,7 +65,7 @@ def create_app() -> FastAPI:
         lifespan=lifespan,
     )
 
-    # Middlewares (request-id, gzip, rate-limit, idempotency headers, etc.)
+    # Middlewares (request-id, gzip, rate-limit, etc.)
     attach_middlewares(app)
 
     # Core routers
@@ -75,7 +77,7 @@ def create_app() -> FastAPI:
     if HAS_UI:
         app.include_router(ui_router, tags=["UI"])
     else:
-        # Minimal root so HF Spaces / root health probes pass even without UI
+        # Minimal root so HF root probes pass even without UI
         @app.get("/", include_in_schema=False)
         async def root() -> Dict[str, Any]:
             return {
@@ -83,19 +85,13 @@ def create_app() -> FastAPI:
                 "service": "matrix-ai",
                 "version": app.version,
                 "docs": "/docs",
-                "endpoints": {
-                    "plan": "/v1/plan",
-                    "chat": "/v1/chat",
-                    "healthz": "/healthz",
-                },
+                "endpoints": {"plan": "/v1/plan", "chat": "/v1/chat", "healthz": "/healthz"},
             }
 
-        # Optional convenience redirect to API docs
         @app.get("/home", include_in_schema=False)
         async def home_redirect():
             return RedirectResponse(url="/docs", status_code=302)
 
     return app
 
-
 app = create_app()