Upload 3 files

CHANGELOG.md

@@ -9,6 +9,15 @@
 
 # Changelog
 
+## V33 — Root custom dashboard
+
+- Serve the custom dashboard directly at `/` and `/custom`.
+- Move the legacy Gradio controls behind `/_gradio` for OAuth/debug only.
+- Remove the product-facing Gradio iframe/preview experience.
+- Keep OAuth-backed API routes and custom dashboard behavior intact.
+- Add `uvicorn` as an explicit runtime dependency.
+
+
 ## v31 — Functional feedback verification
 
 - Added stronger Custom UI feedback states so bucket checks, build launch, validation launch, and polling always show visible status.

README.md

@@ -26,7 +26,9 @@ model card → agentic job → generated private Space → hardware if available
 
 ## Custom UI
 
-A custom dashboard is available at `/custom`. It is wired to the same OAuth-backed backend as the Gradio fallback and supports:
+The product root (`/`) is now the custom dashboard. `/custom` is kept as an alias for the same UI. Gradio is no longer shown in the normal product flow; a debug/auth mount exists under `/_gradio` only to preserve Hugging Face OAuth routes and internal diagnostics.
+
+The custom dashboard supports:
 
 - bucket onboarding, including check/create before build;
 - build launch with explicit ZeroGPU-first and fixed-GPU fallback controls;
@@ -35,7 +37,11 @@ A custom dashboard is available at `/custom`. It is wired to the same OAuth-back
 - recent run exploration from the signed-in user's Bucket;
 - quick links to the HF Job, generated Space, Space settings, and run artifacts.
 
-The Gradio controls remain available as a conservative fallback while the custom UI is validated across more models. The custom UI now follows the validated dashboard layout: Build from model card, live progress, validation metrics, recent events, Run Explorer, selected run details, report preview, and quick links are visible from the main cockpit. It prevents build launches until the user bucket is ready, validates required fields before launch, shows explicit busy/error/success states, and keeps retrying live progress with a visible warning if polling is temporarily unavailable. This avoids leaving users unsure whether the Job is still running.
+The UI follows the validated dashboard layout: Build from model card, live progress, validation metrics, recent events, Run Explorer, selected run details, report preview, and quick links are visible from the main cockpit. It prevents build launches until the user bucket is ready, validates required fields before launch, shows explicit busy/error/success states, and keeps retrying live progress with a visible warning if polling is temporarily unavailable. This avoids leaving users unsure whether the Job is still running.
+
+### V33 root custom dashboard
+
+V33 removes the Gradio iframe/product shell problem: the public root is the custom dashboard itself. The old Gradio controls are not part of the normal UI anymore.
 
 ## V26 custom Run Explorer with selected-run actions
 
@@ -117,20 +123,6 @@ Generated Spaces no longer pin `huggingface_hub<1.0.0`; modern model cards may r
 Hardware decisions are written to `hardware_strategy.json` and `hardware_attempts.json` in the user run bucket.
 
 
-## V24 custom UI shell
-
-V24 introduces the first custom-frontend pass without replacing the validated Gradio controls yet. The custom dashboard is served at `/custom` and embedded in the app as **Custom UI preview**. It includes:
-
-- a product-style Build from model card screen,
-- a live progress card and timeline model,
-- quick links placeholders,
-- a Run Explorer with selected-run actions shell for the connected bucket,
-- static frontend assets under `web/static/`,
-- a small API skeleton for app info, progress projection, and future run listing.
-
-The OAuth-backed actions remain in the functional Gradio controls for this pass. The next custom UI pass should wire the frontend actions to authenticated backend endpoints while preserving the same per-user bucket and Job security model.
-
-
 ### Custom UI V27
 
 The custom interface now includes run-level actions: select a previous run, open its Job/Space/Settings/Artifacts, or prepare the Validate existing Space form directly from that run. A manual hardware action panel appears when a run requires user hardware selection.

app.py

@@ -5,8 +5,9 @@ from pathlib import Path
 from typing import Any
 
 import gradio as gr
-from fastapi import HTTPException, Request
-from fastapi.responses import HTMLResponse, JSONResponse, FileResponse
+import uvicorn
+from fastapi import FastAPI, HTTPException, Request
+from fastapi.responses import HTMLResponse, JSONResponse, FileResponse, RedirectResponse
 
 from src.bucket import check_user_bucket, create_user_bucket, read_run_bundle, list_recent_runs
 from src.config import settings, user_bucket_source
@@ -99,17 +100,18 @@ def _api_links(*, run_id: str | None, bucket_source: str | None, target_space: s
         "artifacts_url": _run_artifacts_url(run_id, bucket_source),
     }
 
