TRELLIS.2

Paused

choephix commited on Mar 9

Commit

9f74130

1 Parent(s): c62eb3e

Refactor server response handling and add frontend HTML

- Removed the inline HTML landing page from `server.py` and replaced it with a static `index.html` file in the `frontend` directory.
- Updated the root endpoint to serve the new HTML file.
- Enhanced the health check response to include the application version.
- Cleaned up unused imports in `server.py`.

Files changed (2) hide show

frontend/index.html +83 -0
server.py +3 -88

frontend/index.html ADDED Viewed

	@@ -0,0 +1,83 @@

+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<title>TRELLIS.2 API</title>
+<style>
+*{margin:0;padding:0;box-sizing:border-box}
+:root{--bg:#0e0e10;--card:#18181b;--border:#27272a;--text:#e4e4e7;--dim:#71717a;--accent:#a78bfa;--green:#4ade80;--red:#f87171}
+body{font-family:system-ui,-apple-system,sans-serif;background:var(--bg);color:var(--text);min-height:100vh;display:flex;align-items:center;justify-content:center;padding:2rem}
+.wrap{max-width:480px;width:100%}
+h1{font-size:1.6rem;font-weight:700;letter-spacing:-.02em;margin-bottom:.25rem}
+.version{color:var(--dim);font-size:.85rem;margin-bottom:1.5rem}
+.grid{display:grid;grid-template-columns:1fr 1fr;gap:.75rem;margin-bottom:1.5rem}
+.stat{background:var(--card);border:1px solid var(--border);border-radius:.75rem;padding:1rem}
+.stat-label{font-size:.7rem;text-transform:uppercase;letter-spacing:.08em;color:var(--dim);margin-bottom:.35rem}
+.stat-value{font-size:1.5rem;font-weight:600;font-variant-numeric:tabular-nums}
+.stat-value.ready{color:var(--green)}
+.stat-value.not-ready{color:var(--red)}
+.wide{grid-column:1/-1}
+.endpoints{background:var(--card);border:1px solid var(--border);border-radius:.75rem;padding:1rem;margin-bottom:1rem}
+.endpoints h2{font-size:.75rem;text-transform:uppercase;letter-spacing:.08em;color:var(--dim);margin-bottom:.6rem}
+.ep{display:flex;justify-content:space-between;align-items:center;padding:.35rem 0;border-bottom:1px solid var(--border);font-size:.82rem}
+.ep:last-child{border-bottom:none}
+.ep-method{font-weight:600;color:var(--accent);min-width:3.2rem}
+.ep-path{color:var(--text);font-family:ui-monospace,monospace;font-size:.78rem}
+.pulse{display:inline-block;width:8px;height:8px;border-radius:50%;margin-right:.5rem;vertical-align:middle;animation:blink 2s ease-in-out infinite}
+@keyframes blink{0%,100%{opacity:1}50%{opacity:.3}}
+.footer{text-align:center;color:var(--dim);font-size:.7rem;margin-top:1rem}
+</style>
+</head>
+<body>
+<div class="wrap">
+  <h1>TRELLIS.2</h1>
+  <div class="version">Image-to-3D API · <span id="version">...</span></div>
+  <div class="grid">
+    <div class="stat wide">
+      <div class="stat-label">Worker Pool</div>
+      <div class="stat-value" id="pool"><span class="pulse" id="pulse"></span><span id="pool-text">...</span></div>
+    </div>
+    <div class="stat">
+      <div class="stat-label">Active Jobs</div>
+      <div class="stat-value"><span id="active">-</span><span style="color:var(--dim);font-size:.85rem"> / <span id="max">-</span></span></div>
+    </div>
+    <div class="stat">
+      <div class="stat-label">Queued</div>
+      <div class="stat-value" id="queued">-</div>
+    </div>
+  </div>
+  <div class="endpoints">
+    <h2>Endpoints</h2>
+    <div class="ep"><span class="ep-method">POST</span><span class="ep-path">/v1/image-to-glb</span></div>
+    <div class="ep"><span class="ep-method">GET</span><span class="ep-path">/v1/jobs/{job_id}</span></div>
+    <div class="ep"><span class="ep-method">GET</span><span class="ep-path">/v1/jobs/{job_id}/result</span></div>
+    <div class="ep"><span class="ep-method">GET</span><span class="ep-path">/healthz</span></div>
+  </div>
+  <div class="footer">auto-refreshes every 3 s</div>
+</div>
+<script>
+async function poll() {
+  try {
+    const response = await fetch("/healthz");
+    const data = await response.json();
+    const ok = data.worker_pool_ready;
+    document.getElementById("version").textContent = `v${data.version ?? "1.2.0"}`;
+    document.getElementById("pool-text").textContent = ok ? "Ready" : "Not Ready";
+    document.getElementById("pool").className = `stat-value ${ok ? "ready" : "not-ready"}`;
+    document.getElementById("pulse").style.background = ok ? "var(--green)" : "var(--red)";
+    document.getElementById("active").textContent = data.active_jobs;
+    document.getElementById("max").textContent = data.max_concurrent_jobs;
+    document.getElementById("queued").textContent = data.queued_jobs;
+  } catch {
+    document.getElementById("pool-text").textContent = "Unreachable";
+    document.getElementById("pool").className = "stat-value not-ready";
+    document.getElementById("pulse").style.background = "var(--red)";
+  }
+}
+poll();
+setInterval(poll, 3000);
+</script>
+</body>
+</html>

server.py CHANGED Viewed

@@ -15,7 +15,7 @@ from typing import Annotated, Any
 from fastapi import FastAPI, File, Form, HTTPException, UploadFile
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse, HTMLResponse, JSONResponse
 from PIL import Image, UnidentifiedImageError
 import runtime_env  # noqa: F401
@@ -477,6 +477,7 @@ async def healthz() -> dict[str, object]:
     queue_state = state.queue.snapshot()
     return {
         "ok": state.executor is not None,
         "worker_pool_ready": state.executor is not None,
         "max_concurrent_jobs": MAX_CONCURRENT_JOBS,
         "active_jobs": queue_state["active_jobs"],
@@ -485,95 +486,9 @@ async def healthz() -> dict[str, object]:
     }
-_LANDING_HTML = """\
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-<title>TRELLIS.2 API</title>
-<style>
-*{margin:0;padding:0;box-sizing:border-box}
-:root{--bg:#0e0e10;--card:#18181b;--border:#27272a;--text:#e4e4e7;--dim:#71717a;--accent:#a78bfa;--green:#4ade80;--red:#f87171;--yellow:#facc15}
-body{font-family:system-ui,-apple-system,sans-serif;background:var(--bg);color:var(--text);min-height:100vh;display:flex;align-items:center;justify-content:center;padding:2rem}
-.wrap{max-width:480px;width:100%}
-h1{font-size:1.6rem;font-weight:700;letter-spacing:-.02em;margin-bottom:.25rem}
-.version{color:var(--dim);font-size:.85rem;margin-bottom:1.5rem}
-.grid{display:grid;grid-template-columns:1fr 1fr;gap:.75rem;margin-bottom:1.5rem}
-.stat{background:var(--card);border:1px solid var(--border);border-radius:.75rem;padding:1rem}
-.stat-label{font-size:.7rem;text-transform:uppercase;letter-spacing:.08em;color:var(--dim);margin-bottom:.35rem}
-.stat-value{font-size:1.5rem;font-weight:600;font-variant-numeric:tabular-nums}
-.stat-value.ready{color:var(--green)}
-.stat-value.not-ready{color:var(--red)}
-.wide{grid-column:1/-1}
-.endpoints{background:var(--card);border:1px solid var(--border);border-radius:.75rem;padding:1rem;margin-bottom:1rem}
-.endpoints h2{font-size:.75rem;text-transform:uppercase;letter-spacing:.08em;color:var(--dim);margin-bottom:.6rem}
-.ep{display:flex;justify-content:space-between;align-items:center;padding:.35rem 0;border-bottom:1px solid var(--border);font-size:.82rem}
-.ep:last-child{border-bottom:none}
-.ep-method{font-weight:600;color:var(--accent);min-width:3.2rem}
-.ep-path{color:var(--text);font-family:ui-monospace,monospace;font-size:.78rem}
-.pulse{display:inline-block;width:8px;height:8px;border-radius:50%;margin-right:.5rem;vertical-align:middle;animation:blink 2s ease-in-out infinite}
-@keyframes blink{0%,100%{opacity:1}50%{opacity:.3}}
-.footer{text-align:center;color:var(--dim);font-size:.7rem;margin-top:1rem}
-</style>
-</head>
-<body>
-<div class="wrap">
-  <h1>TRELLIS.2</h1>
-  <div class="version">Image-to-3D API &middot; v""" + app.version + """</div>
-  <div class="grid">
-    <div class="stat wide">
-      <div class="stat-label">Worker Pool</div>
-      <div class="stat-value" id="pool"><span class="pulse" id="pulse"></span><span id="pool-text">...</span></div>
-    </div>
-    <div class="stat">
-      <div class="stat-label">Active Jobs</div>
-      <div class="stat-value"><span id="active">-</span><span style="color:var(--dim);font-size:.85rem"> / <span id="max">-</span></span></div>
-    </div>
-    <div class="stat">
-      <div class="stat-label">Queued</div>
-      <div class="stat-value" id="queued">-</div>
-    </div>
-  </div>
-  <div class="endpoints">
-    <h2>Endpoints</h2>
-    <div class="ep"><span class="ep-method">POST</span><span class="ep-path">/v1/image-to-glb</span></div>
-    <div class="ep"><span class="ep-method">GET</span><span class="ep-path">/v1/jobs/{job_id}</span></div>
-    <div class="ep"><span class="ep-method">GET</span><span class="ep-path">/v1/jobs/{job_id}/result</span></div>
-    <div class="ep"><span class="ep-method">GET</span><span class="ep-path">/healthz</span></div>
-  </div>
-  <div class="footer">auto-refreshes every 3 s</div>
-</div>
-<script>
-async function poll(){
-  try{
-    const r=await fetch("/healthz");
-    const d=await r.json();
-    const ok=d.worker_pool_ready;
-    document.getElementById("pool-text").textContent=ok?"Ready":"Not Ready";
-    const pv=document.getElementById("pool");
-    pv.className="stat-value "+(ok?"ready":"not-ready");
-    document.getElementById("pulse").style.background=ok?"var(--green)":"var(--red)";
-    document.getElementById("active").textContent=d.active_jobs;
-    document.getElementById("max").textContent=d.max_concurrent_jobs;
-    document.getElementById("queued").textContent=d.queued_jobs;
-  }catch(e){
-    document.getElementById("pool-text").textContent="Unreachable";
-    document.getElementById("pool").className="stat-value not-ready";
-    document.getElementById("pulse").style.background="var(--red)";
-  }
-}
-poll();
-setInterval(poll,3000);
-</script>
-</body>
-</html>
-"""
 @app.get("/")
 async def root():
-    return HTMLResponse(content=_LANDING_HTML)
 @app.post("/v1/image-to-glb")

 from fastapi import FastAPI, File, Form, HTTPException, UploadFile
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import FileResponse, JSONResponse
 from PIL import Image, UnidentifiedImageError
 import runtime_env  # noqa: F401
     queue_state = state.queue.snapshot()
     return {
         "ok": state.executor is not None,
+        "version": app.version,
         "worker_pool_ready": state.executor is not None,
         "max_concurrent_jobs": MAX_CONCURRENT_JOBS,
         "active_jobs": queue_state["active_jobs"],
     }
 @app.get("/")
 async def root():
+    return FileResponse(ROOT_DIR / "frontend" / "index.html")
 @app.post("/v1/image-to-glb")