Spaces:

promptAId
/

Promptaid-VIsion

Running

App Files Files Community

SCGR commited on Aug 14

Commit

8d0e263

1 Parent(s): 1682252

Ship frontend

Browse files

Files changed (2) hide show

Dockerfile +40 -35
py_backend/app/main.py +28 -27

Dockerfile CHANGED Viewed

@@ -1,35 +1,40 @@
-FROM python:3.11-slim
-# Build deps for psycopg2 etc.
-RUN apt-get update && apt-get install -y \
-    build-essential gcc libpq-dev \
- && rm -rf /var/lib/apt/lists/*
-WORKDIR /app
-# Install Python deps first for better caching
-COPY py_backend/requirements.txt /tmp/requirements.txt
-RUN pip install --no-cache-dir -r /tmp/requirements.txt
-# Copy backend code
-COPY py_backend/ /app/
-# Copy startup script
-COPY entrypoint.sh /app/entrypoint.sh
-RUN chmod +x /app/entrypoint.sh
-# Default runtime env (can be overridden by Space Secrets)
-ENV DATABASE_URL=sqlite:////data/app.db
-ENV STORAGE_PROVIDER=local
-ENV STORAGE_DIR=/data/uploads
-ENV HF_HOME=/data/.cache/huggingface
-# Create writable data dirs (enable “Persistent storage” in Space settings to keep them)
-RUN mkdir -p /data/uploads && chmod -R 777 /data
-# Hugging Face sets PORT; default to 7860
-ENV PORT=7860
-EXPOSE 7860
-# Run via shell script so $PORT is expanded before reaching uvicorn
-ENTRYPOINT ["/app/entrypoint.sh"]

+# ---------- Build frontend ----------
+    FROM node:20-alpine AS fe
+    WORKDIR /fe
+    COPY frontend/package*.json ./
+    RUN npm ci
+    COPY frontend/ .
+    RUN npm run build   # produces /fe/dist
+    # ---------- Backend image ----------
+    FROM python:3.11-slim
+    RUN apt-get update && apt-get install -y \
+        build-essential gcc libpq-dev \
+     && rm -rf /var/lib/apt/lists/*
+    WORKDIR /app
+    # Install backend deps
+    COPY py_backend/requirements.txt /tmp/requirements.txt
+    RUN pip install --no-cache-dir -r /tmp/requirements.txt
+    # Copy backend code
+    COPY py_backend/ /app/
+    # Copy built frontend into the image (served by FastAPI)
+    COPY --from=fe /fe/dist /app/static
+    # Data dirs & sensible defaults (you can keep sqlite fallback if you want)
+    RUN mkdir -p /data/uploads && chmod -R 777 /data
+    ENV STORAGE_PROVIDER=local
+    ENV STORAGE_DIR=/data/uploads
+    ENV HF_HOME=/data/.cache/huggingface
+    # Spaces provides PORT; default to 7860 locally
+    ENV PORT=7860
+    EXPOSE 7860
+    # Start backend (serves API + static frontend)
+    CMD uvicorn app.main:app --host 0.0.0.0 --port $PORT

py_backend/app/main.py CHANGED Viewed

@@ -1,51 +1,52 @@
-from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import HTMLResponse, JSONResponse
-from app.routers import upload, caption, metadata, models
 from app.config import settings
 from app.routers.images import router as images_router
 app = FastAPI(title="PromptAid Vision")
 app.add_middleware(
     CORSMiddleware,
     allow_origins=[
         "http://localhost:3000",
         "http://localhost:5173",
-        "https://huggingface.co",
-        "https://*.hf.space",
-        "https://*.hf.space",
-        "*"
     ],
-    allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
 )
-app.include_router(caption.router,  prefix="/api",      tags=["captions"])
-app.include_router(metadata.router, prefix="/api",      tags=["metadata"])
-app.include_router(models.router,   prefix="/api",      tags=["models"])
-app.include_router(upload.router,   prefix="/api/images", tags=["images"])
-app.include_router(images_router,  prefix="/api/contribute", tags=["contribute"])
-@app.get("/", include_in_schema=False, response_class=HTMLResponse)
-async def root():
-    # simple page so HF health-check gets 200 OK
-    return """<!doctype html>
-<title>PromptAid Vision</title>
-<h1>PromptAid Vision API</h1>
-<p>OK</p>
-<p>See <a href="/docs">/docs</a> for the API.</p>
-"""
 @app.get("/health", include_in_schema=False, response_class=JSONResponse)
 async def health():
     return {"status": "ok"}
 print("🚀 PromptAid Vision API server ready")
 print("📊 Available endpoints: /api/images, /api/captions, /api/metadata, /api/models")
 print(f"🌍 Environment: {settings.ENVIRONMENT}")
-print("🔗 CORS enabled for Hugging Face Spaces")

+import os
+from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.staticfiles import StaticFiles
+from fastapi.responses import FileResponse, JSONResponse
 from app.config import settings
+from app.routers import upload, caption, metadata, models
 from app.routers.images import router as images_router
 app = FastAPI(title="PromptAid Vision")
+# CORS: allow localhost dev and all *.hf.space
 app.add_middleware(
     CORSMiddleware,
     allow_origins=[
         "http://localhost:3000",
         "http://localhost:5173",
     ],
+    allow_origin_regex=r"https://.*\.hf\.space$",  # Hugging Face subdomains
+    allow_credentials=False,  # must be False if using "*" or regex
     allow_methods=["*"],
     allow_headers=["*"],
 )
+# ---- API routers (keep them under /api) ----
+app.include_router(caption.router,    prefix="/api",           tags=["captions"])
+app.include_router(metadata.router,   prefix="/api",           tags=["metadata"])
+app.include_router(models.router,     prefix="/api",           tags=["models"])
+app.include_router(upload.router,     prefix="/api/images",    tags=["images"])
+app.include_router(images_router,     prefix="/api/contribute", tags=["contribute"])
+# Simple health endpoint for HF health checks
 @app.get("/health", include_in_schema=False, response_class=JSONResponse)
 async def health():
     return {"status": "ok"}
+# ---- Serve built frontend (Vite) ----
+STATIC_DIR = os.path.join(os.path.dirname(__file__), "..", "static")
+app.mount("/", StaticFiles(directory=STATIC_DIR, html=True), name="static")
+# SPA fallback for client-side routes; don't intercept API or docs
+@app.get("/{full_path:path}", include_in_schema=False)
+def spa_fallback(full_path: str):
+    if full_path.startswith(("api", "docs", "redoc", "openapi")):
+        raise HTTPException(status_code=404, detail="Not Found")
+    return FileResponse(os.path.join(STATIC_DIR, "index.html"))
 print("🚀 PromptAid Vision API server ready")
 print("📊 Available endpoints: /api/images, /api/captions, /api/metadata, /api/models")
 print(f"🌍 Environment: {settings.ENVIRONMENT}")
+print("🔗 CORS enabled for localhost and *.hf.space")