-def register_custom_routes(demo: gr.Blocks) -> None:
-    """Register the custom UI and OAuth-backed JSON endpoints."""
+def register_custom_routes(fastapi_app: FastAPI) -> None:
+    """Register the root custom UI and OAuth-backed JSON endpoints."""
 
-    @demo.app.get("/custom", response_class=HTMLResponse)
+    @fastapi_app.get("/", response_class=HTMLResponse)
+    @fastapi_app.get("/custom", response_class=HTMLResponse)
     async def custom_index():  # type: ignore[no-untyped-def]
         index_path = WEB_DIR / "index.html"
         if not index_path.exists():
             raise HTTPException(status_code=404, detail="Custom UI index not found")
         return HTMLResponse(index_path.read_text(encoding="utf-8"))
 
-    @demo.app.get("/custom-static/{asset_path:path}")
+    @fastapi_app.get("/custom-static/{asset_path:path}")
     async def custom_static(asset_path: str):  # type: ignore[no-untyped-def]
         path = (STATIC_DIR / asset_path).resolve()
         if STATIC_DIR.resolve() not in path.parents and path != STATIC_DIR.resolve():
@@ -118,7 +120,15 @@ def register_custom_routes(demo: gr.Blocks) -> None:
             raise HTTPException(status_code=404, detail="Asset not found")
         return FileResponse(path)
 
-    @demo.app.get("/api/app-info")
+    @fastapi_app.get("/login/huggingface")
+    async def login_redirect():  # type: ignore[no-untyped-def]
+        return RedirectResponse("/_gradio/login/huggingface")
+
+    @fastapi_app.get("/logout")
+    async def logout_redirect():  # type: ignore[no-untyped-def]
+        return RedirectResponse("/_gradio/logout")
+
+    @fastapi_app.get("/api/app-info")
     async def api_app_info(request: Request):  # type: ignore[no-untyped-def]
         ctx: dict[str, Any] | None = None
         try:
@@ -128,17 +138,17 @@ def register_custom_routes(demo: gr.Blocks) -> None:
         return JSONResponse(
             {
                 "name": "Agentic Space Factory",
-                "version": "v31-functional-feedback",
+                "version": "v33-custom-root-ui",
                 "bucket_default": settings.bucket_name,
                 "workflows": ["build_from_model_card", "validate_existing_space", "runs_explorer"],
-                "custom_ui_status": "oauth_verified_bridge",
+                "custom_ui_status": "root_custom_ui",
                 "user": {"username": ctx["username"], "missing_scopes": ctx.get("missing_scopes", []), "warnings": ctx.get("warnings", [])} if ctx else None,
-                "login_url": "/login/huggingface",
-                "logout_url": "/logout",
+                "login_url": "/_gradio/login/huggingface",
+                "logout_url": "/_gradio/logout",
             }
         )
 
-    @demo.app.get("/api/me")
+    @fastapi_app.get("/api/me")
     async def api_me(request: Request):  # type: ignore[no-untyped-def]
         ctx = _oauth_context_from_request(request)
         return JSONResponse(
@@ -155,29 +165,29 @@ def register_custom_routes(demo: gr.Blocks) -> None:
                 "missing_scopes": ctx.get("missing_scopes", []),
                 "warnings": ctx.get("warnings", []),
                 "expires_at": ctx.get("expires_at"),
-                "login_url": "/login/huggingface",
-                "logout_url": "/logout",
+                "login_url": "/_gradio/login/huggingface",
+                "logout_url": "/_gradio/logout",
             }
         )
 
-    @demo.app.get("/api/oauth/diagnostics")
+    @fastapi_app.get("/api/oauth/diagnostics")
     async def api_oauth_diagnostics(request: Request):  # type: ignore[no-untyped-def]
         ctx = extract_oauth_context(request)
         return JSONResponse({"user": public_oauth_context(ctx), "token_identity": verify_token_identity(ctx)})
 
-    @demo.app.get("/api/bucket/status")
+    @fastapi_app.get("/api/bucket/status")
     async def api_bucket_status(request: Request, bucket_name: str = settings.bucket_name):  # type: ignore[no-untyped-def]
         ctx = _oauth_context_from_request(request)
         return JSONResponse(check_user_bucket(username=ctx["username"], bucket_name=bucket_name, token=ctx["token"]))
 
-    @demo.app.post("/api/bucket/create")
+    @fastapi_app.post("/api/bucket/create")
     async def api_bucket_create(request: Request, payload: dict[str, Any] | None = None):  # type: ignore[no-untyped-def]
         ctx = _oauth_context_from_request(request)
         payload = payload or {}
         bucket_name = str(payload.get("bucket_name") or settings.bucket_name)
         return JSONResponse(create_user_bucket(username=ctx["username"], bucket_name=bucket_name, token=ctx["token"]))
 
