Spaces:

userIdc2024
/

Creative_Breakthrough

Running

App Files Files Community

sushilideaclan01 commited on Jan 14

Commit

45ef06a

1 Parent(s): a18335a

Fix: Mount Next.js static files directly, use Response instead of StreamingResponse for better compatibility

Browse files

Files changed (1) hide show

main.py +16 -8

main.py CHANGED Viewed

@@ -8,7 +8,7 @@ from contextlib import asynccontextmanager
 from fastapi import FastAPI, HTTPException, Request, Response, Depends
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
-from fastapi.responses import FileResponse, StreamingResponse
 from pydantic import BaseModel, Field
 from typing import Optional, List, Literal, Any, Dict
 import os
@@ -85,6 +85,11 @@ async def add_cache_headers(request: Request, call_next):
 os.makedirs(settings.output_dir, exist_ok=True)
 app.mount("/images", StaticFiles(directory=settings.output_dir), name="images")
 # Request/Response schemas
 class GenerateRequest(BaseModel):
@@ -335,8 +340,7 @@ async def root():
         async with httpx.AsyncClient(timeout=30.0) as client:
             response = await client.get("http://localhost:3000/")
             # Return full response (not streaming) for better HF compatibility
-            from fastapi.responses import Response
-            return Response(
                 content=response.content,
                 status_code=response.status_code,
                 headers={k: v for k, v in response.headers.items() if k.lower() not in ['content-encoding', 'transfer-encoding', 'content-length']},
@@ -344,7 +348,7 @@ async def root():
             )
     except httpx.RequestError:
         # Return a simple HTML page if frontend is not ready yet
-        return Response(
             content="<html><head><meta http-equiv='refresh' content='2'></head><body><h1>Loading...</h1></body></html>",
             status_code=200,
             media_type="text/html"
@@ -1181,6 +1185,10 @@ async def frontend_proxy(path: str, request: StarletteRequest):
     if path.startswith("image/") or path.startswith("images/"):
         raise HTTPException(status_code=404, detail="API endpoint not found")
     # Check if this is a GET for data endpoints (with specific patterns)
     if request.method == "GET":
         for route in api_get_routes:
@@ -1207,11 +1215,11 @@ async def frontend_proxy(path: str, request: StarletteRequest):
                 follow_redirects=True,
             )
-            # Return response
-            return StreamingResponse(
-                response.iter_bytes(),
                 status_code=response.status_code,
-                headers=dict(response.headers),
                 media_type=response.headers.get("content-type"),
             )
     except httpx.RequestError:

 from fastapi import FastAPI, HTTPException, Request, Response, Depends
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
+from fastapi.responses import FileResponse, StreamingResponse, Response as FastAPIResponse
 from pydantic import BaseModel, Field
 from typing import Optional, List, Literal, Any, Dict
 import os
 os.makedirs(settings.output_dir, exist_ok=True)
 app.mount("/images", StaticFiles(directory=settings.output_dir), name="images")
+# Serve Next.js static files directly (better performance than proxying)
+frontend_static_path = os.path.join(os.path.dirname(__file__), "frontend", ".next", "static")
+if os.path.exists(frontend_static_path):
+    app.mount("/_next/static", StaticFiles(directory=frontend_static_path), name="nextjs_static")
 # Request/Response schemas
 class GenerateRequest(BaseModel):
         async with httpx.AsyncClient(timeout=30.0) as client:
             response = await client.get("http://localhost:3000/")
             # Return full response (not streaming) for better HF compatibility
+            return FastAPIResponse(
                 content=response.content,
                 status_code=response.status_code,
                 headers={k: v for k, v in response.headers.items() if k.lower() not in ['content-encoding', 'transfer-encoding', 'content-length']},
             )
     except httpx.RequestError:
         # Return a simple HTML page if frontend is not ready yet
+        return FastAPIResponse(
             content="<html><head><meta http-equiv='refresh' content='2'></head><body><h1>Loading...</h1></body></html>",
             status_code=200,
             media_type="text/html"
     if path.startswith("image/") or path.startswith("images/"):
         raise HTTPException(status_code=404, detail="API endpoint not found")
+    # Skip static files - they're mounted directly
+    if path.startswith("_next/static/"):
+        raise HTTPException(status_code=404, detail="Static file not found")
     # Check if this is a GET for data endpoints (with specific patterns)
     if request.method == "GET":
         for route in api_get_routes:
                 follow_redirects=True,
             )
+            # Return full response (not streaming) for better compatibility
+            return FastAPIResponse(
+                content=response.content,
                 status_code=response.status_code,
+                headers={k: v for k, v in response.headers.items() if k.lower() not in ['content-encoding', 'transfer-encoding', 'content-length']},
                 media_type=response.headers.get("content-type"),
             )
     except httpx.RequestError: