Upload app.py

app.py

@@ -827,23 +827,41 @@ with gr.Blocks(title="PDF Layout Extractor") as demo:
     )
 
 
-# Mount Gradio to FastAPI
-# We mount it at the root "/" to replace the old index.html, 
-# OR we can mount it at "/gradio" and keep the old UI. 
-# The user said "switch to gradio", implying replacement or primary usage.
-# HF Spaces expects the app at root. 
-# But we have specific API endpoints.
-# Let's mount Gradio at "/" and move the custom API docs to "/docs" (already there).
-# Wait, if we mount at "/", it might shadow "/api" if not careful?
-# No, FastAPI routing takes precedence if defined before mounting, usually.
-# But `gr.mount_gradio_app` documentation says it mounts a sub-app.
-# If path="", it mounts at root.
-# Let's mount at "/" but ensure API routes work.
-# Actually, `mount_gradio_app` handles this gracefully if we pass the `app`.
-
-app = gr.mount_gradio_app(app, demo, path="/")
+# --------------------------------------------------------------------------------
+# Integrate FastAPI routes into Gradio's app
+# --------------------------------------------------------------------------------
+# Gradio creates a FastAPI app internally. We add our API routes to it.
+# This approach works better on HF Spaces than mounting Gradio on our FastAPI app.
+
+# Access Gradio's internal FastAPI app
+fastapi_app = demo.fastapi_app
+
+# Add our existing routes to Gradio's FastAPI instance
+# We need to re-register all our routes on this app
+fastapi_app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+# Mount static output directory
+fastapi_app.mount("/output", StaticFiles(directory="output"), name="output")
+
+# Re-register all API routes
+fastapi_app.get("/api/docs", response_class=HTMLResponse, tags=["UI"], include_in_schema=False)(api_docs_redirect)
+fastapi_app.get("/api/device-info", response_model=DeviceInfo, tags=["System"])(device_info_endpoint)
+fastapi_app.post("/api/upload", response_model=TaskStartResponse, tags=["Processing"])(upload_files)
+fastapi_app.get("/api/progress/{task_id}", response_model=ProgressResponse, tags=["Processing"])(get_progress)
+fastapi_app.get("/api/pdf-list", response_model=PDFListResponse, tags=["Retrieval"])(pdf_list)
+fastapi_app.get("/api/pdf-details/{pdf_stem}", tags=["Retrieval"])(pdf_details)
+fastapi_app.post("/api/predict", tags=["Legacy"])(predict)
+fastapi_app.post("/api/delete", tags=["Processing"])(delete_pdf)
+
+# For HF Spaces: expose the Gradio demo as 'app'
+app = demo
 
 if __name__ == "__main__":
-    import uvicorn
-    # Disable reload in production (HF Spaces) to prevent EADDRINUSE and loop issues
-    uvicorn.run("app:app", host="0.0.0.0", port=7860, reload=False)
+    # For local development
+    demo.launch(server_name="0.0.0.0", server_port=7860)