-    @demo.app.post("/api/build")
+    @fastapi_app.post("/api/build")
     async def api_build(request: Request, payload: dict[str, Any]):  # type: ignore[no-untyped-def]
         ctx = _oauth_context_from_request(request)
         bucket_name = payload.get("bucket_name") or settings.bucket_name
@@ -208,7 +218,7 @@ def register_custom_routes(demo: gr.Blocks) -> None:
         )
         return JSONResponse(result)
 
-    @demo.app.post("/api/validate")
+    @fastapi_app.post("/api/validate")
     async def api_validate(request: Request, payload: dict[str, Any]):  # type: ignore[no-untyped-def]
         ctx = _oauth_context_from_request(request)
         bucket_name = payload.get("bucket_name") or settings.bucket_name
@@ -241,7 +251,7 @@ def register_custom_routes(demo: gr.Blocks) -> None:
         )
         return JSONResponse(result)
 
-    @demo.app.post("/api/progress/from-events")
+    @fastapi_app.post("/api/progress/from-events")
     async def api_progress_from_events(payload: dict[str, Any]):  # type: ignore[no-untyped-def]
         events = payload.get("events") or []
         state = payload.get("state") or {}
@@ -251,7 +261,7 @@ def register_custom_routes(demo: gr.Blocks) -> None:
             raise HTTPException(status_code=400, detail="state must be an object")
         return JSONResponse(progress_from_events(events, state=state))
 
-    @demo.app.get("/api/runs")
+    @fastapi_app.get("/api/runs")
     async def api_runs(  # type: ignore[no-untyped-def]
         request: Request,
         bucket_name: str = settings.bucket_name,
@@ -270,7 +280,7 @@ def register_custom_routes(demo: gr.Blocks) -> None:
             }
         )
 
-    @demo.app.get("/api/runs/{run_id}")
+    @fastapi_app.get("/api/runs/{run_id}")
     async def api_run_detail(request: Request, run_id: str, bucket_name: str = settings.bucket_name):  # type: ignore[no-untyped-def]
         ctx = _oauth_context_from_request(request)
         run_id = validate_run_id(run_id)
@@ -278,7 +288,7 @@ def register_custom_routes(demo: gr.Blocks) -> None:
         bundle = read_run_bundle(run_id, bucket_source=bucket_source, token=ctx["token"])
         return JSONResponse({"run_id": run_id, "bucket_source": bucket_source, **bundle})
 
-    @demo.app.get("/api/runs/{run_id}/progress")
+    @fastapi_app.get("/api/runs/{run_id}/progress")
     async def api_run_progress(request: Request, run_id: str, bucket_name: str = settings.bucket_name):  # type: ignore[no-untyped-def]
         ctx = _oauth_context_from_request(request)
         run_id = validate_run_id(run_id)
@@ -556,15 +566,6 @@ def build_demo() -> gr.Blocks:
         login_status = gr.Markdown()
         demo.load(fn=get_login_status, inputs=None, outputs=login_status)
 
-        with gr.Tab("Custom UI preview"):
-            gr.Markdown(
-                """
-## Custom UI shell
-
-This is the first custom-frontend pass. The shell, CSS, progress timeline, and API skeleton are available below. OAuth-backed actions remain in the functional Gradio tabs while the custom auth bridge is completed.
-"""
-            )
-            gr.HTML('<iframe src="/custom" style="width:100%; min-height:900px; border:1px solid #e5e7eb; border-radius:16px; background:white;"></iframe>')
 
         gr.Markdown("## Run storage")
         gr.Markdown(
@@ -751,9 +752,32 @@ It cannot guarantee that every model card becomes a working Space. It cannot byp
 """
             )
 
-    register_custom_routes(demo)
     return demo
 
 
+def create_app() -> FastAPI:
+    """Create the product app.
+
+    The public root path is the custom dashboard. A Gradio fallback/debug UI is
+    mounted under `/_gradio` only to preserve Hugging Face OAuth routes and for
+    internal diagnostics; users should not see Gradio in the normal product flow.
+    """
+    fastapi_app = FastAPI(title="Agentic Space Factory")
+    register_custom_routes(fastapi_app)
+    try:
+        debug_demo = build_demo()
+        return gr.mount_gradio_app(fastapi_app, debug_demo, path="/_gradio")
+    except ValueError as exc:
+        # Local development without an HF token can make Gradio's mocked OAuth
+        # routes fail at import time. Keep the custom UI importable and testable.
+        # In Spaces, where HF OAuth is configured, the Gradio auth mount is used.
+        if "HF_TOKEN" not in str(exc) and "logged in to HF" not in str(exc):
+            raise
+        return fastapi_app
+
+
+app = create_app()
+
+
 if __name__ == "__main__":
-    build_demo().launch()
+    uvicorn.run(app, host="0.0.0.0", port=7860)